From b1478b281c7f9ce2da0b450a5bb04868c8b25fac Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 14 Jan 2020 12:23:18 -0500 Subject: [PATCH] Update to temaki 3.12.0 (re: #7068) --- CHANGELOG.md | 2 +- data/presets/presets.json | 12 ++++++------ data/presets/presets/aerialway/drag_lift.json | 1 + data/presets/presets/aerialway/j-bar.json | 1 + data/presets/presets/aerialway/mixed_lift.json | 1 + data/presets/presets/aerialway/platter.json | 1 + data/presets/presets/aerialway/pylon.json | 1 + data/presets/presets/aerialway/t-bar.json | 1 + data/taginfo.json | 12 ++++++------ package.json | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69498a2da..87ebba38f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -110,7 +110,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD, * Update Dressmaker icon ([#7229]) * Update Water Well icon ([#7170]) * Update Butcher icon ([#7216]) -* Update preset icons: Cathedral Building, Church Building, College Building, Hospital Building, Hotel Building, Preschool / Kindergarten Building, Mosque Building, School Building, University Building, Recently Demolished Building, Residential Area, Apartment Complex, Water Tap, Island, Islet, Kiosk, Fireworks Store, Row Houses, Houseboat, Tailor, Sewing Supply Shop +* Update preset icons: Cathedral Building, Church Building, College Building, Hospital Building, Hotel Building, Preschool / Kindergarten Building, Mosque Building, School Building, University Building, Recently Demolished Building, Residential Area, Apartment Complex, Water Tap, Island, Islet, Kiosk, Fireworks Store, Row Houses, Houseboat, Tailor, Sewing Supply Shop, Aerialway Pylon, Mixed Lift, Drag Lift, Platter Lift, J-Bar Lift, T-Bar Lift * Add Baby Nursing Area field ([#7152]) * Add Bicycle-Pedestrian Separation field to Cycle & Foot Path ([#7204], thanks [@hikemaniac]) * Add Wheelchair Access field to Entrance / Exit ([#7214]) diff --git a/data/presets/presets.json b/data/presets/presets.json index 2d2b8be4f..09453cda4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -31,16 +31,16 @@ "advertising/totem": {"fields": ["operator", "lit", "visibility", "direction", "height"], "geometry": ["point"], "tags": {"advertising": "totem"}, "name": "Advertising Totem"}, "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"}, "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"}, - "aerialway/drag_lift": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"}, + "aerialway/drag_lift": {"icon": "temaki-drag_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"}, "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "name": "Gondola"}, "aerialway/goods": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "goods"}, "name": "Goods Aerialway"}, - "aerialway/j-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["jbar"], "tags": {"aerialway": "j-bar"}, "name": "J-Bar Lift"}, + "aerialway/j-bar": {"icon": "temaki-j_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["jbar"], "tags": {"aerialway": "j-bar"}, "name": "J-Bar Lift"}, "aerialway/magic_carpet": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "magic_carpet"}, "name": "Magic Carpet Lift"}, - "aerialway/mixed_lift": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "name": "Mixed Lift"}, - "aerialway/platter": {"geometry": ["line"], "terms": ["button lift", "poma lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "name": "Platter Lift"}, - "aerialway/pylon": {"geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "name": "Aerialway Pylon"}, + "aerialway/mixed_lift": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "name": "Mixed Lift"}, + "aerialway/platter": {"icon": "temaki-platter_lift", "geometry": ["line"], "terms": ["button lift", "poma lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "name": "Platter Lift"}, + "aerialway/pylon": {"icon": "temaki-aerialway_pole", "geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "name": "Aerialway Pylon"}, "aerialway/rope_tow": {"geometry": ["line"], "terms": ["handle tow", "bugel lift"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"}, - "aerialway/t-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-Bar Lift"}, + "aerialway/t-bar": {"icon": "temaki-t_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-Bar Lift"}, "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "tags": {"aerialway": "zip_line"}, "name": "Zip Line"}, "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["area", "point"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["gnis/feature_id"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"}, "aeroway/apron": {"icon": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"}, diff --git a/data/presets/presets/aerialway/drag_lift.json b/data/presets/presets/aerialway/drag_lift.json index 6dc4eca5e..324bd77d2 100644 --- a/data/presets/presets/aerialway/drag_lift.json +++ b/data/presets/presets/aerialway/drag_lift.json @@ -1,4 +1,5 @@ { + "icon": "temaki-drag_lift", "geometry": [ "line" ], diff --git a/data/presets/presets/aerialway/j-bar.json b/data/presets/presets/aerialway/j-bar.json index 9469d3b7b..6889b4314 100644 --- a/data/presets/presets/aerialway/j-bar.json +++ b/data/presets/presets/aerialway/j-bar.json @@ -1,4 +1,5 @@ { + "icon": "temaki-j_bar_lift", "geometry": [ "line" ], diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json index c669a6eb1..0253efd77 100644 --- a/data/presets/presets/aerialway/mixed_lift.json +++ b/data/presets/presets/aerialway/mixed_lift.json @@ -1,4 +1,5 @@ { + "icon": "maki-aerialway", "geometry": [ "line" ], diff --git a/data/presets/presets/aerialway/platter.json b/data/presets/presets/aerialway/platter.json index 3cd9b4f4c..a3a8656b8 100644 --- a/data/presets/presets/aerialway/platter.json +++ b/data/presets/presets/aerialway/platter.json @@ -1,4 +1,5 @@ { + "icon": "temaki-platter_lift", "geometry": [ "line" ], diff --git a/data/presets/presets/aerialway/pylon.json b/data/presets/presets/aerialway/pylon.json index ae9fc828f..5cee1b13b 100644 --- a/data/presets/presets/aerialway/pylon.json +++ b/data/presets/presets/aerialway/pylon.json @@ -1,4 +1,5 @@ { + "icon": "temaki-aerialway_pole", "geometry": [ "point", "vertex" diff --git a/data/presets/presets/aerialway/t-bar.json b/data/presets/presets/aerialway/t-bar.json index 888830dbc..912e05d33 100644 --- a/data/presets/presets/aerialway/t-bar.json +++ b/data/presets/presets/aerialway/t-bar.json @@ -1,4 +1,5 @@ { + "icon": "temaki-t_bar_lift", "geometry": [ "line" ], diff --git a/data/taginfo.json b/data/taginfo.json index 8ce7cad1e..a7c9fd79b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -34,16 +34,16 @@ {"key": "advertising", "value": "totem", "description": "🄿 Advertising Totem", "object_types": ["node"]}, {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tram.svg"}, {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/chairlift.svg"}, - {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"]}, + {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/drag_lift.svg"}, {"key": "aerialway", "value": "gondola", "description": "🄿 Gondola", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "aerialway", "value": "goods", "description": "🄿 Goods Aerialway", "object_types": ["way"]}, - {"key": "aerialway", "value": "j-bar", "description": "🄿 J-Bar Lift", "object_types": ["way"]}, + {"key": "aerialway", "value": "j-bar", "description": "🄿 J-Bar Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/j_bar_lift.svg"}, {"key": "aerialway", "value": "magic_carpet", "description": "🄿 Magic Carpet Lift", "object_types": ["way"]}, - {"key": "aerialway", "value": "mixed_lift", "description": "🄿 Mixed Lift", "object_types": ["way"]}, - {"key": "aerialway", "value": "platter", "description": "🄿 Platter Lift", "object_types": ["way"]}, - {"key": "aerialway", "value": "pylon", "description": "🄿 Aerialway Pylon", "object_types": ["node"]}, + {"key": "aerialway", "value": "mixed_lift", "description": "🄿 Mixed Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, + {"key": "aerialway", "value": "platter", "description": "🄿 Platter Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/platter_lift.svg"}, + {"key": "aerialway", "value": "pylon", "description": "🄿 Aerialway Pylon", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/aerialway_pole.svg"}, {"key": "aerialway", "value": "rope_tow", "description": "🄿 Rope Tow Lift", "object_types": ["way"]}, - {"key": "aerialway", "value": "t-bar", "description": "🄿 T-Bar Lift", "object_types": ["way"]}, + {"key": "aerialway", "value": "t-bar", "description": "🄿 T-Bar Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/t_bar_lift.svg"}, {"key": "aerialway", "value": "zip_line", "description": "🄿 Zip Line", "object_types": ["way"]}, {"key": "aeroway", "value": "aerodrome", "description": "🄿 Airport", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, {"key": "aeroway", "value": "apron", "description": "🄿 Apron", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, diff --git a/package.json b/package.json index 8b1eaf3c9..e24a780a2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@fortawesome/free-brands-svg-icons": "^5.11.2", "@fortawesome/free-regular-svg-icons": "^5.11.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", - "@ideditor/temaki": "~3.11.0", + "@ideditor/temaki": "~3.12.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "chai": "^4.1.0",