From 8068447581352fa226cb443c0c8151af9d6a2668 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Tue, 21 Jan 2020 14:57:43 +0000 Subject: [PATCH] Readme updates Former-commit-id: ddc712c6825a2ce0b51daa81d303ff54ff5f21e0 --- README.md | 29 ++++++-------------- modules/odm_orthophoto/src/OdmOrthoPhoto.cpp | 1 - 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 20388ea3..aa516953 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# ODM - ![](https://raw.githubusercontent.com/OpenDroneMap/OpenDroneMap/master/img/odm_image.png) +For documentation, see https://docs.opendronemap.org and Quickstart below + ## What is it? ODM is an open source command line toolkit for processing aerial drone imagery. Typical drones use simple point-and-shoot cameras, so the images from drones, while from a different perspective, are similar to any pictures taken from point-and-shoot cameras, i.e. non-metric imagery. OpenDroneMap turns those simple images into three dimensional geographic data that can be used in combination with other geographic datasets. @@ -22,16 +22,15 @@ In a word, ODM is a toolchain for processing raw civilian UAS imagery to other u ODM now includes state-of-the-art 3D reconstruction work by Michael Waechter, Nils Moehrle, and Michael Goesele. See their publication at [http://www.gcc.tu-darmstadt.de/media/gcc/papers/Waechter-2014-LTB.pdf](http://www.gcc.tu-darmstadt.de/media/gcc/papers/Waechter-2014-LTB.pdf). -For Docs, see Quickstart below and also https://docs.opendronemap.org -## QUICKSTART +## Quickstart ### Docker (All platforms) The easiest way to run ODM is through Docker. If you don't have it installed, see the [Docker Ubuntu installation tutorial](https://docs.docker.com/engine/installation/linux/ubuntulinux/) and follow the instructions through "Create a Docker group". The Docker image workflow -has equivalent procedures for Mac OS X and Windows found at [docs.docker.com](docs.docker.com). Then run the following command which will build a pre-built image and run on images found in `$(pwd)/images` (you can change this if you need to, see the [wiki](https://github.com/OpenDroneMap/OpenDroneMap/wiki/Docker) for more detailed instructions. +has equivalent procedures for Mac OS X and Windows found at [docs.docker.com](https://docs.docker.com). Then run the following command which will build a pre-built image and run on images found in `$(pwd)/images` (you can change this if you need to, see the [wiki](https://github.com/OpenDroneMap/OpenDroneMap/wiki/Docker) for more detailed instructions. ``` docker run -it --rm \ @@ -43,11 +42,10 @@ docker run -it --rm \ ### Native Install (Ubuntu 16.04) -** Please note that we need help getting ODM updated to work for 16.10+. Look at [#659](https://github.com/OpenDroneMap/OpenDroneMap/issues/659) or drop into the [gitter](https://gitter.im/OpenDroneMap/OpenDroneMap) for more info. +** Please note that we need help getting ODM updated to work for 16.10+. Look at [#659](https://github.com/OpenDroneMap/OpenDroneMap/issues/659). -**[Download the latest release here](https://github.com/OpenDroneMap/OpenDroneMap/releases)** -Current version: 0.3.1 (this software is in beta) +**[Download the latest release here](https://github.com/OpenDroneMap/ODM/archive/master.zip)** 1. Extract and enter the OpenDroneMap directory 2. Run `bash configure.sh install` @@ -147,8 +145,6 @@ When the process finishes, the results will be organized as follows: Any file ending in .obj or .ply can be opened and viewed in [MeshLab](http://meshlab.sourceforge.net/) or similar software. That includes `opensfm/depthmaps/merged.ply`, `odm_meshing/odm_mesh.ply`, `odm_texturing/odm_textured_model[_geo].obj`, or `odm_georeferencing/odm_georeferenced_model.ply`. Below is an example textured mesh: -![](https://raw.githubusercontent.com/alexhagiopol/OpenDroneMap/feature-better-docker/toledo_dataset_example_mesh.jpg) - You can also view the orthophoto GeoTIFF in [QGIS](http://www.qgis.org/) or other mapping software: ![](https://raw.githubusercontent.com/OpenDroneMap/OpenDroneMap/master/img/bellus_map.png) @@ -233,28 +229,19 @@ Experimental flags need to be enabled in Docker to use the ```--squash``` flag. After this, you must restart docker by typing ```sudo service docker restart``` into your Linux terminal. - ## User Interface A web interface and API to OpenDroneMap is currently under active development in the [WebODM](https://github.com/OpenDroneMap/WebODM) repository. -## Video Support - -Currently we have an experimental feature that uses ORB_SLAM to render a textured mesh from video. It is only supported on Ubuntu 14.04 on machines with X11 support. See the [wiki](https://github.com/OpenDroneMap/OpenDroneMap/wiki/Reconstruction-from-Video) for details on installation and use. - -## Examples - -Coming soon... - ## Documentation: -For documentation, everything is being moved to [http://docs.opendronemap.org/](http://docs.opendronemap.org/) but you can also take a look at our [wiki](https://github.com/OpenDroneMap/OpenDroneMap/wiki). Check those places first if you are having problems. There's also help at [community forum](http://community.opendronemap.org/), and if you still need help and think you've found a bug or need an enhancement, look through the issue queue or create one. +For documentation, see http://docs.opendronemap.org/ and https://github.com/OpenDroneMap/ODM/wiki. Check those places first if you are having problems. There's also help at [community forum](https://community.opendronemap.org/), and if you still need help and think you've found a bug or need an enhancement, look through the issue queue or create one. ## Developers Help improve our software! -[![Join the chat at https://gitter.im/OpenDroneMap/OpenDroneMap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/OpenDroneMap/OpenDroneMap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +Join the developer's chat at https://community.opendronemap.org/c/developers-chat/21 1. Try to keep commits clean and simple 2. Submit a pull request with detailed changes and test results diff --git a/modules/odm_orthophoto/src/OdmOrthoPhoto.cpp b/modules/odm_orthophoto/src/OdmOrthoPhoto.cpp index d4dd905f..2f7fa218 100644 --- a/modules/odm_orthophoto/src/OdmOrthoPhoto.cpp +++ b/modules/odm_orthophoto/src/OdmOrthoPhoto.cpp @@ -232,7 +232,6 @@ void OdmOrthoPhoto::saveTIFF(const std::string &filename, GDALDataType dataType) for (; i < bands.size(); i++){ hBand = GDALGetRasterBand( hDstDS, static_cast(i) + 1 ); - // TODO: should we set these based on a command line parameter? GDALColorInterp interp = GCI_GrayIndex; if (i < colorInterps.size()){ interp = colorInterps[i];