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

Disambiguate building presets (closes #2799)

Browse Source 
* "Church" -> "Church Building"
* Match generic building=* preset for nodes
* Don't match specific building presets for nodes

This means that if a user adds a node and types "School" they will be
offered the amenity, not the building.
This commit is contained in:
Bryan Housel
2015-11-25 01:28:35 -05:00
parent df1cbbffb4
commit 97f1830e3b
37 changed files with 17 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+6 -6
View File
@@ -1640,16 +1640,16 @@ en:
terms: "<translate with synonyms or related terms for 'Cabin', separated by commas>"
building/cathedral:
# building=cathedral
name: Cathedral
terms: "<translate with synonyms or related terms for 'Cathedral', separated by commas>"
name: Cathedral Building
terms: "<translate with synonyms or related terms for 'Cathedral Building', separated by commas>"
building/chapel:
# building=chapel
name: Chapel
terms: "<translate with synonyms or related terms for 'Chapel', separated by commas>"
name: Chapel Building
terms: "<translate with synonyms or related terms for 'Chapel Building', separated by commas>"
building/church:
# building=church
name: Church
terms: "<translate with synonyms or related terms for 'Church', separated by commas>"
name: Church Building
terms: "<translate with synonyms or related terms for 'Church Building', separated by commas>"
building/college:
# building=college
name: College Building
data/presets/presets.json
+4 -36
View File
@@ -2220,6 +2220,7 @@
"address"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2235,7 +2236,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2250,7 +2250,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2264,7 +2263,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2280,7 +2278,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2295,13 +2292,12 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "cathedral"
},
"name": "Cathedral"
"name": "Cathedral Building"
},
"building/chapel": {
"icon": "place-of-worship",
@@ -2310,13 +2306,12 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "chapel"
},
"name": "Chapel"
"name": "Chapel Building"
},
"building/church": {
"icon": "place-of-worship",
@@ -2325,13 +2320,12 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "church"
},
"name": "Church"
"name": "Church Building"
},
"building/college": {
"icon": "building",
@@ -2340,7 +2334,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
@@ -2359,7 +2352,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2374,7 +2366,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2389,7 +2380,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2412,7 +2402,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2436,7 +2425,6 @@
"capacity"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2451,7 +2439,6 @@
"capacity"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2466,7 +2453,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2481,7 +2467,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2497,7 +2482,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2512,7 +2496,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2528,7 +2511,6 @@
},
"building/hut": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -2543,7 +2525,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2558,7 +2539,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
@@ -2578,7 +2558,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2593,7 +2572,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2609,7 +2587,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2623,7 +2600,6 @@
"address"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2638,7 +2614,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
@@ -2659,7 +2634,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2683,7 +2657,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2698,7 +2671,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2713,7 +2685,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2728,7 +2699,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -2768,7 +2738,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
@@ -2786,7 +2755,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building.json
+1
View File
@@ -6,6 +6,7 @@
"address"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/apartments.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/barn.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/bunker.json
-1
View File
@@ -4,7 +4,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/cabin.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/cathedral.json
+1 -2
View File
@@ -5,11 +5,10 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "cathedral"
},
"name": "Cathedral"
"name": "Cathedral Building"
}
data/presets/presets/building/chapel.json
+1 -2
View File
@@ -5,11 +5,10 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "chapel"
},
"name": "Chapel"
"name": "Chapel Building"
}
data/presets/presets/building/church.json
+1 -2
View File
@@ -5,11 +5,10 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
"building": "church"
},
"name": "Church"
"name": "Church Building"
}
data/presets/presets/building/college.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
data/presets/presets/building/commercial.json
-1
View File
@@ -6,7 +6,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/construction.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/detached.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/dormitory.json
-1
View File
@@ -6,7 +6,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/garage.json
-1
View File
@@ -3,7 +3,6 @@
"capacity"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/garages.json
-1
View File
@@ -4,7 +4,6 @@
"capacity"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/greenhouse.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/hospital.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/hotel.json
-1
View File
@@ -6,7 +6,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/house.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/hut.json
-1
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/industrial.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/kindergarten.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
data/presets/presets/building/public.json
-1
View File
@@ -6,7 +6,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/residential.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/retail.json
-1
View File
@@ -6,7 +6,6 @@
"smoking"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/roof.json
-1
View File
@@ -4,7 +4,6 @@
"address"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/school.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
data/presets/presets/building/semidetached_house.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/shed.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/stable.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/static_caravan.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/terrace.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/building/university.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"terms": [
data/presets/presets/building/warehouse.json
-1
View File
@@ -5,7 +5,6 @@
"levels"
],
"geometry": [
"point",
"area"
],
"tags": {
dist/locales/en.json
Vendored
+3 -3
View File
@@ -1980,15 +1980,15 @@
"terms": ""
},
"building/cathedral": {
"name": "Cathedral",
"name": "Cathedral Building",
"terms": ""
},
"building/chapel": {
"name": "Chapel",
"name": "Chapel Building",
"terms": ""
},
"building/church": {
"name": "Church",
"name": "Church Building",
"terms": ""
},
"building/college": {