Merge pull request stac-utils#22 from azavea/rde/stac-0.8-release

Update PySTAC to STAC 0.8.0 release

Author: lossyrob

pystac/label.py

@@ -20,13 +20,13 @@ def __init__(self,
                  properties,
                  label_description,
                  label_type,
-                 label_property=None,
+                 label_properties=None,
                  label_classes=None,
                  stac_extensions=None,
                  href=None,
                  label_task=None,
                  label_method=None,
-                 label_overview=None):
+                 label_overviews=None):
         if stac_extensions is None:
             stac_extensions = []
         if 'label' not in stac_extensions:
@@ -38,18 +38,18 @@ def __init__(self,
                                         properties=properties,
                                         stac_extensions=stac_extensions,
                                         href=href)
-        self.label_property = label_property
+        self.label_properties = label_properties
         self.label_classes = label_classes
         self.label_description = label_description
         self.label_type = label_type
         self.label_task = label_task
         self.label_method = label_method
-        self.label_overview = label_overview
+        self.label_overviews = label_overviews
 
         # Be kind if folks didn't use lists for some properties
-        if self.label_property is not None:
-            if not type(self.label_property) is list:
-                self.label_property = [self.label_property]
+        if self.label_properties is not None:
+            if not type(self.label_properties) is list:
+                self.label_properties = [self.label_properties]
 
         if self.label_method is not None:
             if not type(self.label_method) is list:
@@ -65,8 +65,8 @@ def __init__(self,
                             "{}; was {}".format(LabelType.ALL, self.label_type))
 
         if self.label_type == LabelType.VECTOR:
-            if self.label_property is None:
-                raise STACError('label_property must be set for vector label type')
+            if self.label_properties is None:
+                raise STACError('label_properties must be set for vector label type')
 
         if self.label_task is not None:
             for task in self.label_task:
@@ -82,15 +82,15 @@ def to_dict(self, include_self_link=True):
         d = super(LabelItem, self).to_dict(include_self_link)
         d['properties']['label:description'] = self.label_description
         d['properties']['label:type'] = self.label_type
-        d['properties']['label:property'] = self.label_property
+        d['properties']['label:properties'] = self.label_properties
         if self.label_classes:
             d['properties']['label:classes'] = [classes.to_dict() for classes in self.label_classes]
         if self.label_task is not None:
             d['properties']['label:task'] = self.label_task
         if self.label_method is not None:
             d['properties']['label:method'] = self.label_method
-        if self.label_overview is not None:
-            d['properties']['label:overview'] = [ov.to_dict() for ov in self.label_overview]
+        if self.label_overviews is not None:
+            d['properties']['label:overviews'] = [ov.to_dict() for ov in self.label_overviews]
 
         return d
 
@@ -126,12 +126,12 @@ def clone(self):
                            properties=deepcopy(self.properties),
                            label_description=self.label_description,
                            label_type=self.label_type,
-                           label_property=self.label_property,
+                           label_properties=self.label_properties,
                            label_classes=copy(self.label_classes),
                            stac_extensions=copy(self.stac_extensions),
                            label_task=self.label_task,
                            label_method=self.label_method,
-                           label_overview=deepcopy(self.label_overview))
+                           label_overviews=deepcopy(self.label_overviews))
         for link in self.links:
             clone.add_link(link.clone())
 
@@ -143,21 +143,21 @@ def from_dict(d):
         item = Item.from_dict(d)
         props = item.properties
 
-        label_property = props.get('label:property')
+        label_properties = props.get('label:properties')
         label_classes = props.get('label:classes')
         if label_classes is not None:
             label_classes = [LabelClasses.from_dict(classes) for classes in label_classes]
         label_description = props['label:description']
         label_type = props['label:type']
         label_task = props.get('label:task')
         label_method = props.get('label:method')
-        label_overview = props.get('label:overview')
-        if label_overview is not None:
-            if type(label_overview) is list:
-                label_overview = [LabelOverview.from_dict(ov) for ov in label_overview]
+        label_overviews = props.get('label:overviews')
+        if label_overviews is not None:
+            if type(label_overviews) is list:
+                label_overviews = [LabelOverview.from_dict(ov) for ov in label_overviews]
             else:
                 # Read STAC with mistaken single overview object (should be list)
-                label_overview = LabelOverview.from_dict(label_overview)
+                label_overviews = LabelOverview.from_dict(label_overviews)
 
         li = LabelItem(id=item.id,
                        geometry=item.geometry,
@@ -166,12 +166,12 @@ def from_dict(d):
                        properties=item.properties,
                        label_description=label_description,
                        label_type=label_type,
-                       label_property=label_property,
+                       label_properties=label_properties,
                        label_classes=label_classes,
                        stac_extensions=item.stac_extensions,
                        label_task=label_task,
                        label_method=label_method,
-                       label_overview=label_overview)
+                       label_overviews=label_overviews)
 
         for link in item.links:
             li.add_link(link)

tests/data-files/catalogs/test-case-1/country-1/area-1-1/area-1-1-labels/area-1-1-labels.json

