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

Capitalize Service in shop/laundry/self_service name

Browse Source 
Add derived data for previous merge
This commit is contained in:
Quincy Morgan
2019-04-29 10:48:49 -07:00
parent 6bf88e5342
commit ca8d92edd3
6 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+8
View File
@@ -1772,6 +1772,9 @@ en:
'yes': 'Yes'
# second_hand field placeholder
placeholder: 'Yes, No, Only'
self_service:
# self_service=*
label: Self-Service
service:
# service=*
label: Type
@@ -6782,6 +6785,11 @@ en:
# shop=laundry
name: Laundry
terms: '<translate with synonyms or related terms for ''Laundry'', separated by commas>'
shop/laundry/self_service_laundry:
# 'shop=laundry, self_service=yes'
name: Self-Service Laundry
# 'terms: Coin Laundry,Laundromat,Coin Wash,Launderette,Washateria'
terms: '<translate with synonyms or related terms for ''Self-Service Laundry'', separated by commas>'
shop/leather:
# shop=leather
name: Leather Store
data/presets/fields.json
+1
View File
@@ -316,6 +316,7 @@
"seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"},
"seats": {"key": "seats", "type": "number", "minValue": 0, "label": "Seats", "placeholder": "2, 4, 6..."},
"second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}},
"self_service": {"key": "self_service", "type": "check", "label": "Self-Service"},
"service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}},
"service_times": {"key": "service_times", "type": "text", "label": "Service Times"},
"service": {"key": "service", "type": "combo", "label": "Type", "options": ["parking_aisle", "driveway", "alley", "emergency_access", "drive-through"]},
data/presets/presets.json
+4 -3
View File
@@ -78,7 +78,7 @@
"amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
"amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
"amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
"amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
"amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
"amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
"amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
"amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
@@ -113,7 +113,7 @@
"amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
"amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
"amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
"amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi"], "moreFields": ["opening_hours", "payment_multi", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
"amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["opening_hours", "payment_multi", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
"amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
"amenity/grit_bin": {"icon": "fas-box", "fields": ["access_simple"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
"amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "removeTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
@@ -996,7 +996,8 @@
"shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"},
"shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
"shop/kitchen": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"},
"shop/laundry": {"icon": "maki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
"shop/laundry": {"icon": "maki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
"shop/laundry/self_service_laundry": {"icon": "maki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"},
"shop/leather": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"},
"shop/lighting": {"icon": "far-lightbulb", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"},
"shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"},
data/presets/presets/shop/laundry/self_service_laundry.json
+1 -1
View File
@@ -15,5 +15,5 @@
"Launderette",
"Washateria"
],
"name": "Self-service Laundry"
"name": "Self-Service Laundry"
}
data/taginfo.json
+2
View File
@@ -936,6 +936,7 @@
{"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
{"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
{"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/laundry-15.svg?sanitize=true"},
{"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/laundry-15.svg?sanitize=true"},
{"key": "shop", "value": "leather", "description": "🄿 Leather Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
{"key": "shop", "value": "lighting", "description": "🄿 Lighting Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/far-lightbulb.svg?sanitize=true"},
{"key": "shop", "value": "locksmith", "description": "🄿 Locksmith", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-key.svg?sanitize=true"},
@@ -1567,6 +1568,7 @@
{"key": "second_hand", "value": "yes", "description": "🄵 Sells Used"},
{"key": "second_hand", "value": "no", "description": "🄵 Sells Used"},
{"key": "second_hand", "value": "only", "description": "🄵 Sells Used"},
{"key": "self_service", "description": "🄵 Self-Service"},
{"key": "service", "value": "spur", "description": "🄵 Service Type"},
{"key": "service", "value": "yard", "description": "🄵 Service Type"},
{"key": "service", "value": "siding", "description": "🄵 Service Type"},