CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 13:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add preschool=yes when upgrading amenity=preschool (close #6636)

Browse Source 
Add preschool field to kindergarten preset
This commit is contained in:
Quincy Morgan
2019-07-09 09:40:26 -04:00
parent 83c5fa3215
commit 7ae5993ea0
8 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.json
+1 -1
View File
@@ -90,7 +90,7 @@
},
{
"old": {"amenity": "preschool"},
"replace": {"amenity": "kindergarten"}
"replace": {"amenity": "kindergarten", "preschool": "yes"}
},
{
"old": {"amenity": "public_building"},
data/presets.yaml
+3
View File
@@ -1516,6 +1516,9 @@ en:
power_supply:
# power_supply=*
label: Power Supply
preschool:
# preschool=*
label: Preschool
produce:
# produce=*
label: Produce
data/presets/fields.json
+1
View File
@@ -271,6 +271,7 @@
"population": {"key": "population", "type": "text", "label": "Population"},
"power_supply": {"key": "power_supply", "type": "check", "label": "Power Supply"},
"power": {"key": "power", "type": "typeCombo", "label": "Type"},
"preschool": {"key": "preschool", "type": "check", "label": "Preschool"},
"produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
"product": {"key": "product", "type": "semiCombo", "label": "Products"},
"railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
data/presets/fields/preschool.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "preschool",
"type": "check",
"label": "Preschool"
}
data/presets/presets.json
+1 -1
View File
@@ -128,7 +128,7 @@
"amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
"amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
"amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
"amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
"amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
"amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
"amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
"amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
data/presets/presets/amenity/kindergarten.json
+5 -4
View File
@@ -3,15 +3,16 @@
"fields": [
"name",
"operator",
"address"
"address",
"phone",
"preschool"
],
"moreFields": [
"email",
"fax",
"opening_hours",
"payment_multi",
"website",
"phone",
"email",
"fax",
"wheelchair"
],
"geometry": [
data/taginfo.json
+2 -1
View File
@@ -1560,6 +1560,7 @@
{"key": "min_age", "description": "🄵 Minimum Age"},
{"key": "population", "description": "🄵 Population"},
{"key": "power_supply", "description": "🄵 Power Supply"},
{"key": "preschool", "description": "🄵 Preschool"},
{"key": "produce", "description": "🄵 Produce"},
{"key": "product", "description": "🄵 Products"},
{"key": "railway:position", "description": "🄵 Milestone Position"},
@@ -1801,7 +1802,7 @@
{"key": "amenity", "value": "hotel", "description": "🄳 ➜ tourism=hotel"},
{"key": "amenity", "value": "kiosk", "description": "🄳 ➜ shop=kiosk"},
{"key": "amenity", "value": "nursery", "description": "🄳 ➜ amenity=kindergarten"},
{"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten"},
{"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten + preschool=yes"},
{"key": "amenity", "value": "public_building", "description": "🄳 ➜ building=public"},
{"key": "amenity", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"},
{"key": "amenity", "value": "sauna", "description": "🄳 ➜ leisure=sauna"},
dist/locales/en.json
Vendored
+3
View File
@@ -3685,6 +3685,9 @@
"power": {
"label": "Type"
},
"preschool": {
"label": "Preschool"
},
"produce": {
"label": "Produce"
},