Fix schema setup (https://stackoverflow.com/a/65150457/687896)

Author: chbrandt

json_schema/geopackage_layers.py

@@ -55,7 +55,8 @@ def validate(gpkg_path, schema='geopackage_layers.schema.json'):
     # version of json-schema (currently draft-07) we're using in one single place.
 
     # Since we have "refs" in our schemas, we need a resolver to link them
-    resolver = RefResolver.from_schema(schema_store['base.schema.json'], store=schema_store)
+    # resolver = RefResolver.from_schema(schema_store['base.schema.json'], store=schema_store)
+    resolver = RefResolver.from_schema(schema_store[schema], store=schema_store)
 
     # Get the correct (or best) validator for our schema's version
     Validator = validator_for(schema_store['base.schema.json'])
@@ -64,7 +65,15 @@ def validate(gpkg_path, schema='geopackage_layers.schema.json'):
     validator = Validator(schema_store[schema], resolver=resolver)
 
     gpkg = gpt.read_file(gpkg_path)
+
     data = gpkg.to_dict()
+    data.pop('layer_styles')
+    print("\nGeoPackage DICT layers/columns:")
+    for name,table in data.items():
+        print(name)
+        print(list(table.keys()))
+        print()
 
     res = validator.validate(data)
+    # jsonschema.validate(data, schema_store[schema])
     return res

json_schema/geopackage_layers.schema.json

@@ -1,20 +1,16 @@
 {
-  "$ref": "base.schema.json",
-
   "title": "Match Geopackage layers list",
-
   "$comment": "Defines mandatory layers, and allows extra ones.",
   "$example": "{'geologic_contacts':'bla','geologic_units':'blu','layer_styles':'foo','linear_features':'wow','surface_features':'yay'}",
 
-  "type": "object",
+  "type" : "object",
 
   "properties": {
-
-    "layer_styles"      : { "$ref" : "layer_layer_styles.json" },
+    "layer_styles"      : { "$ref" : "layer_layer_styles.json#" },
     "geologic_units"    : { "type" : "object" },
     "linear_features"   : { "type" : "object" },
     "surface_features"  : { "type" : "object" },
-    "geologic_contacts" : { "type" : "object" }
+    "geologic_contacts" : { "$ref" : "layer_geologic_contacts.json#" }
   },
 
   "required" : [

json_schema/geopackage_units.schema.json

@@ -0,0 +1,16 @@
+{
+  "$id": "layer_geologic_contacts.json",
+  "title": "QGIS 'geologic_contacts' schema",
+  "description": "Defines the entries/rows of the table across the columns.",
+
+  "type" : "object",
+
+  "properties" : {
+    "Contact_ty"    : { "type" : "object" },
+    "geometry"      : { "type" : "object" }
+  },
+  "required": [
+    "Contact_ty",
+    "geometry"
+  ]
+}

json_schema/layer_geologic_contacts.schema.json

@@ -3,5 +3,5 @@
   "title": "QGIS 'layer_styles' schema",
   "description": "Defines the entries/rows of the table across the columns.",
 
-  "type": "object"
+  "type" : "object"
 }