From 5ed51665bf2fd1b77d3d91af610fc64276ac86c5 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 9 Jan 2017 21:47:54 -0500 Subject: [PATCH 1/5] Update README.md Modified commands as suggested by D.Baldwin --- README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 340ee988..6e492b2a 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,11 @@ If you know Python, web technologies (JS, HTML, CSS, etc.) or both, make a fork, - [Git](https://git-scm.com/downloads) * From the Docker Quickstart Terminal (Windows) or from the command line (Mac / Linux) type: -``` +```bash git clone https://github.com/OpenDroneMap/WebODM cd WebODM -pip install docker-compose +sudo easy_install pip +sudo pip install docker-compose ./webodm.sh start ``` @@ -50,6 +51,19 @@ To update WebODM to the latest version use: We recommend that you read the [Docker Documentation](https://docs.docker.com/) to familiarize with the application lifecycle, setup and teardown, or for more advanced uses. Look at the contents of the webodm.sh script to understand what commands are used to launch WebODM. +### Common Troubleshooting + +if you get the following error while starting WebODM: +```bash +from six.moves import _thread as thread +ImportError: cannot import name _thread +``` + +Try running: +```bash +sudo pip install --ignore-installed six +``` + If you are getting a **MemoryError** while processing the images, make sure that your Docker environment has enough RAM allocated. http://stackoverflow.com/a/39720010 ### Add More Processing Nodes From f96157580b5d9801f1fe7befea464913a5975846 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 9 Jan 2017 21:55:32 -0500 Subject: [PATCH 2/5] Update README.md Shell commands highlight, youtube video link, cleanup --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6e492b2a..1feed394 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ sudo pip install docker-compose * If you're on Windows find the IP of your Docker machine by running this command from your Docker Quickstart Terminal: -``` +```bash docker-machine ip ``` @@ -45,7 +45,7 @@ To stop WebODM press CTRL+C or run: To update WebODM to the latest version use: -``` +```bash ./webodm.sh update ``` @@ -80,7 +80,7 @@ If you want to run WebODM natively, you will need to install: On Linux, make sure you have: -``` +```bash apt-get install binutils libproj-dev gdal-bin ``` @@ -92,13 +92,13 @@ brew install postgres postgis Then these steps should be sufficient to get you up and running: -``` +```bash git clone https://github.com/OpenDroneMap/WebODM ``` Create a `WebODM\webodm\local_settings.py` file containing your database settings: -``` +```python DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', @@ -120,7 +120,7 @@ ALTER SYSTEM SET postgis.gdal_enabled_drivers TO 'GTiff'; Then: -``` +```bash pip install -r requirements.txt sudo npm install -g webpack npm install @@ -130,7 +130,7 @@ chmod +x start.sh && ./start.sh If you are getting a `rt_raster_gdal_warp: Could not create GDAL transformation object for output dataset creation`, make sure that your PostGIS installation has PROJ support: -``` +```sql SELECT PostGIS_Full_Version(); ``` @@ -142,6 +142,7 @@ You may also need to set the environment variable PROJSO to the .so or .dll proj - [X] Task Processing - [X] 2D Map Display - [ ] 3D model display +- [ ] Volumetric Measurements - [X] Cluster management and setup. - [ ] Mission Planner - [X] API @@ -150,6 +151,7 @@ You may also need to set the environment variable PROJSO to the .so or .dll proj - [ ] iOS Mobile App - [ ] Processing Nodes Volunteer Network - [X] Unit Testing +- [ ] Any Feature You Want! ## Terminology @@ -159,6 +161,4 @@ You may also need to set the environment variable PROJSO to the .so or .dll proj - `ImageUpload`: aerial images. - `Mission`: A flight path and other information (overlap %, angle, ...) associated with a particular `Task`. -![image](https://cloud.githubusercontent.com/assets/1951843/17680196/9bfe878e-6304-11e6-852e-c09f1e02f3c0.png) - -![er diagram - webodm 2](https://cloud.githubusercontent.com/assets/1951843/17717379/4a227e28-63d3-11e6-9518-6a63cc1bcd3b.png) +[![WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier](https://img.youtube.com/vi/UnN-NzL96T8/0.jpg)](https://www.youtube.com/watch?v=UnN-NzL96T8 "WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier") From 5718fc59e9c02e61286c8038468cb17984924fcc Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 9 Jan 2017 21:59:04 -0500 Subject: [PATCH 3/5] Update README.md Moved youtube link higher, issue report link. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1feed394..21a76976 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ A free, user-friendly, extendable application and API for drone image processing ![Alt text](/screenshots/dashboard.png?raw=true "Dashboard") +[![WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier](https://img.youtube.com/vi/UnN-NzL96T8/0.jpg)](https://www.youtube.com/watch?v=UnN-NzL96T8 "WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier") + If you know Python, web technologies (JS, HTML, CSS, etc.) or both, make a fork, contribute something that interests you, and make a pull request! All ideas are considered and people of all skill levels are welcome. See the [Contributing](/CONTRIBUTING.md) document for more information. ## Getting Started @@ -66,6 +68,8 @@ sudo pip install --ignore-installed six If you are getting a **MemoryError** while processing the images, make sure that your Docker environment has enough RAM allocated. http://stackoverflow.com/a/39720010 +Have you had other issues? Please [report them](https://github.com/OpenDroneMap/WebODM/issues/new) so that we can include them in this document. + ### Add More Processing Nodes WebODM can be linked to one or more processing nodes running [node-OpenDroneMap](https://github.com/pierotofy/node-OpenDroneMap). The default configuration already includes a "node-odm-1" processing node which runs on the same machine as WebODM, just to help you get started. As you become more familiar with WebODM, you might want to install processing nodes on separate machines. @@ -160,5 +164,4 @@ You may also need to set the environment variable PROJSO to the .so or .dll proj - `ProcessingNode`: An instance usually running on a separate VM, or on a separate machine which accepts aerial images, runs OpenDroneMap and returns the processed results (orthophoto, georeferenced model, etc.). Each node communicates with WebODM via a lightweight API such as [node-OpenDroneMap](https://www.github.com/pierotofy/node-OpenDroneMap). WebODM manages the distribution of `Task` to different `ProcessingNode` instances. - `ImageUpload`: aerial images. - `Mission`: A flight path and other information (overlap %, angle, ...) associated with a particular `Task`. - -[![WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier](https://img.youtube.com/vi/UnN-NzL96T8/0.jpg)](https://www.youtube.com/watch?v=UnN-NzL96T8 "WebODM - An Introduction to a Web Interface for OpenDroneMap to Make Drone Mapping Even Easier") + From fff9080093a36d90b907d8b57165d96859e055e7 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 9 Jan 2017 22:06:15 -0500 Subject: [PATCH 4/5] Update README.md sudo-proofed commands --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 21a76976..882311dd 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ If you know Python, web technologies (JS, HTML, CSS, etc.) or both, make a fork, ```bash git clone https://github.com/OpenDroneMap/WebODM cd WebODM -sudo easy_install pip -sudo pip install docker-compose +easy_install pip || sudo easy_install pip +pip install docker-compose || sudo pip install docker-compose ./webodm.sh start ``` From 287bc022d65e446d0e09ca07ca948fa9d576f2bc Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 9 Jan 2017 22:13:08 -0500 Subject: [PATCH 5/5] Update README.md Rewording --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 882311dd..165d1257 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,8 @@ You may also need to set the environment variable PROJSO to the .so or .dll proj - [ ] iOS Mobile App - [ ] Processing Nodes Volunteer Network - [X] Unit Testing -- [ ] Any Feature You Want! + +Don't see a feature that you want? [Help us make it happen](/CONTRIBUTING.md). ## Terminology