Update temaki to v3.7.0 (close #7142)

Update icon for bunker presets (close #7139)
Update icon for Boat Store and Boatyard presets

data/presets/presets.json

@@ -328,7 +328,7 @@
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
     "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "gnis/feature_id", "layer", "not/name", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
-    "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
+    "building/bunker": {"icon": "temaki-bunker", "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
     "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
     "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
     "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
@@ -785,7 +785,7 @@
     "marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility_semi", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"},
     "marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{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-military", "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/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/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"},
@@ -1032,7 +1032,7 @@
     "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"},
     "shop/bicycle": {"icon": "maki-bicycle", "fields": ["{shop}", "service/bicycle"], "geometry": ["point", "area"], "terms": ["bike", "repair", "tricycle", "unicycle"], "tags": {"shop": "bicycle"}, "name": "Bicycle Shop"},
-    "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
+    "shop/boat": {"icon": "temaki-boat", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
     "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
     "shop/brewing_supplies": {"icon": "temaki-storage_fermenter", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"},
@@ -1260,7 +1260,7 @@
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
-    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
+    "waterway/boatyard": {"icon": "temaki-boat", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["gnis/feature_id", "intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
     "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "gnis/feature_id", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
@@ -3578,7 +3578,7 @@
     "shop/bicycle/Giant": {"name": "Giant", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/giantbicycles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q703557", "shop": "bicycle"}, "addTags": {"brand": "Giant", "brand:wikidata": "Q703557", "brand:wikipedia": "en:Giant Bicycles", "name": "Giant", "shop": "bicycle"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bicycle/Trek": {"name": "Trek", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/TrekBicycle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1067617", "shop": "bicycle"}, "addTags": {"alt_name": "Trek Bicycle Store", "brand": "Trek", "brand:wikidata": "Q1067617", "brand:wikipedia": "en:Trek Bicycle Corporation", "name": "Trek", "shop": "bicycle"}, "terms": ["treck", "trek bicycle"], "matchScore": 2, "suggestion": true},
     "shop/bicycle/サイクルベースあさひ": {"name": "サイクルベースあさひ", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/cbasahi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11257202", "shop": "bicycle"}, "addTags": {"brand": "サイクルベースあさひ", "brand:en": "Cycle Base Asahi", "brand:ja": "サイクルベースあさひ", "brand:wikidata": "Q11257202", "brand:wikipedia": "ja:あさひ (企業)", "name": "サイクルベースあさひ", "name:en": "Cycle Base Asahi", "name:ja": "サイクルベースあさひ", "shop": "bicycle"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/boat/West Marine": {"name": "West Marine", "icon": "temaki-boating", "imageURL": "https://graph.facebook.com/WestMarine/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7985852", "shop": "boat"}, "addTags": {"brand": "West Marine", "brand:wikidata": "Q7985852", "brand:wikipedia": "en:West Marine", "name": "West Marine", "shop": "boat"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/boat/West Marine": {"name": "West Marine", "icon": "temaki-boat", "imageURL": "https://graph.facebook.com/WestMarine/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7985852", "shop": "boat"}, "addTags": {"brand": "West Marine", "brand:wikidata": "Q7985852", "brand:wikipedia": "en:West Marine", "name": "West Marine", "shop": "boat"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bookmaker/Betfred": {"name": "Betfred", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1034363254758359041/dxetDfNN_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4897425", "shop": "bookmaker"}, "addTags": {"brand": "Betfred", "brand:wikidata": "Q4897425", "brand:wikipedia": "en:Betfred", "name": "Betfred", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bookmaker/Coral": {"name": "Coral", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1000461740772134913/T9-zMXmF_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q54621344", "shop": "bookmaker"}, "addTags": {"brand": "Coral", "brand:wikidata": "Q54621344", "brand:wikipedia": "en:Coral (bookmaker)", "name": "Coral", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bookmaker/Fortuna": {"name": "Fortuna", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/703606549739592/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q25857973", "shop": "bookmaker"}, "addTags": {"brand": "Fortuna", "brand:wikidata": "Q25857973", "brand:wikipedia": "en:Fortuna Entertainment Group", "name": "Fortuna", "shop": "bookmaker"}, "countryCodes": ["cz", "hr", "pl", "ro", "sk"], "terms": [], "matchScore": 2, "suggestion": true},

data/presets/presets/building/_bunker.json

@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-bunker",
     "geometry": [
         "area"
     ],

data/presets/presets/military/bunker.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-military",
+    "icon": "temaki-bunker",
     "fields": [
         "name",
         "bunker_type",

data/presets/presets/shop/boat.json

@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-boating",
+    "icon": "temaki-boat",
     "geometry": [
         "point",
         "area"

data/presets/presets/waterway/boatyard.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-harbor",
+    "icon": "temaki-boat",
     "fields": [
         "name",
         "operator"

data/taginfo.json

@@ -323,7 +323,7 @@
     {"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"},
     {"key": "bridge:support", "value": "pier", "description": "🄿 Bridge Pier", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"},
     {"key": "building:part", "description": "🄿 Building Part", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
-    {"key": "building", "value": "bunker", "description": "🄿 Bunker (unsearchable)", "object_types": ["area"]},
+    {"key": "building", "value": "bunker", "description": "🄿 Bunker (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bunker.svg"},
     {"key": "building", "value": "entrance", "description": "🄿 Entrance/Exit (unsearchable), 🄳 ➜ entrance=*", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "building", "value": "train_station", "description": "🄿 Train Station Building (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "apartments", "description": "🄿 Apartment Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
@@ -760,7 +760,7 @@
     {"key": "marker", "description": "🄿 Marker, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/silo.svg"},
     {"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities", "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/military.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": "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"},
@@ -976,7 +976,7 @@
     {"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"},
     {"key": "shop", "value": "bicycle", "description": "🄿 Bicycle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "shop", "value": "boat", "description": "🄿 Boat Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boating.svg"},
+    {"key": "shop", "value": "boat", "description": "🄿 Boat Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boat.svg"},
     {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/money_hand.svg"},
     {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-book.svg"},
     {"key": "shop", "value": "brewing_supplies", "description": "🄿 Brewing Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"},
@@ -1197,7 +1197,7 @@
     {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"},
     {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
-    {"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
+    {"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boat.svg"},
     {"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "lock", "value": "yes", "description": "🄿 Canal Lock", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "waterway", "value": "dam", "description": "🄿 Dam", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"},

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.6.0",
+    "@ideditor/temaki": "~3.7.0",
     "@mapbox/maki": "^6.0.0",
     "@rollup/plugin-buble": "^0.20.0",
     "chai": "^4.1.0",