From 484ec0904bc8f8ad638a4c443095c2ab48a1ddeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Thu, 16 Aug 2018 22:13:22 +0200
Subject: [PATCH 1/4] water: waterway=drain
---
water.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/water.json b/water.json
index 137f0b9..f70d0ed 100644
--- a/water.json
+++ b/water.json
@@ -51,7 +51,7 @@
"0",
"{% elseif tags.waterway == 'river' %}",
"1",
- "{% elseif tags.waterway == 'stream' %}",
+ "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
"3",
"{% elseif tags.waterway == 'ditch' %}",
"5",
@@ -63,7 +63,7 @@
"width": [
"{% if tags.waterway == 'river' %}",
"4",
- "{% elseif tags.waterway == 'stream' %}",
+ "{% elseif tags.waterway == 'stream' or tags.waterway == 'drain' %}",
"2",
"{% elseif tags.waterway == 'ditch' %}",
"1",
@@ -81,7 +81,7 @@
"{% endif %}"
],
"text": [
- "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream' ] %}",
+ "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'ditch', 'wadi', 'drystream', 'drain' ] %}",
"{{ tags.name }} ➔ ",
"{% endif %}"
],
@@ -102,7 +102,7 @@
"{% if map.zoom >= 13 %}",
" <tr>",
" <td>{{ markerLine(evaluate({ \"waterway\": \"stream\" }))|raw }}</td>",
- " <td>{{ tagTrans('waterway', 'stream') }}</td>",
+ " <td>{{ tagTrans('waterway', 'stream') }}, {{ tagTrans('waterway', 'drain') }}</td>",
" </tr>",
" <tr>",
" <td>{{ markerLine(evaluate({ \"waterway\": \"ditch\" }))|raw }}</td>",
From 8f5154ef1500a55804cd0bcce51cd1ed4aac4817 Mon Sep 17 00:00:00 2001
From: Igor Eliezer <IgorEliezer@users.noreply.github.com>
Date: Sun, 26 Aug 2018 23:47:25 -0300
Subject: [PATCH 2/4] Update pt-br.json
Change category:transport.
Add category:car_routes.
---
lang/pt-br.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lang/pt-br.json b/lang/pt-br.json
index e51b8bb..60568c0 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -7,6 +7,7 @@
"category:car_amenities": "Equipamentos",
"category:car_furniture": "Mobiliário urbano",
"category:car_maxspeed": "Velocidade máxima",
+ "category:car_routes": "Rota rodoviária",
"category:children": "Equipamentos infantis",
"category:communication": "Comunicação",
"category:construction": "Terrenos vazios e obras",
@@ -63,7 +64,7 @@
"category:railway": "Ferrovia",
"category:services": "Prestação de serviços",
"category:special": "Especial",
- "category:transport": "Transportes",
+ "category:transport": "Mobilidade",
"category:transport_car": "Tráfego individual",
"category:transport_cycle": "Ciclismo",
"category:transport_pt": "Transporte público",
From 52d041e50ab77f7e25338c83ba50cfe70c6b9126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Mon, 27 Aug 2018 10:09:37 +0200
Subject: [PATCH 3/4] emergency: fix descriptions and icons
---
emergency.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/emergency.json b/emergency.json
index 2889d1e..588c14d 100644
--- a/emergency.json
+++ b/emergency.json
@@ -44,11 +44,12 @@
"{% elseif tags.emergency %}",
"{% set key = 'emergency' %}",
"{% set value = tags.emergency %}",
- "{% endif %}"
+ "{% endif %}",
+ "{% set kv = key ~ \"=\" ~ value %}"
],
- "description": "{{ tagTrans('amenity', tags.amenity) }}",
+ "description": "{{ tagTrans(key, value) }}",
"markerSign": [
- "{% set data = const[tags.amenity] %}",
+ "{% set data = const[kv] %}",
"{% if data %}",
"{{ data.sign }}",
"{% endif %}"
From 8b6f136101916e5c143b18748003df80b7b463f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Mon, 27 Aug 2018 10:19:33 +0200
Subject: [PATCH 4/4] Import pt-br translations to categories
---
car_routes.json | 3 ++-
index.json | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/car_routes.json b/car_routes.json
index 22e00ba..1125d21 100644
--- a/car_routes.json
+++ b/car_routes.json
@@ -1,7 +1,8 @@
{
"type": "overpass",
"name": {
- "en": "Car routes"
+ "en": "Car routes",
+ "pt-br": "Rota rodoviária"
},
"query": {
"10": "relation[type=route][route=road]"
diff --git a/index.json b/index.json
index cf3cf7e..e223697 100644
--- a/index.json
+++ b/index.json
@@ -119,7 +119,7 @@
"ro": "Transport",
"ru": "Транспорт",
"uk": "Транспорт",
- "pt-br": "Transportes",
+ "pt-br": "Mobilidade",
"pt": "Transportes"
},
"subCategories": [