Skip to content

Commit ec0fd84

Browse files
authored
Merge pull request #1 from WebODM/updates
Change some URLs, names, fixes
2 parents a02f0d3 + 1686cc3 commit ec0fd84

21 files changed

Lines changed: 64 additions & 81 deletions

.github/workflows/issue-triage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
- uses: pierotofy/issuewhiz@v1
1313
with:
1414
ghToken: ${{ secrets.GITHUB_TOKEN }}
15-
openAI: ${{ secrets.OPENAI_TOKEN }}
16-
model: gpt-4o-2024-08-06
15+
gemini: ${{ secrets.GEMINI_TOKEN }}
16+
model: gemini-2.5-flash
1717
filter: |
1818
- "#"
1919
variables: |
@@ -24,10 +24,10 @@ jobs:
2424
- E: "Contains a suggestion for an improvement or a feature request?"
2525
- SC: "Describes an issue related to compiling or building source code?"
2626
logic: |
27-
- 'Q and (not B) and (not P) and (not E) and (not SC) and not (title_lowercase ~= ".*bug: .+")': [comment: "Could we move this conversation over to the forum at https://community.opendronemap.org? The forum is the right place to ask questions (we try to keep the GitHub issue tracker for feature requests and bugs only). Thank you!", close: true, stop: true]
27+
- 'Q and (not B) and (not P) and (not E) and (not SC) and not (title_lowercase ~= ".*bug: .+")': [comment: "Could we move this conversation over to a community https://webodm.org/community ? The forum is the right place to ask questions (we try to keep the GitHub issue tracker for feature requests and bugs only). Thank you!", close: true, stop: true]
2828
- "B and (not P) and (not E) and (not SC)": [label: "software fault", stop: true]
2929
- "P and D": [label: "possible software fault", stop: true]
30-
- "P and (not D) and (not SC) and (not E)": [comment: "Thanks for the report, but it looks like you didn't include a copy of your dataset for us to reproduce this issue? Please make sure to follow our [issue guidelines](https://github.com/OpenDroneMap/ODM/blob/master/docs/issue_template.md) :pray: ", close: true, stop: true]
30+
- "P and (not D) and (not SC) and (not E)": [comment: "Thanks for the report, but it looks like you didn't include a copy of your dataset for us to reproduce this issue? Please make sure to follow our [issue guidelines](https://github.com/WebODM/ODM/blob/master/docs/issue_template.md) :pray: ", close: true, stop: true]
3131
- "E": [label: enhancement, stop: true]
3232
- "SC": [label: "possible software fault"]
3333

.github/workflows/publish-docker-gpu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
platforms: linux/amd64
3232
push: true
3333
no-cache: true
34-
tags: opendronemap/odm:gpu
34+
tags: webodm/odm:gpu
3535
# Trigger NodeODM build
3636
- name: Dispatch NodeODM Build Event
3737
id: nodeodm_dispatch
3838
run: |
39-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/OpenDroneMap/NodeODM/actions/workflows/publish-docker-gpu.yaml/dispatches --data '{"ref": "master"}'
39+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/WebODM/NodeODM/actions/workflows/publish-docker-gpu.yaml/dispatches --data '{"ref": "master"}'

.github/workflows/publish-docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
id: docker_meta
3333
uses: crazy-max/ghaction-docker-meta@v1
3434
with:
35-
images: opendronemap/odm
35+
images: webodm/odm
3636
tag-semver: |
3737
{{version}}
3838
- name: Build and push Docker image
@@ -45,9 +45,9 @@ jobs:
4545
no-cache: true
4646
tags: |
4747
${{ steps.docker_meta.outputs.tags }}
48-
opendronemap/odm:latest
48+
webodm/odm:latest
4949
# Trigger NodeODM build
5050
- name: Dispatch NodeODM Build Event
5151
id: nodeodm_dispatch
5252
run: |
53-
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/OpenDroneMap/NodeODM/actions/workflows/publish-docker.yaml/dispatches --data '{"ref": "master"}'
53+
curl -X POST -u "${{secrets.PAT_USERNAME}}:${{secrets.PAT_TOKEN}}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/WebODM/NodeODM/actions/workflows/publish-docker.yaml/dispatches --data '{"ref": "master"}'

CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md
1+
See https://github.com/WebODM/WebODM/blob/master/CONTRIBUTING.md

README.md

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,43 @@ An open source command line toolkit for processing aerial drone imagery. ODM tur
99

1010
The application is available for Windows, Mac and Linux and it works from the command line, making it ideal for power users, scripts and for integration with other software.
1111

