Merge branch 'feature/geojson' of github.com:developmentseed/label-maker into feature/geojson

Author: drewbo

CHANGES.txt

@@ -1,3 +1,11 @@
+0.4.0 (2018-10-04)
+------------------
+- Read file drivers to determine file type rather than relying on extension (#80)
+- Add support for WMS endpoints as an imagery source (#93)
+- Add documentation site (#108)
+- Fix rendering errors at tile boundaries (#78)
+- New examples and updates to example code (#89, #91, #105, #107)
+
 0.3.2 (2018-05-14)
 ------------------
 - Provide a default value of False for imagery_offset to preview function (#79)

README.md

@@ -25,10 +25,6 @@ Full documentation is available here: http://devseed.com/label-maker/
 ## Acknowledgements
 
 This library builds on the concepts of [skynet-data](https://github.com/developmentseed/skynet-data). It wouldn't be possible without the excellent data from OpenStreetMap and Mapbox under the following licenses:
-- OSM QA tile data
-  [copyright OpenStreetMap contributors](http://www.openstreetmap.org/copyright)
-  and licensed under
-  [ODbL](http://opendatacommons.org/licenses/odbl/)
-- Mapbox Satellite data can be
-  [traced for noncommercial purposes](https://www.mapbox.com/tos/#[YmtMIywt]).
-- Marc Farra's [tilepie](https://github.com/kamicut/tilepie) to asynchronously process vector tiles 
+- OSM QA tile data [copyright OpenStreetMap contributors](http://www.openstreetmap.org/copyright) and licensed under [ODbL](http://opendatacommons.org/licenses/odbl/)
+- Mapbox Satellite data can be [traced for noncommercial purposes](https://www.mapbox.com/tos/#[YmtMIywt]).
+- Marc Farra's [tilepie](https://github.com/kamicut/tilepie) to asynchronously process vector tiles

docs/conf.py

@@ -16,7 +16,7 @@
 import sys
 sys.path.insert(0, os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('../label_maker'))
-
+from label_maker.version import __version__
 
 # -- Project information -----------------------------------------------------
 
@@ -25,9 +25,9 @@
 author = 'Development Seed'
 
 # The short X.Y version
-version = '0.3.2'
+version = __version__
 # The full version, including alpha/beta/rc tags
-release = '0.3.2'
+release = __version__
 
 
 # -- General configuration ---------------------------------------------------

docs/parameters.rst

@@ -9,7 +9,7 @@ Here is the full list of configuration parameters you can specify in a ``config.
 	The bounding box to create images from. This should be given in the form: ``[xmin, ymin, xmax, ymax]`` as longitude and latitude values between ``[-180, 180]`` and ``[-90, 90]``, respectively. Values should use the WGS84 datum, with longitude and latitude units in decimal degrees.
 
 **geojson**: string
-	An input ``GeoJSON`` file containing labels. Adding this parameter will override the values in the ``country`` and ``bounding_box`` parameters. The ``GeoJSON`` should only contain polygons.
+	An input ``GeoJSON`` file containing labels. Adding this parameter will override the values in the ``country`` and ``bounding_box`` parameters. The ``GeoJSON`` should only contain `Polygon` and not `Multipolygon` or a `GeometryCollection`.
 
 **zoom**: int
 	The `zoom level <http://wiki.openstreetmap.org/wiki/Zoom_levels>`_ used to create images. This functions as a rough proxy for resolution. Value should be given as an int on the interval [0, 19].
@@ -41,7 +41,7 @@ Here is the full list of configuration parameters you can specify in a ``config.
 	One of ``'classification'``, ``'object-detection'``, or ``'segmentation'``. This defines the output format for the final label numpy arrays (``y_train`` and ``y_test``).
 
  	``'classification'``
- 		Output is an array of the same length as `classes`. Each array value will be either `1` or `0` based on whether it matches the class at the same index.
+ 		Output is an array of ``len(classes) + 1``. Each array value will be either `1` or `0` based on whether it matches the class at the same index. The additional array element belongs to the background class, which will always be the first element. 
 
  	``'object-detection'``
  		Output is an array of bounding boxes of the form ``[xmin, ymin, width, height, class_index]``. In this case, the values are pixel values measured from the upper left-hand corner (not latitude and longitude values). Each feature is tested against each class, so if a feature matches two or more classes, it will have the corresponding number of bounding boxes created.

label_maker/label.py

@@ -59,7 +59,7 @@ def make_labels(dest_folder, zoom, country, classes, ml_type, bounding_box, spar
     sparse: boolean
         Limit the total background tiles to write based on `background_ratio` kwarg.
     geojson: str
-        File name for optional geojson label input
+        Filepath to optional geojson label input
     **kwargs: dict
         Other properties from CLI config passed as keywords to other utility functions
     """

label_maker/utils.py

@@ -119,8 +119,21 @@ def get_tile_wms(tile, imagery, folder, imagery_offset):
 
 
 def is_tif(imagery):
-    """Determine if an imagery path has a valid tif extension"""
-    return op.splitext(imagery)[1].lower() in ['.tif', '.tiff', '.vrt']
+    """Determine if an imagery path leads to a valid tif"""
+    valid_drivers = ['GTiff', 'VRT']
+    try:
+        with rasterio.open(imagery) as test_ds:
+            if test_ds.meta['driver'] not in valid_drivers:
+                # rasterio can open path, but it is not a tif
+                valid_tif = False
+            else:
+                valid_tif = True
+    except rasterio._err.CPLE_HttpResponseError: #pylint: disable=protected-access
+        # rasterio cannot open the path. this is the case for a
+        # tile service
+        valid_tif = False
+
+    return valid_tif
 
 def is_wms(imagery):
     """Determine if an imagery path is a WMS endpoint"""

label_maker/version.py

@@ -1,2 +1,2 @@
 """Library verison"""
-__version__ = '0.3.2'
+__version__ = '0.4.0'

requirements.txt

@@ -14,7 +14,7 @@ pyclipper==1.0.6
 pycurl==7.43.0.1
 pyproj==1.9.5.1
 rasterio==1.0a12
-requests==2.11.0
+requests>=2.20.0
 Shapely>=1.6.3
 six==1.10.0
 tilepie==0.2.1

test/unit/test_utils.py

@@ -1,11 +1,13 @@
 """Tests for utils.py"""
 import os
 from os import path as op, makedirs
+import shutil
+import tempfile
 import unittest
 import numpy as np
 from PIL import Image
 
-from label_maker.utils import url, class_match, get_tile_tif, get_tile_wms
+from label_maker.utils import url, class_match, get_tile_tif, get_tile_wms, is_tif
 
 class TestUtils(unittest.TestCase):
     """Tests for utility functions"""
@@ -43,6 +45,33 @@ def test_class_match_segmentation(self):
         self.assertTrue(class_match(ml_type, passing, class_index))
         self.assertFalse(class_match(ml_type, failing, class_index))
 
+    def test_is_tif(self):
+        """Test identifying tif or vrt files as tif"""
+        img_dir = op.join('test', 'fixtures')
+
+        # tif with .tif extension identified as tif
+        test_tif = op.join(img_dir, 'drone.tif')
+        self.assertTrue(is_tif(test_tif))
+
+        # vrt with .vrt extension identified as tif
+        test_vrt = op.join(img_dir, 'drone.vrt')
+        self.assertTrue(is_tif(test_vrt))
+
+
+        # tif with no extension identified as tif
+        with tempfile.TemporaryDirectory() as tmpdirname:
+            test_tif_no_ext = op.join(tmpdirname, 'drone')
+            shutil.copy(test_tif, test_tif_no_ext)
+            self.assertTrue(is_tif(test_tif_no_ext))
+
+        # vrt with no extension identified as tif
+        with tempfile.TemporaryDirectory() as tmpdirname:
+            test_vrt_no_ext = op.join(tmpdirname, 'drone')
+            shutil.copy(test_vrt, test_vrt_no_ext)
+            self.assertTrue(is_tif(test_vrt_no_ext))
+
+
+
     def test_get_tile_tif(self):
         """Test reading of tile from geotiff"""
         tile = '1087767-1046604-21'