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

Add more kinds of vending machines, change vending to multiple select field

Browse Source 
(closes #4888)
This commit is contained in:
Bryan Housel
2018-03-28 00:55:30 -04:00
parent bf8c24fd2b
commit 02682f0376
24 changed files with 501 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
data/presets.yaml
View File

@@ -1581,7 +1581,7 @@ en:
tourism: Tourism
vending:
# vending=*
label: Type of Goods
label: Types of Goods
visibility:
# visibility=*
label: Visibility
@@ -2299,6 +2299,11 @@ en:
name: Cigarette Vending Machine
# 'terms: cigarette'
terms: '<translate with synonyms or related terms for ''Cigarette Vending Machine'', separated by commas>'
amenity/vending_machine/coffee:
# 'amenity=vending_machine, vending=coffee'
name: Coffee Vending Machine
# 'terms: coffee'
terms: '<translate with synonyms or related terms for ''Coffee Vending Machine'', separated by commas>'
amenity/vending_machine/condoms:
# 'amenity=vending_machine, vending=condoms'
name: Condom Vending Machine
@@ -2309,6 +2314,16 @@ en:
name: Drink Vending Machine
# 'terms: drink,soda,beverage,juice,pop'
terms: '<translate with synonyms or related terms for ''Drink Vending Machine'', separated by commas>'
amenity/vending_machine/electronics:
# 'amenity=vending_machine, vending=electronics'
name: Electronics Vending Machine
# 'terms: cable,charger,earbud,headphone,phone,tablet'
terms: '<translate with synonyms or related terms for ''Electronics Vending Machine'', separated by commas>'
amenity/vending_machine/elongated_coin:
# 'amenity=vending_machine, vending=elongated_coin'
name: Flat Coin Vending Machine
# 'terms: coin,crush,elongated,flatten,penny,souvenir'
terms: '<translate with synonyms or related terms for ''Flat Coin Vending Machine'', separated by commas>'
amenity/vending_machine/excrement_bags:
# 'amenity=vending_machine, vending=excrement_bags'
name: Excrement Bag Vending Machine
@@ -2319,6 +2334,21 @@ en:
name: Feminine Hygiene Vending Machine
# 'terms: condom,tampon,pad,woman,women,menstrual hygiene products,personal care'
terms: '<translate with synonyms or related terms for ''Feminine Hygiene Vending Machine'', separated by commas>'
amenity/vending_machine/food:
# 'amenity=vending_machine, vending=food'
name: Food Vending Machine
# 'terms: food'
terms: '<translate with synonyms or related terms for ''Food Vending Machine'', separated by commas>'
amenity/vending_machine/fuel:
# 'amenity=vending_machine, vending=fuel'
name: Gas Pump
# 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel'
terms: '<translate with synonyms or related terms for ''Gas Pump'', separated by commas>'
amenity/vending_machine/ice_cream:
# 'amenity=vending_machine, vending=ice_cream'
name: Ice Cream Vending Machine
# 'terms: chocolate,ice cream,frozen,popsicle,vanilla'
terms: '<translate with synonyms or related terms for ''Ice Cream Vending Machine'', separated by commas>'
amenity/vending_machine/news_papers:
# 'amenity=vending_machine, vending=news_papers'
name: Newspaper Vending Machine
@@ -2342,6 +2372,11 @@ en:
name: Transit Ticket Vending Machine
# 'terms: bus,train,ferry,rail,ticket,transportation'
terms: '<translate with synonyms or related terms for ''Transit Ticket Vending Machine'', separated by commas>'
amenity/vending_machine/stamps:
# 'amenity=vending_machine, vending=stamps'
name: Postage Vending Machine
# 'terms: mail,postage,stamp'
terms: '<translate with synonyms or related terms for ''Postage Vending Machine'', separated by commas>'
amenity/vending_machine/sweets:
# 'amenity=vending_machine, vending=sweets'
name: Snack Vending Machine

4
data/presets/fields.json
View File

@@ -2129,8 +2129,8 @@
},
"vending": {
"key": "vending",
"type": "combo",
"label": "Type of Goods"
"type": "semiCombo",
"label": "Types of Goods"
},
"visibility": {
"key": "visibility",

4
data/presets/fields/vending.json
View File

@@ -1,5 +1,5 @@
{
"key": "vending",
"type": "combo",
"label": "Type of Goods"
"type": "semiCombo",
"label": "Types of Goods"
}

202
data/presets/presets.json
View File

@@ -3237,6 +3237,7 @@
"amenity/vending_machine/news_papers": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",
@@ -3262,6 +3263,7 @@
"amenity/vending_machine/cigarettes": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3282,9 +3284,34 @@
},
"name": "Cigarette Vending Machine"
},
"amenity/vending_machine/coffee": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"coffee"
],
"tags": {
"amenity": "vending_machine",
"vending": "coffee"
},
"reference": {
"key": "vending",
"value": "coffee"
},
"name": "Coffee Vending Machine"
},
"amenity/vending_machine/condoms": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3308,6 +3335,7 @@
"amenity/vending_machine/drinks": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3332,9 +3360,68 @@
},
"name": "Drink Vending Machine"
},
"amenity/vending_machine/electronics": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"cable",
"charger",
"earbud",
"headphone",
"phone",
"tablet"
],
"tags": {
"amenity": "vending_machine",
"vending": "electronics"
},
"reference": {
"key": "vending",
"value": "electronics"
},
"name": "Electronics Vending Machine"
},
"amenity/vending_machine/elongated_coin": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"coin",
"crush",
"elongated",
"flatten",
"penny",
"souvenir"
],
"tags": {
"amenity": "vending_machine",
"vending": "elongated_coin"
},
"reference": {
"key": "vending",
"value": "elongated_coin"
},
"name": "Flat Coin Vending Machine"
},
"amenity/vending_machine/excrement_bags": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",
@@ -3362,6 +3449,7 @@
"amenity/vending_machine/feminine_hygiene": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3388,9 +3476,93 @@
},
"name": "Feminine Hygiene Vending Machine"
},
"amenity/vending_machine/food": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"food"
],
"tags": {
"amenity": "vending_machine",
"vending": "food"
},
"reference": {
"key": "vending",
"value": "food"
},
"name": "Food Vending Machine"
},
"amenity/vending_machine/fuel": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"petrol",
"fuel",
"gasoline",
"propane",
"diesel",
"lng",
"cng",
"biodiesel"
],
"tags": {
"amenity": "vending_machine",
"vending": "fuel"
},
"reference": {
"key": "vending",
"value": "fuel"
},
"name": "Gas Pump"
},
"amenity/vending_machine/ice_cream": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"chocolate",
"ice cream",
"frozen",
"popsicle",
"vanilla"
],
"tags": {
"amenity": "vending_machine",
"vending": "ice_cream"
},
"reference": {
"key": "vending",
"value": "ice_cream"
},
"name": "Ice Cream Vending Machine"
},
"amenity/vending_machine/newspapers": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",
@@ -3415,6 +3587,7 @@
"amenity/vending_machine/parcel_pickup_dropoff": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3440,6 +3613,7 @@
"amenity/vending_machine/parking_tickets": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3465,6 +3639,7 @@
"amenity/vending_machine/public_transport_tickets": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
@@ -3490,9 +3665,36 @@
},
"name": "Transit Ticket Vending Machine"
},
"amenity/vending_machine/stamps": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"mail",
"postage",
"stamp"
],
"tags": {
"amenity": "vending_machine",
"vending": "stamps"
},
"reference": {
"key": "vending",
"value": "stamps"
},
"name": "Postage Vending Machine"
},
"amenity/vending_machine/sweets": {
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

1
data/presets/presets/amenity/vending_machine/_news_papers.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",

1
data/presets/presets/amenity/vending_machine/cigarettes.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

24
data/presets/presets/amenity/vending_machine/coffee.json Normal file
View File

@@ -0,0 +1,24 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"coffee"
],
"tags": {
"amenity": "vending_machine",
"vending": "coffee"
},
"reference": {
"key": "vending",
"value": "coffee"
},
"name": "Coffee Vending Machine"
}

