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

Revert brand-related preset changes

Browse Source 
I'm not convinced we shouldn't be encouraging simply tagging
`name=McDonald's`, `name=Shell`, etc., without `brand` or
`operator` at all.
This commit is contained in:
John Firebaugh
2014-07-25 10:00:44 -07:00
parent 4d40e8f50b
commit 9f00e465e9
11 changed files with 407 additions and 2291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.js
+1 -1
View File
@@ -105,7 +105,7 @@ function suggestionsToPresets(presets) {
delete existing[name];
}
if (!existing[name]) {
tags = _.extend({name: name, brand: name}, suggestions[key][value][name].tags);
tags = _.extend({name: name}, suggestions[key][value][name].tags);
addSuggestion(item, tags, name, count);
}
}
data/presets.yaml
-9
View File
@@ -118,15 +118,6 @@ en:
label: Type
boundary:
label: Type
brand_fast_food:
label: Brand
placeholder: "McDonald's, Subway, KFC..."
brand_fuel:
label: Brand
placeholder: "Shell, Exxon, BP..."
brand_restaurant:
label: Brand
placeholder: "Olive Garden, Applebee's, TGI Friday's..."
building:
label: Building
building_area:
data/presets/fields.json
-18
View File
@@ -212,24 +212,6 @@
"type": "combo",
"label": "Type"
},
"brand_fast_food": {
"key": "brand",
"type": "text",
"placeholder": "McDonald's, Subway, KFC...",
"label": "Brand"
},
"brand_fuel": {
"key": "brand",
"type": "text",
"placeholder": "Shell, Exxon, BP...",
"label": "Brand"
},
"brand_restaurant": {
"key": "brand",
"type": "text",
"placeholder": "Olive Garden, Applebee's, TGI Friday's...",
"label": "Brand"
},
"building": {
"key": "building",
"type": "typeCombo",
data/presets/fields/brand_fast_food.json
-6
View File
@@ -1,6 +0,0 @@
{
"key": "brand",
"type": "text",
"placeholder": "McDonald's, Subway, KFC...",
"label": "Brand"
}
data/presets/fields/brand_fuel.json
-6
View File
@@ -1,6 +0,0 @@
{
"key": "brand",
"type": "text",
"placeholder": "Shell, Exxon, BP...",
"label": "Brand"
}
data/presets/fields/brand_restaurant.json
-6
View File
@@ -1,6 +0,0 @@
{
"key": "brand",
"type": "text",
"placeholder": "Olive Garden, Applebee's, TGI Friday's...",
"label": "Brand"
}
data/presets/presets.json
+372 -2197
View File
File diff suppressed because it is too large Load Diff
data/presets/presets/amenity/fast_food.json
+1 -18
View File
@@ -1,7 +1,6 @@
{
"icon": "fast-food",
"fields": [
"brand_fast_food",
"cuisine",
"building_area",
"address",
@@ -16,22 +15,6 @@
"tags": {
"amenity": "fast_food"
},
"terms": [
"breakfast",
"cafe*",
"café",
"coffee",
"dine*",
"dining",
"dinner",
"drive-in",
"eat*",
"grill",
"hamburger",
"lunch",
"pizza",
"sandwich",
"take*"
],
"terms": [],
"name": "Fast Food"
}
data/presets/presets/amenity/fuel.json
+2 -3
View File
@@ -1,10 +1,9 @@
{
"icon": "fuel",
"fields": [
"brand_fuel",
"operator",
"address",
"building_area",
"operator"
"building_area"
],
"geometry": [
"point",
data/presets/presets/amenity/restaurant.json
+29 -13
View File
@@ -1,7 +1,6 @@
{
"icon": "restaurant",
"fields": [
"brand_restaurant",
"cuisine",
"building_area",
"address",
@@ -15,21 +14,38 @@
"area"
],
"terms": [
"breakfast",
"cafe*",
"bar",
"cafeteria",
"café",
"coffee",
"dine*",
"dining",
"dinner",
"canteen",
"chophouse",
"coffee shop",
"diner",
"dining room",
"dive*",
"doughtnut shop",
"drive-in",
"eat*",
"eatery",
"eating house",
"eating place",
"fast-food place",
"fish and chips",
"greasy spoon",
"grill",
"hamburger",
"lunch",
"pizza",
"sandwich",
"take*"
"hamburger stand",
"hashery",
"hideaway",
"hotdog stand",
"inn",
"joint*",
"luncheonette",
"lunchroom",
"night club",
"outlet*",
"pizzeria",
"saloon",
"soda fountain",
"watering hole"
],
"tags": {
"amenity": "restaurant"
dist/locales/en.json
Vendored
+2 -14
View File
@@ -578,18 +578,6 @@
"boundary": {
"label": "Type"
},
"brand_fast_food": {
"label": "Brand",
"placeholder": "McDonald's, Subway, KFC..."
},
"brand_fuel": {
"label": "Brand",
"placeholder": "Shell, Exxon, BP..."
},
"brand_restaurant": {
"label": "Brand",
"placeholder": "Olive Garden, Applebee's, TGI Friday's..."
},
"building": {
"label": "Building"
},
@@ -1360,7 +1348,7 @@
},
"amenity/fast_food": {
"name": "Fast Food",
"terms": "breakfast,cafe*,café,coffee,dine*,dining,dinner,drive-in,eat*,grill,hamburger,lunch,pizza,sandwich,take*"
"terms": ""
},
"amenity/fire_station": {
"name": "Fire Station",
@@ -1456,7 +1444,7 @@
},
"amenity/restaurant": {
"name": "Restaurant",
"terms": "breakfast,cafe*,café,coffee,dine*,dining,dinner,drive-in,eat*,grill,hamburger,lunch,pizza,sandwich,take*"
"terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
},
"amenity/school": {
"name": "School Grounds",