updated unit tests

wouellette · wouellette · commit 81d7ba684396 · 2019-05-18T00:38:04.000+02:00
diff --git a/label_maker/label.py b/label_maker/label.py
@@ -122,7 +122,7 @@ def make_labels(dest_folder, zoom, country, classes, ml_type, bounding_box, spar
 
         # write out labels as numpy arrays
         labels_file = op.join(dest_folder, 'labels.npz')
-        # print('Writing out labels to {}'.format(labels_file))
+        print('Writing out labels to {}'.format(labels_file))
         np.savez(labels_file, **tile_results)
 
         # write out labels as GeoJSON or PNG
diff --git a/label_maker/main.py b/label_maker/main.py
@@ -84,12 +84,12 @@ def cli():
         raise Exception(v.errors)
         
     # for aoi, overwrite bounding_box config key to correct labelling
-    if 'aoi' in config.keys:
+    if 'aoi' in config.keys():
         config['bounding_box'] = get_bounds(json.load(open(config.get('aoi'), 'r')))
         
     # custom validation for top level keys
     # require either: country & bounding_box or geojson
-    if 'geojson' not in config.keys()) and not ('country' in config.keys() and 'bounding_box' in config.keys()):
+    if 'geojson' not in config.keys() and not ('country' in config.keys() and 'bounding_box' in config.keys()):
         raise Exception('either "geojson" or "country" and "bounding_box" must be present in the configuration JSON')
 
     # for geojson, overwrite other config keys to correct labeling
diff --git a/requirements.txt b/requirements.txt
@@ -12,8 +12,8 @@ Pillow==4.3.0
 protobuf==3.5.0.post1
 pyclipper==1.0.6
 pycurl==7.43.0.1
-pyproj==1.9.5.1
-rasterio==1.0a12
+pyproj==2.1.3
+rasterio==1.0.21
 requests>=2.20.0
 Shapely>=1.6.3
 six==1.10.0
diff --git a/test/fixtures/integration/config.aoi.json b/test/fixtures/integration/config.aoi.json
@@ -0,0 +1,17 @@
+{
+  "country": ["portugal"],
+  "aoi": "test/fixtures/integration/portugal_aoi.geojson",
+  "zoom": 17,
+  "classes": [
+    { "name": "Water Tower", "filter": ["==", "man_made", "water_tower"] },
+    { "name": "Building", "filter": ["has", "building"] },
+    { "name": "Farmland", "filter": ["==", "landuse", "farmland"] },
+    { "name": "Ruins", "filter": ["==", "historic", "ruins"] },
+    { "name": "Parking", "filter": ["==", "amenity", "parking"] },
+    { "name": "Roads", "filter": ["has", "highway"] }
+  ],
+  "imagery": "https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=ACCESS_TOKEN",
+  "background_ratio": 1,
+  "ml_type": "classification",
+  "seed": 19
+}
diff --git a/test/fixtures/integration/config.integration.json b/test/fixtures/integration/config.integration.json
@@ -1,5 +1,5 @@
 {
-  "country": "portugal",
+  "country": ["portugal"],
   "bounding_box": [
     -9.4575,
     38.8467,
diff --git a/test/fixtures/integration/config.integration.object_detection.json b/test/fixtures/integration/config.integration.object_detection.json
@@ -1,5 +1,5 @@
 {
-  "country": "portugal",
+  "country": ["portugal"],
   "bounding_box": [
     -9.4575,
     38.8467,
diff --git a/test/fixtures/integration/config.integration.segmentation.json b/test/fixtures/integration/config.integration.segmentation.json
@@ -1,5 +1,5 @@
 {
-  "country": "portugal",
+  "country": ^["portugal"],
   "bounding_box": [
     -9.4575,
     38.8467,
diff --git a/test/fixtures/integration/config.integration.segmentation_sparse.json b/test/fixtures/integration/config.integration.segmentation_sparse.json
@@ -1,5 +1,5 @@
 {
-  "country": "portugal",
+  "country": ["portugal"],
   "bounding_box": [
     -9.4575,
     38.8467,
diff --git a/test/fixtures/integration/config.integration_sparse.json b/test/fixtures/integration/config.integration_sparse.json
@@ -1,5 +1,5 @@
 {
-  "country": "portugal",
+  "country": ["portugal"],
   "bounding_box": [
     -9.4575,
     38.8467,
diff --git a/test/fixtures/integration/config.intergration.geotiff_package.json b/test/fixtures/integration/config.intergration.geotiff_package.json
@@ -1,5 +1,5 @@
 {
-  "country": "sao_tome_and_principe",
+  "country": ["sao_tome_and_principe"],
   "bounding_box": [6.72746119738703,0.3382909054246151,6.72776258384623,0.33878086940393715],
   "zoom": 20,
   "classes": [
diff --git a/test/fixtures/integration/portugal_aoi.geojson b/test/fixtures/integration/portugal_aoi.geojson
diff --git a/test/integration/test_classification_labels.py b/test/integration/test_classification_labels.py
@@ -29,7 +29,7 @@ def test_cli(self):
 Farmland: 0 tiles
 Ruins: 1 tiles
 Parking: 1 tiles
-Roads: 8 tiles
+Roads: 0 tiles
 Total tiles: 9
 Writing out labels to integration-cl/labels.npz
 """
@@ -41,15 +41,15 @@ def test_cli(self):
 
         # our labels should look like this
         expected_labels = {
-            '62092-50162-17': np.array([1, 0, 0, 0, 0, 0, 0]),
-            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50163-17': np.array([0, 1, 1, 0, 0, 0, 1]),
-            '62093-50163-17': np.array([0, 0, 0, 0, 1, 1, 1])
+            '62092-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50163-17': np.array([0, 319, 0.5, 0, 0, 0, 0]),
+            '62093-50163-17': np.array([0, 0, 0, 0, 217, 1268, 0])
         }
 
         labels = np.load('integration-cl/labels.npz')
diff --git a/test/integration/test_classification_labels_aoi.py b/test/integration/test_classification_labels_aoi.py
@@ -0,0 +1,66 @@
+"""Test that the following CLI command returns the expected outputs
+label-maker labels --dest integration-cl --config test/fixtures/integration/config.integration.json"""
+import unittest
+import json
+from os import makedirs
+from shutil import copyfile, rmtree
+import subprocess
+
+import numpy as np
+
+class TestClassificationLabel(unittest.TestCase):
+    """Tests for classification label creation"""
+    @classmethod
+    def setUpClass(cls):
+        makedirs('integration-cl')
+        copyfile('test/fixtures/integration/portugal-z17.mbtiles', 'integration-cl/portugal-z17.mbtiles')
+
+    @classmethod
+    def tearDownClass(cls):
+        rmtree('integration-cl')
+
+    def test_cli(self):
+        """Verify stdout, geojson, and labels.npz produced by CLI"""
+        # our command line output should look like this
+        expected_output = """Determining labels for each tile
+---
+Water Tower: 1 tiles
+Building: 1 tiles
+Farmland: 0 tiles
+Ruins: 1 tiles
+Parking: 1 tiles
+Roads: 0 tiles
+Total tiles: 9
+Writing out labels to integration-cl/labels.npz
+"""
+
+        cmd = 'label-maker labels --dest integration-cl --config test/fixtures/integration/config.integration.json'
+        cmd = cmd.split(' ')
+        with subprocess.Popen(cmd, universal_newlines=True, stdout=subprocess.PIPE) as p:
+            self.assertEqual(expected_output, p.stdout.read())
+
+        # our labels should look like this
+        expected_labels = {
+            '62092-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50163-17': np.array([0, 319, 0.5, 0, 0, 0, 0]),
+            '62093-50163-17': np.array([0, 0, 0, 0, 217, 1268, 0])
+        }
+
+        labels = np.load('integration-cl/labels.npz')
+        self.assertEqual(len(labels.files), len(expected_labels.keys()))  # First check number of tiles
+        for tile in labels.files:
+            self.assertTrue(np.array_equal(expected_labels[tile], labels[tile]))  # Now, content
+
+        # our GeoJSON looks like the fixture
+        with open('test/fixtures/integration/classification.geojson') as fixture:
+            with open('integration-cl/classification.geojson') as geojson_file:
+                expected_geojson = json.load(fixture)
+                geojson = json.load(geojson_file)
+
+                self.assertCountEqual(expected_geojson, geojson)
diff --git a/test/integration/test_classification_labels_geojson.py b/test/integration/test_classification_labels_geojson.py
@@ -29,7 +29,7 @@ def test_cli(self):
 Farmland: 0 tiles
 Ruins: 1 tiles
 Parking: 1 tiles
-Roads: 8 tiles
+Roads: 0 tiles
 Total tiles: 9
 Writing out labels to integration-cl/labels.npz
 """
@@ -41,15 +41,15 @@ def test_cli(self):
 
         # our labels should look like this
         expected_labels = {
-            '62092-50162-17': np.array([1, 0, 0, 0, 0, 0, 0]),
-            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50163-17': np.array([0, 1, 1, 0, 0, 0, 1]),
-            '62093-50163-17': np.array([0, 0, 0, 0, 1, 1, 1])
+            '62092-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50163-17': np.array([0, 319, 0.5, 0, 0, 0, 0]),
+            '62093-50163-17': np.array([0, 0, 0, 0, 217, 1268, 0])
         }
 
         labels = np.load('integration-cl/labels.npz')
diff --git a/test/integration/test_classification_labels_sparse.py b/test/integration/test_classification_labels_sparse.py
@@ -29,7 +29,7 @@ def test_cli(self):
 Farmland: 0 tiles
 Ruins: 1 tiles
 Parking: 1 tiles
-Roads: 8 tiles
+Roads: 0 tiles
 Total tiles: 9
 Using sparse mode; subselected 0 background tiles
 Writing out labels to integration-cl/labels.npz
@@ -42,14 +42,8 @@ def test_cli(self):
 
         # our labels should look like this
         expected_labels = {
-            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50163-17': np.array([0, 1, 1, 0, 0, 0, 1]),
-            '62093-50163-17': np.array([0, 0, 0, 0, 1, 1, 1])
+            '62094-50163-17': np.array([0, 319, 0.5, 0, 0, 0, 0]),
+            '62093-50163-17': np.array([0, 0, 0, 0, 217, 1268, 0])
         }
 
         labels = np.load('integration-cl/labels.npz')
diff --git a/test/integration/test_directory_move.py b/test/integration/test_directory_move.py
@@ -33,15 +33,15 @@ def test_cli(self):
 
         # our labels should look like this
         expected_labels = {
-            '62092-50162-17': np.array([1, 0, 0, 0, 0, 0, 0]),
-            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 1]),
-            '62094-50163-17': np.array([0, 1, 1, 0, 0, 0, 1]),
-            '62093-50163-17': np.array([0, 0, 0, 0, 1, 1, 1])
+            '62092-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50163-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62092-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62093-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50162-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50164-17': np.array([0, 0, 0, 0, 0, 0, 0]),
+            '62094-50163-17': np.array([0, 319, 0.5, 0, 0, 0, 0]),
+            '62093-50163-17': np.array([0, 0, 0, 0, 217, 1268, 0])
         }
 
         # move back into the directory

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "country": "portugal",`
	`2`	`+ "country": ["portugal"],`
`3`	`3`	`"bounding_box": [`
`4`	`4`	`-9.4575,`
`5`	`5`	`38.8467,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "country": "portugal",`
	`2`	`+ "country": ^["portugal"],`
`3`	`3`	`"bounding_box": [`
`4`	`4`	`-9.4575,`
`5`	`5`	`38.8467,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "country": "sao_tome_and_principe",`
	`2`	`+ "country": ["sao_tome_and_principe"],`
`3`	`3`	`"bounding_box": [6.72746119738703,0.3382909054246151,6.72776258384623,0.33878086940393715],`
`4`	`4`	`"zoom": 20,`
`5`	`5`	`"classes": [`