fiboa jsonschema and fiboa validate: Support geometryTypes for …

…`geometry` data type #40
fiboa · May 9, 2024 · 2473338 · 2473338
1 parent 1cc1759
commit 2473338
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Converter for EuroCrops France dataset
 - `fiboa create-geojson`: Show conversion progress
+- `fiboa jsonschema` and `fiboa validate`: Support `geometryTypes` for `geometry` data type in GeoJSON
 
 ### Changed
 

diff --git a/fiboa_cli/jsonschema.py b/fiboa_cli/jsonschema.py
@@ -62,36 +62,45 @@ def convert_schema(prop_schema, datatypes, required = False):
 
     datatype_schema = datatypes[prop_schema['type']].copy()
 
-    if required:
-        if '$ref' in datatype_schema:
+    if prop_schema['type'] == 'geometry':
+        geom_types = prop_schema.get('geometryTypes', [])
+        if isinstance(prop_schema.get('geometryTypes'), list):
             datatype_schema = {
-                "allOf": [
-                    datatype_schema,
-                    {
-                        "not": {
-                            "type": "null"
-                        }
-                    }
+                "anyOf": [
+                    {"$ref": f"https://geojson.org/schema/{type}.json"} for type in geom_types
                 ]
             }
+            del prop_schema['geometryTypes']
+
+    anyOf = datatype_schema.get('anyOf')
+    allOf = datatype_schema.get('allOf')
+    oneOf = datatype_schema.get('oneOf')
+    if required:
+        not_null_schema = { "not": { "type": "null" } }
+
+        if '$ref' in datatype_schema or isinstance(anyOf, list) or isinstance(oneOf, list):
+            datatype_schema = {
+                "allOf": [datatype_schema, not_null_schema]
+            }
+        elif (isinstance(allOf, list)):
+            allOf.append(not_null_schema)
+
     else:
-        if isinstance(datatype_schema.get('type'), str):
-            datatype_schema['type'] = [datatype_schema['type'], "null"]
-        elif '$ref' in datatype_schema:
+        schema_type = datatype_schema.get('type')
+        null_schema = { "type": "null" }
+
+        if '$ref' in datatype_schema:
             datatype_schema = {
-                "allOf": [
-                    datatype_schema,
-                    {
-                        "type": "null"
-                    }
-                ]
+                "allOf": [datatype_schema, null_schema]
             }
-        elif (isinstance(datatype_schema.get('type'), list)):
-            datatype_schema.get('type', []).append("null")
-        elif (isinstance(datatype_schema.get('oneOf'), list)):
-            datatype_schema.get('oneOf', []).append({"type": "null"})
-        elif (isinstance(datatype_schema.get('anyOf'), list)):
-            datatype_schema.get('anyOf', []).append({"type": "null"})
+        elif isinstance(schema_type, str):
+            datatype_schema['type'] = [datatype_schema['type'], "null"]
+        elif (isinstance(schema_type, list)):
+            datatype_schema["type"].append("null")
+        elif (isinstance(oneOf, list)):
+            datatype_schema["oneOf"].append(null_schema)
+        elif (isinstance(anyOf, list)):
+            datatype_schema["anyOf"].append(null_schema)
         else:
             log(f"Making schema {json.dumps(datatype_schema)} optional is not supported by this generator")
 

diff --git a/tests/data-files/jsonschema/test1.json b/tests/data-files/jsonschema/test1.json
@@ -11,7 +11,10 @@
     "geometry": {
       "allOf": [
         {
-          "$ref": "https://geojson.org/schema/Geometry.json"
+          "anyOf": [
+            {"$ref": "https://geojson.org/schema/Polygon.json"},
+            {"$ref": "https://geojson.org/schema/MultiPolygon.json"}
+          ]
         },
         { "not": { "type": "null" } }
       ]

diff --git a/tests/data-files/jsonschema/test1.yaml b/tests/data-files/jsonschema/test1.yaml
@@ -11,6 +11,9 @@ properties:
     minLength: 1
   geometry:
     type: geometry
+    geometryTypes:
+      - Polygon
+      - MultiPolygon
   bbox:
     type: bounding-box
   area: