From becc087a91c08d21a14ff6d6ec3be9a135be2d19 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 15 Jan 2019 10:53:35 -0500 Subject: [PATCH 1/3] Moved the seamark/type field from a universal field to the fields or moreFields properties of relevant presets --- data/presets/fields.json | 2 +- data/presets/fields/seamark/type.json | 1 - data/presets/presets.json | 24 +++++++++---------- data/presets/presets/bridge/support.json | 3 +++ data/presets/presets/bridge/support/pier.json | 3 +++ data/presets/presets/historic/wreck.json | 3 +++ data/presets/presets/leisure/marina.json | 7 +++--- data/presets/presets/leisure/slipway.json | 3 +++ data/presets/presets/man_made/bridge.json | 3 +++ .../seamark/beacon_isolated_danger.json | 3 ++- .../presets/seamark/beacon_lateral.json | 3 ++- .../presets/presets/seamark/buoy_lateral.json | 3 ++- .../presets/seamark/buoy_lateral/green.json | 3 ++- .../presets/seamark/buoy_lateral/red.json | 3 ++- data/presets/presets/seamark/mooring.json | 3 ++- 15 files changed, 44 insertions(+), 23 deletions(-) diff --git a/data/presets/fields.json b/data/presets/fields.json index ef9748a48..3853c3b66 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -268,7 +268,7 @@ "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"}, "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}}, "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"}, - "seamark/type": {"key": "seamark:type", "type": "combo", "universal": true, "label": "Seamark"}, + "seamark/type": {"key": "seamark:type", "type": "combo", "label": "Seamark"}, "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"}, "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"}, "seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."}, diff --git a/data/presets/fields/seamark/type.json b/data/presets/fields/seamark/type.json index 1ee2a64bd..dd769ea2c 100644 --- a/data/presets/fields/seamark/type.json +++ b/data/presets/fields/seamark/type.json @@ -1,6 +1,5 @@ { "key": "seamark:type", "type": "combo", - "universal": true, "label": "Seamark" } diff --git a/data/presets/presets.json b/data/presets/presets.json index 38a221eab..82ce79572 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -248,8 +248,8 @@ "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]}, - "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, - "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, + "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, + "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, "building/bunker": {"fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false}, "building/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false}, @@ -469,7 +469,7 @@ "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"}, "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"}, "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"}, - "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "removeTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"}, + "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "removeTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"}, "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "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": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"}, @@ -552,7 +552,7 @@ "leisure/hackerspace": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "website"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"}, "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"}, "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building", "opening_hours"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"}, - "leisure/marina": {"icon": "maki-harbor", "fields": ["name", "operator", "address", "capacity", "fee", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["internet_access/ssid"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"}, + "leisure/marina": {"icon": "maki-harbor", "fields": ["name", "operator", "address", "capacity", "fee", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["internet_access/fee", "internet_access/ssid", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"}, "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"}, "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"}, "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"}, @@ -581,7 +581,7 @@ "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "playground/max_age", "playground/min_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"}, "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "name": "Resort"}, "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"}, - "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "access_simple", "fee"], "geometry": ["point", "vertex", "line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, + "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "access_simple", "fee"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"}, "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"}, "leisure/sports_centre/swimming": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"}, "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, @@ -595,7 +595,7 @@ "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"}, - "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"}, + "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"}, "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"}, "man_made/chimney": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"}, @@ -829,12 +829,12 @@ "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "tags": {"route": "ferry"}, "name": "Ferry Route"}, - "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, - "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"}, - "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, - "seamark/buoy_lateral/green": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, - "seamark/buoy_lateral/red": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, - "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, + "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, + "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"}, + "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, + "seamark/buoy_lateral/green": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, + "seamark/buoy_lateral/red": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, + "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, "shop/fishmonger": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false}, "shop/furnace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false}, diff --git a/data/presets/presets/bridge/support.json b/data/presets/presets/bridge/support.json index 464badee1..029ff39a6 100644 --- a/data/presets/presets/bridge/support.json +++ b/data/presets/presets/bridge/support.json @@ -3,6 +3,9 @@ "fields": [ "bridge/support" ], + "moreFields": [ + "seamark/type" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/bridge/support/pier.json b/data/presets/presets/bridge/support/pier.json index 194027440..f24bab603 100644 --- a/data/presets/presets/bridge/support/pier.json +++ b/data/presets/presets/bridge/support/pier.json @@ -3,6 +3,9 @@ "fields": [ "bridge/support" ], + "moreFields": [ + "seamark/type" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/historic/wreck.json b/data/presets/presets/historic/wreck.json index 3038b2a94..17bf227bb 100644 --- a/data/presets/presets/historic/wreck.json +++ b/data/presets/presets/historic/wreck.json @@ -8,6 +8,9 @@ "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide" ], + "moreFields": [ + "seamark/type" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json index 7d695a958..153c67bd7 100644 --- a/data/presets/presets/leisure/marina.json +++ b/data/presets/presets/leisure/marina.json @@ -8,11 +8,12 @@ "fee", "sanitary_dump_station", "power_supply", - "internet_access", - "internet_access/fee" + "internet_access" ], "moreFields" : [ - "internet_access/ssid" + "internet_access/fee", + "internet_access/ssid", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json index 4d9ec9d42..15c5e8709 100644 --- a/data/presets/presets/leisure/slipway.json +++ b/data/presets/presets/leisure/slipway.json @@ -5,6 +5,9 @@ "access_simple", "fee" ], + "moreFields": [ + "seamark/type" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json index b501d67b6..572c5d553 100644 --- a/data/presets/presets/man_made/bridge.json +++ b/data/presets/presets/man_made/bridge.json @@ -6,6 +6,9 @@ "layer", "maxweight" ], + "moreFields": [ + "seamark/type" + ], "geometry": [ "area" ], diff --git a/data/presets/presets/seamark/beacon_isolated_danger.json b/data/presets/presets/seamark/beacon_isolated_danger.json index 6647a61f3..0df363aab 100644 --- a/data/presets/presets/seamark/beacon_isolated_danger.json +++ b/data/presets/presets/seamark/beacon_isolated_danger.json @@ -2,7 +2,8 @@ "fields": [ "ref", "operator", - "seamark/beacon_isolated_danger/shape" + "seamark/beacon_isolated_danger/shape", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/seamark/beacon_lateral.json b/data/presets/presets/seamark/beacon_lateral.json index 7a35e89ff..086692993 100644 --- a/data/presets/presets/seamark/beacon_lateral.json +++ b/data/presets/presets/seamark/beacon_lateral.json @@ -5,7 +5,8 @@ "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", - "seamark/beacon_lateral/system" + "seamark/beacon_lateral/system", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/seamark/buoy_lateral.json b/data/presets/presets/seamark/buoy_lateral.json index 5121d4a72..a1f6775ec 100644 --- a/data/presets/presets/seamark/buoy_lateral.json +++ b/data/presets/presets/seamark/buoy_lateral.json @@ -5,7 +5,8 @@ "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", - "seamark/buoy_lateral/system" + "seamark/buoy_lateral/system", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json index 11670c94d..03f936b01 100644 --- a/data/presets/presets/seamark/buoy_lateral/green.json +++ b/data/presets/presets/seamark/buoy_lateral/green.json @@ -5,7 +5,8 @@ "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", - "seamark/buoy_lateral/system" + "seamark/buoy_lateral/system", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json index 73facf15e..3892950cf 100644 --- a/data/presets/presets/seamark/buoy_lateral/red.json +++ b/data/presets/presets/seamark/buoy_lateral/red.json @@ -5,7 +5,8 @@ "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", - "seamark/buoy_lateral/system" + "seamark/buoy_lateral/system", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/seamark/mooring.json b/data/presets/presets/seamark/mooring.json index c5d831f2c..1b2e946c1 100644 --- a/data/presets/presets/seamark/mooring.json +++ b/data/presets/presets/seamark/mooring.json @@ -2,7 +2,8 @@ "fields": [ "ref", "operator", - "seamark/mooring/category" + "seamark/mooring/category", + "seamark/type" ], "geometry": [ "point" From 1ba61140f5b164613cd3a224dcc7af14bd59781a Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 15 Jan 2019 11:35:56 -0500 Subject: [PATCH 2/3] Changed the material field to be non-universal Added the material field to the fields or moreFields properties of relevant presets --- data/presets/fields.json | 2 +- data/presets/fields/material.json | 1 - data/presets/presets.json | 56 +++++++++---------- data/presets/presets/_power.json | 3 + data/presets/presets/barrier.json | 3 + data/presets/presets/barrier/block.json | 3 + data/presets/presets/barrier/bollard.json | 3 + data/presets/presets/barrier/fence.json | 3 + .../presets/barrier/fence/railing.json | 3 + data/presets/presets/barrier/guard_rail.json | 3 + data/presets/presets/barrier/kerb.json | 3 + data/presets/presets/barrier/kerb/flush.json | 3 + .../presets/presets/barrier/kerb/lowered.json | 3 + .../presets/barrier/retaining_wall.json | 3 + data/presets/presets/barrier/wall.json | 3 + data/presets/presets/bridge/support.json | 3 +- data/presets/presets/bridge/support/pier.json | 1 + .../presets/historic/boundary_stone.json | 3 + data/presets/presets/historic/memorial.json | 3 + data/presets/presets/historic/monument.json | 3 + .../presets/historic/wayside_cross.json | 3 + data/presets/presets/man_made.json | 3 + data/presets/presets/man_made/bridge.json | 1 + data/presets/presets/man_made/chimney.json | 3 + data/presets/presets/man_made/flagpole.json | 3 + data/presets/presets/man_made/groyne.json | 3 + data/presets/presets/man_made/mast.json | 3 + data/presets/presets/power/pole.json | 3 +- data/presets/presets/power/tower.json | 3 +- data/presets/presets/tourism/artwork.json | 3 + .../tourism/information/guidepost.json | 3 + 31 files changed, 106 insertions(+), 33 deletions(-) diff --git a/data/presets/fields.json b/data/presets/fields.json index 3853c3b66..f49ec6c11 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -178,7 +178,7 @@ "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"}, "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"}, "map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"}, - "material": {"key": "material", "type": "combo", "universal": true, "label": "Material"}, + "material": {"key": "material", "type": "combo", "label": "Material"}, "maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false}, "maxspeed": {"key": "maxspeed", "type": "maxspeed", "label": "Speed Limit", "placeholder": "40, 50, 60..."}, "maxspeed/advisory": {"key": "maxspeed:advisory", "type": "maxspeed", "label": "Advisory Speed Limit", "placeholder": "40, 50, 60..."}, diff --git a/data/presets/fields/material.json b/data/presets/fields/material.json index d51fa1aac..50911c20e 100644 --- a/data/presets/fields/material.json +++ b/data/presets/fields/material.json @@ -1,6 +1,5 @@ { "key": "material", "type": "combo", - "universal": true, "label": "Material" } diff --git a/data/presets/presets.json b/data/presets/presets.json index 82ce79572..d3fde2c96 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -7,7 +7,7 @@ "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"}, + "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"}, "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"}, "roundabout": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "roundabout"}, "name": "Roundabout", "searchable": false}, "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, @@ -224,32 +224,32 @@ "attraction/summer_toboggan": {"fields": ["name", "operator", "opening_hours"], "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"}, "attraction/train": {"icon": "maki-rail", "fields": ["name", "operator", "fee", "opening_hours"], "geometry": ["point", "line"], "terms": ["theme park", "rackless train", "road train", "Tschu-Tschu train", "dotto train", "park train"], "tags": {"attraction": "train"}, "name": "Tourist Train"}, "attraction/water_slide": {"icon": "maki-swimming", "fields": ["name", "operator", "opening_hours"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"}, - "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4}, + "barrier": {"icon": "maki-roadblock", "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4}, "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false}, - "barrier/block": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"}, - "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"}, + "barrier/block": {"icon": "maki-roadblock", "fields": ["access"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"}, + "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access"], "moreFields": ["material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"}, "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"}, "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"}, "barrier/city_wall": {"icon": "maki-barrier", "fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"}, "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"}, "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25}, - "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25}, - "barrier/fence/railing": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "fields": ["height"], "name": "Railing", "terms": ["railing", "handrail", "guard rail"], "matchScore": 0.5}, + "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "moreFields": ["material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25}, + "barrier/fence/railing": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "fields": ["height"], "moreFields": ["material"], "name": "Railing", "terms": ["railing", "handrail", "guard rail"], "matchScore": 0.5}, "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"}, - "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, + "barrier/guard_rail": {"icon": "maki-barrier", "moreFields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, - "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, - "barrier/kerb/flush": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"}, - "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, + "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, + "barrier/kerb/flush": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"}, + "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"}, "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, - "barrier/retaining_wall": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, + "barrier/retaining_wall": {"fields": ["height"], "moreFields": ["material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, - "barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, + "barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height"], "moreFields": ["material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]}, - "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, - "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, + "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, + "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, "building/bunker": {"fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false}, "building/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false}, @@ -461,13 +461,13 @@ "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "maxheight", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"}, "historic": {"icon": "temaki-ruins", "fields": ["historic", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "*"}, "name": "Historic Site"}, "historic/archaeological_site": {"icon": "temaki-ruins", "fields": ["name", "site_type", "historic/civilization", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "archaeological_site"}, "name": "Archaeological Site"}, - "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, + "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"}, "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"}, - "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"}, - "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"}, + "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"}, + "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"}, "historic/ruins": {"icon": "temaki-ruins", "fields": ["name", "historic/civilization", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "ruins"}, "name": "Ruins"}, "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"}, - "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"}, + "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"}, "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"}, "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "removeTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"}, "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"}, @@ -591,22 +591,22 @@ "leisure/track/running": {"icon": "maki-pitch", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["race*", "running", "sprint", "track"], "name": "Racetrack (Running)"}, "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": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "name": "Man Made"}, "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"}, - "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"}, + "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"}, "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"}, - "man_made/chimney": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, + "man_made/chimney": {"icon": "temaki-chimney", "fields": ["material"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, "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/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country", "lit", "height"], "moreFields": ["material"], "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"}, + "man_made/groyne": {"fields": ["material"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"}, - "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"}, + "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "moreFields": ["material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"}, "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"}, "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"}, "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"}, @@ -757,10 +757,10 @@ "power/line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "line"}, "name": "Power Line"}, "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"}, "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "removeTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"}, - "power/pole": {"fields": ["ref"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, + "power/pole": {"fields": ["ref", "material"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"}, "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "switch"}, "name": "Power Switch"}, - "power/tower": {"fields": ["design", "ref"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, + "power/tower": {"fields": ["design", "ref", "material"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"}, "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"}, "public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"}, @@ -978,7 +978,7 @@ "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["internet_access/ssid"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"}, "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"}, "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"}, - "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, + "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"}, "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"}, "tourism/artwork/statue": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"}, @@ -992,7 +992,7 @@ "tourism/hotel": {"icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["stars", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, - "tourism/information/guidepost": {"icon": "maki-information", "fields": ["name", "elevation", "operator", "ref"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"}, + "tourism/information/guidepost": {"icon": "maki-information", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"}, "tourism/information/map": {"icon": "maki-information", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"}, "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"}, "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"}, diff --git a/data/presets/presets/_power.json b/data/presets/presets/_power.json index 4f448710c..ae1731f16 100644 --- a/data/presets/presets/_power.json +++ b/data/presets/presets/_power.json @@ -11,6 +11,9 @@ "fields": [ "power" ], + "moreFields": [ + "material" + ], "searchable": false, "name": "Power" } diff --git a/data/presets/presets/barrier.json b/data/presets/presets/barrier.json index dd3aa8be8..dc7fa23d8 100644 --- a/data/presets/presets/barrier.json +++ b/data/presets/presets/barrier.json @@ -1,5 +1,8 @@ { "icon": "maki-roadblock", + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/barrier/block.json b/data/presets/presets/barrier/block.json index 7c9ba1c38..678fdb1e4 100644 --- a/data/presets/presets/barrier/block.json +++ b/data/presets/presets/barrier/block.json @@ -3,6 +3,9 @@ "fields": [ "access" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/barrier/bollard.json b/data/presets/presets/barrier/bollard.json index 0068ddf85..1aafba5a7 100644 --- a/data/presets/presets/barrier/bollard.json +++ b/data/presets/presets/barrier/bollard.json @@ -3,6 +3,9 @@ "fields": [ "access" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/barrier/fence.json b/data/presets/presets/barrier/fence.json index a92b18986..7361fdcd6 100644 --- a/data/presets/presets/barrier/fence.json +++ b/data/presets/presets/barrier/fence.json @@ -4,6 +4,9 @@ "fence_type", "height" ], + "moreFields": [ + "material" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/barrier/fence/railing.json b/data/presets/presets/barrier/fence/railing.json index f4d86b5af..f2831e9b4 100644 --- a/data/presets/presets/barrier/fence/railing.json +++ b/data/presets/presets/barrier/fence/railing.json @@ -10,6 +10,9 @@ "fields": [ "height" ], + "moreFields": [ + "material" + ], "name": "Railing", "terms": [ "railing", diff --git a/data/presets/presets/barrier/guard_rail.json b/data/presets/presets/barrier/guard_rail.json index 6456f4d8e..0b7b7b250 100644 --- a/data/presets/presets/barrier/guard_rail.json +++ b/data/presets/presets/barrier/guard_rail.json @@ -1,5 +1,8 @@ { "icon": "maki-barrier", + "moreFields": [ + "material" + ], "geometry": [ "line" ], diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json index 81f348ee7..33bdbb370 100644 --- a/data/presets/presets/barrier/kerb.json +++ b/data/presets/presets/barrier/kerb.json @@ -3,6 +3,9 @@ "kerb", "tactile_paving" ], + "moreFields": [ + "material" + ], "geometry": [ "vertex", "line" diff --git a/data/presets/presets/barrier/kerb/flush.json b/data/presets/presets/barrier/kerb/flush.json index 76511a567..3803f65df 100644 --- a/data/presets/presets/barrier/kerb/flush.json +++ b/data/presets/presets/barrier/kerb/flush.json @@ -4,6 +4,9 @@ "kerb", "tactile_paving" ], + "moreFields": [ + "material" + ], "geometry": [ "vertex", "line" diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json index 9054ddc4d..b99417aff 100644 --- a/data/presets/presets/barrier/kerb/lowered.json +++ b/data/presets/presets/barrier/kerb/lowered.json @@ -4,6 +4,9 @@ "kerb", "tactile_paving" ], + "moreFields": [ + "material" + ], "geometry": [ "vertex", "line" diff --git a/data/presets/presets/barrier/retaining_wall.json b/data/presets/presets/barrier/retaining_wall.json index 809f11825..66c831747 100644 --- a/data/presets/presets/barrier/retaining_wall.json +++ b/data/presets/presets/barrier/retaining_wall.json @@ -2,6 +2,9 @@ "fields": [ "height" ], + "moreFields": [ + "material" + ], "geometry": [ "line", "area" diff --git a/data/presets/presets/barrier/wall.json b/data/presets/presets/barrier/wall.json index 6da313e5e..66d4c2b49 100644 --- a/data/presets/presets/barrier/wall.json +++ b/data/presets/presets/barrier/wall.json @@ -4,6 +4,9 @@ "wall", "height" ], + "moreFields": [ + "material" + ], "geometry": [ "line", "area" diff --git a/data/presets/presets/bridge/support.json b/data/presets/presets/bridge/support.json index 029ff39a6..8da2485b7 100644 --- a/data/presets/presets/bridge/support.json +++ b/data/presets/presets/bridge/support.json @@ -4,7 +4,8 @@ "bridge/support" ], "moreFields": [ - "seamark/type" + "material", + "seamark/type" ], "geometry": [ "point", diff --git a/data/presets/presets/bridge/support/pier.json b/data/presets/presets/bridge/support/pier.json index f24bab603..c65a6bbba 100644 --- a/data/presets/presets/bridge/support/pier.json +++ b/data/presets/presets/bridge/support/pier.json @@ -4,6 +4,7 @@ "bridge/support" ], "moreFields": [ + "material", "seamark/type" ], "geometry": [ diff --git a/data/presets/presets/historic/boundary_stone.json b/data/presets/presets/historic/boundary_stone.json index 7c7c7e74f..b40d655a9 100644 --- a/data/presets/presets/historic/boundary_stone.json +++ b/data/presets/presets/historic/boundary_stone.json @@ -4,6 +4,9 @@ "name", "inscription" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/historic/memorial.json b/data/presets/presets/historic/memorial.json index 44b074ab8..26ce80cb5 100644 --- a/data/presets/presets/historic/memorial.json +++ b/data/presets/presets/historic/memorial.json @@ -5,6 +5,9 @@ "memorial", "inscription" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/historic/monument.json b/data/presets/presets/historic/monument.json index 576689517..475646803 100644 --- a/data/presets/presets/historic/monument.json +++ b/data/presets/presets/historic/monument.json @@ -4,6 +4,9 @@ "name", "inscription" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/historic/wayside_cross.json b/data/presets/presets/historic/wayside_cross.json index 027a6a9e9..8f17fd4e2 100644 --- a/data/presets/presets/historic/wayside_cross.json +++ b/data/presets/presets/historic/wayside_cross.json @@ -4,6 +4,9 @@ "name", "inscription" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json index 64665804d..1d61e29e6 100644 --- a/data/presets/presets/man_made.json +++ b/data/presets/presets/man_made.json @@ -4,6 +4,9 @@ "name", "man_made" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json index 572c5d553..e57128c19 100644 --- a/data/presets/presets/man_made/bridge.json +++ b/data/presets/presets/man_made/bridge.json @@ -7,6 +7,7 @@ "maxweight" ], "moreFields": [ + "material", "seamark/type" ], "geometry": [ diff --git a/data/presets/presets/man_made/chimney.json b/data/presets/presets/man_made/chimney.json index b5e15d94e..a4fa25c4b 100644 --- a/data/presets/presets/man_made/chimney.json +++ b/data/presets/presets/man_made/chimney.json @@ -1,5 +1,8 @@ { "icon": "temaki-chimney", + "fields": [ + "material" + ], "geometry": [ "point", "area" diff --git a/data/presets/presets/man_made/flagpole.json b/data/presets/presets/man_made/flagpole.json index 8cac99475..b7d5586c2 100644 --- a/data/presets/presets/man_made/flagpole.json +++ b/data/presets/presets/man_made/flagpole.json @@ -7,6 +7,9 @@ "lit", "height" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/man_made/groyne.json b/data/presets/presets/man_made/groyne.json index 12c289eb5..38094eff3 100644 --- a/data/presets/presets/man_made/groyne.json +++ b/data/presets/presets/man_made/groyne.json @@ -1,4 +1,7 @@ { + "fields": [ + "material" + ], "geometry": [ "line", "area" diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json index 7d2155fab..cf5db65e5 100644 --- a/data/presets/presets/man_made/mast.json +++ b/data/presets/presets/man_made/mast.json @@ -6,6 +6,9 @@ "height", "communication_multi" ], + "moreFields": [ + "material" + ], "geometry": [ "point" ], diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json index 3715fa1bb..2fdc53d77 100644 --- a/data/presets/presets/power/pole.json +++ b/data/presets/presets/power/pole.json @@ -1,6 +1,7 @@ { "fields": [ - "ref" + "ref", + "material" ], "geometry": [ "point", diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index eddacdbfd..95865dd19 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -1,7 +1,8 @@ { "fields": [ "design", - "ref" + "ref", + "material" ], "geometry": [ "point", diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json index 324da79fb..353272840 100644 --- a/data/presets/presets/tourism/artwork.json +++ b/data/presets/presets/tourism/artwork.json @@ -5,6 +5,9 @@ "artwork_type", "artist" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/tourism/information/guidepost.json b/data/presets/presets/tourism/information/guidepost.json index 7a28a7967..e554d816e 100644 --- a/data/presets/presets/tourism/information/guidepost.json +++ b/data/presets/presets/tourism/information/guidepost.json @@ -6,6 +6,9 @@ "operator", "ref" ], + "moreFields": [ + "material" + ], "geometry": [ "point", "vertex" From d1a7400ed735e1f5a17bb52d955d0d1a8c82f9d6 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 15 Jan 2019 11:42:55 -0500 Subject: [PATCH 3/3] Added a field for the building:material key --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/building/material.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/building.json | 3 +++ data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 7 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/building/material.json diff --git a/data/presets.yaml b/data/presets.yaml index b718e83a1..b762f81f4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -277,6 +277,9 @@ en: building: # building=* label: Building + building/material: + # 'building:material=*' + label: Material building_area: # building=* label: Building diff --git a/data/presets/fields.json b/data/presets/fields.json index f49ec6c11..124a56831 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -43,6 +43,7 @@ "bridge/support": {"key": "bridge:support", "type": "combo", "label": "Type"}, "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"}, "building": {"key": "building", "type": "combo", "label": "Building"}, + "building/material": {"key": "building:material", "type": "combo", "label": "Material"}, "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"}, "cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."}, "camera/direction": {"key": "camera:direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"}, diff --git a/data/presets/fields/building/material.json b/data/presets/fields/building/material.json new file mode 100644 index 000000000..c7353274e --- /dev/null +++ b/data/presets/fields/building/material.json @@ -0,0 +1,5 @@ +{ + "key": "building:material", + "type": "combo", + "label": "Material" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d3fde2c96..61461db02 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -250,7 +250,7 @@ "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]}, "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, - "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, + "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["building/material"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, "building/bunker": {"fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false}, "building/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false}, "building/train_station": {"icon": "maki-building", "fields": ["name", "address", "levels", "height"], "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station", "searchable": false}, diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index 5553455dc..ed763e8b9 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -7,6 +7,9 @@ "height", "address" ], + "moreFields": [ + "building/material" + ], "geometry": [ "point", "area" diff --git a/data/taginfo.json b/data/taginfo.json index c531598df..ae30f638d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -7156,6 +7156,7 @@ {"key": "brand", "description": "🄵 Brand"}, {"key": "brewery", "description": "🄵 Draft Beers"}, {"key": "bridge", "description": "🄵 Type"}, + {"key": "building:material", "description": "🄵 Material"}, {"key": "bunker_type", "description": "🄵 Type"}, {"key": "cables", "description": "🄵 Cables"}, { diff --git a/dist/locales/en.json b/dist/locales/en.json index 7b97632d6..4787b053f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2065,6 +2065,9 @@ "building": { "label": "Building" }, + "building/material": { + "label": "Material" + }, "bunker_type": { "label": "Type" },