update to links as dict

radiantearth · Jul 6, 2018 · 480d4fb · 480d4fb
1 parent 931785c
commit 480d4fb
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 37 deletions.
diff --git a/api-spec/STAC-fragment.yaml b/api-spec/STAC-fragment.yaml
@@ -263,13 +263,28 @@ components:
         properties:
           $ref: '#/components/schemas/itemProperties'
         links:
-          type: array
-          items:
-            $ref: '#/components/schemas/link'
+          type: object
+          additionalProperties:
+            type: object
+            required:
+              - href
+              - rel
+            properties:
+              href:
+                type: string
+              rel:
+                type: string
         assets:
-          type: array
-          items:
-            $ref: '#/components/schemas/asset'
+          type: object
+          additionalProperties:
+            type: object
+            required:
+              - href
+            properties:
+              href:
+                type: string
+              name:
+                type: string
       example:
         type: Feature
         id: CS3-20160503_132130_04
@@ -296,25 +311,19 @@ components:
           provider: 'http://www.cool-sat.com'
           license: CC-BY-4.0
         links:
-          - rel: self
-            href: http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04.json
+          self:
+            rel: self
+            href: >-
+              http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04.json
         assets:
           analytic:
             name: 4-Band Analytic
-            href: http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04/analytic.tif
-          thumbnail: 
+            href: >-
+              http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04/analytic.tif
+          thumbnail:
             name: thumbnail
-            href: 'http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04/thumb.png'
-    asset:
-      type: object
-      required:
-        - href
-      properties:
-        href:
-          type: string
-        name:
-          type: string
-          example: prev
+            href: >-
+              http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04/thumb.png
     itemProperties:
       type: object
       required:

diff --git a/api-spec/STAC-standalone-swagger2.yaml b/api-spec/STAC-standalone-swagger2.yaml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: The SpatioTemporal Asset Catalog API (standalone)
-  version: 0.4.1
+  version: 0.5.1
   description: >-
     This is an OpenAPI definition of the core SpatioTemporal Asset Catalog API
     specification. Any service that implements this endpoint to allow search of
@@ -354,9 +354,17 @@ definitions:
       properties:
         $ref: '#/definitions/itemProperties'
       links:
-        type: array
-        items:
-          $ref: '#/definitions/link'
+        type: object
+        additionalProperties:
+          type: object
+          required:
+            - href
+            - rel
+          properties:
+            href:
+              type: string
+            rel:
+              type: string
       assets:
         type: object
         additionalProperties:
@@ -394,7 +402,8 @@ definitions:
         provider: 'http://www.cool-sat.com'
         license: CC-BY-4.0
       links:
-        - rel: self
+        self:
+          rel: self
           href: >-
             http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04.json
       assets:

diff --git a/api-spec/STAC-standalone.yaml b/api-spec/STAC-standalone.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: The SpatioTemporal Asset Catalog API (standalone)
-  version: 0.4.1
+  version: 0.5.1
   description: >-
     This is an OpenAPI definition of the core SpatioTemporal Asset Catalog API
     specification. Any service that implements this endpoint to allow search of
@@ -398,9 +398,17 @@ components:
         properties:
           $ref: '#/components/schemas/itemProperties'
         links:
-          type: array
-          items:
-            $ref: '#/components/schemas/link'
+          type: object
+          additionalProperties:
+            type: object
+            required:
+              - href
+              - rel
+            properties:
+              href:
+                type: string
+              rel:
+                type: string
         assets:
           type: object
           additionalProperties:
@@ -438,7 +446,8 @@ components:
           provider: 'http://www.cool-sat.com'
           license: CC-BY-4.0
         links:
-          - rel: self
+          self:
+            rel: self
             href: >-
               http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04.json
         assets:

diff --git a/api-spec/WFS3core+STAC-swagger2.yaml b/api-spec/WFS3core+STAC-swagger2.yaml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: STAC API integrated with OGC Web Feature Service standard
-  version: 0.4.1
+  version: 0.5.1
   description: >-
     This is an example OpenAPI specification of a SpatioTemporal Asset Catalog
     API  that also implements the OGC Web Feature Service 3.0 specification

diff --git a/api-spec/WFS3core+STAC.yaml b/api-spec/WFS3core+STAC.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.1
 info:
   title: STAC API integrated with OGC Web Feature Service standard
-  version: 0.4.1
+  version: 0.5.1
   description: >-
     This is an example OpenAPI specification of a SpatioTemporal Asset Catalog
     API  that also implements the OGC Web Feature Service 3.0 specification
@@ -743,9 +743,17 @@ components:
         properties:
           $ref: '#/components/schemas/itemProperties'
         links:
-          type: array
-          items:
-            $ref: '#/components/schemas/link'
+          type: object
+          additionalProperties:
+            type: object
+            required:
+              - href
+              - rel
+            properties:
+              href:
+                type: string
+              rel:
+                type: string
         assets:
           type: object
           additionalProperties:
@@ -783,7 +791,8 @@ components:
           provider: 'http://www.cool-sat.com'
           license: CC-BY-4.0
         links:
-          - rel: self
+          self:
+            rel: self
             href: >-
               http://cool-sat.com/catalog/collections/cs/items/CS3-20160503_132130_04.json
         assets: