Update to schema-builder 2.0.0 (close #53, close #54)

data/fields/gnis/feature_id.json

@@ -4,7 +4,9 @@
     "label": "GNIS Feature ID",
     "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}",
     "pattern": "^[0-9]{1,}$",
-    "countryCodes": ["us"],
+    "locationSet": {
+        "include": ["US"]
+    },
     "terms": [
         "Federal Geographic Names Information Service",
         "United States Board on Geographic Names",

data/fields/maxspeed.json

@@ -1,6 +1,6 @@
 {
     "key": "maxspeed",
-    "type": "maxspeed",
+    "type": "roadspeed",
     "label": "Speed Limit",
     "placeholder": "40, 50, 60..."
 }

data/fields/maxspeed/advisory.json

@@ -1,6 +1,6 @@
 {
     "key": "maxspeed:advisory",
-    "type": "maxspeed",
+    "type": "roadspeed",
     "label": "Advisory Speed Limit",
     "placeholder": "40, 50, 60..."
 }

data/fields/minspeed.json

@@ -1,6 +1,6 @@
 {
     "key": "minspeed",
-    "type": "maxspeed",
+    "type": "roadspeed",
     "label": "Minimum Speed Limit",
     "placeholder": "20, 30, 40..."
 }

data/fields/real_fire.json

@@ -1,5 +1,7 @@
 {
-    "countryCodes": ["gb", "ie"],
+    "locationSet": {
+        "include": ["GB", "IE"]
+    },
     "key": "real_fire",
     "type": "check",
     "label": "Real Fire",

data/fields/ref/vatin.json

@@ -2,9 +2,11 @@
     "key": "ref:vatin",
     "type": "identifier",
     "label": "VAT ID Number",
-    "notCountryCodes": [
-        "ao", "ai", "bm", "bt", "io", "vg", "bn", "ky", "km", "cu", "dj", "er", "fk", "gi", "gg", "hk", "iq", "ki", "xk", "kw", "lr", "ly", "mo", "mv", "mh", "fm", "ms", "mm", "nr", "kp", "om", "pw", "pn", "qa", "sh", "sm", "st", "sb", "so", "gs", "ss", "sr", "sz", "sy", "tl", "tc", "tv", "us", "va", "ye"
-    ],
+    "locationSet": {
+        "exclude": [
+            "ao", "ai", "bm", "bt", "io", "vg", "bn", "ky", "km", "cu", "dj", "er", "fk", "gi", "gg", "hk", "iq", "ki", "xk", "kw", "lr", "ly", "mo", "mv", "mh", "fm", "ms", "mm", "nr", "kp", "om", "pw", "pn", "qa", "sh", "sm", "st", "sb", "so", "gs", "ss", "sr", "sz", "sy", "tl", "tc", "tv", "us", "va", "ye"
+        ]
+    },
     "terms": [
         "value added tax identification number",
         "vatin"

data/presets/amenity/pub/irish.json

@@ -17,5 +17,7 @@
         "irish pub",
         "irish bar"
     ],
-    "notCountryCodes": ["ie"]
+    "locationSet": {
+        "exclude": ["IE"]
+    }
 }

data/presets/highway/cycleway/bicycle_foot.json

@@ -1,7 +1,7 @@
 {
-    "notCountryCodes": [
-        "fr", "lt", "pl", "de"
-    ],
+    "locationSet": {
+        "exclude": ["fr", "lt", "pl", "de"]
+    },
     "icon": "temaki-pedestrian_and_cyclist",
     "fields": [
         "name",

data/presets/highway/cycleway/crossing/bicycle_foot.json

@@ -1,7 +1,9 @@
 {
-    "notCountryCodes": [
-        "fr", "lt", "pl"
-    ],
+    "locationSet": {
+        "exclude": [
+            "fr", "lt", "pl"
+        ]
+    },
     "icon": "temaki-ped_cyclist_crosswalk",
     "fields": [
         "crossing",

data/presets/highway/toll_gantry.json

@@ -1,7 +1,9 @@
 {
-    "notCountryCodes": [
-        "de"
-    ],
+    "locationSet": {
+        "exclude": [
+            "de"
+        ]
+    },
     "icon": "temaki-toll_gantry",
     "fields": [
         "ref",

data/presets/network/type/node_network.json

@@ -17,9 +17,11 @@
         "rcn",
         "rwn"
     ],
-    "countryCodes": [
-        "be", "de", "lu", "nl"
-    ],
+    "locationSet": {
+        "include": [
+            "be", "de", "lu", "nl"
+        ]
+    },
     "matchScore": 0.2,
     "name": "Recreational Network Node"
 }

data/presets/office/bail_bond_agent.json

@@ -1,7 +1,9 @@
 {
-    "countryCodes": [
-        "us", "ph"
-    ],
+    "locationSet": {
+        "include": [
+            "us", "ph"
+        ]
+    },
     "icon": "maki-bank",
     "moreFields": [
         "{office}",