Merge pull request #31 from developmentseed/fixCRSInfo

switch from epsg4326 to CRS84

Author: vincentsarago

tests/routes/test_collections.py

@@ -114,7 +114,12 @@ def test_collections_landsat(app):
     body = response.json()
     assert body["id"] == "public.landsat_wrs"
     assert ["id", "title", "links", "extent", "itemType", "crs"] == list(body)
+    assert body["crs"] == ["http://www.opengis.net/def/crs/OGC/1.3/CRS84"]
     assert ["bbox", "crs"] == list(body["extent"]["spatial"])
+    assert (
+        body["extent"]["spatial"]["crs"]
+        == "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+    )
     assert not body["extent"].get("temporal")
 
     response = app.get("/collections/public.landsat_wrs?f=html")

tipg/dbmodel.py

@@ -170,7 +170,7 @@ class Collection(BaseModel):
     @property
     def extent(self) -> Optional[Extent]:
         """Return extent."""
-        extent = {}
+        extent: Dict[str, Any] = {}
         if cols := self.geometry_columns:
             if len(cols) == 1:
                 bbox = [cols[0].bounds]
@@ -183,7 +183,9 @@ def extent(self) -> Optional[Extent]:
 
             extent["spatial"] = {
                 "bbox": bbox,
-                "crs": f"http://www.opengis.net/def/crs/EPSG/0/{cols[0].srid}",
+                # The extent calculated in Pg is in WGS84 LON,LAT order
+                # so we use `CRS84` as CRS
+                "crs": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
             }
 
         if cols := self.datetime_columns:

tipg/model.py

@@ -42,7 +42,7 @@ class Spatial(BaseModel):
     # extent of the data. All subsequent bounding boxes describe
     # more precise bounding boxes, e.g., to identify clusters of data.
     bbox: List[List[float]]
-    crs: str
+    crs: str = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
 
 
 class Temporal(BaseModel):
@@ -76,6 +76,8 @@ class Extent(BaseModel):
 class Collection(BaseModel):
     """Collection model.
 
+    Note: `CRS` is the list of CRS supported by the service not the CRS of the collection
+
     Ref: http://schemas.opengis.net/ogcapi/features/part1/1.0/openapi/schemas/collection.yaml
 
     """
@@ -86,7 +88,7 @@ class Collection(BaseModel):
     links: List[Link]
     extent: Optional[Extent]
     itemType: str = "feature"
-    crs: List[str] = ["http://www.opengis.net/def/crs/EPSG/0/4326"]
+    crs: List[str] = ["http://www.opengis.net/def/crs/OGC/1.3/CRS84"]
 
     class Config:
         """Collection model configuration."""