side
/
main
forked from OpenStreetBrowser/main
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #7 from plepe/master 

Sync 2
master
Igor Eliezer 6 years ago
committed by GitHub
parent
3c1e7ac9e9 11c5fd6b7d
commit
df2a98dae8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 64 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      coal.json
  2. 3
      index.json
  3. 2
      lang/ast.json
  4. 2
      lang/ca.json
  5. 2
      lang/cs.json
  6. 2
      lang/de.json
  7. 2
      lang/el.json
  8. 2
      lang/en.json
  9. 2
      lang/es.json
  10. 2
      lang/et.json
  11. 2
      lang/fr.json
  12. 2
      lang/hu.json
  13. 2
      lang/it.json
  14. 2
      lang/ja.json
  15. 2
      lang/nl.json
  16. 2
      lang/pl.json
  17. 2
      lang/pt-br.json
  18. 2
      lang/pt.json
  19. 2
      lang/ro.json
  20. 2
      lang/ru.json
  21. 2
      lang/template.json
  22. 2
      lang/uk.json
  23. 2
      oil_gas.json
  24. 37
      renewables.json

2
coal.json
View File

@ -28,6 +28,8 @@
"{{ tagTrans('man_made', tags.man_made) }}",
"{% elseif tags.power == 'plant' %}",
"{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
"{% elseif tags.power == 'generator' %}",
"{{ tagTrans('power', 'generator') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
"{% elseif tags.landuse == 'quarry' %}",
"{{ tagTrans('landuse', tags.landuse) }} {% if tags.resource %}({{ tagTrans('resource', tags.resource) }}){% endif %}",
"{% elseif tags.landuse == 'industrial' %}",

3
index.json
View File

@ -265,6 +265,9 @@
},
{
"id": "oil_gas"
},
{
"id": "renewables"
}
]
},

2
lang/ast.json
View File

@ -36,7 +36,6 @@
"category:military": "Militar",
"category:mtb-routes": "",
"category:natural": "Formaciones naturales",
"category:network": "",
"category:oil_gas": "",
"category:other": "Otres",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Relixón",
"category:renewables": "",
"category:residential": "Zones residenciales",
"category:resources": "Estraición de recursos",
"category:services": "Servicios",

2
lang/ca.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "",
"category:renewables": "",
"category:residential": "",
"category:resources": "",
"category:services": "Serveis",

2
lang/cs.json
View File

@ -36,7 +36,6 @@
"category:military": "Vojenské",
"category:mtb-routes": "",
"category:natural": "Přírodní úkazy",
"category:network": "",
"category:oil_gas": "",
"category:other": "Jiné",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Religion",
"category:renewables": "",
"category:residential": "Obytné oblasti",
"category:resources": "Těžba surovin",
"category:services": "Služby",

2
lang/de.json
View File

@ -36,7 +36,6 @@
"category:military": "Militär",
"category:mtb-routes": "",
"category:natural": "Geographische Objekte",
"category:network": "",
"category:oil_gas": "Erdöl und Erdgas",
"category:other": "Andere",
"category:outdoor": "Freiluftaktivitäten",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
"category:railway-routes": "",
"category:religion": "Religion",
"category:renewables": "Erneuerbare Energien",
"category:residential": "Wohngebiete",
"category:resources": "Ressourcengewinnung",
"category:services": "Dienste",

2
lang/el.json
View File

@ -36,7 +36,6 @@
"category:military": "Στρατιωτικό",
"category:mtb-routes": "",
"category:natural": "Φυσικοί Σχηματισμοί",
"category:network": "",
"category:oil_gas": "",
"category:other": "",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Θρησκεία",
"category:renewables": "",
"category:residential": "Περιοχές Κατοικίας",
"category:resources": "",
"category:services": "Υπηρεσίες",

2
lang/en.json
View File

@ -36,7 +36,6 @@
"category:military": "Military",
"category:mtb-routes": "Mountain bike routes",
"category:natural": "Natural Formations",
"category:network": "Network infrastructure",
"category:oil_gas": "Petroleum and natural gas",
"category:other": "Other",
"category:outdoor": "Outdoor activities",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Railway Maxspeed",
"category:railway-routes": "Railway Routes",
"category:religion": "Religion",
"category:renewables": "Renewables",
"category:residential": "Residential Areas",
"category:resources": "Resource Extraction",
"category:services": "Services",

2
lang/es.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "",
"category:renewables": "",
"category:residential": "",
"category:resources": "",
"category:services": "Servicios",

2
lang/et.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "Ülejäänud",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Religioon",
"category:renewables": "",
"category:residential": "Elamupiirkonnad",
"category:resources": "",
"category:services": "Teenused",

2
lang/fr.json
View File

@ -36,7 +36,6 @@
"category:military": "Militaire",
"category:mtb-routes": "Itinéraires de VTT",
"category:natural": "Éléments naturels",
"category:network": "",
"category:oil_gas": "",
"category:other": "Autres",
"category:outdoor": "Activités de plein air",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Limites de vitesse",
"category:railway-routes": "Lignes ferroviaires",
"category:religion": "Religion",
"category:renewables": "",
"category:residential": "Zones résidentielles",
"category:resources": "Extraction des ressources",
"category:services": "Services",

2
lang/hu.json
View File

@ -36,7 +36,6 @@
"category:military": "Katonai objektumok",
"category:mtb-routes": "Hegyikerékpáros útvonalak",
"category:natural": "Természeti képződmények",
"category:network": "",
"category:oil_gas": "",
"category:other": "Egyéb",
"category:outdoor": "Szabadtéri tevékenységek",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Sebességkorlátozás",
"category:railway-routes": "Vasútvonalak",
"category:religion": "Vallás",
"category:renewables": "",
"category:residential": "Lakóövezetek",
"category:resources": "Bányászat",
"category:services": "Szolgáltatások",

2
lang/it.json
View File

@ -36,7 +36,6 @@
"category:military": "Militare",
"category:mtb-routes": "",
"category:natural": "Natura",
"category:network": "",
"category:oil_gas": "",
"category:other": "Altri",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Religione",
"category:renewables": "",
"category:residential": "Aree residenziali",
"category:resources": "Areee estrattive",
"category:services": "Servizi",

2
lang/ja.json
View File

@ -36,7 +36,6 @@
"category:military": "軍事",
"category:mtb-routes": "",
"category:natural": "自然地層",
"category:network": "",
"category:oil_gas": "",
"category:other": "その他",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "宗教",
"category:renewables": "",
"category:residential": "住居エリア",
"category:resources": "",
"category:services": "サービス",

2
lang/nl.json
View File

@ -36,7 +36,6 @@
"category:military": "Militair",
"category:mtb-routes": "",
"category:natural": "Natuurlijke Formaties",
"category:network": "",
"category:oil_gas": "",
"category:other": "Andere",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Religie",
"category:renewables": "",
"category:residential": "Woongebieden",
"category:resources": "Grondstoffenwinning",
"category:services": "Dienstverlening",

2
lang/pl.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "",
"category:renewables": "",
"category:residential": "",
"category:resources": "",
"category:services": "Usługi",

2
lang/pt-br.json
View File

@ -36,7 +36,6 @@
"category:military": "Militar",
"category:mtb-routes": "Rotas mountain bike",
"category:natural": "Formações naturais",
"category:network": "",
"category:oil_gas": "",
"category:other": "Outros",
"category:outdoor": "Atividades ao ar livre",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Velocidade máxima",
"category:railway-routes": "Rotas ferroviárias",
"category:religion": "Religião",
"category:renewables": "",
"category:residential": "Áreas residenciais",
"category:resources": "Extração de recursos",
"category:services": "Prestação de serviços",

2
lang/pt.json
View File

