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

various updates to presets

Browse Source 
Add "crop" field for landuse=farm/farmland/farmyard (for #2149)
  Add "trees" field for landuse=orchard
  Add landuse=landfill
  Add the hoops=* field to the basketball preset (for #1984)
  Add amenity=nightclub
  Add smoking field for many presets under amenity, building, office, tourism (for #1990)
This commit is contained in:
Bryan Housel
2014-03-17 23:10:34 -04:00
parent 8e96752039
commit 593a041f74
38 changed files with 865 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/map.css
+10
View File
@@ -241,6 +241,10 @@ path.stroke.tag-landuse-quarry {
stroke: #a6957b;
}
path.stroke.tag-landuse-landfill {
stroke: #ff9933;
}
path.stroke.tag-landuse-residential,
path.stroke.tag-landuse-construction {
stroke: #e06e5f;
@@ -309,6 +313,12 @@ path.fill.tag-landuse-reservoir {
path.fill.tag-landuse-quarry {
fill: #a6957b;
fill-opacity: 0.2;
}
path.fill.tag-landuse-landfill {
fill: #ff8800;
fill-opacity: 0.2;
}
path.fill.tag-landuse-residential {
data/presets.yaml
+15
View File
@@ -118,6 +118,8 @@ en:
label: Country
covered:
label: Covered
crop:
label: Crop
crossing:
label: Type
cuisine:
@@ -163,6 +165,9 @@ en:
label: Type
historic:
label: Type
hoops:
label: Hoops
placeholder: "1, 2, 4..."
iata:
label: IATA
icao:
@@ -279,6 +284,8 @@ en:
label: Type
shop:
label: Type
smoking:
label: Smoking
social_facility_for:
label: People served
placeholder: "Homeless, Disabled, Child, etc"
@@ -312,6 +319,8 @@ en:
label: Trail Visibility
tree_type:
label: Type
trees:
label: Trees
tunnel:
label: Tunnel
vending:
@@ -488,6 +497,9 @@ en:
amenity/marketplace:
name: Marketplace
terms: "<translate with synonyms or related terms for 'Marketplace', separated by commas>"
amenity/nightclub:
name: Nightclub
terms: "<translate with synonyms or related terms for 'Nightclub', separated by commas>"
amenity/parking:
name: Car Parking
terms: "<translate with synonyms or related terms for 'Car Parking', separated by commas>"
@@ -1091,6 +1103,9 @@ en:
landuse/industrial:
name: Industrial
terms: "<translate with synonyms or related terms for 'Industrial', separated by commas>"
landuse/landfill:
name: Landfill
terms: "<translate with synonyms or related terms for 'Landfill', separated by commas>"
landuse/meadow:
name: Meadow
terms: "<translate with synonyms or related terms for 'Meadow', separated by commas>"
data/presets/fields.json
+27
View File
@@ -255,6 +255,11 @@
"type": "check",
"label": "Covered"
},
"crop": {
"key": "crop",
"type": "combo",
"label": "Crop"
},
"crossing": {
"key": "crossing",
"type": "combo",
@@ -378,6 +383,12 @@
"type": "typeCombo",
"label": "Type"
},
"hoops": {
"key": "hoops",
"type": "number",
"label": "Hoops",
"placeholder": "1, 2, 4..."
},
"iata": {
"key": "iata",
"type": "text",
@@ -690,6 +701,17 @@
"type": "typeCombo",
"label": "Type"
},
"smoking": {
"key": "smoking",
"type": "combo",
"options": [
"no",
"outside",
"separated",
"yes"
],
"label": "Smoking"
},
"social_facility_for": {
"key": "social_facility:for",
"type": "radio",
@@ -797,6 +819,11 @@
],
"label": "Type"
},
"trees": {
"key": "trees",
"type": "combo",
"label": "Trees"
},
"tunnel": {
"key": "tunnel",
"type": "combo",
data/presets/fields/crop.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "crop",
"type": "combo",
"label": "Crop"
}
data/presets/fields/hoops.json
+6
View File
@@ -0,0 +1,6 @@
{
"key": "hoops",
"type": "number",
"label": "Hoops",
"placeholder": "1, 2, 4..."
}
data/presets/fields/smoking.json
+11
View File
@@ -0,0 +1,11 @@
{
"key": "smoking",
"type": "combo",
"options": [
"no",
"outside",
"separated",
"yes"
],
"label": "Smoking"
}
data/presets/fields/trees.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "trees",
"type": "combo",
"label": "Trees"
}
data/presets/presets.json
+646 -298
View File
File diff suppressed because it is too large Load Diff
data/presets/presets/amenity/bar.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"building_area",
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Bar"
}
}
data/presets/presets/amenity/cafe.json
+3 -2
View File
@@ -5,7 +5,8 @@
"internet_access",
"building_area",
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -21,4 +22,4 @@
"amenity": "cafe"
},
"name": "Cafe"
}
}
data/presets/presets/amenity/fast_food.json
+3 -2
View File
@@ -4,7 +4,8 @@
"cuisine",
"building_area",
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -16,4 +17,4 @@
},
"terms": [],
"name": "Fast Food"
}
}
data/presets/presets/amenity/nightclub.json
+24
View File
@@ -0,0 +1,24 @@
{
"icon": "bar",
"fields": [
"building_area",
"address",
"opening_hours",
"smoking"
],
"geometry": [
"point",
"vertex",
"area"
],
"tags": {
"amenity": "nightclub"
},
"terms": [
"disco*",
"night club",
"dancing",
"dance club"
],
"name": "Nightclub"
}
data/presets/presets/amenity/pub.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"building_area",
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Pub"
}
}
data/presets/presets/amenity/restaurant.json
+3 -2
View File
@@ -5,7 +5,8 @@
"building_area",
"address",
"opening_hours",
"capacity"
"capacity",
"smoking"
],
"geometry": [
"point",
@@ -50,4 +51,4 @@
"amenity": "restaurant"
},
"name": "Restaurant"
}
}
data/presets/presets/building.json
+2 -1
View File
@@ -3,7 +3,8 @@
"fields": [
"building",
"levels",
"address"
"address",
"smoking"
],
"geometry": [
"area"
data/presets/presets/building/commercial.json
+5 -1
View File
@@ -1,5 +1,9 @@
{
"icon": "commercial",
"fields": [
"address",
"smoking"
],
"geometry": [
"point",
"vertex",
@@ -9,4 +13,4 @@
"building": "commercial"
},
"name": "Commercial Building"
}
}
data/presets/presets/building/dormitory.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "building",
"fields": [
"address",
"levels"
"levels",
"smoking"
],
"geometry": [
"point",
data/presets/presets/building/hotel.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "building",
"fields": [
"address",
"levels"
"levels",
"smoking"
],
"geometry": [
"point",
data/presets/presets/building/public.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "building",
"fields": [
"address",
"levels"
"levels",
"smoking"
],
"geometry": [
"point",
data/presets/presets/building/retail.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "building",
"fields": [
"address",
"levels"
"levels",
"smoking"
],
"geometry": [
"point",
data/presets/presets/landuse/farm.json
+4 -1
View File
@@ -1,4 +1,7 @@
{
"fields": [
"crop"
],
"geometry": [
"point",
"area"
@@ -9,4 +12,4 @@
"terms": [],
"name": "Farm",
"icon": "farm"
}
}
data/presets/presets/landuse/farmland.json
+4 -1
View File
@@ -1,4 +1,7 @@
{
"fields": [
"crop"
],
"geometry": [
"point",
"area"
@@ -10,4 +13,4 @@
"name": "Farmland",
"icon": "farm",
"searchable": false
}
}
data/presets/presets/landuse/farmyard.json
+4 -1
View File
@@ -1,4 +1,7 @@
{
"fields": [
"crop"
],
"geometry": [
"point",
"area"
@@ -9,4 +12,4 @@
"terms": [],
"name": "Farmyard",
"icon": "farm"
}
}
data/presets/presets/landuse/landfill.json
+12
View File
@@ -0,0 +1,12 @@
{
"geometry": [
"area"
],
"tags": {
"landuse": "landfill"
},
"terms": [
"dump"
],
"name": "Landfill"
}
data/presets/presets/landuse/orchard.json
+6 -3
View File
@@ -1,5 +1,7 @@
{
"icon": "park2",
"fields": [
"trees"
],
"geometry": [
"point",
"area"
@@ -8,5 +10,6 @@
"landuse": "orchard"
},
"terms": [],
"name": "Orchard"
}
"name": "Orchard",
"icon": "park2"
}
data/presets/presets/leisure/pitch/basketball.json
+3 -2
View File
@@ -1,7 +1,8 @@
{
"icon": "basketball",
"fields": [
"surface"
"surface",
"hoops"
],
"geometry": [
"point",
@@ -13,4 +14,4 @@
},
"terms": [],
"name": "Basketball Court"
}
}
data/presets/presets/office.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"office",
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Office"
}
}
data/presets/presets/office/company.json
+3 -2
View File
@@ -2,7 +2,8 @@
"icon": "commercial",
"fields": [
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -14,4 +15,4 @@
},
"terms": [],
"name": "Company Office"
}
}
data/presets/presets/office/ngo.json
+3 -2
View File
@@ -2,7 +2,8 @@
"icon": "commercial",
"fields": [
"address",
"opening_hours"
"opening_hours",
"smoking"
],
"geometry": [
"point",
@@ -14,4 +15,4 @@
},
"terms": [],
"name": "NGO Office"
}
}
data/presets/presets/tourism/camp_site.json
+3 -2
View File
@@ -2,7 +2,8 @@
"icon": "campsite",
"fields": [
"operator",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -16,4 +17,4 @@
"tourism": "camp_site"
},
"name": "Camp Site"
}
}
data/presets/presets/tourism/caravan_site.json
+3 -2
View File
@@ -1,7 +1,8 @@
{
"fields": [
"operator",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -12,4 +13,4 @@
"tourism": "caravan_site"
},
"name": "RV Park"
}
}
data/presets/presets/tourism/chalet.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"building_area",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -14,4 +15,4 @@
"tourism": "chalet"
},
"name": "Chalet"
}
}
data/presets/presets/tourism/guest_house.json
+3 -2
View File
@@ -2,7 +2,8 @@
"icon": "lodging",
"fields": [
"operator",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -18,4 +19,4 @@
"Bed and Breakfast"
],
"name": "Guest House"
}
}
data/presets/presets/tourism/hostel.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"building_area",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -14,4 +15,4 @@
"tourism": "hostel"
},
"name": "Hostel"
}
}
data/presets/presets/tourism/hotel.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"building_area",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -15,4 +16,4 @@
"tourism": "hotel"
},
"name": "Hotel"
}
}
data/presets/presets/tourism/motel.json
+3 -2
View File
@@ -3,7 +3,8 @@
"fields": [
"operator",
"building_area",
"address"
"address",
"smoking"
],
"geometry": [
"point",
@@ -14,4 +15,4 @@
"tourism": "motel"
},
"name": "Motel"
}
}
data/presets/presets/tourism/picnic_site.json
+2 -1
View File
@@ -2,7 +2,8 @@
"icon": "park",
"fields": [
"operator",
"address"
"address",
"smoking"
],
"geometry": [
"point",
dist/locales/en.json
Vendored
+21
View File
@@ -565,6 +565,9 @@
"covered": {
"label": "Covered"
},
"crop": {
"label": "Crop"
},
"crossing": {
"label": "Type"
},
@@ -631,6 +634,10 @@
"historic": {
"label": "Type"
},
"hoops": {
"label": "Hoops",
"placeholder": "1, 2, 4..."
},
"iata": {
"label": "IATA"
},
@@ -797,6 +804,9 @@
"shop": {
"label": "Type"
},
"smoking": {
"label": "Smoking"
},
"social_facility_for": {
"label": "People served",
"placeholder": "Homeless, Disabled, Child, etc"
@@ -844,6 +854,9 @@
"tree_type": {
"label": "Type"
},
"trees": {
"label": "Trees"
},
"tunnel": {
"label": "Tunnel"
},
@@ -1082,6 +1095,10 @@
"name": "Marketplace",
"terms": ""
},
"amenity/nightclub": {
"name": "Nightclub",
"terms": "disco*,night club,dancing,dance club"
},
"amenity/parking": {
"name": "Car Parking",
"terms": ""
@@ -1886,6 +1903,10 @@
"name": "Industrial",
"terms": ""
},
"landuse/landfill": {
"name": "Landfill",
"terms": "dump"
},
"landuse/meadow": {
"name": "Meadow",
"terms": ""