From 2728f07c8480249fab6782079a61e63135cc909b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 28 Mar 2019 14:49:41 -0400 Subject: [PATCH] Use depreacted.json instead of preset replacement property for landuse water features --- data/deprecated.json | 12 ++++++++++++ data/presets/presets.json | 6 +++--- data/presets/presets/landuse/_basin.json | 3 +-- data/presets/presets/landuse/_pond.json | 3 +-- data/presets/presets/landuse/_reservoir.json | 3 +-- data/taginfo.json | 6 +++--- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index e4c008af9..dd5ddb8c9 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -247,6 +247,18 @@ "old": {"landuse": "field"}, "replace": {"landuse": "farmland"} }, + { + "old": {"landuse": "basin"}, + "replace": {"natural": "water", "water": "basin"} + }, + { + "old": {"landuse": "pond"}, + "replace": {"natural": "water", "water": "pond"} + }, + { + "old": {"landuse": "reservoir"}, + "replace": {"natural": "water", "water": "reservoir"} + }, { "old": {"landuse": "wood"}, "replace": {"natural": "wood"} diff --git a/data/presets/presets.json b/data/presets/presets.json index 5859e48d3..13d5a2d87 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -507,10 +507,10 @@ "junction/circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false}, "junction/jughandle": {"geometry": ["line"], "fields": ["name"], "tags": {"junction": "jughandle"}, "name": "Jughandle", "searchable": false}, "junction/roundabout": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "roundabout"}, "name": "Roundabout", "searchable": false}, - "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false, "replacement": "natural/water/basin"}, + "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false}, "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false}, - "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false, "replacement": "natural/water/pond"}, - "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false, "replacement": "natural/water/reservoir"}, + "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false}, + "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false}, "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, diff --git a/data/presets/presets/landuse/_basin.json b/data/presets/presets/landuse/_basin.json index 2e81f8436..dc9633786 100644 --- a/data/presets/presets/landuse/_basin.json +++ b/data/presets/presets/landuse/_basin.json @@ -12,6 +12,5 @@ "landuse": "basin" }, "name": "Basin", - "searchable": false, - "replacement": "natural/water/basin" + "searchable": false } diff --git a/data/presets/presets/landuse/_pond.json b/data/presets/presets/landuse/_pond.json index b890536a6..cf31f3794 100644 --- a/data/presets/presets/landuse/_pond.json +++ b/data/presets/presets/landuse/_pond.json @@ -11,6 +11,5 @@ "landuse": "pond" }, "name": "Pond", - "searchable": false, - "replacement": "natural/water/pond" + "searchable": false } diff --git a/data/presets/presets/landuse/_reservoir.json b/data/presets/presets/landuse/_reservoir.json index 915704ffd..c46c2adf8 100644 --- a/data/presets/presets/landuse/_reservoir.json +++ b/data/presets/presets/landuse/_reservoir.json @@ -11,6 +11,5 @@ "landuse": "reservoir" }, "name": "Reservoir", - "searchable": false, - "replacement": "natural/water/reservoir" + "searchable": false } diff --git a/data/taginfo.json b/data/taginfo.json index e72c32803..80692f5f4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -487,10 +487,10 @@ {"key": "junction", "value": "circular", "description": "🄿 Traffic Circle (unsearchable), 🄵 Junction", "object_types": ["node", "way"]}, {"key": "junction", "value": "jughandle", "description": "🄿 Jughandle (unsearchable), 🄵 Junction", "object_types": ["way"]}, {"key": "junction", "value": "roundabout", "description": "🄿 Roundabout (unsearchable), 🄵 Junction", "object_types": ["node", "way"]}, - {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable)", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, + {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable), 🄳 ➜ landuse=farmland", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true"}, - {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable)", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, - {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable)", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, + {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable), 🄳 ➜ natural=water + water=pond", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, + {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "landuse", "value": "allotments", "description": "🄿 Community Garden", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true"}, {"key": "landuse", "value": "aquaculture", "description": "🄿 Aquaculture", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/aquarium-15.svg?sanitize=true"}, {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"]},