@@ -6,7 +6,7 @@
         "datetime": "2019-10-04 18:55:37Z",
         "label:description": "labels for area-1-1",
         "label:type": "vector",
-        "label:property": [
+        "label:properties": [
             "label"
         ],
         "label:classes": [
@@ -89,4 +89,4 @@
     "stac_extensions": [
         "label"
     ]
-}
+}

tests/data-files/catalogs/test-case-1/country-1/area-1-2/area-1-2-labels/area-1-2-labels.json

@@ -6,7 +6,7 @@
         "datetime": "2019-10-04 18:55:37Z",
         "label:description": "labels for area-1-2",
         "label:type": "vector",
-        "label:property": [
+        "label:properties": [
             "label"
         ],
         "label:classes": [
@@ -89,4 +89,4 @@
     "stac_extensions": [
         "label"
     ]
-}
+}

tests/data-files/catalogs/test-case-1/country-2/area-2-1/area-2-1-labels/area-2-1-labels.json

@@ -6,7 +6,7 @@
         "datetime": "2019-10-04 18:55:37Z",
         "label:description": "labels for area-2-1",
         "label:type": "vector",
-        "label:property": [
+        "label:properties": [
             "label"
         ],
         "label:classes": [
@@ -89,4 +89,4 @@
     "stac_extensions": [
         "label"
     ]
-}
+}

tests/data-files/catalogs/test-case-1/country-2/area-2-2/area-2-2-labels/area-2-2-labels.json

@@ -6,7 +6,7 @@
         "datetime": "2019-10-04 18:55:37Z",
         "label:description": "labels for area-2-2",
         "label:type": "vector",
-        "label:property": [
+        "label:properties": [
             "label"
         ],
         "label:classes": [
@@ -89,4 +89,4 @@
     "stac_extensions": [
         "label"
     ]
-}
+}

tests/data-files/catalogs/test-case-2/1a8c1632-fa91-4a62-b33e-3a87c2ebdf16/5b922d42-9a77-4f79-a672-86096f7f849e/cf73ec1a-d790-4b59-b077-e101738571ed/cf73ec1a-d790-4b59-b077-e101738571ed.json

@@ -22,7 +22,7 @@
         "label:task": [
             "detection"
         ],
-        "label:property": [
+        "label:properties": [
             "label"
         ]
     },

tests/test_catalog.py

@@ -27,8 +27,9 @@ def test_create_and_read(self):
 
     def test_read_remote(self):
         catalog_url = ('https://raw.githubusercontent.com/radiantearth/stac-spec/'
-                       '252cc892cdccf7ba0b9564bcae42bb6ec4189f14'
-                       '/extensions/label/examples/multidataset/catalog.json')
+                       'v{}'
+                       '/extensions/label/examples/multidataset/catalog.json'.format(
+                           STAC_VERSION))
         cat = Catalog.from_file(catalog_url)
 
         zanzibar = cat.get_child('zanzibar-collection')
@@ -314,7 +315,7 @@ def test_full_copy_2(self):
                                    properties={},
                                    label_description='labels',
                                    label_type='vector',
-                                   label_property='label',
+                                   label_properties='label',
                                    label_classes=[LabelClasses(classes=['one', 'two'],
                                                                name='label')],
                                    label_task='classification')

tests/utils.py

@@ -104,12 +104,12 @@ def test_case_3():
                                properties={},
                                label_description='ML Labels',
                                label_type='vector',
-                               label_property=['label'],
+                               label_properties=['label'],
                                label_classes=[LabelClasses(classes=['one', 'two'],
                                                            name='label')],
                                label_task=['classification'],
                                label_method=['manual'],
-                               label_overview=overviews)
+                               label_overviews=overviews)
         label_item.add_source(image_item, assets=['ortho'])
 
         root_cat.add_item(image_item)
@@ -120,14 +120,8 @@ def test_case_3():
 
 class SchemaValidator:
     REPO = 'https://raw.githubusercontent.com/radiantearth/stac-spec'
-
-    # TODO: Replace once 0.8 release is out.
-    # TAG = 'v{}'.format(STAC_VERSION)
-    TAG = 'v0.8.0-rc1'
-
-    # TODO: Replace once 0.8 release is out.
-    # SCHEMA_BASE_URI = '{}/{}'.format(REPO, TAG)
-    SCHEMA_BASE_URI = 'https://raw.githubusercontent.com/radiantearth/stac-spec/dev'
+    TAG = 'v{}'.format(STAC_VERSION)
+    SCHEMA_BASE_URI = '{}/{}'.format(REPO, TAG)
 
     schemas = {
         Catalog: 'catalog-spec/json-schema/catalog.json',

tutorials/pystac-spacenet-tutorial.ipynb

@@ -319,7 +319,7 @@
     "            'properties': {},\n",
     "            'label_description': 'Building labels for scene {}'.format(item.id),\n",
     "            'label_type': 'vector',\n",
-    "            'label_property': 'partialBuilding'\n",
+    "            'label_properties': 'partialBuilding'\n",
     "        }\n",
     "        \n",
     "        with open(label_uri) as gj:\n",