From 1020d04acf67e7cf991b0ac53c7e640e168a0745 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 17 Dec 2019 13:09:38 -0500 Subject: [PATCH] Update temaki to 3.6.0 --- data/presets/presets.json | 8 ++++---- data/presets/presets/seamark/buoy_lateral.json | 1 + data/presets/presets/seamark/buoy_lateral/green.json | 1 + data/presets/presets/seamark/buoy_lateral/red.json | 1 + data/presets/presets/seamark/mooring.json | 1 + data/taginfo.json | 8 ++++---- package.json | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 3befb9d27..fc4b3a5ce 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1006,10 +1006,10 @@ "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"}, "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"}, - "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, - "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, - "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, - "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, + "seamark/buoy_lateral": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, + "seamark/buoy_lateral/green": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, + "seamark/buoy_lateral/red": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, + "seamark/mooring": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "ref/vatin", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"}, "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"}, diff --git a/data/presets/presets/seamark/buoy_lateral.json b/data/presets/presets/seamark/buoy_lateral.json index 26f44e2ce..cc9294e99 100644 --- a/data/presets/presets/seamark/buoy_lateral.json +++ b/data/presets/presets/seamark/buoy_lateral.json @@ -1,4 +1,5 @@ { + "icon": "temaki-buoy", "fields": [ "ref", "operator", diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json index 857ae3046..0f0a43d6f 100644 --- a/data/presets/presets/seamark/buoy_lateral/green.json +++ b/data/presets/presets/seamark/buoy_lateral/green.json @@ -1,4 +1,5 @@ { + "icon": "temaki-buoy", "geometry": [ "point", "vertex" diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json index 431ff7266..7f7b91654 100644 --- a/data/presets/presets/seamark/buoy_lateral/red.json +++ b/data/presets/presets/seamark/buoy_lateral/red.json @@ -1,4 +1,5 @@ { + "icon": "temaki-buoy", "geometry": [ "point", "vertex" diff --git a/data/presets/presets/seamark/mooring.json b/data/presets/presets/seamark/mooring.json index 247015bf3..f96de26d0 100644 --- a/data/presets/presets/seamark/mooring.json +++ b/data/presets/presets/seamark/mooring.json @@ -1,4 +1,5 @@ { + "icon": "temaki-buoy", "fields": [ "ref", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index fe1096c82..db65123ce 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -950,10 +950,10 @@ {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"}, {"key": "seamark:type", "value": "beacon_isolated_danger", "description": "🄿 Danger Beacon", "object_types": ["node"]}, {"key": "seamark:type", "value": "beacon_lateral", "description": "🄿 Channel Beacon", "object_types": ["node"]}, - {"key": "seamark:type", "value": "buoy_lateral", "description": "🄿 Channel Buoy", "object_types": ["node"]}, - {"key": "seamark:buoy_lateral:colour", "value": "green", "description": "🄿 Green Buoy, 🄵 Color", "object_types": ["node"]}, - {"key": "seamark:buoy_lateral:colour", "value": "red", "description": "🄿 Red Buoy, 🄵 Color", "object_types": ["node"]}, - {"key": "seamark:type", "value": "mooring", "description": "🄿 Mooring", "object_types": ["node"]}, + {"key": "seamark:type", "value": "buoy_lateral", "description": "🄿 Channel Buoy", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buoy.svg"}, + {"key": "seamark:buoy_lateral:colour", "value": "green", "description": "🄿 Green Buoy, 🄵 Color", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buoy.svg"}, + {"key": "seamark:buoy_lateral:colour", "value": "red", "description": "🄿 Red Buoy, 🄵 Color", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buoy.svg"}, + {"key": "seamark:type", "value": "mooring", "description": "🄿 Mooring", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/buoy.svg"}, {"key": "shop", "description": "🄿 Shop, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "boutique", "description": "🄿 Boutique (unsearchable), 🄳 ➜ shop=clothes", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"}, {"key": "shop", "value": "fashion", "description": "🄿 Fashion Store (unsearchable), 🄳 ➜ shop=clothes", "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 c26216036..c0ec75ee0 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.5.0", + "@ideditor/temaki": "~3.6.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0",