From dc30371fb67f643a06ed8dae9b55ca671480bf70 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 25 Feb 2020 20:25:02 -0800 Subject: [PATCH] Update to temaki 3.18.0 (re: #7068) Rename Checkpoint to Military Checkpoint --- data/presets.yaml | 4 +-- data/presets/presets.json | 28 +++++++++---------- .../presets/amenity/parking_space.json | 1 + data/presets/presets/amenity/police.json | 2 +- .../presets/barrier/border_control.json | 2 +- data/presets/presets/barrier/stile.json | 2 +- .../presets/landuse/military/barracks.json | 2 +- .../presets/presets/man_made/observatory.json | 1 + data/presets/presets/military/checkpoint.json | 4 +-- data/presets/presets/shop/beauty/nails.json | 2 +- data/presets/presets/shop/curtain.json | 2 +- data/presets/presets/shop/tattoo.json | 2 +- data/presets/presets/shop/tiles.json | 2 +- .../presets/tourism/information/board.json | 2 +- .../presets/tourism/information/terminal.json | 2 +- data/taginfo.json | 26 ++++++++--------- dist/locales/en.json | 2 +- package.json | 2 +- 18 files changed, 45 insertions(+), 43 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 78e8f851a..61a8778f3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6379,9 +6379,9 @@ en: terms: '' military/checkpoint: # military=checkpoint - name: Checkpoint + name: Military Checkpoint # 'terms: air force,army,base,force,guard,marine,navy,troop,war' - terms: '' + terms: '' military/nuclear_explosion_site: # military=nuclear_explosion_site name: Nuclear Explosion Site diff --git a/data/presets/presets.json b/data/presets/presets.json index 27dfa7e30..f30741f90 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -152,7 +152,7 @@ "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"}, "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"}, "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"}, - "amenity/parking_space": {"fields": ["capacity"], "geometry": ["area", "point", "vertex"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"}, + "amenity/parking_space": {"icon": "temaki-parking_space", "fields": ["capacity"], "geometry": ["area", "point", "vertex"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"}, "amenity/parking": {"icon": "temaki-car_parked", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"}, "amenity/parking/multi-storey": {"icon": "temaki-car_structure", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "building/levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"}, "amenity/parking/park_ride": {"icon": "temaki-sign_and_car", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "matchScore": 0.95, "name": "Park & Ride Lot"}, @@ -174,7 +174,7 @@ "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"}, "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"}, "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"}, - "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"}, + "amenity/police": {"icon": "temaki-police_officer", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"}, "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"}, "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "gnis/feature_id", "height", "indoor", "level", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["drop box", "dropbox", "letter drop", "mail box", "mail collection box", "mail drop", "mail dropoff", "mailbox", "package drop", "pillar box", "pillarbox", "post box", "postal box", "postbox"], "name": "Mail Drop Box"}, "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"}, @@ -300,7 +300,7 @@ "barrier/block": {"icon": "fas-cube", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"}, "barrier/bollard_line": {"icon": "temaki-bollard_row", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"}, "barrier/bollard": {"icon": "temaki-bollard", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"}, - "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"}, + "barrier/border_control": {"icon": "temaki-passport_checkpoint", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"}, "barrier/cattle_grid": {"icon": "temaki-cattle_grid", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "terms": ["cattle guard", "cattle stop", "livestock grid", "stock gate", "stock grid", "stock stop", "Texas gate", "vehicle pass"], "name": "Cattle Grid"}, "barrier/chain": {"icon": "temaki-rope_fence", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"}, "barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"}, @@ -322,7 +322,7 @@ "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"}, "barrier/spikes": {"icon": "temaki-spike_strip", "fields": ["direction_vertex", "access", "height", "colour"], "geometry": ["vertex"], "tags": {"barrier": "spikes"}, "terms": ["one-way traffic treadles", "stingers", "stop sticks", "tire deflation device", "tire shredders", "traffic spikes"], "name": "Spike Strip", "matchScore": 0.5}, - "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, + "barrier/stile": {"icon": "temaki-stile_squeezer", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, "barrier/swing_gate": {"icon": "temaki-gate", "fields": ["{barrier/gate}"], "moreFields": ["{barrier/gate}"], "geometry": ["vertex"], "tags": {"barrier": "swing_gate"}, "name": "Swing Gate"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/turnstile": {"icon": "temaki-turnstile", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"}, @@ -626,7 +626,7 @@ "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": ["grazing", "hay field", "pasture"], "name": "Meadow"}, "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"}, "landuse/military/airfield": {"icon": "tnp-2009265", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"}, - "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"}, + "landuse/military/barracks": {"icon": "temaki-army_tent", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"}, "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "mine", "marine", "navy", "troop", "war"], "name": "Danger Area"}, "landuse/military/naval_base": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "naval_base"}, "addTags": {"landuse": "military", "military": "naval_base"}, "terms": ["base", "fight", "force", "guard", "marine", "navy", "ship", "sub", "troop", "war"], "name": "Naval Base"}, "landuse/military/obstacle_course": {"icon": "temaki-military", "geometry": ["point", "area"], "tags": {"military": "obstacle_course"}, "addTags": {"landuse": "military", "military": "obstacle_course"}, "terms": ["army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Obstacle Course"}, @@ -759,7 +759,7 @@ "man_made/mineshaft": {"icon": "temaki-mineshaft_cage", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "moreFields": ["gnis/feature_id"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"}, "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"}, "man_made/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"}, - "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"}, + "man_made/observatory": {"icon": "temaki-telescope", "fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"}, "man_made/petroleum_well": {"icon": "temaki-oil_well", "fields": ["name", "ref", "operator", "substance"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"}, "man_made/pier": {"icon": "temaki-pier_fixed", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "gnis/feature_id", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"}, "man_made/pier/floating": {"icon": "temaki-pier_floating", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "name": "Floating Pier"}, @@ -795,7 +795,7 @@ "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"}, "marker/utility/power": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["electric line", "identifier", "marking", "plate", "pole", "post", "power cable", "power line", "sign"], "tags": {"marker": "*", "utility": "power"}, "name": "Power Marker"}, "military/bunker": {"icon": "temaki-bunker", "fields": ["name", "bunker_type", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"}, - "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"}, + "military/checkpoint": {"icon": "temaki-military_checkpoint", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Checkpoint"}, "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"}, "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "moreFields": ["gnis/feature_id", "level"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"}, "military/trench": {"icon": "temaki-military", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"}, @@ -1043,7 +1043,7 @@ "shop/bakery": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery"}, "terms": ["bread", "cakes", "rolls"], "name": "Bakery"}, "shop/bathroom_furnishing": {"icon": "fas-bath", "geometry": ["point", "area"], "tags": {"shop": "bathroom_furnishing"}, "name": "Bathroom Furnishing Store"}, "shop/beauty": {"icon": "temaki-lipstick", "fields": ["{shop}", "beauty"], "geometry": ["point", "area"], "terms": ["spa", "salon", "tanning"], "tags": {"shop": "beauty"}, "name": "Beauty Shop"}, - "shop/beauty/nails": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["manicure", "pedicure"], "tags": {"shop": "beauty", "beauty": "nails"}, "reference": {"key": "shop", "value": "beauty"}, "name": "Nail Salon"}, + "shop/beauty/nails": {"icon": "temaki-polished_nail", "geometry": ["point", "area"], "terms": ["manicure", "pedicure"], "tags": {"shop": "beauty", "beauty": "nails"}, "reference": {"key": "shop", "value": "beauty"}, "name": "Nail Salon"}, "shop/beauty/tanning": {"icon": "temaki-tanning", "geometry": ["point", "area"], "tags": {"shop": "beauty", "beauty": "tanning"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "name": "Tanning Salon"}, "shop/bed": {"icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed"}, "name": "Bedding/Mattress Store"}, "shop/beverages": {"icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"shop": "beverages"}, "terms": ["drinks"], "name": "Beverage Store"}, @@ -1079,7 +1079,7 @@ "shop/cosmetics": {"icon": "temaki-lipstick", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"}, "shop/country_store": {"icon": "fas-hat-cowboy-side", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"}, "shop/craft": {"icon": "fas-cut", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts & Crafts Store"}, - "shop/curtain": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"}, + "shop/curtain": {"icon": "temaki-curtains", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"}, "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"}, "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"}, "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"}, @@ -1172,11 +1172,11 @@ "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"}, "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"}, "shop/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"}, - "shop/tattoo": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"}, + "shop/tattoo": {"icon": "temaki-tattoo_machine", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"}, "shop/tea": {"icon": "maki-teahouse", "geometry": ["point", "area"], "tags": {"shop": "tea"}, "name": "Tea Store"}, "shop/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "tags": {"shop": "telecommunication"}, "name": "Telecom Retail Store"}, "shop/ticket": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "ticket"}, "terms": ["box office"], "name": "Ticket Seller"}, - "shop/tiles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tiles"}, "name": "Tile Shop"}, + "shop/tiles": {"icon": "temaki-tiling", "geometry": ["point", "area"], "tags": {"shop": "tiles"}, "name": "Tile Shop"}, "shop/tobacco": {"icon": "temaki-pipe", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"}, "shop/tool_hire": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "tool_hire"}, "name": "Tool Rental"}, "shop/toys": {"icon": "fas-rocket", "geometry": ["point", "area"], "tags": {"shop": "toys"}, "terms": ["games"], "name": "Toy Store"}, @@ -1217,12 +1217,12 @@ "tourism/hostel": {"icon": "temaki-bunk_beds", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "terms": ["bunk beds", "dormitories", "dorms", "lodging", "overnight accommodations"], "name": "Hostel"}, "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "terms": ["concierge", "lodge", "lodging", "overnight accommodations"], "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, - "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, + "tourism/information/board": {"icon": "temaki-info_board", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"}, "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"}, "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"}, "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"}, - "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"}, + "tourism/information/terminal": {"icon": "temaki-app_terminal", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"}, "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"}, "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "museum", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, "tourism/museum/history": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["artifacts", "dioramas", "exhibits", "exhibitions", "foundation", "hall", "institution"], "tags": {"tourism": "museum", "museum": "history"}, "reference": {"key": "museum", "value": "history"}, "name": "History Museum"}, @@ -5879,7 +5879,7 @@ "shop/ticket/Boutique Grandes Lignes": {"name": "Boutique Grandes Lignes", "icon": "fas-ticket-alt", "imageURL": "https://graph.facebook.com/SNCFOFFICIEL/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q13646", "shop": "ticket"}, "addTags": {"brand": "Boutique Grandes Lignes", "brand:wikidata": "Q13646", "brand:wikipedia": "fr:Société nationale des chemins de fer français", "name": "Boutique Grandes Lignes", "shop": "ticket"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/ticket/DB Reisezentrum": {"name": "DB Reisezentrum", "icon": "fas-ticket-alt", "imageURL": "https://graph.facebook.com/348950735250586/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15842100", "shop": "ticket"}, "addTags": {"brand": "DB Reisezentrum", "brand:wikidata": "Q15842100", "brand:wikipedia": "de:Reisezentrum", "name": "DB Reisezentrum", "shop": "ticket"}, "countryCodes": ["de"], "terms": ["reisezentrum"], "matchScore": 2, "suggestion": true}, "shop/ticket/Guichet Transilien": {"name": "Guichet Transilien", "icon": "fas-ticket-alt", "imageURL": "https://pbs.twimg.com/profile_images/1187367754988429313/HmyF6sUy_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q389554", "shop": "ticket"}, "addTags": {"brand": "Guichet Transilien", "brand:wikidata": "Q389554", "brand:wikipedia": "fr:Transilien", "name": "Guichet Transilien", "shop": "ticket"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true}, - "shop/tiles/Topps Tiles": {"name": "Topps Tiles", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/toppstiles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17026595", "shop": "tiles"}, "addTags": {"brand": "Topps Tiles", "brand:wikidata": "Q17026595", "brand:wikipedia": "en:Topps Tiles", "name": "Topps Tiles", "shop": "tiles"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, + "shop/tiles/Topps Tiles": {"name": "Topps Tiles", "icon": "temaki-tiling", "imageURL": "https://graph.facebook.com/toppstiles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17026595", "shop": "tiles"}, "addTags": {"brand": "Topps Tiles", "brand:wikidata": "Q17026595", "brand:wikipedia": "en:Topps Tiles", "name": "Topps Tiles", "shop": "tiles"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/tobacco/Nemzeti Dohánybolt": {"name": "Nemzeti Dohánybolt", "icon": "temaki-pipe", "imageURL": "https://graph.facebook.com/195460840603881/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q20639040", "shop": "tobacco"}, "addTags": {"brand": "Nemzeti Dohánybolt", "brand:wikidata": "Q20639040", "brand:wikipedia": "en:Dohánybolt", "name": "Nemzeti Dohánybolt", "shop": "tobacco"}, "countryCodes": ["hu"], "terms": ["dohánybolt"], "matchScore": 2, "suggestion": true}, "shop/tool_hire/HSS Hire": {"name": "HSS Hire", "icon": "temaki-tools", "imageURL": "https://pbs.twimg.com/profile_images/1128980411504373760/yYZco9IU_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5636000", "shop": "tool_hire"}, "addTags": {"brand": "HSS Hire", "brand:wikidata": "Q5636000", "brand:wikipedia": "en:HSS Hire", "name": "HSS Hire", "shop": "tool_hire"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true}, "shop/toys/Build-A-Bear Workshop": {"name": "Build-A-Bear Workshop", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/Buildabear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1002992", "shop": "toys"}, "addTags": {"brand": "Build-A-Bear Workshop", "brand:wikidata": "Q1002992", "brand:wikipedia": "en:Build-A-Bear Workshop", "name": "Build-A-Bear Workshop", "shop": "toys"}, "countryCodes": ["ca", "gb", "us"], "terms": ["build a bear"], "matchScore": 2, "suggestion": true}, diff --git a/data/presets/presets/amenity/parking_space.json b/data/presets/presets/amenity/parking_space.json index 49346d5dd..5b4d979f0 100644 --- a/data/presets/presets/amenity/parking_space.json +++ b/data/presets/presets/amenity/parking_space.json @@ -1,4 +1,5 @@ { + "icon": "temaki-parking_space", "fields": [ "capacity" ], diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json index 01f330ee2..4cd166f37 100644 --- a/data/presets/presets/amenity/police.json +++ b/data/presets/presets/amenity/police.json @@ -1,5 +1,5 @@ { - "icon": "maki-police", + "icon": "temaki-police_officer", "fields": [ "name", "operator", diff --git a/data/presets/presets/barrier/border_control.json b/data/presets/presets/barrier/border_control.json index 18d77a2b3..9273de6f0 100644 --- a/data/presets/presets/barrier/border_control.json +++ b/data/presets/presets/barrier/border_control.json @@ -1,5 +1,5 @@ { - "icon": "maki-roadblock", + "icon": "temaki-passport_checkpoint", "fields": [ "access", "building_area" diff --git a/data/presets/presets/barrier/stile.json b/data/presets/presets/barrier/stile.json index ebf85e144..e5cce6a03 100644 --- a/data/presets/presets/barrier/stile.json +++ b/data/presets/presets/barrier/stile.json @@ -1,5 +1,5 @@ { - "icon": "maki-roadblock", + "icon": "temaki-stile_squeezer", "fields": [ "access", "stile", diff --git a/data/presets/presets/landuse/military/barracks.json b/data/presets/presets/landuse/military/barracks.json index 188890cf0..a93813902 100644 --- a/data/presets/presets/landuse/military/barracks.json +++ b/data/presets/presets/landuse/military/barracks.json @@ -1,5 +1,5 @@ { - "icon": "temaki-military", + "icon": "temaki-army_tent", "fields": [ "name", "building_area" diff --git a/data/presets/presets/man_made/observatory.json b/data/presets/presets/man_made/observatory.json index a0ba83d4d..6f8e323af 100644 --- a/data/presets/presets/man_made/observatory.json +++ b/data/presets/presets/man_made/observatory.json @@ -1,4 +1,5 @@ { + "icon": "temaki-telescope", "fields": [ "name", "operator", diff --git a/data/presets/presets/military/checkpoint.json b/data/presets/presets/military/checkpoint.json index 0aebb96fd..0678562f5 100644 --- a/data/presets/presets/military/checkpoint.json +++ b/data/presets/presets/military/checkpoint.json @@ -1,5 +1,5 @@ { - "icon": "maki-barrier", + "icon": "temaki-military_checkpoint", "fields": [ "name" ], @@ -22,5 +22,5 @@ "troop", "war" ], - "name": "Checkpoint" + "name": "Military Checkpoint" } diff --git a/data/presets/presets/shop/beauty/nails.json b/data/presets/presets/shop/beauty/nails.json index 8ca410525..8e5f4143d 100644 --- a/data/presets/presets/shop/beauty/nails.json +++ b/data/presets/presets/shop/beauty/nails.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "temaki-polished_nail", "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/curtain.json b/data/presets/presets/shop/curtain.json index ddc9eaec7..b7a6bc06d 100644 --- a/data/presets/presets/shop/curtain.json +++ b/data/presets/presets/shop/curtain.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "temaki-curtains", "geometry": [ "point", "area" diff --git a/data/presets/presets/shop/tattoo.json b/data/presets/presets/shop/tattoo.json index 64b0a6a82..cd9035439 100644 --- a/data/presets/presets/shop/tattoo.json +++ b/data/presets/presets/shop/tattoo.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "temaki-tattoo_machine", "moreFields": [ "{shop}", "min_age" diff --git a/data/presets/presets/shop/tiles.json b/data/presets/presets/shop/tiles.json index 0b190f874..c974f5e8f 100644 --- a/data/presets/presets/shop/tiles.json +++ b/data/presets/presets/shop/tiles.json @@ -1,5 +1,5 @@ { - "icon": "maki-shop", + "icon": "temaki-tiling", "geometry": [ "point", "area" diff --git a/data/presets/presets/tourism/information/board.json b/data/presets/presets/tourism/information/board.json index fd6dc3e16..1c1c3e7d1 100644 --- a/data/presets/presets/tourism/information/board.json +++ b/data/presets/presets/tourism/information/board.json @@ -1,5 +1,5 @@ { - "icon": "maki-information", + "icon": "temaki-info_board", "fields": [ "name", "operator", diff --git a/data/presets/presets/tourism/information/terminal.json b/data/presets/presets/tourism/information/terminal.json index 862f43b40..4b1f6f020 100644 --- a/data/presets/presets/tourism/information/terminal.json +++ b/data/presets/presets/tourism/information/terminal.json @@ -1,5 +1,5 @@ { - "icon": "maki-information", + "icon": "temaki-app_terminal", "fields": [ "operator" ], diff --git a/data/taginfo.json b/data/taginfo.json index 0b0d9acc8..8c5d5756b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -154,7 +154,7 @@ {"key": "amenity", "value": "music_school", "description": "🄿 Music School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"}, {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bar-15.svg"}, {"key": "amenity", "value": "parking_entrance", "description": "🄿 Parking Garage Entrance / Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, - {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["area", "node"]}, + {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/parking_space.svg"}, {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_parked.svg"}, {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/car_structure.svg"}, {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sign_and_car.svg"}, @@ -176,7 +176,7 @@ {"key": "religion", "value": "sikh", "description": "🄿 Sikh Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sikhism.svg"}, {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/taoism.svg"}, {"key": "amenity", "value": "planetarium", "description": "🄿 Planetarium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/globe-15.svg"}, - {"key": "amenity", "value": "police", "description": "🄿 Police", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/police-15.svg"}, + {"key": "amenity", "value": "police", "description": "🄿 Police", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/police_officer.svg"}, {"key": "amenity", "value": "polling_station", "description": "🄿 Permanent Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vote-yea.svg"}, {"key": "amenity", "value": "post_box", "description": "🄿 Mail Drop Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/post_box.svg"}, {"key": "amenity", "value": "post_depot", "description": "🄿 Post Sorting Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mail-bulk.svg"}, @@ -297,7 +297,7 @@ {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cube.svg"}, {"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bollard_row.svg"}, - {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, + {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/passport_checkpoint.svg"}, {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cattle_grid.svg"}, {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rope_fence.svg"}, {"key": "barrier", "value": "city_wall", "description": "🄿 City Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, @@ -319,7 +319,7 @@ {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"}, {"key": "barrier", "value": "spikes", "description": "🄿 Spike Strip", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/spike_strip.svg"}, - {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, + {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/stile_squeezer.svg"}, {"key": "barrier", "value": "swing_gate", "description": "🄿 Swing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gate.svg"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/turnstile.svg"}, @@ -608,7 +608,7 @@ {"key": "landuse", "value": "meadow", "description": "🄿 Meadow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, {"key": "landuse", "value": "military", "description": "🄿 Military Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "military", "value": "airfield", "description": "🄿 Military Airfield", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009265.svg"}, - {"key": "military", "value": "barracks", "description": "🄿 Barracks", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, + {"key": "military", "value": "barracks", "description": "🄿 Barracks", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/army_tent.svg"}, {"key": "military", "value": "danger_area", "description": "🄿 Danger Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"}, {"key": "military", "value": "naval_base", "description": "🄿 Naval Base", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "military", "value": "obstacle_course", "description": "🄿 Obstacle Course", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, @@ -738,7 +738,7 @@ {"key": "man_made", "value": "mineshaft", "description": "🄿 Mineshaft", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/mineshaft_cage.svg"}, {"key": "man_made", "value": "monitoring_station", "description": "🄿 Monitoring Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/antenna.svg"}, {"key": "man_made", "value": "obelisk", "description": "🄿 Obelisk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"}, - {"key": "man_made", "value": "observatory", "description": "🄿 Observatory", "object_types": ["node", "area"]}, + {"key": "man_made", "value": "observatory", "description": "🄿 Observatory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/telescope.svg"}, {"key": "man_made", "value": "petroleum_well", "description": "🄿 Oil Well", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/oil_well.svg"}, {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pier_fixed.svg"}, {"key": "floating", "value": "yes", "description": "🄿 Floating Pier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pier_floating.svg"}, @@ -773,7 +773,7 @@ {"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities, 🄵 Utility", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, {"key": "utility", "value": "power", "description": "🄿 Power Marker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"}, {"key": "military", "value": "bunker", "description": "🄿 Military Bunker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bunker.svg"}, - {"key": "military", "value": "checkpoint", "description": "🄿 Checkpoint", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, + {"key": "military", "value": "checkpoint", "description": "🄿 Military Checkpoint", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military_checkpoint.svg"}, {"key": "military", "value": "nuclear_explosion_site", "description": "🄿 Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"}, {"key": "military", "value": "office", "description": "🄿 Military Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, {"key": "military", "value": "trench", "description": "🄿 Military Trench", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/military.svg"}, @@ -990,7 +990,7 @@ {"key": "shop", "value": "bakery", "description": "🄿 Bakery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bakery-15.svg"}, {"key": "shop", "value": "bathroom_furnishing", "description": "🄿 Bathroom Furnishing Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bath.svg"}, {"key": "shop", "value": "beauty", "description": "🄿 Beauty Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/lipstick.svg"}, - {"key": "beauty", "value": "nails", "description": "🄿 Nail Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "beauty", "value": "nails", "description": "🄿 Nail Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/polished_nail.svg"}, {"key": "beauty", "value": "tanning", "description": "🄿 Tanning Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tanning.svg"}, {"key": "shop", "value": "bed", "description": "🄿 Bedding/Mattress Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, {"key": "shop", "value": "beverages", "description": "🄿 Beverage Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bottles.svg"}, @@ -1025,7 +1025,7 @@ {"key": "shop", "value": "cosmetics", "description": "🄿 Cosmetics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/lipstick.svg"}, {"key": "shop", "value": "country_store", "description": "🄿 Country Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hat-cowboy-side.svg"}, {"key": "shop", "value": "craft", "description": "🄿 Arts & Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cut.svg"}, - {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/curtains.svg"}, {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cheese.svg"}, {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, @@ -1117,11 +1117,11 @@ {"key": "shop", "value": "supermarket", "description": "🄿 Supermarket", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/grocery-15.svg"}, {"key": "shop", "value": "swimming_pool", "description": "🄿 Pool Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"}, {"key": "shop", "value": "tailor", "description": "🄿 Tailor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/needle_and_spool.svg"}, - {"key": "shop", "value": "tattoo", "description": "🄿 Tattoo Parlor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "shop", "value": "tattoo", "description": "🄿 Tattoo Parlor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tattoo_machine.svg"}, {"key": "shop", "value": "tea", "description": "🄿 Tea Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/teahouse-15.svg"}, {"key": "shop", "value": "telecommunication", "description": "🄿 Telecom Retail Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"}, {"key": "shop", "value": "ticket", "description": "🄿 Ticket Seller", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ticket-alt.svg"}, - {"key": "shop", "value": "tiles", "description": "🄿 Tile Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, + {"key": "shop", "value": "tiles", "description": "🄿 Tile Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tiling.svg"}, {"key": "shop", "value": "tobacco", "description": "🄿 Tobacco Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pipe.svg"}, {"key": "shop", "value": "tool_hire", "description": "🄿 Tool Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "shop", "value": "toys", "description": "🄿 Toy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-rocket.svg"}, @@ -1162,12 +1162,12 @@ {"key": "tourism", "value": "hostel", "description": "🄿 Hostel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bunk_beds.svg"}, {"key": "tourism", "value": "hotel", "description": "🄿 Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-concierge-bell.svg"}, {"key": "tourism", "value": "information", "description": "🄿 Information", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, - {"key": "information", "value": "board", "description": "🄿 Information Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, + {"key": "information", "value": "board", "description": "🄿 Information Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/info_board.svg"}, {"key": "information", "value": "guidepost", "description": "🄿 Guidepost", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-map-signs.svg"}, {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-map.svg"}, {"key": "information", "value": "office", "description": "🄿 Tourist Information Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, {"key": "information", "value": "route_marker", "description": "🄿 Trail Marker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, - {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, + {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/app_terminal.svg"}, {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, {"key": "museum", "value": "history", "description": "🄿 History Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 9d51e3561..d17a73dce 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8036,7 +8036,7 @@ "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war" }, "military/checkpoint": { - "name": "Checkpoint", + "name": "Military Checkpoint", "terms": "air force,army,base,force,guard,marine,navy,troop,war" }, "military/nuclear_explosion_site": { diff --git a/package.json b/package.json index fa6e9a7cb..08d67f5a9 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@fortawesome/free-brands-svg-icons": "~5.12.0", "@fortawesome/free-regular-svg-icons": "~5.12.0", "@fortawesome/free-solid-svg-icons": "~5.12.0", - "@ideditor/temaki": "~3.17.0", + "@ideditor/temaki": "~3.18.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "@rollup/plugin-commonjs": "^11.0.1",