Update layers schmea to use object/properties and allow extra columns

Author: chbrandt

json_schema/geopackage_layers.py

@@ -1,3 +1,4 @@
+import gpt
 
 _component = __file__.split('.')[0]
 _schemafile = '.'.join([_component, 'schema', 'json'])
@@ -7,8 +8,12 @@
     schema = json.load(f)
 
 def validate(gpkg_path):
-    import fiona
-    data = fiona.listlayers(gpkg_path)
+    # import fiona
+    # data = fiona.listlayers(gpkg_path)
+    gpkg = gpt.read_file(gpkg_path)
+
+    # This is a workaround during devel, until I understand how to tell jsonschema about the DataFrames
+    data = {ln:ln for ln in gpkg.list()}
 
     import jsonschema
     res = jsonschema.validate(data, schema)

json_schema/geopackage_layers.schema.json

@@ -3,24 +3,26 @@
 
   "title": "Match Geopackage layers list",
 
-  "$comment": "Works for, e.g., ['units','contacts','bla'], but not for ['bla','units','contacts']",
-  "$example": ["units","contacts","another-column"],
+  "$comment": "Defines mandatory layers, and allows extra ones.",
+  "$example": "{'geologic_contacts':'bla','geologic_units':'blu','layer_styles':'foo','linear_features':'wow','surface_features':'yay'}",
 
-  "definitions": {
-    "layers": {
-      "type": "string",
-      "enum": ["units", "contacts"]
-    }
+  "type": "object",
+
+  "properties": {
+    "layer_styles"      : { "type" : "string" },
+    "geologic_units"    : { "type" : "string" },
+    "linear_features"   : { "type" : "string" },
+    "surface_features"  : { "type" : "string" },
+    "geologic_contacts" : { "type" : "string" }
   },
 
-  "type": "array",
-  "items": [
-    {
-      "$ref": "#/definitions/layers"
-    }
+  "required" : [
+    "geologic_contacts",
+    "geologic_units",
+    "layer_styles",
+    "linear_features",
+    "surface_features"
   ],
-  "minItems": 2,
 
-  "uniqueItems": true,
-  "additionalItems": { "type": "string" }
+  "additionalProperties": true
 }