Merge pull request #66 from giswqs/master

fix image and tile format inconsistency

Author: drewbo

.gitignore

@@ -12,3 +12,4 @@ data
 config.json
 stdout*
 /integration*
+.idea/

label_maker/package.py

@@ -58,6 +58,8 @@ def package_directory(dest_folder, classes, imagery, ml_type, seed=False, train_
     # open the images and load those plus the labels into the final arrays
     o = urlparse(imagery)
     _, image_format = op.splitext(o.path)
+    if image_format == '.tif': # if a local GeoTIFF or a remote Cloud Optimized GeoTIFF is provided, use jpg as tile format
+        image_format = '.jpg'
     for tile in tiles:
         image_file = op.join(dest_folder, 'tiles', '{}{}'.format(tile, image_format))
         try:

test/fixtures/integration/config.intergration.geotiff_package.json

@@ -0,0 +1,12 @@
+{
+  "country": "sao_tome_and_principe",
+  "bounding_box": [6.72746119738703,0.3382909054246151,6.72776258384623,0.33878086940393715],
+  "zoom": 20,
+  "classes": [
+        { "name": "Roads", "filter": ["has", "highway"] },
+    { "name": "Buildings", "filter": ["has", "building"] }
+  ],
+  "imagery": "integration-tif/drone.tif",
+  "background_ratio": 1,
+  "ml_type": "classification"
+}

test/fixtures/integration/labels-tif.npz

@@ -0,0 +1,39 @@
+"""Test that the following CLI command returns the expected outputs
+label-maker package -d integration-tif/sao_tome -c test/fixtures/integration/config.intergration.geotiff_package.json"""
+import unittest
+from os import makedirs
+from shutil import copyfile, rmtree
+import subprocess
+
+import numpy as np
+
+class TestObjectDetectionPackage(unittest.TestCase):
+    """Tests for local GeoTIFF package creation"""
+    @classmethod
+    def setUpClass(cls):
+        makedirs('integration-tif')
+        copyfile('test/fixtures/drone.tif', 'integration-tif/drone.tif')
+        copyfile('test/fixtures/integration/labels-tif.npz', 'integration-tif/labels.npz')
+
+    @classmethod
+    def tearDownClass(cls):
+        rmtree('integration-tif')
+
+    def test_cli(self):
+        """Verify data.npz produced by CLI"""
+        cmd = 'label-maker images -d integration-tif -c test/fixtures/integration/config.intergration.geotiff_package.json'
+        cmd = cmd.split(' ')
+        subprocess.run(cmd, universal_newlines=True)
+
+        cmd = 'label-maker package -d integration-tif -c test/fixtures/integration/config.intergration.geotiff_package.json'
+        cmd = cmd.split(' ')
+        subprocess.run(cmd, universal_newlines=True)
+
+        data = np.load('integration-tif/data.npz')
+
+        self.assertEqual(data['x_train'].shape, (3, 256, 256, 3))
+        self.assertEqual(data['x_test'].shape, (1, 256, 256, 3))
+
+        # validate our label data with exact matches in shape
+        self.assertEqual(data['y_train'].shape, (3, 3))
+        self.assertEqual(data['y_test'].shape, (1, 3))