Update JSON Schemas to Draft202012 (#223)

* Change to draft 2020-12 schema

* Switch to DRAFT202012

* Support const output without quotes

Author: geographika

mappyfile/pprint.py

@@ -354,7 +354,9 @@ def is_expression(self, option):
 
     def check_options_list(self, options_list, value):
         for option in options_list:
-            if "enum" in option and value.lower() in option["enum"]:
+            if ("enum" in option and value.lower() in option["enum"]) or (
+                "const" in option and value.lower() in option["const"]
+            ):
                 if value.lower() == "end":
                     # in GEOTRANSFORM "end" is an attribute value
                     return self.quoter.add_quotes(value)

mappyfile/schemas/class.json

@@ -2,11 +2,11 @@
   "type": "object",
   "additionalProperties": false,
   "patternProperties": {
-    "^__[a-z]+__$": {}
+    "^__[a-z]+__$": true
   },
   "properties": {
     "__type__": {
-      "enum": [ "class" ]
+      "const": "class"
     },
     "include": {
       "type": "array",
@@ -78,7 +78,7 @@
       "type": "number",
       "minimum": 0,
       "metadata": {
-        "minVersion": 5.0
+        "minVersion": 5
       }
     },
     "maxsize": {
@@ -91,8 +91,7 @@
       "$ref": "metadata.json"
     },
     "minfeaturesize": {
-      "type": "number",
-      "exclusiveMinimum": 0
+      "type": "number"
     },
     "minscale": {
       "type": "number",
@@ -104,7 +103,7 @@
       "type": "number",
       "minimum": 0,
       "metadata": {
-        "minVersion": 5.0
+        "minVersion": 5
       }
     },
     "minsize": {
@@ -141,7 +140,7 @@
         "$ref": "style.json"
       },
       "metadata": {
-        "minVersion": 4.0
+        "minVersion": 4
       }
     },
     "symbol": {
@@ -173,5 +172,6 @@
     "validation": {
       "$ref": "validation.json"
     }
-  }
-}
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/cluster.json

@@ -2,11 +2,11 @@
   "type": "object",
   "additionalProperties": false,
   "patternProperties": {
-    "^__[a-z]+__$": {}
+    "^__[a-z]+__$": true
   },
   "properties": {
     "__type__": {
-      "enum": [ "cluster" ]
+      "const": "cluster"
     },
     "include": {
       "type": "array",
@@ -16,8 +16,7 @@
     },
     "maxdistance": {
       "type": "number",
-      "default": 10,
-      "exclusiveMinimum": 0
+      "default": 10
     },
     "region": {
       "oneOf": [
@@ -41,5 +40,6 @@
     "filter": {
       "$ref": "expression.json"
     }
-  }
-}
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/color.json

@@ -15,5 +15,6 @@
       "example": "#aa33cc",
       "type": "string"
     }
-  ]
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
 }

mappyfile/schemas/composite.json

@@ -2,11 +2,11 @@
   "type": "object",
   "additionalProperties": false,
   "patternProperties": {
-    "^__[a-z]+__$": {}
+    "^__[a-z]+__$": true
   },
   "properties": {
     "__type__": {
-      "enum": [ "composite" ]
+      "const": "composite"
     },
     "include": {
       "type": "array",
@@ -58,5 +58,6 @@
         "xor"
       ]
     }
-  }
-}
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/connectionoptions.json

@@ -1,9 +1,9 @@
 {
   "type": "object",
-  "properties": {
-  },
+  "properties": {},
   "additionalProperties": true,
   "metadata": {
     "minVersion": 7.6
-  }
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
 }

mappyfile/schemas/debug.json

@@ -1,3 +1,13 @@
 {
-  "enum": [ "on", "off", 0, 1, 2, 3, 4, 5 ]
-}
+  "enum": [
+    "on",
+    "off",
+    0,
+    1,
+    2,
+    3,
+    4,
+    5
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/expression.json

@@ -13,5 +13,6 @@
       "pattern": "^/(.*?)/$",
       "description": "regex"
     }
-  ]
-}
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/extent.json

@@ -4,5 +4,6 @@
     "type": "number"
   },
   "minItems": 4,
-  "maxItems": 4
-}
+  "maxItems": 4,
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}

mappyfile/schemas/feature.json

@@ -2,11 +2,11 @@
   "type": "object",
   "additionalProperties": false,
   "patternProperties": {
-    "^__[a-z]+__$": {}
+    "^__[a-z]+__$": true
   },
   "properties": {
     "__type__": {
-      "enum": [ "feature" ]
+      "const": "feature"
     },
     "include": {
       "type": "array",
@@ -36,5 +36,6 @@
     "wkt": {
       "type": "string"
     }
-  }
-}
+  },
+  "$schema": "https://json-schema.org/draft/2020-12/schema"
+}