From ce8d16a2208fc55f1ab17201c247b1d0c7286f6b Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 11:49:30 -0500 Subject: [PATCH 1/6] initial commit...hide parts, not entire viewer ref #5829 --- css/80_app.css | 3 ++- modules/services/mapillary.js | 27 +++++++++++++++++++----- modules/services/openstreetcam.js | 14 +++++++++---- modules/services/streetside.js | 34 +++++++++++++++++++++++++------ modules/svg/mapillary_signs.js | 5 +++++ 5 files changed, 67 insertions(+), 16 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index 530e7cf64..bf67d5349 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -264,7 +264,8 @@ div.hide, form.hide, button.hide, a.hide, -li.hide { +li.hide, +canvas.hide { display: none; } diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index 0cc6b650e..e5b53bf7f 100644 --- a/modules/services/mapillary.js +++ b/modules/services/mapillary.js @@ -376,7 +376,8 @@ export default { var wrap = d3_select('#photoviewer') .classed('hide', false); - var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size(); + var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size() || + wrap.selectAll('.photo-wrapper.mly-wrapper .hide').size(); if (isHidden && _mlyViewer) { wrap @@ -387,6 +388,14 @@ export default { .selectAll('.photo-wrapper.mly-wrapper') .classed('hide', false); + wrap + .selectAll('.mapillary-js-interactive') + .classed('hide', false); + + wrap + .selectAll('.mapillary-js-dom') + .classed('hide', false); + _mlyViewer.resize(); } @@ -404,10 +413,16 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - viewer - .classed('hide', true) - .selectAll('.photo-wrapper') - .classed('hide', true); + viewer.select('.mapillary-js-interactive') + .classed('hide', true); + + viewer.select('.mapillary-js-dom') + .classed('hide', true); + + // viewer + // .classed('hide', true) + // .selectAll('.photo-wrapper') + // .classed('hide', true); d3_selectAll('.viewfield-group, .sequence, .icon-sign') .classed('currentView', false); @@ -415,6 +430,8 @@ export default { return this.setStyles(null, true); }, + removeViewer: function() { + }, parsePagination: parsePagination, diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js index d4963a1f3..b901a907d 100644 --- a/modules/services/openstreetcam.js +++ b/modules/services/openstreetcam.js @@ -384,6 +384,8 @@ export default { viewer .selectAll('.photo-wrapper.osc-wrapper') + .classed('hide', false) + .selectAll('div') .classed('hide', false); } @@ -397,11 +399,15 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - viewer - .classed('hide', true) - .selectAll('.photo-wrapper') - .classed('hide', true); + // viewer + // .classed('hide', true) + // .selectAll('.photo-wrapper') + // .classed('hide', true); + viewer + .selectAll('.osc-wrapper > div') + .classed('hide', true); + d3_selectAll('.viewfield-group, .sequence, .icon-sign') .classed('currentView', false); diff --git a/modules/services/streetside.js b/modules/services/streetside.js index da7181172..c7873404e 100644 --- a/modules/services/streetside.js +++ b/modules/services/streetside.js @@ -722,16 +722,29 @@ export default { var wrap = d3_select('#photoviewer') .classed('hide', false); - var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size(); + var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size() || + wrap.selectAll('.photo-wrapper.ms-wrapper > div.hide').size(); if (isHidden) { wrap .selectAll('.photo-wrapper:not(.ms-wrapper)') .classed('hide', true); - wrap - .selectAll('.photo-wrapper.ms-wrapper') + var msWrap = wrap.selectAll('.photo-wrapper.ms-wrapper'); + + msWrap + .classed('hide', false) + .selectAll('.pnlm-container') .classed('hide', false); + + msWrap + .select('.photo-controls-wrap') + .classed('hide', false); + + msWrap + .selectAll('#divForCanvasWork > canvas') + .classed('hide', false); + } return this; @@ -744,9 +757,18 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - viewer - .classed('hide', true) - .selectAll('.photo-wrapper') + var msWrap = viewer.selectAll('.photo-wrapper.ms-wrapper'); + + msWrap + .select('.photo-controls-wrap') + .classed('hide', true); + + msWrap + .selectAll('.pnlm-container') + .classed('hide', true); + + msWrap + .selectAll('#divForCanvasWork > canvas') .classed('hide', true); d3_selectAll('.viewfield-group, .sequence, .icon-sign') diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js index c282d5363..2a764873a 100644 --- a/modules/svg/mapillary_signs.js +++ b/modules/svg/mapillary_signs.js @@ -40,6 +40,11 @@ export function svgMapillarySigns(projection, context, dispatch) { function hideLayer() { + var service = getService(); + if (service) { + service.hideViewer(); + } + throttledRedraw.cancel(); editOff(); } From d89452114341562a8d9c76437587563b84b8b239 Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 13:55:10 -0500 Subject: [PATCH 2/6] just don't close viewer... ref #5829 --- css/80_app.css | 3 +-- modules/services/mapillary.js | 27 +++++------------------- modules/services/openstreetcam.js | 12 +++-------- modules/services/streetside.js | 34 ++++++------------------------- modules/svg/mapillary_images.js | 3 --- modules/svg/mapillary_signs.js | 3 --- modules/svg/streetside.js | 3 --- 7 files changed, 15 insertions(+), 70 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index bf67d5349..530e7cf64 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -264,8 +264,7 @@ div.hide, form.hide, button.hide, a.hide, -li.hide, -canvas.hide { +li.hide { display: none; } diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index e5b53bf7f..0cc6b650e 100644 --- a/modules/services/mapillary.js +++ b/modules/services/mapillary.js @@ -376,8 +376,7 @@ export default { var wrap = d3_select('#photoviewer') .classed('hide', false); - var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size() || - wrap.selectAll('.photo-wrapper.mly-wrapper .hide').size(); + var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size(); if (isHidden && _mlyViewer) { wrap @@ -388,14 +387,6 @@ export default { .selectAll('.photo-wrapper.mly-wrapper') .classed('hide', false); - wrap - .selectAll('.mapillary-js-interactive') - .classed('hide', false); - - wrap - .selectAll('.mapillary-js-dom') - .classed('hide', false); - _mlyViewer.resize(); } @@ -413,16 +404,10 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - viewer.select('.mapillary-js-interactive') - .classed('hide', true); - - viewer.select('.mapillary-js-dom') - .classed('hide', true); - - // viewer - // .classed('hide', true) - // .selectAll('.photo-wrapper') - // .classed('hide', true); + viewer + .classed('hide', true) + .selectAll('.photo-wrapper') + .classed('hide', true); d3_selectAll('.viewfield-group, .sequence, .icon-sign') .classed('currentView', false); @@ -430,8 +415,6 @@ export default { return this.setStyles(null, true); }, - removeViewer: function() { - }, parsePagination: parsePagination, diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js index b901a907d..d4963a1f3 100644 --- a/modules/services/openstreetcam.js +++ b/modules/services/openstreetcam.js @@ -384,8 +384,6 @@ export default { viewer .selectAll('.photo-wrapper.osc-wrapper') - .classed('hide', false) - .selectAll('div') .classed('hide', false); } @@ -399,15 +397,11 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - // viewer - // .classed('hide', true) - // .selectAll('.photo-wrapper') - // .classed('hide', true); - viewer - .selectAll('.osc-wrapper > div') + .classed('hide', true) + .selectAll('.photo-wrapper') .classed('hide', true); - + d3_selectAll('.viewfield-group, .sequence, .icon-sign') .classed('currentView', false); diff --git a/modules/services/streetside.js b/modules/services/streetside.js index c7873404e..da7181172 100644 --- a/modules/services/streetside.js +++ b/modules/services/streetside.js @@ -722,29 +722,16 @@ export default { var wrap = d3_select('#photoviewer') .classed('hide', false); - var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size() || - wrap.selectAll('.photo-wrapper.ms-wrapper > div.hide').size(); + var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size(); if (isHidden) { wrap .selectAll('.photo-wrapper:not(.ms-wrapper)') .classed('hide', true); - var msWrap = wrap.selectAll('.photo-wrapper.ms-wrapper'); - - msWrap - .classed('hide', false) - .selectAll('.pnlm-container') + wrap + .selectAll('.photo-wrapper.ms-wrapper') .classed('hide', false); - - msWrap - .select('.photo-controls-wrap') - .classed('hide', false); - - msWrap - .selectAll('#divForCanvasWork > canvas') - .classed('hide', false); - } return this; @@ -757,18 +744,9 @@ export default { var viewer = d3_select('#photoviewer'); if (!viewer.empty()) viewer.datum(null); - var msWrap = viewer.selectAll('.photo-wrapper.ms-wrapper'); - - msWrap - .select('.photo-controls-wrap') - .classed('hide', true); - - msWrap - .selectAll('.pnlm-container') - .classed('hide', true); - - msWrap - .selectAll('#divForCanvasWork > canvas') + viewer + .classed('hide', true) + .selectAll('.photo-wrapper') .classed('hide', true); d3_selectAll('.viewfield-group, .sequence, .icon-sign') diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index 7b43840b4..d1914e962 100644 --- a/modules/svg/mapillary_images.js +++ b/modules/svg/mapillary_images.js @@ -65,9 +65,6 @@ export function svgMapillaryImages(projection, context, dispatch) { function hideLayer() { var service = getService(); - if (service) { - service.hideViewer(); - } throttledRedraw.cancel(); diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js index 2a764873a..12a885227 100644 --- a/modules/svg/mapillary_signs.js +++ b/modules/svg/mapillary_signs.js @@ -41,9 +41,6 @@ export function svgMapillarySigns(projection, context, dispatch) { function hideLayer() { var service = getService(); - if (service) { - service.hideViewer(); - } throttledRedraw.cancel(); editOff(); diff --git a/modules/svg/streetside.js b/modules/svg/streetside.js index 89b9883dc..a1fa1ffde 100644 --- a/modules/svg/streetside.js +++ b/modules/svg/streetside.js @@ -62,9 +62,6 @@ export function svgStreetside(projection, context, dispatch) { */ function hideLayer() { var service = getService(); - if (service) { - service.hideViewer(); - } throttledRedraw.cancel(); From ec1a42ad39af48e62d5773a2284cf32679e996ad Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 13:59:04 -0500 Subject: [PATCH 3/6] clean up & remove hideViewer for openstreetcam ref #5829 --- modules/svg/mapillary_signs.js | 2 -- modules/svg/openstreetcam_images.js | 5 ----- 2 files changed, 7 deletions(-) diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js index 12a885227..c282d5363 100644 --- a/modules/svg/mapillary_signs.js +++ b/modules/svg/mapillary_signs.js @@ -40,8 +40,6 @@ export function svgMapillarySigns(projection, context, dispatch) { function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); editOff(); } diff --git a/modules/svg/openstreetcam_images.js b/modules/svg/openstreetcam_images.js index 254897169..a94bc5174 100644 --- a/modules/svg/openstreetcam_images.js +++ b/modules/svg/openstreetcam_images.js @@ -49,11 +49,6 @@ export function svgOpenstreetcamImages(projection, context, dispatch) { function hideLayer() { - var service = getService(); - if (service) { - service.hideViewer(); - } - throttledRedraw.cancel(); layer From 7f837c7e0c81311573ff67831e229a9943f5fca6 Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 14:01:17 -0500 Subject: [PATCH 4/6] no need to generate service variable ref #5929 --- modules/svg/mapillary_images.js | 2 -- modules/svg/streetside.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index d1914e962..96b56a5f6 100644 --- a/modules/svg/mapillary_images.js +++ b/modules/svg/mapillary_images.js @@ -64,8 +64,6 @@ export function svgMapillaryImages(projection, context, dispatch) { function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); layer diff --git a/modules/svg/streetside.js b/modules/svg/streetside.js index a1fa1ffde..9d5b43e06 100644 --- a/modules/svg/streetside.js +++ b/modules/svg/streetside.js @@ -61,8 +61,6 @@ export function svgStreetside(projection, context, dispatch) { * hideLayer(). */ function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); layer From e50b82d2ad64d7ea265995921a769913871be5c3 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 1 Feb 2019 16:38:33 -0500 Subject: [PATCH 5/6] Ditch the separate linear platform presets for public transport (closes #5837) --- data/presets.yaml | 50 ------------------- data/presets/presets.json | 30 ++++------- .../public_transport/linear_platform.json | 32 ------------ .../linear_platform_aerialway.json | 30 ----------- .../public_transport/linear_platform_bus.json | 39 --------------- .../linear_platform_ferry.json | 32 ------------ .../linear_platform_light_rail.json | 44 ---------------- .../linear_platform_monorail.json | 40 --------------- .../linear_platform_subway.json | 43 ---------------- .../linear_platform_train.json | 41 --------------- .../linear_platform_tram.json | 45 ----------------- .../linear_platform_trolleybus.json | 44 ---------------- .../presets/public_transport/platform.json | 1 + .../public_transport/platform_aerialway.json | 3 +- .../public_transport/platform_bus.json | 3 +- .../public_transport/platform_ferry.json | 3 +- .../public_transport/platform_light_rail.json | 3 +- .../public_transport/platform_monorail.json | 3 +- .../public_transport/platform_subway.json | 3 +- .../public_transport/platform_train.json | 3 +- .../public_transport/platform_tram.json | 3 +- .../public_transport/platform_trolleybus.json | 3 +- data/taginfo.json | 20 ++++---- dist/locales/en.json | 40 --------------- 24 files changed, 39 insertions(+), 519 deletions(-) delete mode 100644 data/presets/presets/public_transport/linear_platform.json delete mode 100644 data/presets/presets/public_transport/linear_platform_aerialway.json delete mode 100644 data/presets/presets/public_transport/linear_platform_bus.json delete mode 100644 data/presets/presets/public_transport/linear_platform_ferry.json delete mode 100644 data/presets/presets/public_transport/linear_platform_light_rail.json delete mode 100644 data/presets/presets/public_transport/linear_platform_monorail.json delete mode 100644 data/presets/presets/public_transport/linear_platform_subway.json delete mode 100644 data/presets/presets/public_transport/linear_platform_train.json delete mode 100644 data/presets/presets/public_transport/linear_platform_tram.json delete mode 100644 data/presets/presets/public_transport/linear_platform_trolleybus.json diff --git a/data/presets.yaml b/data/presets.yaml index e0abb7851..d8546536e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5593,56 +5593,6 @@ en: # power=transformer name: Transformer terms: '' - public_transport/linear_platform: - # public_transport=platform - name: Transit Stop / Platform - # 'terms: platform,public transit,public transportation,transit,transportation' - terms: '' - public_transport/linear_platform_aerialway: - # 'public_transport=platform, aerialway=yes' - name: Aerialway Stop / Platform - # 'terms: aerialway,cable car,platform,public transit,public transportation,transit,transportation' - terms: '' - public_transport/linear_platform_bus: - # 'public_transport=platform, bus=yes' - name: Bus Stop / Platform - # 'terms: bus,platform,public transit,public transportation,transit,transportation' - terms: '' - public_transport/linear_platform_ferry: - # 'public_transport=platform, ferry=yes' - name: Ferry Stop / Platform - # 'terms: boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation' - terms: '' - public_transport/linear_platform_light_rail: - # 'public_transport=platform, light_rail=yes' - name: Light Rail Stop / Platform - # 'terms: electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation' - terms: '' - public_transport/linear_platform_monorail: - # 'public_transport=platform, monorail=yes' - name: Monorail Stop / Platform - # 'terms: monorail,platform,public transit,public transportation,rail,transit,transportation' - terms: '' - public_transport/linear_platform_subway: - # 'public_transport=platform, subway=yes' - name: Subway Stop / Platform - # 'terms: metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground' - terms: '' - public_transport/linear_platform_train: - # 'public_transport=platform, train=yes' - name: Train Stop / Platform - # 'terms: platform,public transit,public transportation,rail,track,train,transit,transportation' - terms: '' - public_transport/linear_platform_tram: - # 'public_transport=platform, tram=yes' - name: Tram Stop / Platform - # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation' - terms: '' - public_transport/linear_platform_trolleybus: - # 'public_transport=platform, trolleybus=yes' - name: Trolleybus Stop / Platform - # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation' - terms: '' public_transport/platform: # public_transport=platform name: Transit Stop / Platform diff --git a/data/presets/presets.json b/data/presets/presets.json index 4e3dae11d..e934497dc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -769,26 +769,16 @@ "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"}, "power/tower": {"fields": ["design", "ref", "material"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"}, - "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, - "public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"}, - "public_transport/linear_platform_ferry": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"}, - "public_transport/linear_platform_light_rail": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"}, - "public_transport/linear_platform_monorail": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"}, - "public_transport/linear_platform_subway": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"}, - "public_transport/linear_platform_train": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"}, - "public_transport/linear_platform_tram": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"}, - "public_transport/linear_platform_trolleybus": {"icon": "iD-highway-footway", "fields": ["{public_transport/linear_platform}"], "moreFields": ["{public_transport/linear_platform}"], "geometry": ["line"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"}, - "public_transport/linear_platform": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface"], "moreFields": ["lit", "bench", "shelter", "passenger_information_display", "wheelchair"], "geometry": ["line"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, - "public_transport/platform_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, - "public_transport/platform_bus": {"icon": "maki-bus", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"}, - "public_transport/platform_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"}, - "public_transport/platform_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"}, - "public_transport/platform_monorail": {"icon": "temaki-monorail", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"}, - "public_transport/platform_subway": {"icon": "temaki-subway", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"}, - "public_transport/platform_train": {"icon": "maki-rail", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"}, - "public_transport/platform_tram": {"icon": "temaki-tram", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"}, - "public_transport/platform_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"}, - "public_transport/platform": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface"], "moreFields": ["lit", "bench", "shelter", "passenger_information_display", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, + "public_transport/platform_aerialway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, + "public_transport/platform_bus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"}, + "public_transport/platform_ferry": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stop / Platform"}, + "public_transport/platform_light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stop / Platform"}, + "public_transport/platform_monorail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stop / Platform"}, + "public_transport/platform_subway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stop / Platform"}, + "public_transport/platform_train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"}, + "public_transport/platform_tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"}, + "public_transport/platform_trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"}, + "public_transport/platform": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface"], "moreFields": ["lit", "bench", "shelter", "passenger_information_display", "wheelchair"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, "public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/station}", "aerialway/access", "aerialway/summer/access"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "aerialway": "yes"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"}, "public_transport/station_bus": {"icon": "maki-bus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "bus": "yes"}, "addTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Bus Station / Terminal"}, "public_transport/station_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "ferry": "yes"}, "addTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "removeTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "reference": {"key": "amenity", "value": "ferry_terminal"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Ferry Station / Terminal"}, diff --git a/data/presets/presets/public_transport/linear_platform.json b/data/presets/presets/public_transport/linear_platform.json deleted file mode 100644 index 98a146056..000000000 --- a/data/presets/presets/public_transport/linear_platform.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "name", - "ref_platform", - "network", - "operator", - "surface" - ], - "moreFields": [ - "lit", - "bench", - "shelter", - "passenger_information_display", - "wheelchair" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform" - }, - "terms": [ - "platform", - "public transit", - "public transportation", - "transit", - "transportation" - ], - "name": "Transit Stop / Platform", - "matchScore": 0.2 -} diff --git a/data/presets/presets/public_transport/linear_platform_aerialway.json b/data/presets/presets/public_transport/linear_platform_aerialway.json deleted file mode 100644 index 2d0e1dd55..000000000 --- a/data/presets/presets/public_transport/linear_platform_aerialway.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "aerialway": "yes" - }, - "reference": { - "key": "public_transport", - "value": "platform" - }, - "terms": [ - "aerialway", - "cable car", - "platform", - "public transit", - "public transportation", - "transit", - "transportation" - ], - "name": "Aerialway Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_bus.json b/data/presets/presets/public_transport/linear_platform_bus.json deleted file mode 100644 index a476c5c0e..000000000 --- a/data/presets/presets/public_transport/linear_platform_bus.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "bus": "yes" - }, - "addTags": { - "public_transport": "platform", - "bus": "yes", - "highway": "bus_stop" - }, - "removeTags": { - "public_transport": "platform", - "bus": "yes", - "highway": "bus_stop" - }, - "reference": { - "key": "public_transport", - "value": "platform" - }, - "terms": [ - "bus", - "platform", - "public transit", - "public transportation", - "transit", - "transportation" - ], - "name": "Bus Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_ferry.json b/data/presets/presets/public_transport/linear_platform_ferry.json deleted file mode 100644 index aa05ef1df..000000000 --- a/data/presets/presets/public_transport/linear_platform_ferry.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "ferry": "yes" - }, - "reference": { - "key": "public_transport", - "value": "platform" - }, - "terms": [ - "boat", - "dock", - "ferry", - "pier", - "platform", - "public transit", - "public transportation", - "transit", - "transportation" - ], - "name": "Ferry Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_light_rail.json b/data/presets/presets/public_transport/linear_platform_light_rail.json deleted file mode 100644 index d11011924..000000000 --- a/data/presets/presets/public_transport/linear_platform_light_rail.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "light_rail": "yes" - }, - "addTags": { - "public_transport": "platform", - "light_rail": "yes", - "railway": "platform" - }, - "removeTags": { - "public_transport": "platform", - "light_rail": "yes", - "railway": "platform" - }, - "reference": { - "key": "railway", - "value": "platform" - }, - "terms": [ - "electric", - "light rail", - "platform", - "public transit", - "public transportation", - "rail", - "track", - "tram", - "trolley", - "transit", - "transportation" - ], - "name": "Light Rail Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_monorail.json b/data/presets/presets/public_transport/linear_platform_monorail.json deleted file mode 100644 index f4cb11139..000000000 --- a/data/presets/presets/public_transport/linear_platform_monorail.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "monorail": "yes" - }, - "addTags": { - "public_transport": "platform", - "monorail": "yes", - "railway": "platform" - }, - "removeTags": { - "public_transport": "platform", - "monorail": "yes", - "railway": "platform" - }, - "reference": { - "key": "railway", - "value": "platform" - }, - "terms": [ - "monorail", - "platform", - "public transit", - "public transportation", - "rail", - "transit", - "transportation" - ], - "name": "Monorail Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_subway.json b/data/presets/presets/public_transport/linear_platform_subway.json deleted file mode 100644 index 21edae954..000000000 --- a/data/presets/presets/public_transport/linear_platform_subway.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "subway": "yes" - }, - "addTags": { - "public_transport": "platform", - "subway": "yes", - "railway": "platform" - }, - "removeTags": { - "public_transport": "platform", - "subway": "yes", - "railway": "platform" - }, - "reference": { - "key": "railway", - "value": "platform" - }, - "terms": [ - "metro", - "platform", - "public transit", - "public transportation", - "rail", - "subway", - "track", - "transit", - "transportation", - "underground" - ], - "name": "Subway Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_train.json b/data/presets/presets/public_transport/linear_platform_train.json deleted file mode 100644 index ff9f9f89f..000000000 --- a/data/presets/presets/public_transport/linear_platform_train.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "train": "yes" - }, - "addTags": { - "public_transport": "platform", - "train": "yes", - "railway": "platform" - }, - "removeTags": { - "public_transport": "platform", - "train": "yes", - "railway": "platform" - }, - "reference": { - "key": "railway", - "value": "platform" - }, - "terms": [ - "platform", - "public transit", - "public transportation", - "rail", - "track", - "train", - "transit", - "transportation" - ], - "name": "Train Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_tram.json b/data/presets/presets/public_transport/linear_platform_tram.json deleted file mode 100644 index a9f2100e9..000000000 --- a/data/presets/presets/public_transport/linear_platform_tram.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "tram": "yes" - }, - "addTags": { - "public_transport": "platform", - "tram": "yes", - "railway": "platform" - }, - "removeTags": { - "public_transport": "platform", - "tram": "yes", - "railway": "platform" - }, - "reference": { - "key": "public_transport", - "value": "platform" - }, - "terms": [ - "electric", - "light rail", - "platform", - "public transit", - "public transportation", - "rail", - "streetcar", - "track", - "tram", - "trolley", - "transit", - "transportation" - ], - "name": "Tram Stop / Platform" -} diff --git a/data/presets/presets/public_transport/linear_platform_trolleybus.json b/data/presets/presets/public_transport/linear_platform_trolleybus.json deleted file mode 100644 index c8dcedce2..000000000 --- a/data/presets/presets/public_transport/linear_platform_trolleybus.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "icon": "iD-highway-footway", - "fields": [ - "{public_transport/linear_platform}" - ], - "moreFields": [ - "{public_transport/linear_platform}" - ], - "geometry": [ - "line" - ], - "tags": { - "public_transport": "platform", - "trolleybus": "yes" - }, - "addTags": { - "public_transport": "platform", - "trolleybus": "yes", - "highway": "bus_stop" - }, - "removeTags": { - "public_transport": "platform", - "trolleybus": "yes", - "highway": "bus_stop" - }, - "reference": { - "key": "public_transport", - "value": "platform" - }, - "terms": [ - "bus", - "electric", - "platform", - "public transit", - "public transportation", - "streetcar", - "trackless", - "tram", - "trolley", - "transit", - "transportation" - ], - "name": "Trolleybus Stop / Platform" -} diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json index d38fee4c8..c4dfc6b6b 100644 --- a/data/presets/presets/public_transport/platform.json +++ b/data/presets/presets/public_transport/platform.json @@ -16,6 +16,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_aerialway.json b/data/presets/presets/public_transport/platform_aerialway.json index 238b37fc3..582cb59c8 100644 --- a/data/presets/presets/public_transport/platform_aerialway.json +++ b/data/presets/presets/public_transport/platform_aerialway.json @@ -1,5 +1,5 @@ { - "icon": "maki-aerialway", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_bus.json b/data/presets/presets/public_transport/platform_bus.json index aac7be08e..86efe46de 100644 --- a/data/presets/presets/public_transport/platform_bus.json +++ b/data/presets/presets/public_transport/platform_bus.json @@ -1,5 +1,5 @@ { - "icon": "maki-bus", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_ferry.json b/data/presets/presets/public_transport/platform_ferry.json index f9d6632ab..66f432fa9 100644 --- a/data/presets/presets/public_transport/platform_ferry.json +++ b/data/presets/presets/public_transport/platform_ferry.json @@ -1,5 +1,5 @@ { - "icon": "maki-ferry", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json index e5e2cc6dd..6b5714b89 100644 --- a/data/presets/presets/public_transport/platform_light_rail.json +++ b/data/presets/presets/public_transport/platform_light_rail.json @@ -1,5 +1,5 @@ { - "icon": "temaki-light_rail", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json index 0f95cf5b7..848af6e5b 100644 --- a/data/presets/presets/public_transport/platform_monorail.json +++ b/data/presets/presets/public_transport/platform_monorail.json @@ -1,5 +1,5 @@ { - "icon": "temaki-monorail", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json index 3bf9ef059..1606625bf 100644 --- a/data/presets/presets/public_transport/platform_subway.json +++ b/data/presets/presets/public_transport/platform_subway.json @@ -1,5 +1,5 @@ { - "icon": "temaki-subway", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_train.json b/data/presets/presets/public_transport/platform_train.json index dc2c11e36..bede99254 100644 --- a/data/presets/presets/public_transport/platform_train.json +++ b/data/presets/presets/public_transport/platform_train.json @@ -1,5 +1,5 @@ { - "icon": "maki-rail", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json index 6a2182430..f1da97f74 100644 --- a/data/presets/presets/public_transport/platform_tram.json +++ b/data/presets/presets/public_transport/platform_tram.json @@ -1,5 +1,5 @@ { - "icon": "temaki-tram", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/presets/presets/public_transport/platform_trolleybus.json b/data/presets/presets/public_transport/platform_trolleybus.json index c6089e485..e2b06c928 100644 --- a/data/presets/presets/public_transport/platform_trolleybus.json +++ b/data/presets/presets/public_transport/platform_trolleybus.json @@ -1,5 +1,5 @@ { - "icon": "temaki-trolleybus", + "icon": "temaki-pedestrian", "fields": [ "{public_transport/platform}" ], @@ -8,6 +8,7 @@ ], "geometry": [ "point", + "line", "area" ], "tags": { diff --git a/data/taginfo.json b/data/taginfo.json index 9579aa1b7..48d755de1 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -752,16 +752,16 @@ {"key": "power", "value": "switch", "description": "🄿 Power Switch", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"}, {"key": "power", "value": "tower", "description": "🄿 High-Voltage Tower", "object_types": ["node"]}, {"key": "power", "value": "transformer", "description": "🄿 Transformer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"}, - {"key": "aerialway", "value": "yes", "description": "🄿 Aerialway Stop / Platform, 🄿 Aerialway Station, 🄿 Aerialway Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "bus", "value": "yes", "description": "🄿 Bus Stop / Platform, 🄿 Bus Station / Terminal, 🄿 Bus Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "ferry", "value": "yes", "description": "🄿 Ferry Stop / Platform, 🄿 Ferry Station / Terminal, 🄿 Ferry Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "light_rail", "value": "yes", "description": "🄿 Light Rail Stop / Platform, 🄿 Light Rail Station, 🄿 Light Rail Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "monorail", "value": "yes", "description": "🄿 Monorail Stop / Platform, 🄿 Monorail Station, 🄿 Monorail Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "subway", "value": "yes", "description": "🄿 Subway Stop / Platform, 🄿 Subway Station, 🄿 Subway Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "train", "value": "yes", "description": "🄿 Train Stop / Platform, 🄿 Train Station, 🄿 Train Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "tram", "value": "yes", "description": "🄿 Tram Stop / Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop / Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, - {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-footway.svg?sanitize=true"}, + {"key": "aerialway", "value": "yes", "description": "🄿 Aerialway Stop / Platform, 🄿 Aerialway Station, 🄿 Aerialway Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "bus", "value": "yes", "description": "🄿 Bus Stop / Platform, 🄿 Bus Station / Terminal, 🄿 Bus Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "ferry", "value": "yes", "description": "🄿 Ferry Stop / Platform, 🄿 Ferry Station / Terminal, 🄿 Ferry Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "light_rail", "value": "yes", "description": "🄿 Light Rail Stop / Platform, 🄿 Light Rail Station, 🄿 Light Rail Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "monorail", "value": "yes", "description": "🄿 Monorail Stop / Platform, 🄿 Monorail Station, 🄿 Monorail Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "subway", "value": "yes", "description": "🄿 Subway Stop / Platform, 🄿 Subway Station, 🄿 Subway Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "train", "value": "yes", "description": "🄿 Train Stop / Platform, 🄿 Train Station, 🄿 Train Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "tram", "value": "yes", "description": "🄿 Tram Stop / Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop / Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, + {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"}, {"key": "railway", "value": "halt", "description": "🄿 Train Station (Halt / Request), 🄿 Train Station (Halt / Request) (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, {"key": "public_transport", "value": "station", "description": "🄿 Transit Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, {"key": "public_transport", "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 2535fc7ef..020477d53 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6685,46 +6685,6 @@ "name": "Transformer", "terms": "" }, - "public_transport/linear_platform_aerialway": { - "name": "Aerialway Stop / Platform", - "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation" - }, - "public_transport/linear_platform_bus": { - "name": "Bus Stop / Platform", - "terms": "bus,platform,public transit,public transportation,transit,transportation" - }, - "public_transport/linear_platform_ferry": { - "name": "Ferry Stop / Platform", - "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation" - }, - "public_transport/linear_platform_light_rail": { - "name": "Light Rail Stop / Platform", - "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation" - }, - "public_transport/linear_platform_monorail": { - "name": "Monorail Stop / Platform", - "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation" - }, - "public_transport/linear_platform_subway": { - "name": "Subway Stop / Platform", - "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground" - }, - "public_transport/linear_platform_train": { - "name": "Train Stop / Platform", - "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation" - }, - "public_transport/linear_platform_tram": { - "name": "Tram Stop / Platform", - "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation" - }, - "public_transport/linear_platform_trolleybus": { - "name": "Trolleybus Stop / Platform", - "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation" - }, - "public_transport/linear_platform": { - "name": "Transit Stop / Platform", - "terms": "platform,public transit,public transportation,transit,transportation" - }, "public_transport/platform_aerialway": { "name": "Aerialway Stop / Platform", "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation" From 491ec404358413c865faf57c9aa8375da4da3dcb Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 1 Feb 2019 16:42:52 -0500 Subject: [PATCH 6/6] Ditch the separate linear platform presets for public transport (closes #5837) --- data/presets/presets.json | 2 +- data/presets/presets/public_transport/platform.json | 2 +- data/taginfo.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index e934497dc..c205b71a5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -778,7 +778,7 @@ "public_transport/platform_train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stop / Platform"}, "public_transport/platform_tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "removeTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"}, "public_transport/platform_trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop / Platform"}, - "public_transport/platform": {"icon": "maki-bus", "fields": ["name", "ref_platform", "network", "operator", "surface"], "moreFields": ["lit", "bench", "shelter", "passenger_information_display", "wheelchair"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, + "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["name", "ref_platform", "network", "operator", "surface"], "moreFields": ["lit", "bench", "shelter", "passenger_information_display", "wheelchair"], "geometry": ["point", "line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.2}, "public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/station}", "aerialway/access", "aerialway/summer/access"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "aerialway": "yes"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"}, "public_transport/station_bus": {"icon": "maki-bus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "bus": "yes"}, "addTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "removeTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Bus Station / Terminal"}, "public_transport/station_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "ferry": "yes"}, "addTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "removeTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "reference": {"key": "amenity", "value": "ferry_terminal"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Ferry Station / Terminal"}, diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json index c4dfc6b6b..684105958 100644 --- a/data/presets/presets/public_transport/platform.json +++ b/data/presets/presets/public_transport/platform.json @@ -1,5 +1,5 @@ { - "icon": "maki-bus", + "icon": "temaki-pedestrian", "fields": [ "name", "ref_platform", diff --git a/data/taginfo.json b/data/taginfo.json index 48d755de1..b9dba7b46 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -761,7 +761,7 @@ {"key": "train", "value": "yes", "description": "🄿 Train Stop / Platform, 🄿 Train Station, 🄿 Train Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "tram", "value": "yes", "description": "🄿 Tram Stop / Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop / Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, - {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bus-15.svg?sanitize=true"}, + {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"}, {"key": "railway", "value": "halt", "description": "🄿 Train Station (Halt / Request), 🄿 Train Station (Halt / Request) (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, {"key": "public_transport", "value": "station", "description": "🄿 Transit Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, {"key": "public_transport", "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/relation.svg?sanitize=true"},