@ -36,7 +36,6 @@
"category:military": "Militar",
"category:mtb-routes": "",
"category:natural": "Formações naturais",
"category:network": "",
"category:oil_gas": "",
"category:other": "Outros",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "Velocidade máxima",
"category:railway-routes": "",
"category:religion": "Religião",
"category:renewables": "",
"category:residential": "Áreas residenciais",
"category:resources": "Extração de recursos",
"category:services": "Serviços",

2
lang/ro.json
View File

@ -36,7 +36,6 @@
"category:military": "Militar",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "Altele",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Religie",
"category:renewables": "",
"category:residential": "Zona rezidentiala",
"category:resources": "",
"category:services": "Servicii",

2
lang/ru.json
View File

@ -36,7 +36,6 @@
"category:military": "Вооружённые силы",
"category:mtb-routes": "",
"category:natural": "Природные образования",
"category:network": "",
"category:oil_gas": "",
"category:other": "Прочее",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Религия",
"category:renewables": "",
"category:residential": "Жилые районы",
"category:resources": "Добыча ресурсов",
"category:services": "Услуги",

2
lang/template.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "",
"category:network": "",
"category:oil_gas": "",
"category:other": "",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "",
"category:renewables": "",
"category:residential": "",
"category:resources": "",
"category:services": "",

2
lang/uk.json
View File

@ -36,7 +36,6 @@
"category:military": "",
"category:mtb-routes": "",
"category:natural": "Природне середовище",
"category:network": "",
"category:oil_gas": "",
"category:other": "Інше",
"category:outdoor": "",
@ -56,6 +55,7 @@
"category:railway-maxspeed": "",
"category:railway-routes": "",
"category:religion": "Релігія",
"category:renewables": "",
"category:residential": "Житлова зона",
"category:resources": "",
"category:services": "Послуги",

2
oil_gas.json
View File

@ -51,6 +51,8 @@
"{{ tagTrans('man_made', tags.man_made) }}",
"{% elseif tags.power == 'plant' %}",
"{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
"{% elseif tags.power == 'generator' %}",
"{{ tagTrans('power', 'generator') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
"{% elseif tags.waterway == 'offshore_field' %}",
"{{ tagTrans('waterway', tags.waterway) }}",
"{% elseif tags.landuse == 'industrial' %}",

37
renewables.json
View File

@ -0,0 +1,37 @@
{
"type": "overpass",
"name": {
"de": "Erneuerbare Energien",
"en": "Renewables"
},
"query": {
"11": [
"(",
"node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
")",
""
],
"15": [
"(",
"node[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"way[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"relation[power~\"^(plant)$\"][\"plant:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"node[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"way[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
"relation[power~\"^(generator)$\"][\"generator:source\"~\"^(wind|solar|biomass|hydro|geothermal|biogas|biofuel)$\"];",
")"
]
},
"feature": {
"description": "{{ tagTrans('power', tags.power) }}{% set x='generator:source' %}{% if tags[x] %}, {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
"popupDescription": "{{ tagTrans('power', tags.power) }}",
"body": [
"{% set x='generator:source' %}{% if tags[x] %}<br/>{{ keyTrans('generator:source') }}: {{ tagTransList('generator:source', tags[x]) }}{% endif %}",
"{% set x='generator:method' %}{% if tags[x] %}<br/>{{ keyTrans('generator:method') }}: {{ tagTransList('generator:method', tags[x]) }}{% endif %}",
"{% set x='generator:type' %}{% if tags[x] %}<br/>{{ tagTransList('generator:type') }}: {{ tagTrans('generator:type', tags[x]) }}{% endif %}"
],
"priority": "{% if tags.power == 'plant' %}0{% elseif tags.power == 'generator' or tags.power == 'line' %}1{% elseif tags.power == 'substation' %}2{% else %}3{% endif %}"
}
}
Write Preview
Loading…
Cancel
Save