Merge pull request #55 from tschaub/array-length

Validation for array length
opengeospatial · Mar 4, 2018 · 9a0017c · 9a0017c
2 parents 7f9a386 + 8b41212
commit 9a0017c
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/core/openapi/parameters/bbox.yaml b/core/openapi/parameters/bbox.yaml
@@ -15,10 +15,10 @@ description: >-
 required: false
 schema:
   type: array
+  minItems: 4
+  maxItems: 4
   items:
     type: number
-    minItems: 4
-    maxItems: 4
     minimum: -180
     maximum: 180
 style: form

diff --git a/core/openapi/schemas/bbox.yaml b/core/openapi/schemas/bbox.yaml
@@ -10,9 +10,9 @@ properties:
   bbox:
     description: west, north, east, south edges of the bounding box
     type: array
+    minItems: 4
+    maxItems: 4
     items:
-      minItems: 4
-      maxItems: 4
       type: number
       minimum: -180
       maximum: 180

diff --git a/core/openapi/schemas/linestringGeoJSON.yaml b/core/openapi/schemas/linestringGeoJSON.yaml
@@ -9,9 +9,9 @@ properties:
       - LineString
   coordinates:
     type: array
+    minItems: 2
     items:
       type: array
       minItems: 2
       items:
-        type: number
-        minItems: 2
+        type: number
diff --git a/core/openapi/schemas/multilinestringGeoJSON.yaml b/core/openapi/schemas/multilinestringGeoJSON.yaml
@@ -11,9 +11,9 @@ properties:
     type: array
     items:
       type: array
+      minItems: 2
       items:
         type: array
         minItems: 2
         items:
-          type: number
-          minItems: 2
+          type: number
diff --git a/core/openapi/schemas/multipointGeoJSON.yaml b/core/openapi/schemas/multipointGeoJSON.yaml
@@ -11,6 +11,6 @@ properties:
     type: array
     items:
       type: array
+      minItems: 2
       items:
-        type: number
-        minItems: 2
+        type: number
diff --git a/core/openapi/schemas/multipolygonGeoJSON.yaml b/core/openapi/schemas/multipolygonGeoJSON.yaml
@@ -13,9 +13,9 @@ properties:
       type: array
       items:
         type: array
+        minItems: 4
         items:
           type: array
-          minItems: 4
+          minItems: 2
           items:
-            type: number
-            minItems: 2
+            type: number
diff --git a/core/openapi/schemas/pointGeoJSON.yaml b/core/openapi/schemas/pointGeoJSON.yaml
@@ -9,6 +9,6 @@ properties:
       - Point
   coordinates:
     type: array
+    minItems: 2
     items:
-      type: number
-      minItems: 2
+      type: number
diff --git a/core/standard/clause_7_core.adoc b/core/standard/clause_7_core.adoc
@@ -641,10 +641,10 @@ in: query
 required: false
 schema:
   type: array
+  minItems: 4
+  maxItems: 4
   items:
     type: number
-    minItems: 4
-    maxItems: 4
     minimum: -180
     maximum: 180
 style: form

diff --git a/docs/17-069.html b/docs/17-069.html
@@ -2435,10 +2435,10 @@ <h4 id="_parameter_bbox"><a class="anchor" href="#_parameter_bbox"></a>7.9.3. Pa
 required: false
 schema:
   type: array
+  minItems: 4
+  maxItems: 4
   items:
     type: number
-    minItems: 4
-    maxItems: 4
     minimum: -180
     maximum: 180
 style: form
@@ -4252,10 +4252,10 @@ <h2 id="oas30_example"><a class="anchor" href="#oas30_example"></a>Annex B: Open
       required: false
       schema:
         type: array
+        minItems: 4
+        maxItems: 4
         items:
           type: number
-          minItems: 4
-          maxItems: 4
           minimum: -180
           maximum: 180
       style: form
@@ -4321,9 +4321,9 @@ <h2 id="oas30_example"><a class="anchor" href="#oas30_example"></a>Annex B: Open
         bbox:
           description: west, north, east, south edges of the bounding box
           type: array
+          minItems: 4
+          maxItems: 4
           items:
-            minItems: 4
-            maxItems: 4
             type: number
             minimum: -180
             maximum: 180

diff --git a/openapi.yaml b/openapi.yaml
@@ -223,10 +223,10 @@ components:
       required: false
       schema:
         type: array
+        minItems: 4
+        maxItems: 4
         items:
           type: number
-          minItems: 4
-          maxItems: 4
           minimum: -180
           maximum: 180
       style: form
@@ -292,9 +292,9 @@ components:
         bbox:
           description: west, north, east, south edges of the bounding box
           type: array
+          minItems: 4
+          maxItems: 4
           items:
-            minItems: 4
-            maxItems: 4
             type: number
             minimum: -180
             maximum: 180

diff --git a/placeholder-additional-conformance-class/parameters/zzz_save.yaml b/placeholder-additional-conformance-class/parameters/zzz_save.yaml
@@ -211,10 +211,10 @@ near:
   required: false
   schema:
    type: array
+   minItems: 2
+   maxItems: 2
    items:
      type: number
-     minItems: 2
-     maxItems: 2
      minimum: -180
      maximum: 180
   style: form

diff --git a/swagger.yaml b/swagger.yaml
@@ -205,10 +205,10 @@ parameters:
       However, in cases where the box spans the antimeridian the first value
       (west-most box edge) is larger than the third value (east-most box edge).
     type: array
+    minItems: 4
+    maxItems: 4
     items:
       type: number
-      minItems: 4
-      maxItems: 4
       minimum: -180
       maximum: 180
     collectionFormat: csv
@@ -267,9 +267,9 @@ definitions:
       bbox:
         description: west, north, east, south edges of the bounding box
         type: array
+        minItems: 4
+        maxItems: 4
         items:
-          minItems: 4
-          maxItems: 4
           type: number
           minimum: -180
           maximum: 180
@@ -367,12 +367,12 @@ definitions:
         type: array
         items:
           type: array
+          minItems: 4
           items:
             type: array
-            minItems: 4
+            minItems: 2
             items:
               type: number
-              minItems: 2
   building:
     type: object
     required: