diff --git a/gastro.json b/gastro.json
deleted file mode 100644
index 667b858..0000000
--- a/gastro.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "type": "overpass",
- "name": {
- "ast": "Gastronomía",
- "cs": "Stravování",
- "de": "Gastronomie",
- "el": "Γαστρονομία",
- "en": "Gastronomy",
- "fr": "Restauration",
- "hu": "Vendéglátás",
- "it": "Gastronomia",
- "ja": "食べ物",
- "nl": "Gastronomie",
- "pl": "Gastronomia",
- "pt": "Restauração",
- "pt-br": "Gastronomia",
- "ro": "Gastronomie",
- "ru": "Общепит",
- "uk": "Гастрономія"
- },
- "query": {
- "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];);"
- },
- "feature": {
- "description": "{{ tagTrans('amenity', tags.amenity) }}",
- "details": "{{ tagTransList('cuisine', tags.cuisine) }}",
- "body": [
- "<ul>",
- " <li class='hasSymbol'>",
- " <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>",
- " <span class='key'>{{ keyTrans('cuisine') }}:</span>",
- " <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>",
- " </li>",
- " {% set diets = tagsPrefix(tags, 'diet:') %}",
- " {% if diets %}",
- " <li class='hasSymbol'>",
- " <i class=\"fa fa-cutlery\" aria-hidden=\"true\"></i>",
- " <span class='key'>{{ keyTrans('diet') }}:</span>",
- " <span class='value'>",
- " {% for kv, k in diets %}",
- " {% set v = tags[k] %}",
- " <span title='{{ k ~ '=' ~ v }}' style='white-space: nowrap; margin-right: 0.5em;'>{% if v == 'no' %}✘ {% elseif v == 'only' %}❗{% else %}✔{% endif %}{{ keyTrans(k) }}</span>",
- " {% endfor %}",
- " </span></li>",
- " {% endif %}",
- "</ul>"
- ],
- "markerSign": "{% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}"
- },
- "filter": {
- "amenity": {
- "name": "{{ trans('filter:type') }}",
- "type": "select",
- "show_default": "true",
- "values": [
- "bar",
- "biergarten",
- "cafe",
- "fast_food",
- "food_court",
- "ice_cream",
- "pub",
- "restaurant"
- ],
- "valueName": "{{ tagTrans('amenity', value) }}",
- "op": "="
- },
- "cuisine_food": {
- "name": "{{ keyTrans('cuisine/food') }}",
- "type": "select",
- "key": "cuisine",
- "values": [ "barbecue", "burger", "casserole", "chicken", "couscous", "curry", "fish", "fish_and_chips", "fried_food", "friture", "gyros", "kebab", "noodle", "pasta", "pizza", "sandwich", "sausage", "seafood", "soup", "steak_house", "sub", "sushi", "tapas", "wings" ],
- "valueName": "{{ tagTrans('cuisine', value) }}",
- "op": "has"
- },
- "cuisine_dessert": {
- "name": "{{ keyTrans('cuisine/dessert') }}",
- "type": "select",
- "key": "cuisine",
- "values": [ "bagel", "biscuit", "bougatsa", "cake", "coffee_shop", "cookie", "crepe", "dessert", "donut", "empanada", "frozen_yogurt", "gingerbread", "ice_cream", "chimney_cake", "langos", "pancake", "pastry", "petit_four", "pie", "pogacha", "poppy_seed_roll", "profiterole", "punch_cake", "savory_pancakes", "strudel", "teahouse", "waffle" ],
- "valueName": "{{ tagTrans('cuisine', value) }}",
- "op": "has"
- },
- "cuisine_ethnicity": {
- "name": "{{ keyTrans('cuisine/ethnicity') }}",
- "type": "select",
- "key": "cuisine",
- "values": [ "afghan", "african", "american", "arab", "argentinian", "asian", "australian", "baiana", "balkan", "basque", "bavarian", "belarusan", "bolivian", "brazilian", "cantonese", "capixaba", "caribbean", "chinese", "croatian", "czech", "danish", "french", "gaucho", "german", "greek", "hawaiian", "hunan", "hungarian", "indian", "international", "iranian", "italian", "japanese", "jewish", "korean", "kyo_ryouri", "latin_american", "lebanese", "malagasy", "mediterranean", "mexican", "mineira", "new_mexican", "okinawa_ryori", "pakistani", "peruvian", "polish", "portuguese", "regional", "rhenish", "russian", "shandong", "sichuan", "spanish", "texan", "tex-mex", "thai", "turkish", "vietnamese", "westphalian" ],
- "valueName": "{{ tagTrans('cuisine', value) }}",
- "op": "has"
- },
- "diet": {
- "name": "{{ keyTrans('diet') }}",
- "type": "select",
- "values": {
- "*": {
- "name": "{{ repoTrans('Objects with diet information') }}",
- "query": "nwr[~\"^diet:\"~\".\"]"
- },
- "diet:vegan": {},
- "diet:vegetarian": {},
- "diet:pescetarian": {},
- "diet:lacto_vegetarian": {},
- "diet:ovo_vegetarian": {},
- "diet:fruitarian": {},
- "diet:raw": {},
- "diet:gluten_free": {},
- "diet:dairy_free": {},
- "diet:lactose_free": {},
- "diet:halal": {},
- "diet:kosher": {}
- },
- "valueName": "{{ keyTrans(value) }}",
- "op": "has_key_value"
- }
- }
-}
diff --git a/gastro.yaml b/gastro.yaml
new file mode 100644
index 0000000..3e547e3
--- /dev/null
+++ b/gastro.yaml
@@ -0,0 +1,210 @@
+type: overpass
+query:
+ 16: (node[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|food_court|ice_cream|pub|restaurant)$'];);
+feature:
+ description: |
+ {{ tagTrans('amenity', tags.amenity) }}
+ details: |
+ {{ tagTransList('cuisine', tags.cuisine) }}
+ body: |
+ <ul>
+ <li class='hasSymbol'>
+ <i class="fa fa-cutlery" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('cuisine') }}:</span>
+ <span class='value'>{{ tagTransList('cuisine', tags.cuisine)|default(trans('unknown')) }}</span>
+ </li>
+ {% set diets = tagsPrefix(tags, 'diet:') %}
+ {% if diets %}
+ <li class='hasSymbol'>
+ <i class="fa fa-cutlery" aria-hidden="true"></i>
+ <span class='key'>{{ keyTrans('diet') }}:</span>
+ <span class='value'>
+ {% for kv, k in diets %}
+ {% set v = tags[k] %}
+ <span title='{{ k ~ '=' ~ v }}' style='white-space: nowrap; margin-right: 0.5em;'>{% if v == 'no' %}✘ {% elseif v == 'only' %}❗{% else %}✔{% endif %}{{ keyTrans(k) }}</span>
+ {% endfor %}
+ </span></li>
+ {% endif %}
+ </ul>
+ markerSign: |
+ {% if tags.amenity=='bar' %}🍸{% elseif tags.amenity=='biergarten'%}🍻{% elseif tags.amenity=='cafe' %}☕{% elseif tags.amenity=='fast_food' %}🍔{% elseif tags.amenity=='ice_cream' %}🍨{% elseif tags.amenity=='pub' %}🍺{% else %}🍴{% endif %}
+filter:
+ amenity:
+ name: |
+ {{ trans('filter:type') }}
+ type: select
+ show_default: true
+ values:
+ - bar
+ - biergarten
+ - cafe
+ - fast_food
+ - food_court
+ - ice_cream
+ - pub
+ - restaurant
+ valueName: |
+ {{ tagTrans('amenity', value) }}
+ op: '='
+ cuisine_food:
+ name: |
+ {{ keyTrans('cuisine/food') }}
+ type: select
+ key: cuisine
+ values:
+ - barbecue
+ - burger
+ - casserole
+ - chicken
+ - couscous
+ - curry
+ - fish
+ - fish_and_chips
+ - fried_food
+ - friture
+ - gyros
+ - kebab
+ - noodle
+ - pasta
+ - pizza
+ - sandwich
+ - sausage
+ - seafood
+ - soup
+ - steak_house
+ - sub
+ - sushi
+ - tapas
+ - wings
+ valueName: |
+ {{ tagTrans('cuisine', value) }}
+ op: has
+ cuisine_dessert:
+ name: |
+ {{ keyTrans('cuisine/dessert') }}
+ type: select
+ key: cuisine
+ values:
+ - bagel
+ - biscuit
+ - bougatsa
+ - cake
+ - coffee_shop
+ - cookie
+ - crepe
+ - dessert
+ - donut
+ - empanada
+ - frozen_yogurt
+ - gingerbread
+ - ice_cream
+ - chimney_cake
+ - langos
+ - pancake
+ - pastry
+ - petit_four
+ - pie
+ - pogacha
+ - poppy_seed_roll
+ - profiterole
+ - punch_cake
+ - savory_pancakes
+ - strudel
+ - teahouse
+ - waffle
+ valueName: |
+ {{ tagTrans('cuisine', value) }}
+ op: has
+ cuisine_ethnicity:
+ name: |
+ {{ keyTrans('cuisine/ethnicity') }}
+ type: select
+ key: cuisine
+ values:
+ - afghan
+ - african
+ - american
+ - arab
+ - argentinian
+ - asian
+ - australian
+ - baiana
+ - balkan
+ - basque
+ - bavarian
+ - belarusan
+ - bolivian
+ - brazilian
+ - cantonese
+ - capixaba
+ - caribbean
+ - chinese
+ - croatian
+ - czech
+ - danish
+ - french
+ - gaucho
+ - german
+ - greek
+ - hawaiian
+ - hunan
+ - hungarian
+ - indian
+ - international
+ - iranian
+ - italian
+ - japanese
+ - jewish
+ - korean
+ - kyo_ryouri
+ - latin_american
+ - lebanese
+ - malagasy
+ - mediterranean
+ - mexican
+ - mineira
+ - new_mexican
+ - okinawa_ryori
+ - pakistani
+ - peruvian
+ - polish
+ - portuguese
+ - regional
+ - rhenish
+ - russian
+ - shandong
+ - sichuan
+ - spanish
+ - texan
+ - tex-mex
+ - thai
+ - turkish
+ - vietnamese
+ - westphalian
+ valueName: |
+ {{ tagTrans('cuisine', value) }}
+ op: has
+ diet:
+ name: |
+ {{ keyTrans('diet') }}
+ type: select
+ values:
+ '*':
+ name: |
+ {{ repoTrans('Objects with diet information') }}
+ query: nwr[~"^diet:"~"."]
+ diet:vegan: {}
+ diet:vegetarian: {}
+ diet:pescetarian: {}
+ diet:lacto_vegetarian: {}
+ diet:ovo_vegetarian: {}
+ diet:fruitarian: {}
+ diet:raw: {}
+ diet:gluten_free: {}
+ diet:dairy_free: {}
+ diet:lactose_free: {}
+ diet:halal: {}
+ diet:kosher: {}
+ valueName: |
+ {{ keyTrans(value) }}
+ op: has_key_value