From 4df0dd3f35a2286da55ccea4f622a25055eef3bf Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 17 Feb 2022 16:44:55 +0100 Subject: [PATCH 1/6] 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(); From fbcf02d3f8e477f10b253068efd2f2a492f46efb Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 19:22:50 +0200 Subject: [PATCH 2/6] bump version number (skipping v4 to match major v. of schema-builder) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4c6238e..a53fc523 100644 --- a/package.json +++ b/package.json @@ -1,7 +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", From 2542974846eb50b2ecbbbed4247867b11f4daa84 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 20:26:13 +0200 Subject: [PATCH 3/6] consolidate duplicate names/terms by using new cross-references --- data/fields/building/levels_building.json | 2 +- data/fields/payment_multi_fee.json | 2 +- data/presets/highway/motorway_link-US-CA.json | 10 +--------- data/presets/highway/primary_link-US-CA.json | 9 +-------- data/presets/highway/trunk_link-US-CA.json | 9 +-------- interim/source_strings.yaml | 13 ------------- 6 files changed, 5 insertions(+), 40 deletions(-) diff --git a/data/fields/building/levels_building.json b/data/fields/building/levels_building.json index 03850c68..fa696d47 100644 --- a/data/fields/building/levels_building.json +++ b/data/fields/building/levels_building.json @@ -2,7 +2,7 @@ "key": "building:levels", "type": "number", "minValue": 0, - "label": "Building Levels", + "label": "{building/levels}", "placeholder": "2, 4, 6...", "prerequisiteTag": { "key": "building", diff --git a/data/fields/payment_multi_fee.json b/data/fields/payment_multi_fee.json index b9ad3525..5db2a39b 100644 --- a/data/fields/payment_multi_fee.json +++ b/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" diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json index afe1f844..8c712c5a 100644 --- a/data/presets/highway/motorway_link-US-CA.json +++ b/data/presets/highway/motorway_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Motorway Link", + "name": "{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", diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json index 293ae85d..26f37875 100644 --- a/data/presets/highway/primary_link-US-CA.json +++ b/data/presets/highway/primary_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Primary Link", + "name": "{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", diff --git a/data/presets/highway/trunk_link-US-CA.json b/data/presets/highway/trunk_link-US-CA.json index 7fb672fa..eac25f91 100644 --- a/data/presets/highway/trunk_link-US-CA.json +++ b/data/presets/highway/trunk_link-US-CA.json @@ -1,5 +1,5 @@ { - "name": "Trunk Link", + "name": "{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", diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e44ae6e8..01519b7d 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -431,10 +431,8 @@ 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 @@ -2165,8 +2163,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 @@ -6358,9 +6354,6 @@ en: terms: 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: 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 @@ -6403,9 +6396,6 @@ en: terms: 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: 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 @@ -6557,9 +6547,6 @@ en: terms: 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: 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 From 85ff0905cd083a5afeb81d80caf2ceac38b8336a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 20:46:14 +0200 Subject: [PATCH 4/6] bump schema to v5.1, allows to cross-reference placeholders --- data/fields/building/levels_building.json | 2 +- interim/source_strings.yaml | 2 -- package.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/fields/building/levels_building.json b/data/fields/building/levels_building.json index fa696d47..52203809 100644 --- a/data/fields/building/levels_building.json +++ b/data/fields/building/levels_building.json @@ -3,7 +3,7 @@ "type": "number", "minValue": 0, "label": "{building/levels}", - "placeholder": "2, 4, 6...", + "placeholder": "{building/levels}", "prerequisiteTag": { "key": "building", "valueNot": "no" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 01519b7d..d023d4ec 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -431,8 +431,6 @@ en: terms: '[translate with synonyms or related terms for ''Underground Levels'', separated by commas]' building/levels_building: # building:levels=* - # building/levels_building field placeholder - placeholder: 2, 4, 6... building/material: # building:material=* label: Material diff --git a/package.json b/package.json index a53fc523..7d072646 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~5.0.0", + "@ideditor/schema-builder": "~5.1.0", "prettier": "~2.7.1" } } From 3cca279599bdfb086eb3d85f962522b8f7a4c9ba Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 29 Sep 2022 21:12:36 +0200 Subject: [PATCH 5/6] update to schema v5.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d072646..4a760228 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "translations": "node scripts/translations.js" }, "devDependencies": { - "@ideditor/schema-builder": "~5.1.0", + "@ideditor/schema-builder": "~5.1.1", "prettier": "~2.7.1" } } From ad24670912571c942edc05ccb3f098ccae971336 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 3 Oct 2022 08:47:23 +0200 Subject: [PATCH 6/6] fix preset references --- data/presets/highway/motorway_link-US-CA.json | 2 +- data/presets/highway/primary_link-US-CA.json | 2 +- data/presets/highway/trunk_link-US-CA.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json index 8c712c5a..a20fd1a4 100644 --- a/data/presets/highway/motorway_link-US-CA.json +++ b/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", diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json index 26f37875..7d8b44a4 100644 --- a/data/presets/highway/primary_link-US-CA.json +++ b/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", diff --git a/data/presets/highway/trunk_link-US-CA.json b/data/presets/highway/trunk_link-US-CA.json index eac25f91..5425bc5e 100644 --- a/data/presets/highway/trunk_link-US-CA.json +++ b/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}"