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

Merge branch 'master' into greenkeeper-rbush-2.0.1

Browse Source
This commit is contained in:
Bryan Housel
2016-07-01 22:39:42 -04:00
parent c182c1462f 8bf9c260a7
commit 4b5389c310
13 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LICENSE
+2
View File
@@ -1,3 +1,5 @@
ISC License
Copyright (c) 2015, iD Contributors
Permission to use, copy, modify, and/or distribute this software for any
data/presets.yaml
+7 -6
View File
@@ -466,6 +466,9 @@ en:
internet_access/fee:
# 'internet_access:fee=*'
label: Internet Access Fee
kerb:
# kerb=*
label: Curb Ramp
lamp_type:
# lamp_type=*
label: Type
@@ -868,9 +871,6 @@ en:
site:
# site=*
label: Type
sloped_curb:
# sloped_curb=*
label: Sloped Curb
smoking:
# smoking=*
label: Smoking
@@ -1394,7 +1394,7 @@ en:
amenity/pharmacy:
# amenity=pharmacy
name: Pharmacy
# 'terms: drug,medicine'
# 'terms: drug*,med*,prescription'
terms: '<translate with synonyms or related terms for ''Pharmacy'', separated by commas>'
amenity/place_of_worship:
# amenity=place_of_worship
@@ -3209,8 +3209,9 @@ en:
terms: '<translate with synonyms or related terms for ''Cheese Store'', separated by commas>'
shop/chemist:
# shop=chemist
name: Chemist
terms: '<translate with synonyms or related terms for ''Chemist'', separated by commas>'
name: Drugstore
# 'terms: med*,drug*,gift'
terms: '<translate with synonyms or related terms for ''Drugstore'', separated by commas>'
shop/chocolate:
# shop=chocolate
name: Chocolate Store
data/presets/fields.json
+5 -5
View File
@@ -640,6 +640,11 @@
"type": "check",
"label": "Internet Access Fee"
},
"kerb": {
"key": "kerb",
"type": "combo",
"label": "Curb Ramp"
},
"lamp_type": {
"key": "lamp_type",
"type": "combo",
@@ -1155,11 +1160,6 @@
"type": "combo",
"label": "Type"
},
"sloped_curb": {
"key": "sloped_curb",
"type": "combo",
"label": "Sloped Curb"
},
"smoking": {
"key": "smoking",
"type": "combo",
data/presets/fields/kerb.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "kerb",
"type": "combo",
"label": "Curb Ramp"
}
data/presets/fields/sloped_curb.json
-5
View File
@@ -1,5 +0,0 @@
{
"key": "sloped_curb",
"type": "combo",
"label": "Sloped Curb"
}
data/presets/presets.json
+24 -18
View File
@@ -1289,8 +1289,9 @@
"amenity": "pharmacy"
},
"terms": [
"drug",
"medicine"
"drug*",
"med*",
"prescription"
],
"name": "Pharmacy"
},
@@ -4040,7 +4041,7 @@
"crossing",
"access",
"surface",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
@@ -4059,7 +4060,7 @@
"crossing",
"access",
"surface",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
@@ -4288,7 +4289,7 @@
"highway/crossing": {
"fields": [
"crossing",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
@@ -4303,7 +4304,7 @@
"highway/crosswalk": {
"fields": [
"crossing",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
@@ -8288,7 +8289,7 @@
"name": "Cheese Store"
},
"shop/chemist": {
"icon": "chemist",
"icon": "grocery",
"fields": [
"operator",
"address",
@@ -8302,7 +8303,12 @@
"tags": {
"shop": "chemist"
},
"name": "Chemist"
"terms": [
"med*",
"drug*",
"gift"
],
"name": "Drugstore"
},
"shop/chocolate": {
"icon": "shop",
@@ -33779,7 +33785,7 @@
"shop": "chemist"
},
"name": "dm",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33798,7 +33804,7 @@
"shop": "chemist"
},
"name": "Müller",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33817,7 +33823,7 @@
"shop": "chemist"
},
"name": "Schlecker",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33836,7 +33842,7 @@
"shop": "chemist"
},
"name": "Etos",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33855,7 +33861,7 @@
"shop": "chemist"
},
"name": "Bipa",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33874,7 +33880,7 @@
"shop": "chemist"
},
"name": "Rossmann",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33893,7 +33899,7 @@
"shop": "chemist"
},
"name": "DM Drogeriemarkt",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33912,7 +33918,7 @@
"shop": "chemist"
},
"name": "Ihr Platz",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33931,7 +33937,7 @@
"shop": "chemist"
},
"name": "Douglas",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
@@ -33950,7 +33956,7 @@
"shop": "chemist"
},
"name": "Kruidvat",
"icon": "chemist",
"icon": "grocery",
"geometry": [
"point",
"area"
data/presets/presets/amenity/pharmacy.json
+3 -2
View File
@@ -15,8 +15,9 @@
"amenity": "pharmacy"
},
"terms": [
"drug",
"medicine"
"drug*",
"med*",
"prescription"
],
"name": "Pharmacy"
}
data/presets/presets/footway/crossing.json
+1 -1
View File
@@ -3,7 +3,7 @@
"crossing",
"access",
"surface",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
data/presets/presets/footway/crosswalk.json
+1 -1
View File
@@ -4,7 +4,7 @@
"crossing",
"access",
"surface",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
data/presets/presets/highway/crossing.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"fields": [
"crossing",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
data/presets/presets/highway/crosswalk.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"fields": [
"crossing",
"sloped_curb",
"kerb",
"tactile_paving"
],
"geometry": [
data/presets/presets/shop/chemist.json
+7 -2
View File
@@ -1,5 +1,5 @@
{
"icon": "chemist",
"icon": "grocery",
"fields": [
"operator",
"address",
@@ -13,5 +13,10 @@
"tags": {
"shop": "chemist"
},
"name": "Chemist"
"terms": [
"med*",
"drug*",
"gift"
],
"name": "Drugstore"
}
dist/locales/en.json
Vendored
+6 -6
View File
@@ -1042,6 +1042,9 @@
"internet_access/fee": {
"label": "Internet Access Fee"
},
"kerb": {
"label": "Curb Ramp"
},
"lamp_type": {
"label": "Type"
},
@@ -1365,9 +1368,6 @@
"site": {
"label": "Type"
},
"sloped_curb": {
"label": "Sloped Curb"
},
"smoking": {
"label": "Smoking",
"placeholder": "No, Separated, Yes...",
@@ -1814,7 +1814,7 @@
},
"amenity/pharmacy": {
"name": "Pharmacy",
"terms": "drug,medicine"
"terms": "drug*,med*,prescription"
},
"amenity/place_of_worship": {
"name": "Place of Worship",
@@ -3481,8 +3481,8 @@
"terms": ""
},
"shop/chemist": {
"name": "Chemist",
"terms": ""
"name": "Drugstore",
"terms": "med*,drug*,gift"
},
"shop/chocolate": {
"name": "Chocolate Store",