From e8a68205abfc283252433512b24d81cca453a95a Mon Sep 17 00:00:00 2001 From: Lukas Toggenburger Date: Fri, 12 Jan 2018 11:58:58 +0100 Subject: [PATCH 1/6] Add ref:isil=* for libraries --- data/presets/fields/ref/isil.json | 5 +++++ data/presets/presets/amenity/library.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/ref/isil.json diff --git a/data/presets/fields/ref/isil.json b/data/presets/fields/ref/isil.json new file mode 100644 index 000000000..a071099d3 --- /dev/null +++ b/data/presets/fields/ref/isil.json @@ -0,0 +1,5 @@ +{ + "key": "ref:isil", + "type": "text", + "label": "International Standard Identifier for Libraries and Related Organisations" +} diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json index 0f3a48c77..f6fc301cd 100644 --- a/data/presets/presets/amenity/library.json +++ b/data/presets/presets/amenity/library.json @@ -8,7 +8,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "geometry": [ "point", From 4544bbc1f5b2cc3e636751db655d2ba280198fa8 Mon Sep 17 00:00:00 2001 From: Lukas Toggenburger Date: Fri, 12 Jan 2018 17:31:05 +0100 Subject: [PATCH 2/6] Shorten label of field ref:isil=* --- data/presets/fields/ref/isil.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/fields/ref/isil.json b/data/presets/fields/ref/isil.json index a071099d3..fcf0a0ffe 100644 --- a/data/presets/fields/ref/isil.json +++ b/data/presets/fields/ref/isil.json @@ -1,5 +1,5 @@ { "key": "ref:isil", "type": "text", - "label": "International Standard Identifier for Libraries and Related Organisations" + "label": "ISIL Code" } From 4dc32343d7af8b05aa8f24f0385d3361b087772c Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 17 Jan 2018 08:03:53 -0500 Subject: [PATCH 3/6] npm run build to rebuild preset file --- data/presets.yaml | 3 ++ data/presets/fields.json | 5 +++ data/presets/presets.json | 72 ++++++++++++++++++++++++++------------- dist/locales/en.json | 3 ++ 4 files changed, 59 insertions(+), 24 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 1400a6737..92d2f3da3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1145,6 +1145,9 @@ en: ref: # ref=* label: Reference Code + ref/isil: + # 'ref:isil=*' + label: ISIL Code ref_aeroway_gate: # ref=* label: Gate Number diff --git a/data/presets/fields.json b/data/presets/fields.json index 90b49d4cc..25c2fa544 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1571,6 +1571,11 @@ "type": "text", "label": "Reference Code" }, + "ref/isil": { + "key": "ref:isil", + "type": "text", + "label": "ISIL Code" + }, "relation": { "key": "type", "type": "combo", diff --git a/data/presets/presets.json b/data/presets/presets.json index 074a879d7..3686b7629 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1882,7 +1882,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "geometry": [ "point", @@ -44431,7 +44432,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44454,7 +44456,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44477,7 +44480,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44500,7 +44504,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44523,7 +44528,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44546,7 +44552,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44569,7 +44576,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44592,7 +44600,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44615,7 +44624,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44638,7 +44648,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44661,7 +44672,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44684,7 +44696,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44707,7 +44720,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44730,7 +44744,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44753,7 +44768,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44776,7 +44792,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44799,7 +44816,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44822,7 +44840,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44845,7 +44864,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44868,7 +44888,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44891,7 +44912,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44914,7 +44936,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, @@ -44937,7 +44960,8 @@ "opening_hours", "internet_access", "internet_access/fee", - "internet_access/ssid" + "internet_access/ssid", + "ref/isil" ], "suggestion": true }, diff --git a/dist/locales/en.json b/dist/locales/en.json index a81b5609b..6ddd7846d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2249,6 +2249,9 @@ "ref": { "label": "Reference Code" }, + "ref/isil": { + "label": "ISIL Code" + }, "relation": { "label": "Type" }, From 8c9a0eb2c1fe7af7e40e3ac51a126417805488e8 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 17 Jan 2018 09:23:09 -0500 Subject: [PATCH 4/6] Fix doubleclick on line to create a point (closes #4691) --- modules/modes/select.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/modes/select.js b/modules/modes/select.js index 1c87a96ed..ba9af0b95 100644 --- a/modules/modes/select.js +++ b/modules/modes/select.js @@ -248,13 +248,13 @@ export function modeSelect(context, selectedIDs) { var target = d3_select(d3_event.target); var datum = target.datum(); - var entity = datum && datum.id && context.hasEntity(datum.id); - if (entity) datum = entity; + var entity = datum && datum.properties && datum.properties.entity; + if (!entity) return; - if (datum instanceof osmWay && target.classed('target')) { - var choice = geoChooseEdge(context.childNodes(datum), context.mouse(), context.projection); - var prev = datum.nodes[choice.index - 1]; - var next = datum.nodes[choice.index]; + if (entity instanceof osmWay && target.classed('target')) { + var choice = geoChooseEdge(context.childNodes(entity), context.mouse(), context.projection); + var prev = entity.nodes[choice.index - 1]; + var next = entity.nodes[choice.index]; context.perform( actionAddMidpoint({loc: choice.loc, edge: [prev, next]}, osmNode()), @@ -264,9 +264,9 @@ export function modeSelect(context, selectedIDs) { d3_event.preventDefault(); d3_event.stopPropagation(); - } else if (datum.type === 'midpoint') { + } else if (entity.type === 'midpoint') { context.perform( - actionAddMidpoint({loc: datum.loc, edge: datum.edge}, osmNode()), + actionAddMidpoint({loc: entity.loc, edge: entity.edge}, osmNode()), t('operations.add.annotation.vertex')); d3_event.preventDefault(); From baa289c6c22dec1532f7ed2eef81a2dcc4be707f Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Wed, 17 Jan 2018 17:22:58 +0000 Subject: [PATCH 5/6] Add name and elevation fields to guidepost preset (closes #4700) --- data/presets/presets.json | 2 ++ data/presets/presets/tourism/information/guidepost.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/data/presets/presets.json b/data/presets/presets.json index 3686b7629..f369241f4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -18514,6 +18514,8 @@ "tourism/information/guidepost": { "icon": "information", "fields": [ + "name", + "elevation", "operator", "ref" ], diff --git a/data/presets/presets/tourism/information/guidepost.json b/data/presets/presets/tourism/information/guidepost.json index 2fe4f0ede..f9e0ee043 100644 --- a/data/presets/presets/tourism/information/guidepost.json +++ b/data/presets/presets/tourism/information/guidepost.json @@ -1,6 +1,8 @@ { "icon": "information", "fields": [ + "name", + "elevation", "operator", "ref" ], From 9bbb5db5ef1ed1bea67fe75100e305294ef2ad69 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Wed, 17 Jan 2018 17:42:35 +0000 Subject: [PATCH 6/6] Rename garage landuse preset (closes #4697) --- data/presets.yaml | 4 ++-- data/presets/presets.json | 2 +- data/presets/presets/landuse/garages.json | 2 +- dist/locales/en.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 92d2f3da3..7cf9cab58 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3413,8 +3413,8 @@ en: terms: '' landuse/garages: # landuse=garages - name: Garages - terms: '' + name: Garage Landuse + terms: '' landuse/grass: # landuse=grass name: Grass diff --git a/data/presets/presets.json b/data/presets/presets.json index f369241f4..7ff1bc71c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8414,7 +8414,7 @@ "landuse": "garages" }, "terms": [], - "name": "Garages" + "name": "Garage Landuse" }, "landuse/grass": { "geometry": [ diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json index ba5f253ab..72575fdd9 100644 --- a/data/presets/presets/landuse/garages.json +++ b/data/presets/presets/landuse/garages.json @@ -9,5 +9,5 @@ "landuse": "garages" }, "terms": [], - "name": "Garages" + "name": "Garage Landuse" } diff --git a/dist/locales/en.json b/dist/locales/en.json index 6ddd7846d..ae008afc4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4257,7 +4257,7 @@ "terms": "tree" }, "landuse/garages": { - "name": "Garages", + "name": "Garage Landuse", "terms": "" }, "landuse/grass": {