From 4df0dd3f35a2286da55ccea4f622a25055eef3bf Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 17 Feb 2022 16:44:55 +0100 Subject: [PATCH] upgrade to schema-builder v5 --- data/fields/address.json | 1 - data/fields/colour.json | 2 +- data/fields/contact/webcam.json | 1 - data/fields/ele.json | 1 - data/fields/ele_node.json | 1 - data/fields/note.json | 1 - data/fields/phone.json | 1 - data/fields/restrictions.json | 1 - data/fields/source.json | 1 - data/fields/website.json | 1 - data/fields/wheelchair.json | 1 - data/fields/wikidata.json | 1 - data/fields/wikipedia.json | 1 - package.json | 3 ++- scripts/build.js | 3 +-- scripts/dist.js | 2 +- scripts/test.js | 3 ++- 17 files changed, 7 insertions(+), 18 deletions(-) diff --git a/data/fields/address.json b/data/fields/address.json index a660165f..bec5e811 100644 --- a/data/fields/address.json +++ b/data/fields/address.json @@ -25,7 +25,6 @@ "addr:suburb", "addr:unit" ], - "icon": "address", "label": "Address", "strings": { "placeholders": { diff --git a/data/fields/colour.json b/data/fields/colour.json index d53e2a95..e47495f6 100644 --- a/data/fields/colour.json +++ b/data/fields/colour.json @@ -1,5 +1,5 @@ { "key": "colour", - "type": "text", + "type": "colour", "label": "Color" } diff --git a/data/fields/contact/webcam.json b/data/fields/contact/webcam.json index 54a6c878..33a1b939 100644 --- a/data/fields/contact/webcam.json +++ b/data/fields/contact/webcam.json @@ -1,7 +1,6 @@ { "key": "contact:webcam", "type": "url", - "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/" } diff --git a/data/fields/ele.json b/data/fields/ele.json index 4bd7a541..fe94c916 100644 --- a/data/fields/ele.json +++ b/data/fields/ele.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "geometry": [ "line", diff --git a/data/fields/ele_node.json b/data/fields/ele_node.json index 2b2a1ba1..41b072a5 100644 --- a/data/fields/ele_node.json +++ b/data/fields/ele_node.json @@ -1,7 +1,6 @@ { "key": "ele", "type": "number", - "icon": "elevation", "label": "Elevation (Meters)", "universal": true, "geometry": [ diff --git a/data/fields/note.json b/data/fields/note.json index b53905b1..fa35a600 100644 --- a/data/fields/note.json +++ b/data/fields/note.json @@ -2,7 +2,6 @@ "key": "note", "type": "textarea", "universal": true, - "icon": "note", "label": "Note", "terms": [ "comment" diff --git a/data/fields/phone.json b/data/fields/phone.json index 23ed71e2..fe129ed9 100644 --- a/data/fields/phone.json +++ b/data/fields/phone.json @@ -1,7 +1,6 @@ { "key": "phone", "type": "tel", - "icon": "maki-telephone", "label": "Telephone", "placeholder": "+31 42 123 4567", "terms": [ diff --git a/data/fields/restrictions.json b/data/fields/restrictions.json index 9a4eee14..61420c4e 100644 --- a/data/fields/restrictions.json +++ b/data/fields/restrictions.json @@ -3,7 +3,6 @@ "geometry": [ "vertex" ], - "icon": "iD-restrictions", "usage": "manual", "reference": { "rtype": "restriction" diff --git a/data/fields/source.json b/data/fields/source.json index 98439ed5..bff414b7 100644 --- a/data/fields/source.json +++ b/data/fields/source.json @@ -1,7 +1,6 @@ { "key": "source", "type": "semiCombo", - "icon": "source", "universal": true, "label": "Sources", "snake_case": false, diff --git a/data/fields/website.json b/data/fields/website.json index 69a333ac..6f50b192 100644 --- a/data/fields/website.json +++ b/data/fields/website.json @@ -1,7 +1,6 @@ { "key": "website", "type": "url", - "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": [ diff --git a/data/fields/wheelchair.json b/data/fields/wheelchair.json index 127042d8..d06f36e4 100644 --- a/data/fields/wheelchair.json +++ b/data/fields/wheelchair.json @@ -8,7 +8,6 @@ "no": "No" } }, - "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": [ "handicap access" diff --git a/data/fields/wikidata.json b/data/fields/wikidata.json index 5fe33792..b413c01c 100644 --- a/data/fields/wikidata.json +++ b/data/fields/wikidata.json @@ -5,7 +5,6 @@ "wikipedia" ], "type": "wikidata", - "icon": "wikipedia", "universal": true, "label": "Wikidata" } diff --git a/data/fields/wikipedia.json b/data/fields/wikipedia.json index a886cc02..1164729e 100644 --- a/data/fields/wikipedia.json +++ b/data/fields/wikipedia.json @@ -5,7 +5,6 @@ "wikidata" ], "type": "wikipedia", - "icon": "wikipedia", "universal": true, "label": "Wikipedia" } diff --git a/package.json b/package.json index 28a7d038..b4c6238e 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "type": "module", "name": "@openstreetmap/id-tagging-schema", "version": "3.5.1", "description": "The OpenStreetMap tagging model used by the iD editor", @@ -19,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~4.0.6", + "@ideditor/schema-builder": "~5.0.0", "prettier": "~2.7.1" } } diff --git a/scripts/build.js b/scripts/build.js index ff710d55..a6d9a238 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,4 +1,3 @@ - -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDev(); diff --git a/scripts/dist.js b/scripts/dist.js index 342e3f72..af5baadf 100644 --- a/scripts/dist.js +++ b/scripts/dist.js @@ -1,4 +1,4 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; schemaBuilder.buildDist({ taginfoProjectInfo: { diff --git a/scripts/test.js b/scripts/test.js index 271cdc68..ae2dddf7 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -1,2 +1,3 @@ -const schemaBuilder = require('@ideditor/schema-builder'); +import schemaBuilder from '@ideditor/schema-builder'; + schemaBuilder.validate();