12-
If you would rather not type commands in a shell and are looking for a friendly user interface, check out [WebODM](https://github.com/OpenDroneMap/WebODM).
12+
If you would rather not type commands in a shell and are looking for a friendly user interface, check out [WebODM](https://github.com/WebODM/WebODM).
1313

1414
## Quickstart
1515

1616
The easiest way to run ODM is via docker. To install docker, see [docs.docker.com](https://docs.docker.com). Once you have docker installed and [working](https://docs.docker.com/get-started/#test-docker-installation), you can get ODM by running from a Command Prompt / Terminal:
1717

1818
```bash
19-
docker pull opendronemap/odm
19+
docker pull webodm/odm
2020
```
2121

2222
Run ODM by placing some images (JPEGs, TIFFs or DNGs) in a folder named “images” (for example `C:\Users\youruser\datasets\project\images` or `/home/youruser/datasets/project/images`) and simply run from a Command Prompt / Terminal:
2323

2424
```bash
2525
# Windows
26-
docker run -ti --rm -v c:/Users/youruser/datasets:/datasets opendronemap/odm --project-path /datasets project
26+
docker run -ti --rm -v c:/Users/youruser/datasets:/datasets webodm/odm --project-path /datasets project
2727
```
2828
```bash
2929
# Mac/Linux
30-
docker run -ti --rm -v /home/youruser/datasets:/datasets opendronemap/odm --project-path /datasets project
30+
docker run -ti --rm -v /home/youruser/datasets:/datasets webodm/odm --project-path /datasets project
3131
```
3232

33-
You can pass [additional parameters](https://docs.opendronemap.org/arguments/) by appending them to the command:
33+
You can pass additional parameters by appending them to the command:
3434

3535
```bash
36-
docker run -ti --rm -v /datasets:/datasets opendronemap/odm --project-path /datasets project [--additional --parameters --here]
36+
docker run -ti --rm -v /datasets:/datasets webodm/odm --project-path /datasets project [--additional --parameters --here]
3737
```
3838

3939
For example, to generate a DSM (`--dsm`) and increase the orthophoto resolution (`--orthophoto-resolution 2`) :
4040

4141
```bash
42-
docker run -ti --rm -v /datasets:/datasets opendronemap/odm --project-path /datasets project --dsm --orthophoto-resolution 2
42+
docker run -ti --rm -v /datasets:/datasets webodm/odm --project-path /datasets project --dsm --orthophoto-resolution 2
43+
```
44+
45+
For all parameters:
46+
47+
```bash
48+
docker run -ti --rm -v /datasets:/datasets webodm/odm --help
4349
```
4450

4551
## Viewing Results
@@ -70,30 +76,30 @@ You can use the following free and open source software to open the files genera
7076

7177
## API
7278

73-
ODM can be made accessible from a network via [NodeODM](https://github.com/OpenDroneMap/NodeODM).
79+
ODM can be made accessible from a network via [NodeODM](https://github.com/WebODM/NodeODM).
7480

7581
## Documentation
7682

77-
See http://docs.opendronemap.org for tutorials and more guides.
83+
See http://docs.webodm.org for tutorials and more guides.
7884

79-
## Forum
85+
## Community
8086

81-
We have a vibrant [community forum](https://community.opendronemap.org/). You can [search it](https://community.opendronemap.org/search?expanded=true) for issues you might be having with ODM and you can post questions there. We encourage users of ODM to participate in the forum and to engage with fellow drone mapping users.
87+
See https://webodm.org/community to find a community near you.
8288

8389
## Windows Setup
8490

85-
ODM can be installed natively on Windows. Just download the latest setup from the [releases](https://github.com/OpenDroneMap/ODM/releases) page. After opening the ODM Console you can process datasets by typing:
91+
ODM can be installed natively on Windows. Just download the latest setup from the [releases](https://github.com/WebODM/ODM/releases) page. After opening the ODM Console you can process datasets by typing:
8692

8793
```bash
8894
run C:\Users\youruser\datasets\project [--additional --parameters --here]
8995
```
9096

9197
## GPU Acceleration
9298

93-
ODM has support for doing SIFT feature extraction on a GPU, which is about 2x faster than the CPU on a typical consumer laptop. To use this feature, you need to use the `opendronemap/odm:gpu` docker image instead of `opendronemap/odm` and you need to pass the `--gpus all` flag:
99+
ODM has support for doing SIFT feature extraction on a GPU, which is about 2x faster than the CPU on a typical consumer laptop. To use this feature, you need to use the `webodm/odm:gpu` docker image instead of `webodm/odm:gpu` and you need to pass the `--gpus all` flag:
94100

95101
```
96-
docker run -ti --rm -v c:/Users/youruser/datasets:/datasets --gpus all opendronemap/odm:gpu --project-path /datasets project --feature-type sift
102+
docker run -ti --rm -v c:/Users/youruser/datasets:/datasets --gpus all webodm/odm:gpu --project-path /datasets project --feature-type sift
97103
```
98104

99105
When you run ODM, if the GPU is recognized, in the first few lines of output you should see:
@@ -133,7 +139,7 @@ See https://github.com/NVIDIA/nvidia-docker and https://docs.nvidia.com/datacent
133139
You can run ODM natively on Ubuntu 24.04 (although we don't recommend it):
134140

135141
```bash
136-
git clone https://github.com/OpenDroneMap/ODM
142+
git clone https://github.com/WebODM/ODM
137143
cd ODM
138144
bash configure.sh install
139145
```
@@ -154,14 +160,14 @@ First install:
154160
Then Run:
155161

156162
```bash
157-
git clone https://github.com/OpenDroneMap/ODM
163+
git clone https://github.com/WebODM/ODM
158164
cd ODM
159165
bash configure_macos.sh install
160166
```
161167

162168
You can then process datasets with `./run.sh /datasets/odm_data_aukerman`
163169

164-
This could be improved in the future. [Helps us create a Homebrew formula](https://github.com/OpenDroneMap/ODM/issues/1531).
170+
This could be improved in the future. [Helps us create a Homebrew formula](https://github.com/WebODM/ODM/issues/1531).
165171

166172
### Updating a native installation
167173

@@ -202,7 +208,7 @@ Starting from version 3.0.4, ODM can automatically extract images from video fil
202208

203209
## Developers
204210

205-
Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check our [code of conduct](https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md), the [contributing guidelines](https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md) and [how decisions are made](https://github.com/OpenDroneMap/documents/blob/master/GOVERNANCE.md#how-decisions-are-made).
211+
Help improve our software! We welcome contributions from everyone, whether to add new features, improve speed, fix existing bugs or add support for more cameras. Check [contributing guidelines](https://github.com/WebODM/WebODM/blob/master/CONTRIBUTING.md).
206212

207213

208214
### Installation and first run
@@ -229,29 +235,32 @@ You can now make changes to the ODM source. When you are ready to test the chang
229235
docker stop odmdev
230236
```
231237
### To come back to dev environement
232-
change your_username to your username
238+
239+
(change `your_username` to your username)
240+
233241
```bash
234242
docker start odmdev
235243
docker exec -ti odmdev bash
236244
su your_username
237245
```
238246

239247

240-
If you have questions, join the developer's chat at https://community.opendronemap.org/c/developers-chat/21
248+
If you have questions, join the #devtalk's channel on discord: https://webodm.org/community
241249

242250
1. Try to keep commits clean and simple
243251
2. Submit a pull request with detailed changes and test results
244252
3. Have fun!
245253

246254
### Troubleshooting
247-
The dev environment makes use of `opendronemap/nodeodm` by default. You may want to run
248-
`docker pull opendronemap/nodeodm` before running `./start-dev-env.sh` to avoid using an old cached version.
255+
256+
The dev environment makes use of `webodm/nodeodm` by default. You may want to run
257+
`docker pull webodm/nodeodm` before running `./start-dev-env.sh` to avoid using an old cached version.
249258

250259
In order to make a clean build, remove `~/.odm-dev-home` and `ODM/.setupdevenv`.
251260

252261
## Credits
253262

254-
ODM makes use of [several libraries](https://github.com/OpenDroneMap/ODM/blob/master/snap/snapcraft.yaml#L36) and other awesome open source projects to perform its tasks. Among them we'd like to highlight:
263+
ODM makes use of other awesome open source projects to perform its tasks. Among them we'd like to highlight:
255264

256265
- [OpenSfM](https://github.com/mapillary/OpenSfM)
257266
- [OpenMVS](https://github.com/cdcseacave/openMVS/)

code_of_conduct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md
1+
See https://github.com/WebODM/WebODM/blob/master/CONDUCT.md

configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,15 @@ usage() {
208208
echo "bash configure.sh <install|update|uninstall|installreqs|installpython|help> [nproc]"
209209
echo "Subcommands:"
210210
echo " install"
211-
echo " Installs all dependencies and modules for running OpenDroneMap"
211+
echo " Installs all dependencies and modules for running ODM"
212212
echo " installruntimedepsonly"
213213
echo " Installs *only* the runtime libraries (used by docker builds). To build from source, use the 'install' command."
214214
echo " installreqs"
215215
echo " Only installs the system requirements and dependencies (does not build SuperBuild or install Python packages)"
216216
echo " installpython"
217217
echo " Installs Python requirements after SuperBuild is compiled"
218218
echo " reinstall"
219-
echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. "
219+
echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update ODM to the latest version. "
220220
echo " uninstall"
221221
echo " Removes SuperBuild and build modules. Does not uninstall dependencies"
222222
echo " clean"

contrib/dem-blend/dem-blend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import argparse
1111
from opendm.dem import merge
1212

13-
parser = argparse.ArgumentParser(description='Merge and blend DEMs using OpenDroneMap\'s approach.')
13+
parser = argparse.ArgumentParser(description='Merge and blend DEMs using ODM\'s approach.')
1414
parser.add_argument('input_dems',
1515
type=str,
1616
help='Path to input dems (.tif)')

contrib/mask-duplicator/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ This snippet takes the file path of a single image mask and duplicates it for al
66

77
Before using this code snippet, open one of your 360 images in an image editor and mask out the helmet or tripod, etc at the bottom of your image. Save this image as a png and then use it as the mask image that will be duplicated for all images in the dataset.
88

9-
See https://docs.opendronemap.org/masks/ for more details on mask creation.
9+
See https://docs.webodm.org/tutorials/using-image-masks/ for more details on mask creation.

0 commit comments

Comments
 (0)