Browse Source

Merge pull request #13 from plepe/master

Sync
climbing
Igor Eliezer 4 years ago
committed by GitHub
parent
commit
52f8556133
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      buildings-start_date.json
  2. 4
      detailsBody.html
  3. 5
      lang/ast.json
  4. 5
      lang/ca.json
  5. 5
      lang/cs.json
  6. 5
      lang/de.json
  7. 5
      lang/el.json
  8. 5
      lang/en.json
  9. 5
      lang/es.json
  10. 5
      lang/et.json
  11. 5
      lang/fr.json
  12. 5
      lang/hu.json
  13. 5
      lang/it.json
  14. 5
      lang/ja.json
  15. 5
      lang/nl.json
  16. 5
      lang/pl.json
  17. 7
      lang/pt-br.json
  18. 5
      lang/pt.json
  19. 5
      lang/ro.json
  20. 5
      lang/ru.json
  21. 5
      lang/template.json
  22. 5
      lang/uk.json
  23. 4
      popupBody.html
  24. 4
      pt.json
  25. 8
      residential.json
  26. 4
      xmas.json

15
buildings-start_date.json

@ -45,7 +45,16 @@
],
"description": [
"{% if tags.start_date %}",
"{{ tags.start_date }}",
"{{ tags.start_date|osmFormatDate({ format: 'short' }) }}",
"{% else %}",
"{{ trans('unknown') }}",
"{% endif %}"
],
"popupDescription": [
"{% if tags.start_date %}",
"{{ tags.start_date|osmFormatDate }}",
"{% else %}",
"{{ trans('unknown') }}",
"{% endif %}"
],
"markerSymbol": null,
@ -111,11 +120,11 @@
" </tr>",
" <tr>",
" <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"xxx\" }))|raw }}</td>",
" <td>unparseable start_date</td>",
" <td>{{ repoTrans('date format not understood') }}</td>",
" </tr>",
" <tr>",
" <td>{{ markerPolygon(evaluate({ \"building\": \"yes\" }))|raw }}</td>",
" <td>no start_date</td>",
" <td>{{ trans('unknown') }}</td>",
" </tr>",
"</table>"
]

4
detailsBody.html

@ -145,7 +145,7 @@
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('start_date') }}:</span>
<span class='value'>{{ enumerate(tags.start_date) }}</span>
<span class='value'>{{ tags.start_date|osmFormatDate }}</span>
</li>
{% endif %}
@ -153,7 +153,7 @@
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_date') }}:</span>
<span class='value'>{{ enumerate(tags.opening_date) }}</span>
<span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
</li>
{% endif %}

5
lang/ast.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "Fábriques",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/ca.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/cs.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "Továrny",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/de.json

@ -85,5 +85,8 @@
"category:water": "Gewässer",
"category:wikipedia": "Wikipedia",
"category:works": "Fabriken",
"category:xmas": "Weihnachten"
"category:xmas": "Weihnachten",
"date format not understood": "Datumsformat nicht erkannt",
"outdated feature": "Informationen nicht aktuell",
"xmas:outdated-warning": "Objekt wurde nicht für die aktuelle Saison aktualisiert. Bitte prüfen und das Tag 'xmas:lastcheck' auf das aktuelle Datum setzen."
}

5
lang/el.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/en.json

@ -85,5 +85,8 @@
"category:water": "Waterbodies",
"category:wikipedia": "Wikipedia",
"category:works": "Works",
"category:xmas": "Christmas"
"category:xmas": "Christmas",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": "Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date."
}

5
lang/es.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/et.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/fr.json

@ -85,5 +85,8 @@
"category:water": "Hydrographie",
"category:wikipedia": "Wikipédia",
"category:works": "Zones industrielles",
"category:xmas": "Noël"
"category:xmas": "Noël",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/hu.json

@ -85,5 +85,8 @@
"category:water": "Vizek",
"category:wikipedia": "Wikipédia",
"category:works": "Üzemek",
"category:xmas": "Karácsony"
"category:xmas": "Karácsony",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/it.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "Fabbriche",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/ja.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "工場",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/nl.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "Fabrieken",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/pl.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

