Merge pull request #598 from openstreetmap/schema-builder-v5

upgrade to schema-builder v5

data/fields/address.json

@@ -25,7 +25,6 @@
         "addr:suburb",
         "addr:unit"
     ],
-    "icon": "address",
     "label": "Address",
     "strings": {
         "placeholders": {

data/fields/building/levels_building.json

@@ -2,8 +2,8 @@
     "key": "building:levels",
     "type": "number",
     "minValue": 0,
-    "label": "Building Levels",
-    "placeholder": "2, 4, 6...",
+    "label": "{building/levels}",
+    "placeholder": "{building/levels}",
     "prerequisiteTag": {
         "key": "building",
         "valueNot": "no"

data/fields/colour.json

@@ -1,5 +1,5 @@
 {
     "key": "colour",
-    "type": "text",
+    "type": "colour",
     "label": "Color"
 }

data/fields/contact/webcam.json

@@ -1,7 +1,6 @@
 {
     "key": "contact:webcam",
     "type": "url",
-    "icon": "website",
     "label": "Webcam URL",
     "placeholder": "http://example.com/"
 }

data/fields/ele.json

@@ -1,7 +1,6 @@
 {
     "key": "ele",
     "type": "number",
-    "icon": "elevation",
     "label": "Elevation (Meters)",
     "geometry": [
         "line",

data/fields/ele_node.json

@@ -1,7 +1,6 @@
 {
     "key": "ele",
     "type": "number",
-    "icon": "elevation",
     "label": "Elevation (Meters)",
     "universal": true,
     "geometry": [

data/fields/note.json

@@ -2,7 +2,6 @@
     "key": "note",
     "type": "textarea",
     "universal": true,
-    "icon": "note",
     "label": "Note",
     "terms": [
         "comment"

data/fields/payment_multi_fee.json

@@ -1,7 +1,7 @@
 {
     "key": "payment:",
     "type": "multiCombo",
-    "label": "Payment Types",
+    "label": "{payment_multi}",
     "prerequisiteTag": {
         "key": "fee",
         "valueNot": "no"

data/fields/phone.json

@@ -1,7 +1,6 @@
 {
     "key": "phone",
     "type": "tel",
-    "icon": "maki-telephone",
     "label": "Telephone",
     "placeholder": "+31 42 123 4567",
     "terms": [

data/fields/restrictions.json

@@ -3,7 +3,6 @@
     "geometry": [
         "vertex"
     ],
-    "icon": "iD-restrictions",
     "usage": "manual",
     "reference": {
         "rtype": "restriction"

data/fields/source.json

@@ -1,7 +1,6 @@
 {
     "key": "source",
     "type": "semiCombo",
-    "icon": "source",
     "universal": true,
     "label": "Sources",
     "snake_case": false,

data/fields/website.json

@@ -1,7 +1,6 @@
 {
     "key": "website",
     "type": "url",
-    "icon": "website",
     "placeholder": "https://example.com",
     "label": "Website",
     "terms": [

data/fields/wheelchair.json

@@ -8,7 +8,6 @@
             "no": "No"
         }
     },
-    "icon": "maki-wheelchair",
     "label": "Wheelchair Access",
     "terms": [
         "handicap access"

data/fields/wikidata.json

@@ -5,7 +5,6 @@
         "wikipedia"
     ],
     "type": "wikidata",
-    "icon": "wikipedia",
     "universal": true,
     "label": "Wikidata"
 }

data/fields/wikipedia.json

@@ -5,7 +5,6 @@
         "wikidata"
     ],
     "type": "wikipedia",
-    "icon": "wikipedia",
     "universal": true,
     "label": "Wikipedia"
 }

data/presets/highway/motorway_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Motorway Link",
+    "name": "{highway/motorway_link}",
     "icon": "iD-highway-motorway-link",
     "fields": [
         "destination_oneway",
@@ -34,14 +34,6 @@
     "tags": {
         "highway": "motorway_link"
     },
-    "terms": [
-        "exit",
-        "ramp",
-        "road",
-        "street",
-        "on ramp",
-        "off ramp"
-    ],
     "locationSet": {
         "include": [
             "ca",

data/presets/highway/primary_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Primary Link",
+    "name": "{highway/primary_link}",
     "icon": "iD-highway-primary-link",
     "fields": [
         "destination_oneway",
@@ -38,13 +38,6 @@
     "tags": {
         "highway": "primary_link"
     },
-    "terms": [
-        "on ramp",
-        "off ramp",
-        "ramp",
-        "road",
-        "street"
-    ],
     "locationSet": {
         "include": [
             "ca",

data/presets/highway/trunk_link-US-CA.json

@@ -1,5 +1,5 @@
 {
-    "name": "Trunk Link",
+    "name": "{highway/trunk_link}",
     "icon": "iD-highway-trunk-link",
     "fields": [
         "{highway/motorway_link-US-CA}"
@@ -13,13 +13,6 @@
     "tags": {
         "highway": "trunk_link"
     },
-    "terms": [
-        "on ramp",
-        "off ramp",
-        "ramp",
-        "road",
-        "street"
-    ],
     "locationSet": {
         "include": [
             "ca",

interim/source_strings.yaml

@@ -444,10 +444,6 @@ en:
         terms: '[translate with synonyms or related terms for ''Underground Levels'', separated by commas]'
       building/levels_building:
         # building:levels=*
-        label: Building Levels
-        # building/levels_building field placeholder
-        placeholder: 2, 4, 6...
-        terms: '[translate with synonyms or related terms for ''Building Levels'', separated by commas]'
       building/material:
         # building:material=*
         label: Material
@@ -2183,8 +2179,6 @@ en:
         terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]'
       payment_multi_fee:
         # payment:=*
-        label: Payment Types
-        terms: '[translate with synonyms or related terms for ''Payment Types'', separated by commas]'
       phases:
         # phases=*
         label: Phases
@@ -6405,9 +6399,6 @@ en:
         terms: <translate with synonyms or related terms for 'Motorway Link', separated by commas>
       highway/motorway_link-US-CA:
         # highway=motorway_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Motorway Link
-        # 'terms: exit,ramp,road,street,on ramp,off ramp'
-        terms: <translate with synonyms or related terms for 'Motorway Link', separated by commas>
       highway/passing_place:
         # highway=passing_place | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Passing Place
@@ -6450,9 +6441,6 @@ en:
         terms: <translate with synonyms or related terms for 'Primary Link', separated by commas>
       highway/primary_link-US-CA:
         # highway=primary_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Primary Link
-        # 'terms: on ramp,off ramp,ramp,road,street'
-        terms: <translate with synonyms or related terms for 'Primary Link', separated by commas>
       highway/raceway:
         # highway=raceway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Motorsport Racetrack
@@ -6604,9 +6592,6 @@ en:
         terms: <translate with synonyms or related terms for 'Trunk Link', separated by commas>
       highway/trunk_link-US-CA:
         # highway=trunk_link | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Trunk Link
-        # 'terms: on ramp,off ramp,ramp,road,street'
-        terms: <translate with synonyms or related terms for 'Trunk Link', separated by commas>
       highway/turning_circle:
         # highway=turning_circle | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Turning Circle

package.json

@@ -1,6 +1,7 @@
 {
+  "type": "module",
   "name": "@openstreetmap/id-tagging-schema",
-  "version": "3.5.1",
+  "version": "5.0.0-dev",
   "description": "The OpenStreetMap tagging model used by the iD editor",
   "homepage": "https://github.com/openstreetmap/id-tagging-schema#readme",
   "bugs": "https://github.com/openstreetmap/id-tagging-schema/issues",
@@ -19,7 +20,7 @@
     "translations": "node scripts/translations.js"
   },
   "devDependencies": {
-    "@ideditor/schema-builder": "~4.0.6",
+    "@ideditor/schema-builder": "~5.1.1",
     "prettier": "~2.7.1"
   }
 }

scripts/build.js

@@ -1,4 +1,3 @@
-
-const schemaBuilder = require('@ideditor/schema-builder');
+import schemaBuilder from '@ideditor/schema-builder';
 
 schemaBuilder.buildDev();

scripts/dist.js

@@ -1,4 +1,4 @@
-const schemaBuilder = require('@ideditor/schema-builder');
+import schemaBuilder from '@ideditor/schema-builder';
 
 schemaBuilder.buildDist({
   taginfoProjectInfo: {

scripts/test.js

@@ -1,2 +1,3 @@
-const schemaBuilder = require('@ideditor/schema-builder');
+import schemaBuilder from '@ideditor/schema-builder';
+
 schemaBuilder.validate();