From f9891538f26b29dbc3f42170376d396612a05fed Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 12 Dec 2019 11:50:12 -0500 Subject: [PATCH] Update to temaki v3.5.0 --- data/presets/presets.json | 6 +++--- data/presets/presets/landuse/grass.json | 1 + data/presets/presets/natural/grassland.json | 1 + data/presets/presets/tourism/artwork/statue.json | 2 +- data/taginfo.json | 6 +++--- package.json | 2 +- svg/fontawesome/fas-female.svg | 1 - 7 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 svg/fontawesome/fas-female.svg diff --git a/data/presets/presets.json b/data/presets/presets.json index 1bd556487..96d3adffc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -602,7 +602,7 @@ "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"}, "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["boreal", "cut", "forest", "forestry", "forrest", "lumber", "silviculture", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Managed Forest"}, "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"}, - "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": ["field", "green", "lawn", "managed grass", "mown grass", "turf"], "name": "Grass"}, + "landuse/grass": {"icon": "temaki-lawn", "geometry": ["area"], "tags": {"landuse": "grass"}, "terms": ["field", "green", "lawn", "managed grass", "mown grass", "turf"], "name": "Grass"}, "landuse/greenfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"}, "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"}, "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"}, @@ -798,7 +798,7 @@ "natural/coastline": {"geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"}, "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"}, "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"}, - "natural/grassland": {"geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"}, + "natural/grassland": {"icon": "temaki-grass", "geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"}, "natural/heath": {"geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"}, "natural/mud": {"geometry": ["area"], "tags": {"natural": "mud"}, "terms": ["wetland"], "name": "Mud"}, "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"}, @@ -1178,7 +1178,7 @@ "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"}, "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"}, "tourism/artwork/sculpture": {"icon": "temaki-sculpture", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"}, - "tourism/artwork/statue": {"icon": "fas-female", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"}, + "tourism/artwork/statue": {"icon": "temaki-statue", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"}, "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"}, "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"}, "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "power_supply", "ref/vatin", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"}, diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json index b8964772b..bc18a3d03 100644 --- a/data/presets/presets/landuse/grass.json +++ b/data/presets/presets/landuse/grass.json @@ -1,4 +1,5 @@ { + "icon": "temaki-lawn", "geometry": [ "area" ], diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json index 24addf880..384f4a23f 100644 --- a/data/presets/presets/natural/grassland.json +++ b/data/presets/presets/natural/grassland.json @@ -1,4 +1,5 @@ { + "icon": "temaki-grass", "geometry": [ "area" ], diff --git a/data/presets/presets/tourism/artwork/statue.json b/data/presets/presets/tourism/artwork/statue.json index e81f198e2..52fd78774 100644 --- a/data/presets/presets/tourism/artwork/statue.json +++ b/data/presets/presets/tourism/artwork/statue.json @@ -1,5 +1,5 @@ { - "icon": "fas-female", + "icon": "temaki-statue", "fields": [ "name", "artist", diff --git a/data/taginfo.json b/data/taginfo.json index b1e4d54c0..ba2bb8ab7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -584,7 +584,7 @@ {"key": "landuse", "value": "flowerbed", "description": "🄿 Flowerbed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"}, {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, - {"key": "landuse", "value": "grass", "description": "🄿 Grass", "object_types": ["area"]}, + {"key": "landuse", "value": "grass", "description": "🄿 Grass", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/lawn.svg"}, {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"}, {"key": "landuse", "value": "greenhouse_horticulture", "description": "🄿 Greenhouse Horticulture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"}, {"key": "landuse", "value": "harbour", "description": "🄿 Harbor", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"}, @@ -773,7 +773,7 @@ {"key": "natural", "value": "coastline", "description": "🄿 Coastline", "object_types": ["way"]}, {"key": "natural", "value": "fell", "description": "🄿 Fell", "object_types": ["area"]}, {"key": "natural", "value": "glacier", "description": "🄿 Glacier", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/snow.svg"}, - {"key": "natural", "value": "grassland", "description": "🄿 Grassland", "object_types": ["area"]}, + {"key": "natural", "value": "grassland", "description": "🄿 Grassland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/grass.svg"}, {"key": "natural", "value": "heath", "description": "🄿 Heath", "object_types": ["area"]}, {"key": "natural", "value": "mud", "description": "🄿 Mud", "object_types": ["area"]}, {"key": "natural", "value": "peak", "description": "🄿 Peak", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/mountain-15.svg"}, @@ -1121,7 +1121,7 @@ {"key": "artwork_type", "value": "installation", "description": "🄿 Art Installation", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sculpture.svg"}, {"key": "artwork_type", "value": "mural", "description": "🄿 Mural", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"}, {"key": "artwork_type", "value": "sculpture", "description": "🄿 Sculpture", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/sculpture.svg"}, - {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-female.svg"}, + {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/statue.svg"}, {"key": "tourism", "value": "attraction", "description": "🄿 Tourist Attraction", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/star-15.svg"}, {"key": "tourism", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"}, {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"}, diff --git a/package.json b/package.json index 1046d9180..c26216036 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.4.0", + "@ideditor/temaki": "~3.5.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0", diff --git a/svg/fontawesome/fas-female.svg b/svg/fontawesome/fas-female.svg deleted file mode 100644 index 2542a04cb..000000000 --- a/svg/fontawesome/fas-female.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file