Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add shop=agrarian preset and agrarian=* field #4507

Merged
merged 2 commits into from
Nov 7, 2017
Merged

add shop=agrarian preset and agrarian=* field #4507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94c363a
add shop=agrarian preset and agrarian=* field
willemarcel Nov 6, 2017
59426e8
remove brand field from shop=agrarian preset
willemarcel Nov 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/presets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ en:
aeroway:
# aeroway=*
label: Type
agrarian:
# agrarian=*
label: Products
amenity:
# amenity=*
label: Type
Expand Down Expand Up @@ -4513,6 +4516,11 @@ en:
# shop=*
name: Shop
terms: '<translate with synonyms or related terms for ''Shop'', separated by commas>'
shop/agrarian:
# shop=agrarian
name: Agriculture Shop
# 'terms: agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools'
terms: '<translate with synonyms or related terms for ''Agriculture Shop'', separated by commas>'
shop/alcohol:
# shop=alcohol
name: Liquor Store
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@
"type": "typeCombo",
"label": "Type"
},
"agrarian": {
"key": "agrarian",
"type": "semiCombo",
"label": "Products"
},
"amenity": {
"key": "amenity",
"type": "typeCombo",
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/agrarian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "agrarian",
"type": "semiCombo",
"label": "Products"
}
27 changes: 27 additions & 0 deletions data/presets/presets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13519,6 +13519,33 @@
"name": "Vacant Shop",
"searchable": false
},
"shop/agrarian": {
"icon": "shop",
"fields": [
"name",
"brand",
"agrarian",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"agricultural inputs",
"agricultural machines",
"seeds",
"pesticides",
"fertilizer",
"agricultural tools"
],
"tags": {
"shop": "agrarian"
},
"name": "Agriculture Shop"
},
"shop/alcohol": {
"icon": "alcohol-shop",
"fields": [
Expand Down
27 changes: 27 additions & 0 deletions data/presets/presets/shop/agrarian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"icon": "shop",
"fields": [
"name",
"brand",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove brand, otherwise looks ok...

None of our other shop presets offer this field because we don't have a good way to suggest values for it. Users would need to just know how to create a semicolon separated list of brands sold here.

"agrarian",
"address",
"building_area",
"opening_hours"
],
"geometry": [
"point",
"area"
],
"terms": [
"agricultural inputs",
"agricultural machines",
"seeds",
"pesticides",
"fertilizer",
"agricultural tools"
],
"tags": {
"shop": "agrarian"
},
"name": "Agriculture Shop"
}
4 changes: 4 additions & 0 deletions data/taginfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2591,6 +2591,10 @@
"key": "shop",
"value": "vacant"
},
{
"key": "shop",
"value": "agrarian"
},
{
"key": "shop",
"value": "alcohol"
Expand Down
7 changes: 7 additions & 0 deletions dist/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,6 +1219,9 @@
"aeroway": {
"label": "Type"
},
"agrarian": {
"label": "Products"
},
"amenity": {
"label": "Type"
},
Expand Down Expand Up @@ -5052,6 +5055,10 @@
"name": "Vacant Shop",
"terms": ""
},
"shop/agrarian": {
"name": "Agriculture Shop",
"terms": "agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools"
},
"shop/alcohol": {
"name": "Liquor Store",
"terms": "alcohol,beer,booze,wine"
Expand Down