diff --git a/data/presets/presets.json b/data/presets/presets.json index c33babc3c..9b36277a6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -401,7 +401,7 @@ "craft/clockmaker": {"icon": "temaki-clock", "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"}, "craft/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"}, "craft/distillery": {"icon": "temaki-storage_fermenter", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"}, - "craft/dressmaker": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"}, + "craft/dressmaker": {"icon": "temaki-dress", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"}, "craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"}, "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"}, "craft/floorer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "floorer"}, "name": "Floorer"}, @@ -782,7 +782,7 @@ "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"}, "man_made/water_tap": {"icon": "maki-drinking-water", "fields": ["ref", "operator", "drinking_water", "access_simple"], "geometry": ["point", "vertex"], "tags": {"man_made": "water_tap"}, "terms": ["drinking water", "water faucet", "water point", "water source", "water spigot"], "name": "Water Tap"}, "man_made/water_tower": {"icon": "temaki-water_tower", "fields": ["operator", "height"], "moreFields": ["gnis/feature_id"], "geometry": ["area", "point"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"}, - "man_made/water_well": {"icon": "maki-water", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"}, + "man_made/water_well": {"icon": "temaki-well_pump_manual", "fields": ["ref", "operator", "drinking_water", "pump", "access_simple"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "terms": ["aquifer", "drinking water", "water point", "water source"], "name": "Water Well"}, "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"}, "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"}, "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"}, diff --git a/data/presets/presets/craft/dressmaker.json b/data/presets/presets/craft/dressmaker.json index 7222c427c..171043328 100644 --- a/data/presets/presets/craft/dressmaker.json +++ b/data/presets/presets/craft/dressmaker.json @@ -1,5 +1,5 @@ { - "icon": "maki-clothing-store", + "icon": "temaki-dress", "geometry": [ "point", "area" diff --git a/data/presets/presets/man_made/water_well.json b/data/presets/presets/man_made/water_well.json index 7d713261e..14377d492 100644 --- a/data/presets/presets/man_made/water_well.json +++ b/data/presets/presets/man_made/water_well.json @@ -1,5 +1,5 @@ { - "icon": "maki-water", + "icon": "temaki-well_pump_manual", "fields": [ "ref", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index a28686ddb..23a6a34e2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -396,7 +396,7 @@ {"key": "craft", "value": "clockmaker", "description": "🄿 Clockmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/clock.svg"}, {"key": "craft", "value": "confectionery", "description": "🄿 Candy Maker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/confectionery-15.svg"}, {"key": "craft", "value": "distillery", "description": "🄿 Distillery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_fermenter.svg"}, - {"key": "craft", "value": "dressmaker", "description": "🄿 Dressmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"}, + {"key": "craft", "value": "dressmaker", "description": "🄿 Dressmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/dress.svg"}, {"key": "craft", "value": "electrician", "description": "🄿 Electrician", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, {"key": "craft", "value": "electronics_repair", "description": "🄿 Electronics Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, {"key": "craft", "value": "floorer", "description": "🄿 Floorer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tools.svg"}, @@ -757,7 +757,7 @@ {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/waste.svg"}, {"key": "man_made", "value": "water_tap", "description": "🄿 Water Tap", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"}, {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/water_tower.svg"}, - {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, + {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/well_pump_manual.svg"}, {"key": "man_made", "value": "water_works", "description": "🄿 Water Works", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"}, {"key": "man_made", "value": "windmill", "description": "🄿 Windmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/windmill-15.svg"}, diff --git a/package.json b/package.json index fa4dd363a..c8185f28a 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.8.0", + "@ideditor/temaki": "~3.9.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "chai": "^4.1.0",