From 4595a77f00899ed0175e6e1580798c5e3b2f4542 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 18 Oct 2017 15:00:28 +0300
Subject: [PATCH 1/3] Add phrases

---
 OsmAnd/res/values-ru/phrases.xml | 7 +++++++
 OsmAnd/res/values/phrases.xml    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 31bf56f9d1..4a0efbfaa6 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3526,4 +3526,11 @@
 	<string name="poi_visibility_street">Видимость: улица</string>
 	<string name="poi_visibility_area">Видимость: площадь</string>
 
+	<string name="poi_operational_status">Рабочее состояние</string>
+	<string name="poi_operational_status_open">Открыто</string>
+	<string name="poi_operational_status_closed">Закрыто</string>
+	<string name="poi_operational_status_restricted">Ограничено</string>
+	<string name="poi_operational_status_broken">Сломано</string>
+	<string name="poi_operational_status_needs_maintenance">Требуется обслуживание</string>
+
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 1e33caeeb9..51ddb4aa5a 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -92,6 +92,7 @@
 	<string name="poi_animal_shelter_type">Animals accepted</string>
 	<string name="poi_animal_shelter_purpose">Purpose</string>
 	<string name="poi_boat_rental_type">Rented boats</string>
+	<string name="poi_operational_status">Operational status</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -3513,4 +3514,10 @@
 	<string name="poi_visibility_street">Visibility: street</string>
 	<string name="poi_visibility_area">Visibility: area</string>
 
+	<string name="poi_operational_status_open">Open</string>
+	<string name="poi_operational_status_closed">Closed</string>
+	<string name="poi_operational_status_restricted">Restricted</string>
+	<string name="poi_operational_status_broken">Broken</string>
+	<string name="poi_operational_status_needs_maintenance">Needs maintenance</string>
+
 </resources>

From 786df4526654ec678ad4cd6690ab090a63aae86d Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Thu, 19 Oct 2017 11:17:36 +0300
Subject: [PATCH 2/3] Add turn lanes test

---
 OsmAnd-java/test/resources/test_turn_lanes.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/OsmAnd-java/test/resources/test_turn_lanes.json b/OsmAnd-java/test/resources/test_turn_lanes.json
index 5adf85c731..fe46817dd7 100644
--- a/OsmAnd-java/test/resources/test_turn_lanes.json
+++ b/OsmAnd-java/test/resources/test_turn_lanes.json
@@ -644,6 +644,20 @@
     "expectedResults": {
       "84975049": "TL|+TR,C"
     }
+  },
+  {
+    "testName": "36.Bierweg TR Äußere Bayreuther Straße (B 2) ",
+    "startPoint": {
+      "latitude": 45.61486172708771,
+      "longitude": 35.50859335064885
+    },
+    "endPoint": {
+      "latitude": 45.61364315690609,
+      "longitude": 35.51007661223409
+    },
+    "expectedResults": {
+      "35361252": "TL|+TR,C"
+    }
   }
 
 ]
\ No newline at end of file

From a0750fc53f2cc60287cc031f6f9466d9714c8933 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Thu, 19 Oct 2017 13:40:28 +0300
Subject: [PATCH 3/3] Add phrases

---
 OsmAnd/res/values-ru/phrases.xml | 26 ++++++++++++++++++++++++++
 OsmAnd/res/values/phrases.xml    | 24 ++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 4a0efbfaa6..cbd843e477 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3533,4 +3533,30 @@
 	<string name="poi_operational_status_broken">Сломано</string>
 	<string name="poi_operational_status_needs_maintenance">Требуется обслуживание</string>
 
+	<string name="poi_water_place_durability_durable">Прочность водостока: прочный</string>
+	<string name="poi_water_place_durability_emergency">Прочность водостока: для экстренного использования</string>
+
+	<string name="poi_water_supply_type">Тип водоснабжения</string>
+	<string name="poi_water_purification">Очистка воды</string>
+
+	<string name="poi_water_purification_none">Нет</string>
+	<string name="poi_water_purification_chlorine">Хлорирование</string>
+	<string name="poi_water_purification_reverse_osmosis">Обратный осмос</string>
+	<string name="poi_water_purification_aquatabs">Таблетки для дезинфекции воды</string>
+
+	<string name="poi_water_supply_water_well">Колодец</string>
+	<string name="poi_water_supply_pipeline">Трубопровод</string>
+	<string name="poi_water_supply_running_water">Проточная вода</string>
+	<string name="poi_water_supply_pump">Насос</string>
+	<string name="poi_water_supply_borehole">Скважина</string>
+	<string name="poi_water_supply_water_trucking">Доставка воды</string>
+	<string name="poi_water_supply_water_tank">Резервуар для воды</string>
+	<string name="poi_water_supply_bottled_water">Бутилированная вода</string>
+
+	<string name="poi_water_place_access">Доступ к водоснабжению</string>
+	<string name="poi_water_place_access_community">Сообщество</string>
+	<string name="poi_water_place_access_family">Семья</string>
+	<string name="poi_water_place_access_multifamilies">Несколько семей</string>
+
+
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 51ddb4aa5a..2b19f3169c 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -93,6 +93,9 @@
 	<string name="poi_animal_shelter_purpose">Purpose</string>
 	<string name="poi_boat_rental_type">Rented boats</string>
 	<string name="poi_operational_status">Operational status</string>
+	<string name="poi_water_supply_type">Water supply type</string>
+	<string name="poi_water_purification">Water purification</string>
+	<string name="poi_water_place_access">Water place access</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -3520,4 +3523,25 @@
 	<string name="poi_operational_status_broken">Broken</string>
 	<string name="poi_operational_status_needs_maintenance">Needs maintenance</string>
 
+	<string name="poi_water_place_durability_durable">Water place durability: durable</string>
+	<string name="poi_water_place_durability_emergency">Water place durability: emergency</string>
+
+	<string name="poi_water_purification_none">None</string>
+	<string name="poi_water_purification_chlorine">Chlorine</string>
+	<string name="poi_water_purification_reverse_osmosis">Reverse osmosis</string>
+	<string name="poi_water_purification_aquatabs">Aquatabs</string>
+
+	<string name="poi_water_supply_water_well">Water well</string>
+	<string name="poi_water_supply_pipeline">Pipeline</string>
+	<string name="poi_water_supply_running_water">Running water</string>
+	<string name="poi_water_supply_pump">Pump</string>
+	<string name="poi_water_supply_borehole">Borehole</string>
+	<string name="poi_water_supply_water_trucking">Water trucking</string>
+	<string name="poi_water_supply_water_tank">Water tank</string>
+	<string name="poi_water_supply_bottled_water">Bottled water</string>
+
+	<string name="poi_water_place_access_community">Community</string>
+	<string name="poi_water_place_access_family">Family</string>
+	<string name="poi_water_place_access_multifamilies">Multifamilies</string>
+
 </resources>