7
lang/pt-br.json

@ -84,6 +84,9 @@
"category:waste": "Lixo",
"category:water": "Hidrografia",
"category:wikipedia": "Wikipédia",
"category:works": "Fábricas",
"category:xmas": "Natal"
"category:works": "Produção",
"category:xmas": "Natal",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/pt.json

@ -85,5 +85,8 @@
"category:water": "Massas de água",
"category:wikipedia": "Wikipédia",
"category:works": "Fábricas",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/ro.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/ru.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "Промышленность",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/template.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

5
lang/uk.json

@ -85,5 +85,8 @@
"category:water": "",
"category:wikipedia": "",
"category:works": "",
"category:xmas": ""
"category:xmas": "",
"date format not understood": "",
"outdated feature": "",
"xmas:outdated-warning": ""
}

4
popupBody.html

@ -151,7 +151,7 @@
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('start_date') }}:</span>
<span class='value'>{{ enumerate(tags.start_date) }}</span>
<span class='value'>{{ tags.start_date|osmFormatDate }}</span>
</li>
{% endif %}
@ -159,7 +159,7 @@
<li class='hasSymbol'>
<i class="fa fa-clock-o" aria-hidden="true"></i>
<span class='key'>{{ keyTrans('opening_date') }}:</span>
<span class='value'>{{ enumerate(tags.opening_date) }}</span>
<span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
</li>
{% endif %}

4
pt.json

@ -58,7 +58,7 @@
],
"description": "{{ tagTrans('route', tags.route) }}",
"body": [
"<h4>Stops</h4><ul>",
"<h4>{{ repoTrans('category:pt:stops') }}</h4><ul>",
"{% for member in members %}",
"{% if member.tags.highway == 'bus_stop' or member.tags.amenity == 'bus_station' or member.tags.amenity == 'ferry_terminal' or member.tags.railway == 'tram_stop' or member.tags.railway == 'halt' or member.tags.railway == 'station' or member.tags.aerialway == 'station' or member.tags.public_transport == 'stop_position' or member.role|slice(-4) == 'stop' %}",
"<li data-object='{{ member.id }}' data-sublayer='member'><b>{% if member.tags %}{{ member.tags.name|default(trans('unknown')) }}{% else %}<i>{{ trans('loading') }}</i>{% endif %}</li>",
@ -123,7 +123,7 @@
],
"title": "{% if isStop %}{{ tags.name|default(stopName)|default(id) }}{% endif %}",
"body": [
"<h4>Routes</h4>",
"<h4>{{ repoTrans('category:pt:routes') }}</h4>",
"<ul class='overpass-layer-list'>",
"{% for master in masters %}",
" {% if master.tags.public_transport != 'stop_area' %}",

8
residential.json

@ -35,6 +35,12 @@
]
},
"feature": {
"description": "{{ tagTrans('landuse', tags.landuse) }}"
"description": [
"{{ tagTrans('landuse', tags.landuse) }}",
"",
"{% if tags.residential %}",
"({{ tagTransList('residential', tags.residential) }})",
"{% endif %}"
]
}
}

4
xmas.json

@ -25,7 +25,7 @@
"description": "{{ tagTransList(\"xmas:feature\", attribute(tags, \"xmas:feature\")) }}",
"body": [
"{% if not isCurrent %}",
"<div style='border: 1px solid red; padding: 2px; margin-bottom: 2px;'>Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date.</div>",
"<div style='border: 1px solid red; padding: 2px; margin-bottom: 2px;'>{{ repoTrans('xmas:outdated-warning') }}</div>",
"{% endif %}",
"",
"{% if attribute(tags, 'xmas:location') %}",
@ -88,7 +88,7 @@
"{% endfor %}",
" <tr>",
" <td>{{ markerCircle({\"fillColor\":\"red\"})|raw }}</td>",
" <td>outdated feature</td>",
" <td>{{ repoTrans('outdated feature') }}</td>",
" </tr>",
"</table>"
]

Loading…
Cancel
Save