1
data/presets/presets/amenity/vending_machine/condoms.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

1
data/presets/presets/amenity/vending_machine/drinks.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

29
data/presets/presets/amenity/vending_machine/electronics.json Normal file
View File

@@ -0,0 +1,29 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"cable",
"charger",
"earbud",
"headphone",
"phone",
"tablet"
],
"tags": {
"amenity": "vending_machine",
"vending": "electronics"
},
"reference": {
"key": "vending",
"value": "electronics"
},
"name": "Electronics Vending Machine"
}

29
data/presets/presets/amenity/vending_machine/elongated_coin.json Normal file
View File

@@ -0,0 +1,29 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"coin",
"crush",
"elongated",
"flatten",
"penny",
"souvenir"
],
"tags": {
"amenity": "vending_machine",
"vending": "elongated_coin"
},
"reference": {
"key": "vending",
"value": "elongated_coin"
},
"name": "Flat Coin Vending Machine"
}

1
data/presets/presets/amenity/vending_machine/excrement_bags.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",

1
data/presets/presets/amenity/vending_machine/feminine_hygiene.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

24
data/presets/presets/amenity/vending_machine/food.json Normal file
View File

@@ -0,0 +1,24 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"food"
],
"tags": {
"amenity": "vending_machine",
"vending": "food"
},
"reference": {
"key": "vending",
"value": "food"
},
"name": "Food Vending Machine"
}

31
data/presets/presets/amenity/vending_machine/fuel.json Normal file
View File

