diff --git a/data/presets.yaml b/data/presets.yaml index 341e988c8..4f44b089e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3448,7 +3448,6 @@ en: embankment: # embankment=yes name: Embankment - terms: '' emergency/ambulance_station: # emergency=ambulance_station name: Ambulance Station @@ -4563,6 +4562,7 @@ en: man_made/embankment: # man_made=embankment name: Embankment + terms: '' man_made/flagpole: # man_made=flagpole name: Flagpole diff --git a/data/presets/presets.json b/data/presets/presets.json index 4bba9b97d..765ddc49d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -4,6 +4,7 @@ "aeroway": {"icon": "maki-airport", "fields": ["aeroway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"aeroway": "*"}, "searchable": false, "name": "Aeroway"}, "amenity": {"fields": ["amenity"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "*"}, "searchable": false, "name": "Amenity"}, "circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false}, + "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false}, "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway"}, "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"}, "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "searchable": false, "name": "Power"}, @@ -320,7 +321,6 @@ "craft/watchmaker": {"icon": "temaki-clock", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "watchmaker"}, "name": "Watchmaker"}, "craft/window_construction": {"icon": "temaki-window", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["glass"], "tags": {"craft": "window_construction"}, "name": "Window Construction"}, "craft/winery": {"icon": "maki-alcohol-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"craft": "winery"}, "name": "Winery"}, - "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2}, "emergency/designated": {"fields": [], "geometry": ["line"], "tags": {"emergency": "designated"}, "terms": [], "name": "Emergency Access Designated", "searchable": false, "matchScore": 0.01}, "emergency/destination": {"fields": [], "geometry": ["line"], "tags": {"emergency": "destination"}, "terms": [], "name": "Emergency Access Destination", "searchable": false, "matchScore": 0.01}, "emergency/no": {"fields": [], "geometry": ["line"], "tags": {"emergency": "no"}, "terms": [], "name": "Emergency Access No", "searchable": false, "matchScore": 0.01}, @@ -554,7 +554,6 @@ "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"}, "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1}, "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "name": "Man Made"}, - "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment", "searchable": false}, "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["operator", "direction"], "terms": ["entrance", "underground", "mine", "cave"], "tags": {"man_made": "adit"}, "name": "Adit"}, "man_made/antenna": {"icon": "temaki-antenna", "fields": ["height", "communication_multi"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"}, "man_made/breakwater": {"geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"}, @@ -564,6 +563,7 @@ "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"}, "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"}, + "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"}, "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"}, "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, diff --git a/data/presets/presets/embankment.json b/data/presets/presets/_embankment.json similarity index 71% rename from data/presets/presets/embankment.json rename to data/presets/presets/_embankment.json index 3d07b0cf5..52b3a1f5e 100644 --- a/data/presets/presets/embankment.json +++ b/data/presets/presets/_embankment.json @@ -6,5 +6,6 @@ "embankment": "yes" }, "name": "Embankment", - "matchScore": 0.2 + "matchScore": 0.2, + "searchable": false } diff --git a/data/presets/presets/man_made/_embankment.json b/data/presets/presets/man_made/embankment.json similarity index 66% rename from data/presets/presets/man_made/_embankment.json rename to data/presets/presets/man_made/embankment.json index 26480f908..c4a7bd91b 100644 --- a/data/presets/presets/man_made/_embankment.json +++ b/data/presets/presets/man_made/embankment.json @@ -5,6 +5,5 @@ "tags": { "man_made": "embankment" }, - "name": "Embankment", - "searchable": false + "name": "Embankment" } diff --git a/data/taginfo.json b/data/taginfo.json index 2743fbc68..575bed298 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -32,6 +32,12 @@ "description": "Traffic Circle", "object_types": ["node", "way"] }, + { + "key": "embankment", + "value": "yes", + "description": "Embankment", + "object_types": ["way"] + }, { "key": "highway", "description": "Highway, Type", @@ -2192,12 +2198,6 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/alcohol-shop-15.svg?sanitize=true" }, - { - "key": "embankment", - "value": "yes", - "description": "Embankment", - "object_types": ["way"] - }, { "key": "emergency", "value": "designated", @@ -3707,12 +3707,6 @@ "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true" }, - { - "key": "man_made", - "value": "embankment", - "description": "Embankment", - "object_types": ["way"] - }, { "key": "man_made", "value": "adit", @@ -3775,6 +3769,12 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true" }, + { + "key": "man_made", + "value": "embankment", + "description": "Embankment", + "object_types": ["way"] + }, { "key": "man_made", "value": "flagpole", diff --git a/dist/locales/en.json b/dist/locales/en.json index ea25622ca..485703619 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3192,6 +3192,10 @@ "name": "Traffic Circle", "terms": "" }, + "embankment": { + "name": "Embankment", + "terms": "" + }, "highway": { "name": "Highway", "terms": "" @@ -4456,10 +4460,6 @@ "name": "Winery", "terms": "" }, - "embankment": { - "name": "Embankment", - "terms": "" - }, "emergency/designated": { "name": "Emergency Access Designated", "terms": "" @@ -5392,10 +5392,6 @@ "name": "Man Made", "terms": "" }, - "man_made/embankment": { - "name": "Embankment", - "terms": "" - }, "man_made/adit": { "name": "Adit", "terms": "entrance,underground,mine,cave" @@ -5432,6 +5428,10 @@ "name": "Cut line", "terms": "" }, + "man_made/embankment": { + "name": "Embankment", + "terms": "" + }, "man_made/flagpole": { "name": "Flagpole", "terms": "" @@ -7341,9 +7341,6 @@ "SPW_PICC": { "name": "SPW(allonie) PICC numerical imagery" }, - "US-TIGER-Roads-2012": { - "name": "TIGER Roads 2012" - }, "US-TIGER-Roads-2014": { "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap", "name": "TIGER Roads 2014" @@ -7352,6 +7349,10 @@ "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", "name": "TIGER Roads 2017" }, + "US-TIGER-Roads-2018": { + "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap", + "name": "TIGER Roads 2018" + }, "US_Forest_Service_roads_overlay": { "description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars", "name": "U.S. Forest Roads Overlay"