diff --git a/data/presets.yaml b/data/presets.yaml index f68b8f65f..5bc77660b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5563,6 +5563,7 @@ en: natural/glacier: # natural=glacier name: Glacier + # 'terms: ice,snow' terms: '' natural/grassland: # natural=grassland diff --git a/data/presets/presets.json b/data/presets/presets.json index 8670b6b44..03530092e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -552,7 +552,7 @@ "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"}, "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"}, "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"}, - "landuse/farmland": {"icon": "maki-farm", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, + "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"}, "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"}, "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"}, @@ -577,7 +577,7 @@ "landuse/military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "office"}, "addTags": {"landuse": "military", "military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"}, "landuse/military/range": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "range"}, "addTags": {"landuse": "military", "military": "range"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Range"}, "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Training Area"}, - "landuse/orchard": {"icon": "maki-park-alt1", "fields": ["name", "operator", "trees"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"}, + "landuse/orchard": {"fields": ["name", "operator", "trees"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"}, "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"}, "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"}, "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"}, @@ -729,7 +729,7 @@ "natural/cliff": {"icon": "maki-triangle", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"}, "natural/coastline": {"geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"}, "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"}, - "natural/glacier": {"geometry": ["area"], "tags": {"natural": "glacier"}, "terms": [], "name": "Glacier"}, + "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"}, "natural/grassland": {"geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["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"}, diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json index a6e42ae4b..730a46e22 100644 --- a/data/presets/presets/landuse/farmland.json +++ b/data/presets/presets/landuse/farmland.json @@ -1,5 +1,5 @@ { - "icon": "maki-farm", + "icon": "fas-tractor", "fields": [ "name", "operator", diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json index 849317508..37c1d58e6 100644 --- a/data/presets/presets/landuse/orchard.json +++ b/data/presets/presets/landuse/orchard.json @@ -1,5 +1,4 @@ { - "icon": "maki-park-alt1", "fields": [ "name", "operator", diff --git a/data/presets/presets/natural/glacier.json b/data/presets/presets/natural/glacier.json index 19f5a7e27..859a027cf 100644 --- a/data/presets/presets/natural/glacier.json +++ b/data/presets/presets/natural/glacier.json @@ -1,10 +1,14 @@ { + "icon": "temaki-snow", "geometry": [ "area" ], "tags": { "natural": "glacier" }, - "terms": [], + "terms": [ + "ice", + "snow" + ], "name": "Glacier" } diff --git a/data/taginfo.json b/data/taginfo.json index 547c61b7b..f1fc0a6e4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -531,7 +531,7 @@ {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/religious-christian-15.svg?sanitize=true"}, {"key": "landuse", "value": "commercial", "description": "🄿 Commercial Area", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/suitcase-15.svg?sanitize=true"}, {"key": "landuse", "value": "construction", "description": "🄿 Construction", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, - {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true"}, + {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-tractor.svg?sanitize=true"}, {"key": "landuse", "value": "farmyard", "description": "🄿 Farmyard", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true"}, {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-alt1-15.svg?sanitize=true"}, {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-warehouse.svg?sanitize=true"}, @@ -555,7 +555,7 @@ {"key": "military", "value": "office", "description": "🄿 Military Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "range", "description": "🄿 Military Range", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, {"key": "military", "value": "training_area", "description": "🄿 Training Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"}, - {"key": "landuse", "value": "orchard", "description": "🄿 Orchard", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-alt1-15.svg?sanitize=true"}, + {"key": "landuse", "value": "orchard", "description": "🄿 Orchard", "object_types": ["area"]}, {"key": "landuse", "value": "plant_nursery", "description": "🄿 Plant Nursery", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-15.svg?sanitize=true"}, {"key": "landuse", "value": "quarry", "description": "🄿 Quarry", "object_types": ["area"]}, {"key": "landuse", "value": "railway", "description": "🄿 Railway Corridor", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, @@ -701,7 +701,7 @@ {"key": "natural", "value": "cliff", "description": "🄿 Cliff", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-15.svg?sanitize=true"}, {"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"]}, + {"key": "natural", "value": "glacier", "description": "🄿 Glacier", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/snow.svg?sanitize=true"}, {"key": "natural", "value": "grassland", "description": "🄿 Grassland", "object_types": ["area"]}, {"key": "natural", "value": "heath", "description": "🄿 Heath", "object_types": ["area"]}, {"key": "natural", "value": "mud", "description": "🄿 Mud", "object_types": ["area"]}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ca3bbd0e3..081983136 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7181,7 +7181,7 @@ }, "natural/glacier": { "name": "Glacier", - "terms": "" + "terms": "ice,snow" }, "natural/grassland": { "name": "Grassland",