CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-18 22:48:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename landuse=allotments preset to "Garden Allotments" (re: #7501)

Browse Source 
Add operator and plots fields to landuse=allotments preset
Remove explicit values from Garden Type field
This commit is contained in:
Quincy Morgan
2020-04-06 09:54:32 -07:00
parent 5358c4f42d
commit ecc0c5af54
8 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+11 -3
View File
@@ -949,6 +949,9 @@ en:
gambling:
# gambling=*
label: Games
garden/type:
# 'garden:type=*'
label: Garden Type
gauge:
# gauge=*
label: Gauge
@@ -1832,6 +1835,11 @@ en:
playground/theme:
# 'playground:theme=*'
label: Theme
plots:
# plots=*
label: Plots
# plots field placeholder
placeholder: '10, 20, 30...'
polling_station:
# polling_station=*
label: Polling Place
@@ -5506,9 +5514,9 @@ en:
name: Land Use Feature
landuse/allotments:
# landuse=allotments
name: Community Garden
# 'terms: allotment,garden'
terms: '<translate with synonyms or related terms for ''Community Garden'', separated by commas>'
name: Garden Allotments
# 'terms: allotment,community garden,garden'
terms: '<translate with synonyms or related terms for ''Garden Allotments'', separated by commas>'
landuse/aquaculture:
# landuse=aquaculture
name: Aquaculture
data/presets/fields.json
+2
View File
@@ -170,6 +170,7 @@
"fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"},
"fuel": {"key": "fuel", "type": "combo", "label": "Fuel"},
"gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"},
"garden/type": {"key": "garden:type", "type": "combo", "label": "Garden Type"},
"gauge": {"key": "gauge", "type": "combo", "label": "Gauge"},
"gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]},
"generator/method": {"key": "generator:method", "type": "combo", "label": "Method"},
@@ -313,6 +314,7 @@
"plant/source": {"key": "plant:source", "type": "combo", "label": "Energy Source"},
"playground": {"key": "playground", "type": "combo", "label": "Type"},
"playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"},
"plots": {"key": "plots", "type": "number", "minValue": 0, "label": "Plots", "placeholder": "10, 20, 30..."},
"polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
"population": {"key": "population", "type": "text", "label": "Population"},
"post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},
data/presets/fields/garden/type.json
+1 -11
View File
@@ -1,15 +1,5 @@
{
"key": "garden:type",
"type": "combo",
"label": "Garden Type",
"strings": {
"options": {
"arboretum": "Arboretum",
"botanical": "Botanical",
"community": "Community",
"residential": "Residential",
"roof_garden": "Roof Garden",
"show_garden": "Show Garden"
}
}
"label": "Garden Type"
}
data/presets/fields/plots.json
+7
View File
@@ -0,0 +1,7 @@
{
"key": "plots",
"type": "number",
"minValue": 0,
"label": "Plots",
"placeholder": "10, 20, 30..."
}
data/presets/presets.json
+2 -2
View File
@@ -606,7 +606,7 @@
"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},
"landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
"landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name", "operator", "plots"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "community garden", "garden"], "name": "Garden Allotments"},
"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": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Cemetery"},
@@ -674,7 +674,7 @@
"leisure/fitness_station/sign": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sign"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sign", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Exercise Instruction Sign"},
"leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "situp", "sit up", "trim trail"], "name": "Sit-Up Station"},
"leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"},
"leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
"leisure/garden": {"icon": "maki-garden", "fields": ["name", "garden/type", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
"leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
"leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "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"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
data/presets/presets/landuse/allotments.json
+5 -2
View File
@@ -4,7 +4,9 @@
"area"
],
"fields": [
"name"
"name",
"operator",
"plots"
],
"moreFields": [
"address",
@@ -18,7 +20,8 @@
},
"terms": [
"allotment",
"community garden",
"garden"
],
"name": "Allotment Garden"
"name": "Garden Allotments"
}
data/taginfo.json
+3 -1
View File
@@ -588,7 +588,7 @@
{"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"},
{"key": "landuse", "value": "allotments", "description": "🄿 Community Garden", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
{"key": "landuse", "value": "allotments", "description": "🄿 Garden Allotments", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
{"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"},
@@ -1522,6 +1522,7 @@
{"key": "fuel:", "description": "🄵 Fuel Types"},
{"key": "fuel", "description": "🄵 Fuel"},
{"key": "gambling", "description": "🄵 Games"},
{"key": "garden:type", "description": "🄵 Garden Type"},
{"key": "gauge", "description": "🄵 Gauge"},
{"key": "male", "description": "🄵 Gender"},
{"key": "female", "description": "🄵 Gender"},
@@ -1702,6 +1703,7 @@
{"key": "plant:output:electricity", "description": "🄵 Power Output"},
{"key": "plant:source", "description": "🄵 Energy Source"},
{"key": "playground:theme", "description": "🄵 Theme"},
{"key": "plots", "description": "🄵 Plots"},
{"key": "population", "description": "🄵 Population"},
{"key": "post:block_number", "description": "🄵 Delivery Address"},
{"key": "post:city", "description": "🄵 Delivery Address"},
dist/locales/en.json
Vendored
+9 -2
View File
@@ -3425,6 +3425,9 @@
"gambling": {
"label": "Games"
},
"garden/type": {
"label": "Garden Type"
},
"gauge": {
"label": "Gauge"
},
@@ -4149,6 +4152,10 @@
"playground/theme": {
"label": "Theme"
},
"plots": {
"label": "Plots",
"placeholder": "10, 20, 30..."
},
"polling_station": {
"label": "Polling Place",
"terms": "voting place"
@@ -7330,8 +7337,8 @@
"name": "Reservoir"
},
"landuse/allotments": {
"name": "Community Garden",
"terms": "allotment,garden"
"name": "Garden Allotments",
"terms": "allotment,community garden,garden"
},
"landuse/aquaculture": {
"name": "Aquaculture",