1.0.0-beta.2 (#38)

* bump stac-pydantic

* update index, ingest script

* update test data

* update pipfile

* update pipfile

* oops

* update pipfile

* eo:gsd -> gsd

Author: geospatial-jeff

Pipfile

@@ -13,7 +13,7 @@ shapely = "*"
 sqlalchemy = "*"
 geoalchemy2 = "<0.8.0"
 sqlakeyset = "*"
-stac-pydantic = ">=1.1.3"
+stac-pydantic = ">=1.3.5"
 pydantic = {extras=["dotenv"], version="*"}
 cogeo-mosaic = "==3.0a10"
 titiler = "==0.1a2"

Pipfile.lock

@@ -19,6 +19,7 @@ def ingest_joplin_data():
     r = requests.get(f"https://{bucket}.s3.amazonaws.com/joplin/index.geojson")
     index = r.json()
     for feat in index["features"]:
+        del feat["stac_extensions"]
         r = requests.post(
             urljoin(app_host, f"/collections/{collection['id']}/items"), json=feat
         )

scripts/ingest_joplin.py

@@ -104,7 +104,7 @@ def get_database_model(cls, schema: schemas.Item) -> dict:
         # Exclude indexed fields from the properties jsonb field
         properties = schema.properties.dict(exclude=set(config.settings.indexed_fields))
         now = datetime.utcnow().strftime(DATETIME_RFC339)
-        if "created" not in properties:
+        if not properties["created"]:
             properties["created"] = now
         properties["updated"] = now
 

stac_api/models/database.py

@@ -1 +1 @@
-{"id":"test-collection","description":"Landat 8 imagery radiometrically calibrated and orthorectified using gound points and Digital Elevation Model (DEM) data to correct relief displacement.","stac_version":"0.9.0","license":"PDDL-1.0","extent":{"spatial":{"bbox":[[-180.0,-90.0,180.0,90.0]]},"temporal":{"interval":[["2013-06-01",null]]}},"links":[{"href":"http://localhost:8081/collections/landsat-8-l1","rel":"self","type":"application/json"},{"href":"http://localhost:8081/","rel":"parent","type":"application/json"},{"href":"http://localhost:8081/collections/landsat-8-l1/items","rel":"item","type":"application/geo+json"},{"href":"http://localhost:8081/","rel":"root","type":"application/json"}],"title":"Landsat 8 L1","keywords":["landsat","earth observation","usgs"],"providers":[{"name":"USGS","roles":["producer"],"url":"https://landsat.usgs.gov/"},{"name":"Planet Labs","roles":["processor"],"url":"https://github.com/landsat-pds/landsat_ingestor"},{"name":"AWS","roles":["host"],"url":"https://landsatonaws.com/"},{"name":"Development Seed","roles":["processor"],"url":"https://github.com/sat-utils/sat-api"},{"name":"Earth Search by Element84","description":"API of Earth on AWS datasets","roles":["host"],"url":"https://element84.com"}]}
+{"id":"test-collection","description":"Landat 8 imagery radiometrically calibrated and orthorectified using gound points and Digital Elevation Model (DEM) data to correct relief displacement.","stac_version":"1.0.0-beta.2","license":"PDDL-1.0","extent":{"spatial":{"bbox":[[-180.0,-90.0,180.0,90.0]]},"temporal":{"interval":[["2013-06-01",null]]}},"links":[{"href":"http://localhost:8081/collections/landsat-8-l1","rel":"self","type":"application/json"},{"href":"http://localhost:8081/","rel":"parent","type":"application/json"},{"href":"http://localhost:8081/collections/landsat-8-l1/items","rel":"item","type":"application/geo+json"},{"href":"http://localhost:8081/","rel":"root","type":"application/json"}],"title":"Landsat 8 L1","keywords":["landsat","earth observation","usgs"],"providers":[{"name":"USGS","roles":["producer"],"url":"https://landsat.usgs.gov/"},{"name":"Planet Labs","roles":["processor"],"url":"https://github.com/landsat-pds/landsat_ingestor"},{"name":"AWS","roles":["host"],"url":"https://landsatonaws.com/"},{"name":"Development Seed","roles":["processor"],"url":"https://github.com/sat-utils/sat-api"},{"name":"Earth Search by Element84","description":"API of Earth on AWS datasets","roles":["host"],"url":"https://element84.com"}]}

tests/data/test_collection.json

@@ -31,8 +31,8 @@
 "properties": {
 "datetime": "2020-02-12T12:30:22Z",
 "landsat:scene_id": "LC82081612020043LGN00",
-"eo:row": "161",
-"eo:gsd": 15,
+"landsat:row": "161",
+"gsd": 15,
 "eo:bands": [
 {
 "gsd": 30,
@@ -113,17 +113,17 @@
 }
 ],
 "landsat:revision": "00",
-"eo:sun_azimuth": -148.83296771,
-"eo:instrument": "OLI_TIRS",
+"view:sun_azimuth": -148.83296771,
+"instrument": "OLI_TIRS",
 "landsat:product_id": "LC08_L1GT_208161_20200212_20200212_01_RT",
 "eo:cloud_cover": -1,
 "landsat:tier": "RT",
 "landsat:processing_level": "L1GT",
-"eo:column": "208",
-"eo:platform": "landsat-8",
+"landsat:column": "208",
+"platform": "landsat-8",
 "proj:epsg": 32756,
-"eo:sun_elevation": -37.30791534,
-"eo:off_nadir": 0,
+"view:sun_elevation": -37.30791534,
+"view:off_nadir": 0,
 "height": 2500,
 "width": 2500
 },

tests/data/test_item.json

@@ -64,12 +64,13 @@ def test_update_item_already_exists(app_client, load_test_data):
     )
     assert resp.status_code == 200
 
-    test_item["properties"]["eo:gsd"] = 16
+    assert test_item["properties"]["gsd"] != 16
+    test_item["properties"]["gsd"] = 16
     resp = app_client.put(
         f"/collections/{test_item['collection']}/items", json=test_item
     )
     updated_item = resp.json()
-    assert updated_item["properties"]["eo:gsd"] == 16
+    assert updated_item["properties"]["gsd"] == 16
 
 
 def test_update_new_item(app_client, load_test_data):
@@ -615,10 +616,10 @@ def test_field_extension_get(app_client, load_test_data):
     )
     assert resp.status_code == 200
 
-    params = {"fields": "+properties.proj:epsg,+properties.eo:gsd"}
+    params = {"fields": "+properties.proj:epsg,+properties.gsd"}
     resp = app_client.get("/search", params=params)
     feat_properties = resp.json()["features"][0]["properties"]
-    assert not set(feat_properties) - {"proj:epsg", "eo:gsd", "datetime"}
+    assert not set(feat_properties) - {"proj:epsg", "gsd", "datetime"}
 
 
 def test_field_extension_post(app_client, load_test_data):