Added geo, masks sections

source/conf.py

@@ -14,9 +14,9 @@ copyright = '2020, OpenDroneMap'
 author = 'OpenDroneMap'
 
 # The short X.Y version
-version = '0.9.10'
+version = '2.0.0'
 # The full version, including alpha/beta/rc tags
-release = '0.9.10'
+release = '2.0.0'
 
 
 # -- General configuration ---------------------------------------------------

source/geo.rst

@@ -0,0 +1,34 @@
+#######################
+Image Geolocation Files
+#######################
+
+By default ODM will use the GPS information embedded in the images, if it is available. Sometimes images do not contain GPS information, or a user wishes to override the information with more accurate data (such as RTK).
+
+Starting from ODM ``2.0`` people can supply an image geolocation file (geo) for this purpose. 
+
+The format of the image geolocation file is simple.
+
+	 * The first line should contain the name of the projection used for the geo coordinates. This can be specified either as a PROJ string (e.g. ``+proj=utm +zone=10 +ellps=WGS84 +datum=WGS84 +units=m +no_defs``), EPSG code (e.g. ``EPSG:4326``) or as a ``WGS84 UTM <zone>[N|S]`` value (eg. ``WGS84 UTM 16N``)
+ 	 * Subsequent lines are the image filename, X, Y & Z (optional) coordinates, the camera angles (optional, currently used only for radiometric calibration) and the horizontal/vertical accuracy (optional):
+ 	 * Camera angles can be set to ``0`` if they are not available.
+ 	 * The 10th column (optional) can contain extra fields, such as a label.
+
+File format::
+
+    <projection>
+    image_name geo_x geo_y [geo_z] [omega (degrees)] [phi (degrees)] [kappa (degrees)] [horz accuracy (meters)] [vert accuracy (meters)] [extras...]
+    ...
+
+Example::
+
+    EPSG:4326
+    DJI_0028.JPG    -91.9942096111111   46.84252125 198.609
+    DJI_0032.JPG    -91.9938293055556   46.8424584444444    198.609
+
+
+
+If you supply a file called ``geo.txt`` then ODM will automatically detect it. If it has another name you can specify using ``--geo <path>``.
+
+The ``geo.txt`` file must be created in the base of your project folder.
+
+`Help edit these docs! <https://github.com/OpenDroneMap/docs/blob/publish/source/tutorials.rst>`_

source/index.rst

@@ -33,6 +33,8 @@ Welcome to OpenDroneMap's documentation
     arguments
     outputs
     gcp
+    geo
+    masks
     large
     resources
     flying

source/masks.rst

@@ -0,0 +1,29 @@
+#################
+Using Image Masks
+#################
+
+Starting from ODM ``2.0`` people can supply image masks to inform the software to skip reconstruction over certain areas. This is useful for cases where the sky was accidentally included in the input photos from oblique shots, or simply to limit the reconstruction of a single subject.
+
+To add a mask, simply create a new black and white image of the same dimension as the target image you want to mask (you can use a program such as GIMP to do this). Color in black the areas to exclude from the reconstruction. 
+
+.. figure:: https://user-images.githubusercontent.com/1951843/93247037-ade87a00-f75b-11ea-8b42-25bc1d89279d.png
+   :alt: Target image
+   :align: center
+
+.. figure:: https://user-images.githubusercontent.com/1951843/93247007-a2954e80-f75b-11ea-87b3-4f04bd1737b9.png
+   :alt: Image mask
+   :align: center
+
+
+.. figure:: https://user-images.githubusercontent.com/1951843/93246970-8f827e80-f75b-11ea-8179-5a8fdd9f5193.png
+   :alt: 3D result (building is masked)
+   :align: center
+
+Name your file:
+
+``<filename>_mask.JPG``
+
+For example, ``DJI_0018.JPG`` can have a mask by creating a ``DJI_0018_mask.JPG`` file and include that in the list of images. You can use ``.JPG``, ``.PNG``, ``.BMP`` and ``.TIF`` formats for image masks.
+
+
+`Help edit these docs! <https://github.com/OpenDroneMap/docs/blob/publish/source/tutorials.rst>`_