Move specialized sampling features to part 4 (resolves #82) (#96)

opengeospatial · Dec 13, 2024 · 191212a · 191212a
1 parent 7132570
commit 191212a
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 20 deletions.
diff --git a/api/part1/openapi/requests/samplingFeature.yaml b/api/part1/openapi/requests/samplingFeature.yaml
@@ -2,7 +2,7 @@ required: true
 content:
   application/geo+json:
     schema:
-      $ref: ../schemas/geojson/anySamplingFeature.json
+      $ref: ../schemas/geojson/samplingFeature.json
     examples:
       sf-point:
         summary: Sampling Point

diff --git a/api/part1/openapi/requests/samplingFeatureOrArray.yaml b/api/part1/openapi/requests/samplingFeatureOrArray.yaml
@@ -5,6 +5,6 @@ content:
     schema:
       oneOf:
       - title: Single Feature
-        $ref: ../schemas/geojson/anySamplingFeature.json
+        $ref: ../schemas/geojson/samplingFeature.json
       - title: List of Features
         $ref: ../schemas/geojson/samplingFeatureArray.json
diff --git a/api/part1/openapi/responses/samplingFeature.yaml b/api/part1/openapi/responses/samplingFeature.yaml
@@ -2,7 +2,7 @@ description: OK. Successful request
 content:
   application/geo+json:
     schema:
-      $ref: ../schemas/geojson/anySamplingFeature.json
+      $ref: ../schemas/geojson/samplingFeature.json
     examples:
       sf-point:
         summary: Sampling Point

diff --git a/api/part1/openapi/responses/samplingFeatureCollection.yaml b/api/part1/openapi/responses/samplingFeatureCollection.yaml
@@ -1,18 +1,5 @@
 description: OK. Successful request
 content:
   application/geo+json:
-    schema:
-      type: object
-      required: features
-      properties:
-        type:
-          type: string
-          const: FeatureCollection
-        features:
-          type: array
-          items:
-            $ref: ../schemas/geojson/anySamplingFeature.json
-        links:
-          type: array
-          items:
-            $ref: ../schemas/common/commonDefs.json#/definitions/Link
+    schema: 
+      $ref: ../schemas/geojson/samplingFeatureCollection.json
diff --git a/api/part1/openapi/schemas/geojson/samplingFeatureArray.json b/api/part1/openapi/schemas/geojson/samplingFeatureArray.json
@@ -3,6 +3,6 @@
   "type": "array",
   "items": {
     "title": "Sampling Feature",
-    "$ref": "./anySamplingFeature.json"
+    "$ref": "./samplingFeature.json"
   }
 }
diff --git a/api/part1/standard/23-001r0.adoc b/api/part1/standard/23-001r0.adoc
@@ -46,7 +46,7 @@
 :geojson-deployment-collection-schema: link:{geojson-schema-root}/deploymentCollection.json[deploymentCollection.json]
 :geojson-deployed-system-schema: link:{geojson-schema-root}/deployedSystem.json[deployedSystem.json]
 :geojson-deployed-system-collection-schema: link:{geojson-schema-root}/deployedSystemCollection.json[deployedSystemCollection.json]
-:geojson-samplingFeature-schema: link:{geojson-schema-root}/anySamplingFeature.json[anySamplingFeature.json]
+:geojson-samplingFeature-schema: link:{geojson-schema-root}/samplingFeature.json[samplingFeature.json]
 :geojson-samplingFeature-collection-schema: link:{geojson-schema-root}/samplingFeatureCollection.json[samplingFeatureCollection.json]
 //
 :sensorml-schema-root: {jsonschema-root}/sensorml

diff --git a/...i/schemas/geojson/anySamplingFeature.json → ...4/openapi/schemas/anySamplingFeature.json b/...i/schemas/geojson/anySamplingFeature.json → ...4/openapi/schemas/anySamplingFeature.json
diff --git a/...penapi/schemas/geojson/samplingCurve.json → api/part4/openapi/schemas/samplingCurve.json b/...penapi/schemas/geojson/samplingCurve.json → api/part4/openapi/schemas/samplingCurve.json
diff --git a/...openapi/schemas/geojson/samplingPart.json → api/part4/openapi/schemas/samplingPart.json b/...openapi/schemas/geojson/samplingPart.json → api/part4/openapi/schemas/samplingPart.json
diff --git a/...penapi/schemas/geojson/samplingPoint.json → api/part4/openapi/schemas/samplingPoint.json b/...penapi/schemas/geojson/samplingPoint.json → api/part4/openapi/schemas/samplingPoint.json
diff --git a/...api/schemas/geojson/samplingPointXYZ.json → ...rt4/openapi/schemas/samplingPointXYZ.json b/...api/schemas/geojson/samplingPointXYZ.json → ...rt4/openapi/schemas/samplingPointXYZ.json
diff --git a/...napi/schemas/geojson/samplingProfile.json → ...art4/openapi/schemas/samplingProfile.json b/...napi/schemas/geojson/samplingProfile.json → ...art4/openapi/schemas/samplingProfile.json
diff --git a/...penapi/schemas/geojson/samplingProxy.json → api/part4/openapi/schemas/samplingProxy.json b/...penapi/schemas/geojson/samplingProxy.json → api/part4/openapi/schemas/samplingProxy.json
diff --git a/...penapi/schemas/geojson/samplingSolid.json → api/part4/openapi/schemas/samplingSolid.json b/...penapi/schemas/geojson/samplingSolid.json → api/part4/openapi/schemas/samplingSolid.json
diff --git a/...napi/schemas/geojson/samplingSpatial.json → ...art4/openapi/schemas/samplingSpatial.json b/...napi/schemas/geojson/samplingSpatial.json → ...art4/openapi/schemas/samplingSpatial.json
diff --git a/...as/geojson/samplingSpatialParametric.json → ...pi/schemas/samplingSpatialParametric.json b/...as/geojson/samplingSpatialParametric.json → ...pi/schemas/samplingSpatialParametric.json
diff --git a/...api/schemas/geojson/samplingSpecimen.json → ...rt4/openapi/schemas/samplingSpecimen.json b/...api/schemas/geojson/samplingSpecimen.json → ...rt4/openapi/schemas/samplingSpecimen.json
diff --git a/...enapi/schemas/geojson/samplingSphere.json → ...part4/openapi/schemas/samplingSphere.json b/...enapi/schemas/geojson/samplingSphere.json → ...part4/openapi/schemas/samplingSphere.json
diff --git a/...napi/schemas/geojson/samplingSurface.json → ...art4/openapi/schemas/samplingSurface.json b/...napi/schemas/geojson/samplingSurface.json → ...art4/openapi/schemas/samplingSurface.json
diff --git a/...napi/schemas/geojson/sphericalSector.json → ...art4/openapi/schemas/sphericalSector.json b/...napi/schemas/geojson/sphericalSector.json → ...art4/openapi/schemas/sphericalSector.json
diff --git a/...enapi/schemas/geojson/viewingFrustum.json → ...part4/openapi/schemas/viewingFrustum.json b/...enapi/schemas/geojson/viewingFrustum.json → ...part4/openapi/schemas/viewingFrustum.json