From 4b982379caab791ed2f6081a4db5da52d3a7078e Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 4 Dec 2019 18:10:49 -0500 Subject: [PATCH] Update temaki to v3.2.0 (close #7089) --- data/presets/presets.json | 10 +++++----- data/presets/presets/highway/street_lamp.json | 2 +- data/presets/presets/man_made/tower/minaret.json | 2 +- data/presets/presets/playground/slide.json | 2 +- data/presets/presets/playground/structure.json | 2 +- data/presets/presets/shop/lighting.json | 2 +- data/taginfo.json | 10 +++++----- package.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 6682dfaa6..6644f312a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -545,7 +545,7 @@ "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "tactile_paving", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"}, "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"}, - "highway/street_lamp": {"icon": "temaki-bulb3", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, + "highway/street_lamp": {"icon": "temaki-street_lamp_arm", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"}, "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, @@ -768,7 +768,7 @@ "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"}, "man_made/tower/communication": {"icon": "temaki-tower_communication", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"}, "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"}, - "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, + "man_made/tower/minaret": {"icon": "temaki-domed_tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"}, "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "utility_semi", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, @@ -911,8 +911,8 @@ "playground/roundabout": {"icon": "maki-stadium", "fields": ["{playground}", "bench"], "geometry": ["point", "area"], "tags": {"playground": "roundabout"}, "name": "Play Roundabout", "terms": ["merry-go-round"]}, "playground/sandpit": {"icon": "maki-playground", "geometry": ["point", "area"], "tags": {"playground": "sandpit"}, "terms": ["sandbox"], "name": "Sandpit"}, "playground/seesaw": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "seesaw"}, "name": "Seesaw"}, - "playground/slide": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "slide"}, "name": "Slide"}, - "playground/structure": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"playground": "structure"}, "terms": ["jungle gym"], "name": "Play Structure"}, + "playground/slide": {"icon": "temaki-slide", "geometry": ["point", "line"], "tags": {"playground": "slide"}, "name": "Slide"}, + "playground/structure": {"icon": "temaki-play_structure", "geometry": ["point", "area"], "tags": {"playground": "structure"}, "terms": ["jungle gym"], "name": "Play Structure"}, "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair", "blind"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"}, "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"}, "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1}, @@ -1101,7 +1101,7 @@ "shop/laundry": {"icon": "temaki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"}, "shop/laundry/self_service": {"icon": "temaki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"}, "shop/leather": {"icon": "temaki-handbag", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"}, - "shop/lighting": {"icon": "temaki-bulb3", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"}, + "shop/lighting": {"icon": "temaki-desk_lamp", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"}, "shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"}, "shop/lottery": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "name": "Lottery Shop"}, "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"}, diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json index 282b09254..1dcff6d2f 100644 --- a/data/presets/presets/highway/street_lamp.json +++ b/data/presets/presets/highway/street_lamp.json @@ -1,5 +1,5 @@ { - "icon": "temaki-bulb3", + "icon": "temaki-street_lamp_arm", "geometry": [ "point", "vertex" diff --git a/data/presets/presets/man_made/tower/minaret.json b/data/presets/presets/man_made/tower/minaret.json index 4478546b2..addff51fd 100644 --- a/data/presets/presets/man_made/tower/minaret.json +++ b/data/presets/presets/man_made/tower/minaret.json @@ -1,5 +1,5 @@ { - "icon": "temaki-tower", + "icon": "temaki-domed_tower", "geometry": [ "point", "area" diff --git a/data/presets/presets/playground/slide.json b/data/presets/presets/playground/slide.json index f6e30a757..2998fd20f 100644 --- a/data/presets/presets/playground/slide.json +++ b/data/presets/presets/playground/slide.json @@ -1,5 +1,5 @@ { - "icon": "maki-playground", + "icon": "temaki-slide", "geometry": [ "point", "line" diff --git a/data/presets/presets/playground/structure.json b/data/presets/presets/playground/structure.json index 8711e6a7b..102c0405f 100644 --- a/data/presets/presets/playground/structure.json +++ b/data/presets/presets/playground/structure.json @@ -1,5 +1,5 @@ { - "icon": "maki-pitch", + "icon": "temaki-play_structure", "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/lighting.json b/data/presets/presets/shop/lighting.json index 647126311..d2f9629c5 100644 --- a/data/presets/presets/shop/lighting.json +++ b/data/presets/presets/shop/lighting.json @@ -1,5 +1,5 @@ { - "icon": "temaki-bulb3", + "icon": "temaki-desk_lamp", "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index 93cbea5d5..9c8779e44 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -528,7 +528,7 @@ {"key": "highway", "value": "speed_camera", "description": "🄿 Speed Camera", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/security_camera.svg"}, {"key": "highway", "value": "steps", "description": "🄿 Steps", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-steps.svg"}, {"key": "highway", "value": "stop", "description": "🄿 Stop Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/stop.svg"}, - {"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulb3.svg"}, + {"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/street_lamp_arm.svg"}, {"key": "highway", "value": "tertiary_link", "description": "🄿 Tertiary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-tertiary-link.svg"}, {"key": "highway", "value": "tertiary", "description": "🄿 Tertiary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-tertiary.svg"}, {"key": "highway", "value": "track", "description": "🄿 Unmaintained Track Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-truck-monster.svg"}, @@ -743,7 +743,7 @@ {"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bell.svg"}, {"key": "tower:type", "value": "defensive", "description": "🄿 Fortified Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"}, - {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, + {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/domed_tower.svg"}, {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009642.svg"}, {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"}, @@ -886,8 +886,8 @@ {"key": "playground", "value": "roundabout", "description": "🄿 Play Roundabout", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/stadium-15.svg"}, {"key": "playground", "value": "sandpit", "description": "🄿 Sandpit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "seesaw", "description": "🄿 Seesaw", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, - {"key": "playground", "value": "slide", "description": "🄿 Slide", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, - {"key": "playground", "value": "structure", "description": "🄿 Play Structure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"}, + {"key": "playground", "value": "slide", "description": "🄿 Slide", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/slide.svg"}, + {"key": "playground", "value": "structure", "description": "🄿 Play Structure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/play_structure.svg"}, {"key": "playground", "value": "swing", "description": "🄿 Swing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "zipwire", "description": "🄿 Zip Wire", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "polling_station", "description": "🄿 Temporary Polling Place, 🄵 Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vote-yea.svg"}, @@ -1044,7 +1044,7 @@ {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/laundry.svg"}, {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/laundry.svg"}, {"key": "shop", "value": "leather", "description": "🄿 Leather Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/handbag.svg"}, - {"key": "shop", "value": "lighting", "description": "🄿 Lighting Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulb3.svg"}, + {"key": "shop", "value": "lighting", "description": "🄿 Lighting Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/desk_lamp.svg"}, {"key": "shop", "value": "locksmith", "description": "🄿 Locksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-key.svg"}, {"key": "shop", "value": "lottery", "description": "🄿 Lottery Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ticket-alt.svg"}, {"key": "shop", "value": "mall", "description": "🄿 Mall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, diff --git a/package.json b/package.json index d04a4d281..44e35bc44 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.1.0", + "@ideditor/temaki": "~3.2.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0",