From 11c45a1c216dc31b055b0db9d31c49d574987f5a Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 31 Dec 2019 12:24:44 -0500 Subject: [PATCH] Make the Churchyard preset unsearchable (re: #7187) --- data/presets.yaml | 1 - data/presets/presets.json | 2 +- .../landuse/{churchyard.json => _churchyard.json} | 11 +++-------- data/taginfo.json | 2 +- dist/locales/en.json | 7 +++---- 5 files changed, 8 insertions(+), 15 deletions(-) rename data/presets/presets/landuse/{churchyard.json => _churchyard.json} (61%) diff --git a/data/presets.yaml b/data/presets.yaml index 91a2ec757..7abaa5c6c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5351,7 +5351,6 @@ en: landuse/churchyard: # landuse=churchyard name: Churchyard - terms: '' landuse/commercial: # landuse=commercial name: Commercial Area diff --git a/data/presets/presets.json b/data/presets/presets.json index d989c544a..3bb456b06 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -590,6 +590,7 @@ "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false}, + "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["{landuse/religious}"], "moreFields": ["{landuse/religious}"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "searchable": false, "name": "Churchyard"}, "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}, "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false}, @@ -597,7 +598,6 @@ "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, "landuse/brownfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"}, - "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"}, "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"}, "landuse/construction": {"icon": "temaki-bulldozer", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": ["building", "bulldozer", "construction site", "construction zone", "crane", "demolition", "development", "infrastructure"], "name": "Construction Area"}, "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"}, diff --git a/data/presets/presets/landuse/churchyard.json b/data/presets/presets/landuse/_churchyard.json similarity index 61% rename from data/presets/presets/landuse/churchyard.json rename to data/presets/presets/landuse/_churchyard.json index 1341d70e3..9f3dcf550 100644 --- a/data/presets/presets/landuse/churchyard.json +++ b/data/presets/presets/landuse/_churchyard.json @@ -1,16 +1,10 @@ { "icon": "maki-religious-christian", "fields": [ - "name", - "religion", - "denomination" + "{landuse/religious}" ], "moreFields": [ - "address", - "email", - "fax", - "phone", - "website" + "{landuse/religious}" ], "geometry": [ "area" @@ -19,5 +13,6 @@ "landuse": "churchyard" }, "terms": [], + "searchable": false, "name": "Churchyard" } diff --git a/data/taginfo.json b/data/taginfo.json index c7fef39a2..103e791fc 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -572,6 +572,7 @@ {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"}, {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"}, {"key": "landuse", "value": "basin", "description": "🄿 Basin (unsearchable), 🄳 ➜ natural=water + water=basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, + {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard (unsearchable)", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"}, {"key": "landuse", "value": "farm", "description": "🄿 Farmland (unsearchable), 🄳 ➜ landuse=farmland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"}, {"key": "landuse", "value": "pond", "description": "🄿 Pond (unsearchable), 🄳 ➜ natural=water + water=pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, @@ -579,7 +580,6 @@ {"key": "landuse", "value": "aquaculture", "description": "🄿 Aquaculture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"}, {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"}, {"key": "landuse", "value": "cemetery", "description": "🄿 Cemetery", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, - {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"}, {"key": "landuse", "value": "commercial", "description": "🄿 Commercial Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "landuse", "value": "construction", "description": "🄿 Construction Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bulldozer.svg"}, {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tractor.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e26d896c1..c4f9a9ea2 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7143,6 +7143,9 @@ "landuse/basin": { "name": "Basin" }, + "landuse/churchyard": { + "name": "Churchyard" + }, "landuse/farm": { "name": "Farmland" }, @@ -7168,10 +7171,6 @@ "name": "Cemetery", "terms": "" }, - "landuse/churchyard": { - "name": "Churchyard", - "terms": "" - }, "landuse/commercial": { "name": "Commercial Area", "terms": ""