Merge pull request #1146 from pietervdvn/feature/organic
Feature/organic
This commit is contained in:
GitHub
commit
68035ba16b
12 changed files with 236 additions and 136 deletions
|
|
@ -152,6 +152,22 @@
|
|||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "has_organic",
|
||||
"options": [
|
||||
{
|
||||
"osmTags": {
|
||||
"or": [
|
||||
"organic=yes",
|
||||
"organic=only"
|
||||
]
|
||||
},
|
||||
"question": {
|
||||
"en": "Has organic options"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -606,6 +606,33 @@
|
|||
"condition": "cuisine!=friture",
|
||||
"id": "halal (no friture)"
|
||||
},
|
||||
{
|
||||
"id": "organic (no friture)",
|
||||
"question": {
|
||||
"en": "Does this restaurant offer organic food?"
|
||||
},
|
||||
"mappings": [
|
||||
{
|
||||
"if": "organic=no",
|
||||
"then": {
|
||||
"en": "There are no organic options available"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=yes",
|
||||
"then": {
|
||||
"en": "There is an organic menu"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=only",
|
||||
"then": {
|
||||
"en": "Only organic options are available"
|
||||
}
|
||||
}
|
||||
],
|
||||
"condition": "cuisine!=friture"
|
||||
},
|
||||
{
|
||||
"id": "friture-vegetarian",
|
||||
"question": {
|
||||
|
|
@ -684,6 +711,37 @@
|
|||
],
|
||||
"condition": "cuisine=friture"
|
||||
},
|
||||
{
|
||||
"id": "friture-organic",
|
||||
"question": {
|
||||
"en": "Does this fries shop offer organic snacks?",
|
||||
"nl": "Heeft deze frituur biologische snacks?"
|
||||
},
|
||||
"mappings": [
|
||||
{
|
||||
"if": "organic=yes",
|
||||
"then": {
|
||||
"en": "Organic snacks are available",
|
||||
"nl": "Er zijn biologische snacks aanwezig"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=no",
|
||||
"then": {
|
||||
"en": "No organic snacks are available",
|
||||
"nl": "Geen biologische snacks beschikbaar"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=only",
|
||||
"then": {
|
||||
"en": "Only organic snacks are available",
|
||||
"nl": "Enkel biologische snacks zijn beschikbaar"
|
||||
}
|
||||
}
|
||||
],
|
||||
"condition": "cuisine=friture"
|
||||
},
|
||||
{
|
||||
"id": "friture-oil",
|
||||
"question": {
|
||||
|
|
@ -836,6 +894,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"has_organic",
|
||||
"accepts_cash",
|
||||
"accepts_cards"
|
||||
],
|
||||
|
|
@ -913,7 +972,18 @@
|
|||
]
|
||||
},
|
||||
"then": {
|
||||
"render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
|
||||
"render": "circle:white;./assets/layers/food/Vegetarian-mark.svg"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": {
|
||||
"or": [
|
||||
"organic=yes",
|
||||
"organic=only"
|
||||
]
|
||||
},
|
||||
"then": {
|
||||
"render": "./assets/layers/food/organic.svg"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -29,6 +29,16 @@
|
|||
"https://www.flaticon.com/free-icon/french-fries_1144288"
|
||||
]
|
||||
},
|
||||
{
|
||||
"path": "organic.svg",
|
||||
"license": "CC0",
|
||||
"authors": [
|
||||
"European Commission"
|
||||
],
|
||||
"sources": [
|
||||
"https://commons.wikimedia.org/wiki/File:Organic-Logo.svg"
|
||||
]
|
||||
},
|
||||
{
|
||||
"path": "restaurant.svg",
|
||||
"license": "CC0",
|
||||
|
|
|
|||
20
assets/layers/food/organic.svg
Normal file
20
assets/layers/food/organic.svg
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="400" height="268" id="svg2">
|
||||
<defs id="defs4"/>
|
||||
<rect width="400" height="268" x="0" y="0" id="rect2927" style="fill:#97be0d;fill-opacity:1"/>
|
||||
<g id="g2913" style="fill:#ffffff">
|
||||
<path d="M 145.62,62.7181 C 157.082,63.4373 168.392,64.7762 178.195,68.8137 169.007,72.2451 162.032,76.3014 154.055,80.0453 L 160.36,53.8903 C 165.358,63.8697 170.642,74.4742 173.425,84.4537 164.34,75.6031 155.047,69.0419 145.62,62.7181 z" id="path2889"/>
|
||||
<path d="M 195.933,60.0618 221.788,69.4387 201.555,78.9515 C 203.515,70.4081 205.696,61.7546 208.485,52.7966 211.421,63.8372 214.443,75.2339 216.549,85.8599 209.994,76.5742 202.869,68.5853 195.933,60.0618 z" id="path2891"/>
|
||||
<path d="M 247.183,69.2806 C 254.801,70.5745 262.826,70.2401 270.851,69.2824 264.282,75.1812 257.601,80.9674 250.618,86.4516 253.711,77.6835 256.589,68.7001 259.267,59.5153 261.121,68.5573 262.976,77.5992 264.83,86.6411 259.312,81.9312 253.169,76.1462 247.183,69.2806 z" id="path2893"/>
|
||||
<path d="M 299.058,68.4994 C 305.384,66.6256 313.586,61.8786 320.694,58.5012 314.783,66.2083 308.872,73.484 302.961,80.3578 304.934,72.4373 307.774,64.1993 310.36,55.6091 312.338,61.559 313.843,67.0447 316.549,72.4224 310.719,72.0905 304.888,70.9034 299.058,68.4994 z" id="path2895"/>
|
||||
<path d="M 276.87,112.874 C 287.566,110.977 294.743,107.737 303.351,104.751 295.827,112.454 286.977,122.911 280.774,127.858 L 290.36,99.8277 C 292.513,107.634 295.085,115.021 297.643,122.422 290.434,120.687 283.664,117.101 276.87,112.874 z" id="path2897"/>
|
||||
<path d="M 250.776,148.03 C 260.467,150.41 269.078,152.108 279.288,151.313 272.912,157.458 265.04,161.36 257.024,165.045 259.688,157.193 262.324,149.281 264.579,140.609 267.94,149.442 270.8,159.839 274.674,166.641 265.11,160.97 257.891,154.518 250.776,148.03 z" id="path2899"/>
|
||||
<path d="M 222.808,170.843 C 231.791,174.656 240.305,178.594 249.757,180.376 242.893,183.376 236.014,186.36 228.743,188.952 230.782,181.275 232.595,174.067 235.048,166.39 238.051,175.969 241.366,185.444 245.612,194.61 237.513,188.435 229.718,179.456 222.808,170.843 z" id="path2901"/>
|
||||
<path d="M 186.089,184.905 C 195.28,187.561 204.472,191.536 213.663,195.845 205.992,199.049 198.497,202.78 191.242,207.233 194.33,197.717 197.699,188.004 199.735,178.734 202.578,189.754 206.32,201.303 209.049,212.579 203.504,205.958 193.726,193.401 186.089,184.905 z" id="path2903"/>
|
||||
<path d="M 131.245,192.249 C 141.799,190.377 152.12,189.905 162.257,190.532 152.494,199.257 144.572,206.755 135.93,214.733 139.959,202.108 143.988,189.484 148.017,176.859 150.542,188.778 152.717,201.398 154.83,214.141 148.701,207.298 139.606,199.048 131.245,192.249 z" id="path2905"/>
|
||||
<path d="M 112.026,97.093 C 123.911,93.5084 135.473,93.3177 146.945,94.2822 L 120.774,111.452 C 123.604,102.421 126.352,93.3899 129.579,84.359 134.501,93.1733 138.963,101.991 142.643,110.391 134.414,104.45 123.126,100.573 112.026,97.093 z" id="path2907"/>
|
||||
<path d="M 89.0575,147.874 C 100.645,141.975 112.388,137.496 123.976,137.407 L 95.93,164.733 107.235,127.64 C 111.461,137.395 115.625,148.133 117.799,157.891 108.901,153.66 99.6027,150.046 89.0575,147.874 z" id="path2909"/>
|
||||
<path d="M 68.745,210.999 C 75.2119,208.654 86.6709,199.738 93.5228,197.777 112.706,164.866 189.74,119.381 225.587,115.732 226.594,115.63 226.477,116.341 225.628,116.589 188.038,127.557 124.927,161.934 101.319,199.282 92.241,213.643 88.6779,215.682 76.8675,229.264 80.6148,214.858 84.4477,200.424 89.4228,185.609 93.9863,196.873 97.26,208.567 100.612,220.234 91.2856,215.198 80.1533,212.288 68.745,210.999 z" id="path2911"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.7 KiB |
|
|
@ -206,6 +206,51 @@
|
|||
"internet",
|
||||
"internet-fee",
|
||||
"internet-ssid",
|
||||
{
|
||||
"id": "organic",
|
||||
"question": {
|
||||
"en": "Does this shop offer organic products?"
|
||||
},
|
||||
"mappings": [
|
||||
{
|
||||
"if": "organic=yes",
|
||||
"then": {
|
||||
"en": "This shop offers organic products"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=only",
|
||||
"then": {
|
||||
"en": "This shop only offers organic products"
|
||||
}
|
||||
},
|
||||
{
|
||||
"if": "organic=no",
|
||||
"then": {
|
||||
"en": "This shop does not offer organic products"
|
||||
}
|
||||
}
|
||||
],
|
||||
"condition": {
|
||||
"or": [
|
||||
"shop=supermarket",
|
||||
"shop=convenience",
|
||||
"shop=farm",
|
||||
"shop=greengrocer",
|
||||
"shop=health_food",
|
||||
"shop=clothes",
|
||||
"shop=shoes",
|
||||
"shop=butcher",
|
||||
"shop=cosmetics",
|
||||
"shop=deli",
|
||||
"shop=bakery",
|
||||
"shop=alcohol",
|
||||
"shop=seafood",
|
||||
"shop=beverages",
|
||||
"shop=florist"
|
||||
]
|
||||
}
|
||||
},
|
||||
"questions",
|
||||
"reviews"
|
||||
],
|
||||
|
|
@ -269,6 +314,15 @@
|
|||
{
|
||||
"if": "opening_hours~*",
|
||||
"then": "isOpen"
|
||||
},
|
||||
{
|
||||
"if": {
|
||||
"or": [
|
||||
"organic=yes",
|
||||
"organic=only"
|
||||
]
|
||||
},
|
||||
"then": "./assets/layers/food/organic.svg"
|
||||
}
|
||||
],
|
||||
"label": {
|
||||
|
|
@ -341,6 +395,7 @@
|
|||
]
|
||||
},
|
||||
"accepts_cash",
|
||||
"accepts_cards"
|
||||
"accepts_cards",
|
||||
"has_organic"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="352px" height="375px" viewBox="0 0 352 375" version="1.1">
|
||||
<g id="surface1">
|
||||
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0.392157%,49.803922%,0%);fill-opacity:1;" d="M 330.257812 7.449219 C 321.976562 9.625 304.480469 13.554688 291.433594 16.140625 C 258.203125 22.660156 252.921875 24.628906 238.117188 35.597656 C 217.101562 51.222656 202.398438 81.4375 202.503906 108.859375 C 202.605469 119.308594 204.160156 126.757812 205.921875 124.792969 C 206.335938 124.277344 207.785156 121.273438 209.027344 118.171875 C 215.339844 102.960938 233.664062 79.78125 249.296875 67.261719 C 257.269531 60.84375 273.316406 54.53125 273.316406 57.84375 C 273.316406 58.980469 267.832031 65.8125 261.308594 72.640625 C 255.199219 79.160156 253.128906 81.851562 241.636719 98.511719 C 229.730469 115.996094 214.203125 147.246094 203.746094 175.082031 C 193.601562 202.089844 186.144531 223.613281 181.175781 239.753906 C 172.789062 267.382812 165.234375 289.21875 163.886719 289.632812 C 162.230469 290.253906 157.675781 275.457031 148.152344 238.722656 C 133.347656 181.1875 127.03125 161.425781 111.914062 125.414062 C 101.5625 100.890625 87.894531 81.230469 60.152344 51.117188 C 44.933594 34.457031 23.292969 18.523438 10.25 14.175781 C 1.761719 11.277344 1.035156 12.726562 7.453125 19.867188 C 37.683594 53.910156 55.179688 79.160156 73.714844 115.066406 C 89.347656 145.59375 100.113281 175.910156 119.679688 245.445312 C 124.648438 263.246094 135.625 308.566406 139.144531 326.160156 C 143.078125 345.714844 147.425781 364.859375 148.566406 367.859375 C 148.980469 368.792969 150.53125 370.03125 152.085938 370.445312 C 155.605469 371.378906 172.582031 371.378906 176.207031 370.445312 C 181.589844 368.894531 182.625 364.652344 190.078125 315.8125 C 195.050781 282.800781 199.292969 263.039062 207.785156 233.546875 C 222.175781 183.257812 237.496094 146.417969 246.8125 140.417969 C 248.160156 139.589844 254.785156 137.933594 261.722656 136.796875 C 288.640625 132.347656 310.277344 120.445312 325.601562 101.511719 C 335.847656 88.886719 338.542969 79.574219 341.128906 48.53125 C 342.476562 32.078125 343.304688 27.421875 346.410156 17.589844 C 348.375 11.175781 349.722656 5.378906 349.515625 4.65625 C 348.789062 2.792969 347.132812 3 330.257812 7.449219 Z M 330.257812 7.449219 "/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.4 KiB |
|
|
@ -1,14 +1,4 @@
|
|||
[
|
||||
{
|
||||
"path": "Vegetarian-mark.svg",
|
||||
"license": "PD",
|
||||
"authors": [
|
||||
"European Vegetarian Union"
|
||||
],
|
||||
"sources": [
|
||||
"https://commons.wikimedia.org/wiki/File:Vegetarian-mark.svg"
|
||||
]
|
||||
},
|
||||
{
|
||||
"path": "fries.svg",
|
||||
"license": "CC-BY",
|
||||
|
|
|
|||
|
|
@ -3723,6 +3723,13 @@
|
|||
"question": "No information about tactile paving"
|
||||
}
|
||||
}
|
||||
},
|
||||
"6": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Has organic options"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -4116,6 +4123,20 @@
|
|||
},
|
||||
"question": "Does this fries shop use vegetable or animal oil for cooking?"
|
||||
},
|
||||
"friture-organic": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
"then": "Organic snacks are available"
|
||||
},
|
||||
"1": {
|
||||
"then": "No organic snacks are available"
|
||||
},
|
||||
"2": {
|
||||
"then": "Only organic snacks are available"
|
||||
}
|
||||
},
|
||||
"question": "Does this fries shop offer organic snacks?"
|
||||
},
|
||||
"friture-take-your-container": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
|
|
@ -4174,6 +4195,20 @@
|
|||
}
|
||||
},
|
||||
"question": "Does this restaurant offer a halal menu?"
|
||||
},
|
||||
"organic (no friture)": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
"then": "There are no organic options available"
|
||||
},
|
||||
"1": {
|
||||
"then": "There is an organic menu"
|
||||
},
|
||||
"2": {
|
||||
"then": "Only organic options are available"
|
||||
}
|
||||
},
|
||||
"question": "Does this restaurant offer organic food?"
|
||||
}
|
||||
},
|
||||
"title": {
|
||||
|
|
@ -6450,6 +6485,20 @@
|
|||
"render": "This is a {shop}"
|
||||
}
|
||||
},
|
||||
"organic": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
"then": "This shop offers organic products"
|
||||
},
|
||||
"1": {
|
||||
"then": "This shop only offers organic products"
|
||||
},
|
||||
"2": {
|
||||
"then": "This shop does not offer organic products"
|
||||
}
|
||||
},
|
||||
"question": "Does this shop offer organic products?"
|
||||
},
|
||||
"shops-name": {
|
||||
"question": "What is the name of this shop?",
|
||||
"render": "This shop is called <i>{name}</i>"
|
||||
|
|
|
|||
|
|
@ -3910,6 +3910,20 @@
|
|||
},
|
||||
"question": "Bakt deze frituur met dierlijk vet of met plantaardige olie?"
|
||||
},
|
||||
"friture-organic": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
"then": "Er zijn biologische snacks aanwezig"
|
||||
},
|
||||
"1": {
|
||||
"then": "Geen biologische snacks beschikbaar"
|
||||
},
|
||||
"2": {
|
||||
"then": "Enkel biologische snacks zijn beschikbaar"
|
||||
}
|
||||
},
|
||||
"question": "Heeft deze frituur biologische snacks?"
|
||||
},
|
||||
"friture-take-your-container": {
|
||||
"mappings": {
|
||||
"0": {
|
||||
|
|
|
|||
|
|
@ -423,22 +423,6 @@
|
|||
"indoors": {
|
||||
"title": "Indoors"
|
||||
},
|
||||
"mapcomplete-changes": {
|
||||
"layers": {
|
||||
"0": {
|
||||
"filter": {
|
||||
"0": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "El nom de la petició conté {search}"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"name": "Centres del conjunt de canvis"
|
||||
}
|
||||
}
|
||||
},
|
||||
"maproulette": {
|
||||
"title": "Tasques de MapRoulette"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -741,101 +741,6 @@
|
|||
"description": "Eine Karte mit Bordsteinen und Überwegen.",
|
||||
"title": "Bordsteine und Überwege"
|
||||
},
|
||||
"mapcomplete-changes": {
|
||||
"description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
|
||||
"layers": {
|
||||
"0": {
|
||||
"description": "Zeigt alle MapComplete-Änderungen",
|
||||
"filter": {
|
||||
"0": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Themename enthält {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Erstellt vom Mitwirkenden {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"2": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "<b>Nicht</b> von Mitwirkendem {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"3": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Erstellt vor {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"4": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Erstellt nach {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"5": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Benutzersprache (ISO-Code) {search}"
|
||||
}
|
||||
}
|
||||
},
|
||||
"6": {
|
||||
"options": {
|
||||
"0": {
|
||||
"question": "Erstellt mit host {search}"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"name": "Zentrum der Änderungssätze",
|
||||
"tagRenderings": {
|
||||
"contributor": {
|
||||
"question": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
|
||||
"render": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
|
||||
},
|
||||
"host": {
|
||||
"question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
|
||||
"render": "Geändert über <a href='{host}'>{host}</a>"
|
||||
},
|
||||
"locale": {
|
||||
"question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
|
||||
"render": "Benutzergebietsschema ist {locale}"
|
||||
},
|
||||
"show_changeset_id": {
|
||||
"render": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
|
||||
},
|
||||
"theme-id": {
|
||||
"question": "Welches Thema wurde für diese Änderung verwendet?",
|
||||
"render": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
|
||||
}
|
||||
},
|
||||
"title": {
|
||||
"render": "Änderungssatz für {theme}"
|
||||
}
|
||||
},
|
||||
"1": {
|
||||
"override": {
|
||||
"tagRenderings": {
|
||||
"link_to_more": {
|
||||
"render": "Weitere Statistiken finden Sie unter <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"shortDescription": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden",
|
||||
"title": "Mit MapComplete vorgenommene Änderungen"
|
||||
},
|
||||
"maproulette": {
|
||||
"description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.",
|
||||
"title": "MapRoulette-Aufgaben"
|
||||
|
|
|
|||
|
|
@ -160,13 +160,6 @@
|
|||
"indoors": {
|
||||
"title": "اندروں"
|
||||
},
|
||||
"mapcomplete-changes": {
|
||||
"layers": {
|
||||
"0": {
|
||||
"name": "تبدیلیاں دے کیندر"
|
||||
}
|
||||
}
|
||||
},
|
||||
"maproulette": {
|
||||
"title": "میپرولیٹ دے کم"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue