Properly allow overriding /collections/{collectionId}/items/{featureI…

…d} to replace geojson with stac items #8
radiantearth · Nov 16, 2020 · 2cb51af · 2cb51af
1 parent 955d2c2
commit 2cb51af
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 43 deletions.
diff --git a/STAC-extensions.yaml b/STAC-extensions.yaml
@@ -194,7 +194,16 @@ paths:
         - $ref: '#/components/parameters/featureId'
       responses:
         '200':
-          $ref: '#/components/responses/Feature'
+          description: |-
+            fetch the feature with id `featureId` in the feature collection
+            with id `collectionId`
+          content:
+            application/geo+json:
+              schema:
+                $ref: '#/components/schemas/item'
+            text/html:
+              schema:
+                type: string
           headers:
             ETag:
               schema:
@@ -2284,17 +2293,6 @@ components:
         text/html:
           schema:
             type: string
-    Feature:
-      description: |-
-        fetch the feature with id `featureId` in the feature collection
-        with id `collectionId`
-      content:
-        application/geo+json:
-          schema:
-            $ref: '#/components/schemas/item'
-        text/html:
-          schema:
-            type: string
     InvalidParameter:
       description: A query parameter has an invalid value.
       content:

diff --git a/STAC.yaml b/STAC.yaml
@@ -138,7 +138,16 @@ paths:
         - $ref: '#/components/parameters/featureId'
       responses:
         '200':
-          $ref: '#/components/responses/Feature'
+          description: |-
+            fetch the feature with id `featureId` in the feature collection
+            with id `collectionId`
+          content:
+            application/geo+json:
+              schema:
+                $ref: '#/components/schemas/item'
+            text/html:
+              schema:
+                type: string
         '404':
           $ref: '#/components/responses/NotFound'
         '500':
@@ -1718,17 +1727,6 @@ components:
         text/html:
           schema:
             type: string
-    Feature:
-      description: |-
-        fetch the feature with id `featureId` in the feature collection
-        with id `collectionId`
-      content:
-        application/geo+json:
-          schema:
-            $ref: '#/components/schemas/item'
-        text/html:
-          schema:
-            type: string
     InvalidParameter:
       description: A query parameter has an invalid value.
       content:

diff --git a/openapi/OAFeat.yaml b/openapi/OAFeat.yaml
@@ -120,7 +120,18 @@ paths:
         - $ref: '#/components/parameters/featureId'
       responses:
         '200':
-          $ref: '#/components/responses/Feature'
+          # Moved from #/components/responses/Feature to allow merging with extensions
+          description: |-
+            fetch the feature with id `featureId` in the feature collection
+            with id `collectionId`
+          content:
+            application/geo+json:
+              schema:
+                $ref: '#/components/schemas/featureGeoJSON'
+              # Removed example, I can't override it from STAC.yaml
+            text/html:
+              schema:
+                type: string
         '404':
           $ref: '#/components/responses/NotFound'
         '500':
@@ -797,18 +808,6 @@ components:
         text/html:
           schema:
             type: string
-    Feature:
-      description: |-
-        fetch the feature with id `featureId` in the feature collection
-        with id `collectionId`
-      content:
-        application/geo+json:
-          schema:
-            $ref: '#/components/schemas/featureGeoJSON'
-          # Removed example, I can't override it from STAC.yaml
-        text/html:
-          schema:
-            type: string
     InvalidParameter:
       description: |-
         A query parameter has an invalid value.

diff --git a/openapi/STAC.yaml b/openapi/STAC.yaml
@@ -113,6 +113,15 @@ paths:
             text/html:
               schema:
                 type: string
+  # This schema changes the OAFeat endpoint to replace the schema from featureGeoJson to item.
+  '/collections/{collectionId}/items/{featureId}':
+    get:
+      responses:
+        '200':
+          content:
+            application/geo+json:
+              schema:
+                $ref: '#/components/schemas/item'
 components:
   parameters:
     ids:
@@ -198,12 +207,6 @@ components:
                 rel: search
                 type: application/json
                 title: Search across feature collections
-    # This schema extends OAFeat.yaml#/components/responses/Feature change the schema from featureGeoJson to item.
-    Feature:
-      content:
-        application/geo+json:
-          schema:
-            $ref: '#/components/schemas/item'
   schemas:
     # This schema extends OAFeat.yaml#/components/schemas/collection to add and require additional fields and add an example.
     collection: