diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml index c279b0a8..697bcfb3 100644 --- a/.github/workflows/issue-triage.yml +++ b/.github/workflows/issue-triage.yml @@ -12,8 +12,8 @@ jobs: - uses: pierotofy/issuewhiz@v1 with: ghToken: ${{ secrets.GITHUB_TOKEN }} - openAI: ${{ secrets.OPENAI_TOKEN }} - model: gpt-4o-2024-08-06 + gemini: ${{ secrets.GEMINI_TOKEN }} + model: gemini-2.5-flash filter: | - "#" variables: | @@ -24,10 +24,10 @@ jobs: - E: "Contains a suggestion for an improvement or a feature request?" - SC: "Describes an issue related to compiling or building source code?" logic: | - - '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] + - '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] - "B and (not P) and (not E) and (not SC)": [label: "software fault", stop: true] - "P and D": [label: "possible software fault", stop: true] - - "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] + - "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] - "E": [label: enhancement, stop: true] - "SC": [label: "possible software fault"] diff --git a/.github/workflows/publish-docker-gpu.yaml b/.github/workflows/publish-docker-gpu.yaml index 9ad83419..75c14945 100644 --- a/.github/workflows/publish-docker-gpu.yaml +++ b/.github/workflows/publish-docker-gpu.yaml @@ -31,9 +31,9 @@ jobs: platforms: linux/amd64 push: true no-cache: true - tags: opendronemap/odm:gpu + tags: webodm/odm:gpu # Trigger NodeODM build - name: Dispatch NodeODM Build Event id: nodeodm_dispatch run: | - 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"}' + 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"}' diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 4aafa026..1b8a8a08 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -32,7 +32,7 @@ jobs: id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: opendronemap/odm + images: webodm/odm tag-semver: | {{version}} - name: Build and push Docker image @@ -45,9 +45,9 @@ jobs: no-cache: true tags: | ${{ steps.docker_meta.outputs.tags }} - opendronemap/odm:latest + webodm/odm:latest # Trigger NodeODM build - name: Dispatch NodeODM Build Event id: nodeodm_dispatch run: | - 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"}' \ No newline at end of file + 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"}' \ No newline at end of file diff --git a/CNAME b/CNAME deleted file mode 100644 index ed563e1e..00000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -opendronemap.org \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c16f4460..ff93e02f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See https://github.com/OpenDroneMap/documents/blob/master/CONTRIBUTING.md +See https://github.com/WebODM/WebODM/blob/master/CONTRIBUTING.md diff --git a/README.md b/README.md index 2a7d2f64..9a0fd05b 100644 --- a/README.md +++ b/README.md @@ -9,37 +9,43 @@ An open source command line toolkit for processing aerial drone imagery. ODM tur 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. -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). +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). ## Quickstart 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: ```bash -docker pull opendronemap/odm +docker pull webodm/odm ``` 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: ```bash # Windows -docker run -ti --rm -v c:/Users/youruser/datasets:/datasets opendronemap/odm --project-path /datasets project +docker run -ti --rm -v c:/Users/youruser/datasets:/datasets webodm/odm --project-path /datasets project ``` ```bash # Mac/Linux -docker run -ti --rm -v /home/youruser/datasets:/datasets opendronemap/odm --project-path /datasets project +docker run -ti --rm -v /home/youruser/datasets:/datasets webodm/odm --project-path /datasets project ``` -You can pass [additional parameters](https://docs.opendronemap.org/arguments/) by appending them to the command: +You can pass additional parameters by appending them to the command: ```bash -docker run -ti --rm -v /datasets:/datasets opendronemap/odm --project-path /datasets project [--additional --parameters --here] +docker run -ti --rm -v /datasets:/datasets webodm/odm --project-path /datasets project [--additional --parameters --here] ``` For example, to generate a DSM (`--dsm`) and increase the orthophoto resolution (`--orthophoto-resolution 2`) : ```bash -docker run -ti --rm -v /datasets:/datasets opendronemap/odm --project-path /datasets project --dsm --orthophoto-resolution 2 +docker run -ti --rm -v /datasets:/datasets webodm/odm --project-path /datasets project --dsm --orthophoto-resolution 2 +``` + +For all parameters: + +```bash +docker run -ti --rm -v /datasets:/datasets webodm/odm --help ``` ## Viewing Results @@ -70,19 +76,19 @@ You can use the following free and open source software to open the files genera ## API -ODM can be made accessible from a network via [NodeODM](https://github.com/OpenDroneMap/NodeODM). +ODM can be made accessible from a network via [NodeODM](https://github.com/WebODM/NodeODM). ## Documentation -See http://docs.opendronemap.org for tutorials and more guides. +See http://docs.webodm.org for tutorials and more guides. -## Forum +## Community -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. +See https://webodm.org/community to find a community near you. ## Windows Setup -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: +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: ```bash run C:\Users\youruser\datasets\project [--additional --parameters --here] @@ -90,10 +96,10 @@ run C:\Users\youruser\datasets\project [--additional --parameters --here] ## GPU Acceleration -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: +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: ``` -docker run -ti --rm -v c:/Users/youruser/datasets:/datasets --gpus all opendronemap/odm:gpu --project-path /datasets project --feature-type sift +docker run -ti --rm -v c:/Users/youruser/datasets:/datasets --gpus all webodm/odm:gpu --project-path /datasets project --feature-type sift ``` 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 You can run ODM natively on Ubuntu 24.04 (although we don't recommend it): ```bash -git clone https://github.com/OpenDroneMap/ODM +git clone https://github.com/WebODM/ODM cd ODM bash configure.sh install ``` @@ -154,14 +160,14 @@ First install: Then Run: ```bash -git clone https://github.com/OpenDroneMap/ODM +git clone https://github.com/WebODM/ODM cd ODM bash configure_macos.sh install ``` You can then process datasets with `./run.sh /datasets/odm_data_aukerman` -This could be improved in the future. [Helps us create a Homebrew formula](https://github.com/OpenDroneMap/ODM/issues/1531). +This could be improved in the future. [Helps us create a Homebrew formula](https://github.com/WebODM/ODM/issues/1531). ### Updating a native installation @@ -202,7 +208,7 @@ Starting from version 3.0.4, ODM can automatically extract images from video fil ## Developers -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). +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). ### Installation and first run @@ -229,7 +235,9 @@ You can now make changes to the ODM source. When you are ready to test the chang docker stop odmdev ``` ### To come back to dev environement -change your_username to your username + +(change `your_username` to your username) + ```bash docker start odmdev docker exec -ti odmdev bash @@ -237,21 +245,22 @@ su your_username ``` -If you have questions, join the developer's chat at https://community.opendronemap.org/c/developers-chat/21 +If you have questions, join the #devtalk's channel on discord: https://webodm.org/community 1. Try to keep commits clean and simple 2. Submit a pull request with detailed changes and test results 3. Have fun! ### Troubleshooting -The dev environment makes use of `opendronemap/nodeodm` by default. You may want to run -`docker pull opendronemap/nodeodm` before running `./start-dev-env.sh` to avoid using an old cached version. + +The dev environment makes use of `webodm/nodeodm` by default. You may want to run +`docker pull webodm/nodeodm` before running `./start-dev-env.sh` to avoid using an old cached version. In order to make a clean build, remove `~/.odm-dev-home` and `ODM/.setupdevenv`. ## Credits -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: +ODM makes use of other awesome open source projects to perform its tasks. Among them we'd like to highlight: - [OpenSfM](https://github.com/mapillary/OpenSfM) - [OpenMVS](https://github.com/cdcseacave/openMVS/) diff --git a/code_of_conduct.md b/code_of_conduct.md index 99501c7c..6233d6e0 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -1 +1 @@ -See https://github.com/OpenDroneMap/documents/blob/master/CONDUCT.md +See https://github.com/WebODM/WebODM/blob/master/CONDUCT.md diff --git a/configure.sh b/configure.sh index e9b09acb..253e1384 100755 --- a/configure.sh +++ b/configure.sh @@ -208,7 +208,7 @@ usage() { echo "bash configure.sh [nproc]" echo "Subcommands:" echo " install" - echo " Installs all dependencies and modules for running OpenDroneMap" + echo " Installs all dependencies and modules for running ODM" echo " installruntimedepsonly" echo " Installs *only* the runtime libraries (used by docker builds). To build from source, use the 'install' command." echo " installreqs" @@ -216,7 +216,7 @@ usage() { echo " installpython" echo " Installs Python requirements after SuperBuild is compiled" echo " reinstall" - echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. " + echo " Removes SuperBuild and build modules, then re-installs them. Note this does not update ODM to the latest version. " echo " uninstall" echo " Removes SuperBuild and build modules. Does not uninstall dependencies" echo " clean" diff --git a/contrib/dem-blend/dem-blend.py b/contrib/dem-blend/dem-blend.py index 17752504..7f88cb4f 100755 --- a/contrib/dem-blend/dem-blend.py +++ b/contrib/dem-blend/dem-blend.py @@ -10,7 +10,7 @@ import argparse from opendm.dem import merge -parser = argparse.ArgumentParser(description='Merge and blend DEMs using OpenDroneMap\'s approach.') +parser = argparse.ArgumentParser(description='Merge and blend DEMs using ODM\'s approach.') parser.add_argument('input_dems', type=str, help='Path to input dems (.tif)') diff --git a/contrib/mask-duplicator/README.md b/contrib/mask-duplicator/README.md index a704df19..c5e72dd3 100644 --- a/contrib/mask-duplicator/README.md +++ b/contrib/mask-duplicator/README.md @@ -6,4 +6,4 @@ This snippet takes the file path of a single image mask and duplicates it for al 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. -See https://docs.opendronemap.org/masks/ for more details on mask creation. +See https://docs.webodm.org/tutorials/using-image-masks/ for more details on mask creation. diff --git a/contrib/orthorectify/README.md b/contrib/orthorectify/README.md index f239793b..aa731899 100644 --- a/contrib/orthorectify/README.md +++ b/contrib/orthorectify/README.md @@ -11,13 +11,13 @@ This tool is capable of orthorectifying individual images (or all images) from a After running a reconstruction using ODM: ``` -docker run -ti --rm -v /home/youruser/datasets:/datasets opendronemap/odm --project-path /datasets project +docker run -ti --rm -v /home/youruser/datasets:/datasets webodm/odm --project-path /datasets project ``` You can run the orthorectification module by running: ``` -docker run -ti --rm -v /home/youruser/datasets:/datasets --entrypoint /code/contrib/orthorectify/run.sh opendronemap/odm /datasets/project +docker run -ti --rm -v /home/youruser/datasets:/datasets --entrypoint /code/contrib/orthorectify/run.sh webodm/odm /datasets/project ``` This will start the orthorectification process for all images in the dataset. See additional flags you can pass at the end of the command above: diff --git a/contrib/pc2dem/README.md b/contrib/pc2dem/README.md index b338dceb..60da5ef1 100644 --- a/contrib/pc2dem/README.md +++ b/contrib/pc2dem/README.md @@ -9,7 +9,7 @@ This tool includes methods to perform efficient and scalable gapfill interpolati ## Usage ``` -docker run -ti --rm -v /home/youruser/folder_with_point_cloud:/input --entrypoint /code/contrib/pc2dem/pc2dem.py opendronemap/odm /input/point_cloud.las [flags] +docker run -ti --rm -v /home/youruser/folder_with_point_cloud:/input --entrypoint /code/contrib/pc2dem/pc2dem.py webodm/odm /input/point_cloud.las [flags] ``` The result (`dsm.tif` or `dtm.tif`) will be stored in the same folder as the input point cloud. See additional `flags` you can pass at the end of the command above: diff --git a/contrib/time-sift/Timesift_odm.py b/contrib/time-sift/Timesift_odm.py index 8dc197c5..04a048d6 100644 --- a/contrib/time-sift/Timesift_odm.py +++ b/contrib/time-sift/Timesift_odm.py @@ -103,7 +103,7 @@ def clean_reconstruction_dict(subdict, key, images): ### LAUNCH global alignment (Time-SIFT multitemporal block) try: subprocess.run(['docker', 'run', '-i', '--rm', '-v', datasets_DIR + ':/datasets', - 'opendronemap/odm', '--project-path', '/datasets', timesift_DIR, '--end-with', 'opensfm']) + 'webodm/odm', '--project-path', '/datasets', timesift_DIR, '--end-with', 'opensfm']) except: print(f'\033[91m[Time-SIFT] ERROR: {sys.exc_info()[0]}\033[0m') exit() @@ -135,7 +135,7 @@ def clean_reconstruction_dict(subdict, key, images): #### Launches dense matching from the good previous step, with possible options (e.g. => to stop at the point clouds) command_rerun = ['docker', 'run', '-i', '--rm', '-v', datasets_DIR + ':/datasets', - 'opendronemap/odm', + 'webodm/odm', '--project-path', '/datasets', epoch, '--rerun-from', 'openmvs'] if additional_options_to_rerun: diff --git a/docs/issue_template.md b/docs/issue_template.md index f873a132..d8899201 100644 --- a/docs/issue_template.md +++ b/docs/issue_template.md @@ -3,7 +3,7 @@ PLEASE REMOVE THIS NOTE AFTER READING IT! First of all, thank you for taking the time to report an issue. -Before you continue, make sure you are in the right place. Please open an issue only to report faults and bugs. For questions and discussion please open a topic on http://community.opendronemap.org/c/opendronemap. +Before you continue, make sure you are in the right place. Please open an issue only to report faults and bugs. Please use the format below to report bugs and faults. **************************************** diff --git a/innosetup.iss b/innosetup.iss index bb71f8cc..d30b72d7 100644 --- a/innosetup.iss +++ b/innosetup.iss @@ -6,8 +6,8 @@ #define MyAppVersion FileRead(VerFile) #expr FileClose(VerFile) #undef VerFile -#define MyAppPublisher "OpenDroneMap" -#define MyAppURL "https://opendronemap.org" +#define MyAppPublisher "WebODM" +#define MyAppURL "https://webodm.org" [Setup] ; NOTE: The value of AppId uniquely identifies this application. diff --git a/licenses/license.md b/licenses/license.md index 11357853..489a353d 100644 --- a/licenses/license.md +++ b/licenses/license.md @@ -1,4 +1,4 @@ -Licensing for portions of OpenDroneMap are as follows: +Licensing for portions of ODM are as follows: * ImageMagick - Apache 2.0 - http://www.imagemagick.org/script/license.php * Jhead - None - http://www.sentex.net/~mwandel/jhead/ * libjpeg - GPLv2 - http://sourceforge.net/projects/libjpeg/ @@ -19,6 +19,6 @@ Licensing for portions of OpenDroneMap are as follows: * Flann - BSD2 - http://opensource.org/licenses/bsd-license.php * Eigen - MPL2 - http://www.mozilla.org/MPL/2.0 * Qhull - http://www.qhull.org/COPYING.txt -* libext - https://github.com/OpenDroneMap/OpenDroneMap/blob/gh-pages/licenses/libext_copyright.txt -* libx11 - https://github.com/OpenDroneMap/OpenDroneMap/blob/gh-pages/licenses/libx11_copyright.txt +* libext - https://github.com/WebODM/ODM/blob/gh-pages/licenses/libext_copyright.txt +* libx11 - https://github.com/WebODM/ODM/blob/gh-pages/licenses/libx11_copyright.txt * MVS Texturing - BSD - https://github.com/nmoehrle/mvs-texturing/blob/master/LICENSE.txt diff --git a/odm_docker_readme.txt b/odm_docker_readme.txt deleted file mode 100644 index b5f4a595..00000000 --- a/odm_docker_readme.txt +++ /dev/null @@ -1,25 +0,0 @@ -#ODM 0.3.1 under Debian 8.10 jessie - 2018-02-27 by yjmenezes -#https://github.com/OpenDroneMap/OpenDroneMap/wiki/Docker -#git clone https://github.com/OpenDroneMap/OpenDroneMap.git -git clone https://github.com/yjmenezes/OpenDroneMap.git -cd OpenDroneMap -# list images -docker images -#remove old my_odm_image if necessary -docker rmi my_odm_image -#build a fresh one using instructions from ./Dockerfile -docker build -t my_odm_image . -#run tests with supplied image set. -#Mapped host directories for output. -v host_path:container_path -cd tests/test_data/ -sudo rm -r odm_* opensfm -docker run -it --rm \ - -v $(pwd)/gcp_list.txt:/code/gcp_list.txt \ - -v $(pwd)/images:/code/images \ - -v $(pwd)/opensfm:/code/opensfm \ - -v $(pwd)/odm_meshing:/code/odm_meshing \ - -v $(pwd)/odm_georeferencing:/code/odm_georeferencing \ - -v $(pwd)/odm_orthophoto:/code/odm_orthophoto \ - -v $(pwd)/odm_texturing:/code/odm_texturing \ - my_odm_image --mesh-size 100000 - diff --git a/opendm/rollingshutter.py b/opendm/rollingshutter.py index 7efe7aa9..9fcb0df8 100644 --- a/opendm/rollingshutter.py +++ b/opendm/rollingshutter.py @@ -54,7 +54,7 @@ 'autel robotics xt705': 30, # Autel EVO II pro # Help us add more! - # See: https://github.com/OpenDroneMap/RSCalibration for instructions + # See: https://github.com/WebODM/RSCalibration for instructions } DEFAULT_RS_READOUT = 30 # Just a guess @@ -93,7 +93,7 @@ def get_rolling_shutter_readout(photo, override_value=0): else: # Warn once if not key in warn_db_missing: - log.ODM_WARNING("Rolling shutter readout time for \"%s %s\" is not in our database, using default of %sms which might be incorrect. Use --rolling-shutter-readout to set an actual value (see https://github.com/OpenDroneMap/RSCalibration for instructions on how to calculate this value)" % (make, model, DEFAULT_RS_READOUT)) + log.ODM_WARNING("Rolling shutter readout time for \"%s %s\" is not in our database, using default of %sms which might be incorrect. Use --rolling-shutter-readout to set an actual value (see https://github.com/WebODM/RSCalibration for instructions on how to calculate this value)" % (make, model, DEFAULT_RS_READOUT)) warn_db_missing[key] = True return float(DEFAULT_RS_READOUT) diff --git a/stages/odm_app.py b/stages/odm_app.py index aee04277..27e08635 100644 --- a/stages/odm_app.py +++ b/stages/odm_app.py @@ -96,11 +96,11 @@ def execute(self): if code == 139 or code == 134 or code == 1 or code == 3221225477: # Segfault - log.ODM_ERROR("Uh oh! Processing stopped because of strange values in the reconstruction. This is often a sign that the input data has some issues or the software cannot deal with it. Have you followed best practices for data acquisition? See https://docs.opendronemap.org/flying/") + log.ODM_ERROR("Uh oh! Processing stopped because of strange values in the reconstruction. This is often a sign that the input data has some issues or the software cannot deal with it. Have you followed best practices for data acquisition? See https://docs.webodm.org/flying-tips/") elif code == 137 or code == 3221226505: log.ODM_ERROR("Whoops! You ran out of memory! Add more RAM to your computer, if you're using docker configure it to use more memory, for WSL2 make use of .wslconfig (https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig), resize your images, lower the quality settings or process the images using a cloud provider (e.g. https://webodm.net).") elif code == 132: - log.ODM_ERROR("Oh no! It looks like your CPU is not supported (is it fairly old?). You can still use ODM, but you will need to build your own docker image. See https://github.com/OpenDroneMap/ODM#build-from-source") + log.ODM_ERROR("Oh no! It looks like your CPU is not supported (is it fairly old?). You can still use ODM, but you will need to build your own docker image. See https://github.com/WebODM/ODM#build-from-source") elif code == 3: log.ODM_ERROR("ODM can't find a program that is required for processing to run! Did you do a custom build of ODM? (cool!) Make sure that all programs required by ODM are in the right place and are built correctly.") else: diff --git a/stages/odm_filterpoints.py b/stages/odm_filterpoints.py index dac7c3f1..6823699f 100644 --- a/stages/odm_filterpoints.py +++ b/stages/odm_filterpoints.py @@ -61,7 +61,7 @@ def process(self, args, outputs): extra_msg = '' if 'boundary' in outputs: extra_msg = '. Also, since you used a boundary setting, make sure that the boundary polygon you specified covers the reconstruction area correctly.' - raise system.ExitException("Uh oh! We ended up with an empty point cloud. This means that the reconstruction did not succeed. Have you followed best practices for data acquisition? See https://docs.opendronemap.org/flying/%s" % extra_msg) + raise system.ExitException("Uh oh! We ended up with an empty point cloud. This means that the reconstruction did not succeed. Have you followed best practices for data acquisition? See https://docs.webodm.org/flying-tips/%s" % extra_msg) else: log.ODM_WARNING('Found a valid point cloud file in: %s' % tree.filtered_point_cloud) diff --git a/start-dev-env.sh b/start-dev-env.sh index f90a417f..13e4f0aa 100755 --- a/start-dev-env.sh +++ b/start-dev-env.sh @@ -98,7 +98,7 @@ if [[ ! -z $IMAGE ]]; then fi export PORT="${PORT:=3000}" export QTC="${QTC:=NO}" -export IMAGE="${IMAGE:=opendronemap/nodeodm}" +export IMAGE="${IMAGE:=webodm/nodeodm}" export GPU="${GPU:=NO}" if [ -z "$DATA" ]; then