@@ -0,0 +1,31 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"petrol",
"fuel",
"gasoline",
"propane",
"diesel",
"lng",
"cng",
"biodiesel"
],
"tags": {
"amenity": "vending_machine",
"vending": "fuel"
},
"reference": {
"key": "vending",
"value": "fuel"
},
"name": "Gas Pump"
}

28
data/presets/presets/amenity/vending_machine/ice_cream.json Normal file
View File

@@ -0,0 +1,28 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"chocolate",
"ice cream",
"frozen",
"popsicle",
"vanilla"
],
"tags": {
"amenity": "vending_machine",
"vending": "ice_cream"
},
"reference": {
"key": "vending",
"value": "ice_cream"
},
"name": "Ice Cream Vending Machine"
}

1
data/presets/presets/amenity/vending_machine/newspapers.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"fee",
"payment_multi",

1
data/presets/presets/amenity/vending_machine/parcel_pickup_dropoff.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

1
data/presets/presets/amenity/vending_machine/parking_tickets.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

1
data/presets/presets/amenity/vending_machine/public_transport_tickets.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

26
data/presets/presets/amenity/vending_machine/stamps.json Normal file
View File

@@ -0,0 +1,26 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"
],
"geometry": [
"point"
],
"terms": [
"mail",
"postage",
"stamp"
],
"tags": {
"amenity": "vending_machine",
"vending": "stamps"
},
"reference": {
"key": "vending",
"value": "stamps"
},
"name": "Postage Vending Machine"
}

1
data/presets/presets/amenity/vending_machine/sweets.json
View File

@@ -1,6 +1,7 @@
{
"icon": "poi-vending-machine",
"fields": [
"vending",
"operator",
"payment_multi",
"currency_multi"

28
data/taginfo.json
View File

@@ -579,6 +579,10 @@
"key": "vending",
"value": "cigarettes"
},
{
"key": "vending",
"value": "coffee"
},
{
"key": "vending",
"value": "condoms"
@@ -587,6 +591,14 @@
"key": "vending",
"value": "drinks"
},
{
"key": "vending",
"value": "electronics"
},
{
"key": "vending",
"value": "elongated_coin"
},
{
"key": "vending",
"value": "excrement_bags"
@@ -595,6 +607,18 @@
"key": "vending",
"value": "feminine_hygiene"
},
{
"key": "vending",
"value": "food"
},
{
"key": "vending",
"value": "fuel"
},
{
"key": "vending",
"value": "ice_cream"
},
{
"key": "vending",
"value": "newspapers"
@@ -611,6 +635,10 @@
"key": "vending",
"value": "public_transport_tickets"
},
{
"key": "vending",
"value": "stamps"
},
{
"key": "vending",
"value": "sweets"

30
dist/locales/en.json vendored
View File

@@ -2676,7 +2676,7 @@
}
},
"vending": {
"label": "Type of Goods"
"label": "Types of Goods"
},
"visibility": {
"label": "Visibility",
@@ -3339,6 +3339,10 @@
"name": "Cigarette Vending Machine",
"terms": "cigarette"
},
"amenity/vending_machine/coffee": {
"name": "Coffee Vending Machine",
"terms": "coffee"
},
"amenity/vending_machine/condoms": {
"name": "Condom Vending Machine",
"terms": "condom"
@@ -3347,6 +3351,14 @@
"name": "Drink Vending Machine",
"terms": "drink,soda,beverage,juice,pop"
},
"amenity/vending_machine/electronics": {
"name": "Electronics Vending Machine",
"terms": "cable,charger,earbud,headphone,phone,tablet"
},
"amenity/vending_machine/elongated_coin": {
"name": "Flat Coin Vending Machine",
"terms": "coin,crush,elongated,flatten,penny,souvenir"
},
"amenity/vending_machine/excrement_bags": {
"name": "Excrement Bag Vending Machine",
"terms": "excrement bags,poop,dog,animal"
@@ -3355,6 +3367,18 @@
"name": "Feminine Hygiene Vending Machine",
"terms": "condom,tampon,pad,woman,women,menstrual hygiene products,personal care"
},
"amenity/vending_machine/food": {
"name": "Food Vending Machine",
"terms": "food"
},
"amenity/vending_machine/fuel": {
"name": "Gas Pump",
"terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
},
"amenity/vending_machine/ice_cream": {
"name": "Ice Cream Vending Machine",
"terms": "chocolate,ice cream,frozen,popsicle,vanilla"
},
"amenity/vending_machine/newspapers": {
"name": "Newspaper Vending Machine",
"terms": "newspaper"
@@ -3371,6 +3395,10 @@
"name": "Transit Ticket Vending Machine",
"terms": "bus,train,ferry,rail,ticket,transportation"
},
"amenity/vending_machine/stamps": {
"name": "Postage Vending Machine",
"terms": "mail,postage,stamp"
},
"amenity/vending_machine/sweets": {
"name": "Snack Vending Machine",
"terms": "candy,gum,chip,pretzel,cookie,cracker"