From 409911c630d774e424db367c1c2cc219244b2d55 Mon Sep 17 00:00:00 2001
From: P <plamen_mbx@yahoo.com>
Date: Wed, 13 Jan 2016 17:44:19 +0100
Subject: [PATCH 01/18] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (1882 of 1882 strings)
---
 OsmAnd/res/values-bg/strings.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 52d61851d5..c5630bb40e 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
     <string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string>
     <string name="clear_intermediate_points">Изчистване на междинните точки</string>
     <string name="keep_intermediate_points">Запази междинните точки</string>
@@ -2039,4 +2040,15 @@
     <string name="weekly">Всяка седмица</string>
     <string name="morning">Сутрин</string>
     <string name="Night">През нощта</string>
-</resources>
\ No newline at end of file
+<string name="switch_start_finish">Размяна на началната с крайна точка</string>
+    <string name="rendering_attr_hideIcons_name">Скриване на POI иконите</string>
+    <string name="item_deleted">Изтрито</string>
+    <string name="n_items_deleted">изтрити елемента</string>
+    <string name="shared_string_undo_all">ВРЪЩАНЕ НА ВСИЧКО</string>
+    <string name="shared_string_type">Тип</string>
+    <string name="starting_point">Начална точка</string>
+    <string name="select_month_and_country">Изберете месец и държава</string>
+    <string name="number_of_contributors">Брой участници</string>
+    <string name="number_of_edits">Брой редакции</string>
+    <string name="reports_for">Отчет за:</string>
+</resources>

From 0caedf0f91269ef83767fe80dddf6785a931f27d Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 13 Jan 2016 20:59:53 +0300
Subject: [PATCH 02/18] Fix tap on list item (map settings, map config,
 waypoints)

---
 OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
index 741bdce1d2..90c92f5f79 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
@@ -310,7 +310,7 @@ public class DynamicListView extends ObservableListView {
 				tag.onClick();
 			}
 			touchEventsCancelled();
-			return true;
+			return super.onTouchEvent(event);
 		}
 
 		switch (event.getAction() & MotionEvent.ACTION_MASK) {

From 35d712f3daecfac35153a328f2685a08017b4092 Mon Sep 17 00:00:00 2001
From: xmd5a <lornaderek@mail.ru>
Date: Wed, 13 Jan 2016 23:17:11 +0300
Subject: [PATCH 03/18] Update phrases

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

diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 6b440c770e..0908aa22dd 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -2587,4 +2587,7 @@
 	<string name="poi_atm_yes">С банкоматом</string>
 	<string name="poi_atm_no">Без банкомата</string>
 
+	<string name="poi_firepit">Место для разведения огня</string>
+	<string name="poi_street_cabinet">Распределительный шкаф</string>
+
 </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c4f0f04f46..477471bff1 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -2584,4 +2584,7 @@
 	<string name="poi_atm_yes">Atm: yes</string>
 	<string name="poi_atm_no">Atm: no</string>
 
+	<string name="poi_firepit">Firepit</string>
+	<string name="poi_street_cabinet">Street cabinet</string>
+
 </resources>

From 2b322b0a888b3211e49c6daa3119ffb3be501843 Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Wed, 13 Jan 2016 20:54:49 +0100
Subject: [PATCH 04/18] Translated using Weblate (Dutch)

Currently translated at 99.9% (1881 of 1882 strings)
---
 OsmAnd/res/values-nl/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 2c838f39de..cc1f7d0083 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2163,6 +2163,8 @@
     <string name="item_deleted">Item verwijderd</string>
     <string name="n_items_deleted">items verwijderd</string>
     <string name="shared_string_undo_all">Alles terugzetten</string>
-    <string name="rendering_attr_hideIcons_name">Verberg iconen</string>
-    <string name="switch_start_finish">Verwissel start en einde</string>
+    <string name="rendering_attr_hideIcons_name">Verberg POI-iconen</string>
+    <string name="switch_start_finish">Verwissel start en bestemming</string>
+    <string name="number_of_contributors">Aantal bijdragers</string>
+    <string name="number_of_edits">Aantal bewerkingen</string>
     </resources>

From 61fbeacfc73966195a96d47e83c12a6e3e1bd155 Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Wed, 13 Jan 2016 20:23:15 +0100
Subject: [PATCH 05/18] Translated using Weblate (Italian)

Currently translated at 99.8% (1879 of 1882 strings)
---
 OsmAnd/res/values-it/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index e10d594ec2..ac56aed1f5 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2141,4 +2141,5 @@
     <string name="switch_start_finish">Inverti punti di partenza e destinazione</string>
     <string name="rendering_attr_hideIcons_name">Nascondi le icone dei PDI</string>
     <string name="number_of_edits">Numero di modifiche</string>
+    <string name="number_of_contributors">Numero di contributori</string>
     </resources>

From d25c5db3cb25f5a3b59e9dae9e8aaca047a4f830 Mon Sep 17 00:00:00 2001
From: Adam Magnier <adam@magnier.io>
Date: Wed, 13 Jan 2016 19:39:38 +0100
Subject: [PATCH 06/18] Translated using Weblate (French)

Currently translated at 73.5% (1750 of 2378 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index b9cfbdf387..ee3fe9a919 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -1872,4 +1872,40 @@
 	<string name="poi_content_manure">Contenu : fumier</string>
 	<string name="poi_nudism_permissive">Nudisme autorisé</string>
 
+	<string name="poi_construction_yes">En cours de construction</string>
+	<string name="poi_dolphin">Duc-d’Albe</string>
+
+	<string name="poi_official_name">Nom officiel</string>
+
+	<string name="poi_rc_car">Courses de voitures radio-commandées</string>
+	<string name="poi_futsal">Football en salle</string>
+	<string name="poi_judo">Judo</string>
+	<string name="poi_badminton">Badminton</string>
+	<string name="poi_karting">Karting</string>
+	<string name="poi_fitness">Remise en forme</string>
+
+	<string name="poi_water_heater_yes">Chauffe-eau : Oui</string>
+	<string name="poi_water_heater_no">Chauffe-eau : non</string>
+
+	<string name="poi_parking_surface">Type : surface</string>
+	<string name="poi_historic_civilization_prehistoric">Civilisation : préhistorique</string>
+	<string name="poi_historic_civilization_roman">Civilisation : romaine</string>
+	<string name="poi_historic_civilization_ancient_egyptian">Civilisation : ancienne égypte (jusqu\'en 332 av. J.-C.)</string>
+	<string name="poi_historic_civilization_greek_egyptian">Civilisations : grecque égyptienne (332 av. J.C. – 30 av. J.C.)</string>
+	<string name="poi_animal_training">Formation animale</string>
+	<string name="poi_animal_training_dog">Dressage de chiens</string>
+	<string name="poi_animal_training_horse">Entrainement de chevaux</string>
+
+	<string name="poi_surveillance_public">Surveillance : publique</string>
+
+	<string name="poi_historic_manor">Manoir historique</string>
+	<string name="poi_castle_type_kremlin">Type de château : kremlin</string>
+	<string name="poi_sanitary_dump_station_yes">Station de vidange sanitaire : oui</string>
+	<string name="poi_sanitary_dump_station_no">Station de vidange sanitaire : non</string>
+	<string name="poi_sanitary_dump_station_customers">Station de vidange sanitaire : clients uniquement</string>
+	<string name="poi_refugee_no">Réfugiés : non</string>
+
+	<string name="poi_product_charcoal">Produit : charbon</string>
+	<string name="poi_tomb_war_grave">Type : tombe de guerre</string>
+	<string name="poi_surface_paving_stones">Surface : pavés</string>
 	</resources>

From edd6cff972d6459c0de575bee5c852b0c989389f Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Wed, 13 Jan 2016 22:31:05 +0100
Subject: [PATCH 07/18] Fix for Issue 2136(a) commented out for now, because it
 inhibits automatic route calcluation after destination is selected by "Select
 on map" method

---
 .../osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index a42e15b70d..8c6fbdfd53 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -612,9 +612,10 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 			mapControlsLayer.switchToRouteFollowingLayout();
 		}
 		//Fix for Issue 2136(a)
-		if (getTargets().getPointToNavigate() == null) {
-			mapActivity.getMapActions().stopNavigationWithoutConfirm();
-		}
+		//commented out for now, because it inhibits automatic route calcluation after destination is selected by "Select on map" method
+		//if (getTargets().getPointToNavigate() == null) {
+		//	mapActivity.getMapActions().stopNavigationWithoutConfirm();
+		//}
 	}
 
 	public void show() {

From 9ddf58d39b85b849799cbb82a68223d0584c3a93 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Wed, 13 Jan 2016 21:31:32 +0100
Subject: [PATCH 08/18] Translated using Weblate (Swedish)

Currently translated at 99.2% (1867 of 1882 strings)
---
 OsmAnd/res/values-sv/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 67905b7176..14547163bc 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2066,4 +2066,7 @@
     <string name="shared_string_undo_all">ÅNGRA ALLA</string>
     <string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string>
     <string name="switch_start_finish">Skifta startpunkt och destination</string>
-    </resources>
+    <string name="number_of_contributors">Antal bidragsgivare</string>
+    <string name="number_of_edits">Antal redigeringar</string>
+    <string name="reports_for">Rapport för:</string>
+</resources>

From b746a714aeed12554b814e95a46e19afac75c0fd Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Wed, 13 Jan 2016 22:39:18 +0100
Subject: [PATCH 09/18] Translated using Weblate (Danish)

Currently translated at 100.0% (2380 of 2380 strings)
---
 OsmAnd/res/values-da/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index dcb4efd4ad..b696e7465a 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -2642,4 +2642,7 @@
 <string name="poi_atm_yes">Hæveautomat: ja</string>
 	<string name="poi_atm_no">Hæveautomat: nej</string>
 
+<string name="poi_firepit">Bålplads</string>
+	<string name="poi_street_cabinet">Gadeskab</string>
+
 </resources>

From 53270fcbe0d792fe1d9c8e6b58e8137e5f046c45 Mon Sep 17 00:00:00 2001
From: ezjerry liao <ezjerry@gmail.com>
Date: Thu, 14 Jan 2016 05:36:16 +0100
Subject: [PATCH 10/18] Translated using Weblate (Chinese (Taiwan))

Currently translated at 100.0% (1882 of 1882 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 94bafd2fe4..ca64fec682 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2073,4 +2073,7 @@
     <string name="shared_string_undo_all">全部取消</string>
     <string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string>
     <string name="switch_start_finish">起始點與目的地對調</string>
-    </resources>
+    <string name="number_of_contributors">貢獻者數</string>
+    <string name="number_of_edits">編輯次數</string>
+    <string name="reports_for">報告：</string>
+</resources>

From 926670f9b44003ac5daa50eb794ad82370a94438 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 14 Jan 2016 10:36:00 +0300
Subject: [PATCH 11/18] Fix 2136(a)

---
 .../plus/mapcontextmenu/other/MapRouteInfoMenu.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
index 8c6fbdfd53..1370c6e007 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenu.java
@@ -611,11 +611,9 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
 		if (switched) {
 			mapControlsLayer.switchToRouteFollowingLayout();
 		}
-		//Fix for Issue 2136(a)
-		//commented out for now, because it inhibits automatic route calcluation after destination is selected by "Select on map" method
-		//if (getTargets().getPointToNavigate() == null) {
-		//	mapActivity.getMapActions().stopNavigationWithoutConfirm();
-		//}
+		if (getTargets().getPointToNavigate() == null && !selectFromMapTouch) {
+			mapActivity.getMapActions().stopNavigationWithoutConfirm();
+		}
 	}
 
 	public void show() {

From bf7ac3ac0f995df334c31ad70694016de3562c6d Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 14 Jan 2016 07:45:29 +0100
Subject: [PATCH 12/18] Translated using Weblate (Danish)

Currently translated at 100.0% (1882 of 1882 strings)
---
 OsmAnd/res/values-da/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index aea7de43c8..19b1e0b8bd 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2226,7 +2226,7 @@
     <string name="n_items_deleted">Emner slettet</string>
     <string name="shared_string_undo_all">FORTRYD ALLE</string>
     <string name="rendering_attr_hideIcons_name">Skjul IP ikoner</string>
-    <string name="switch_start_finish">Byt rundt på startpunkt &amp; destination</string>
+    <string name="switch_start_finish">Byt om på startpunkt og destination</string>
     <string name="number_of_contributors">Antallet af bidragydere</string>
     <string name="number_of_edits">Antal redigeringer</string>
     <string name="reports_for">Rapport for:</string>

From ed78424b81faa71b79fb2287808e34c73e5a1153 Mon Sep 17 00:00:00 2001
From: jf-simon <simon@t-tischer.de>
Date: Thu, 14 Jan 2016 07:17:42 +0100
Subject: [PATCH 13/18] Translated using Weblate (German)

Currently translated at 99.8% (1880 of 1882 strings)
---
 OsmAnd/res/values-de/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 120265009f..e2a8b4a5fa 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1997,5 +1997,8 @@
     <string name="starting_point">Startpunkt</string>
     <string name="shared_string_undo_all">Alles rückgängig machen</string>
     <string name="rendering_attr_hideIcons_name">POI Symbole ausblenden</string>
-    <string name="switch_start_finish">Startpunkt und Ziel vertauschen</string>
+    <string name="switch_start_finish">Startpunkt und Ziel tauschen</string>
+<string name="number_of_edits">Anzahl der Bearbeitungen</string>
+    <string name="number_of_contributors">Anzahl der Mitwirkenden</string>
+    <string name="reports_for">Bericht für:</string>
 </resources>

From 8f045b269bfeb37afc58cde8c3b7088a0c52d4e9 Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Thu, 14 Jan 2016 00:59:52 +0100
Subject: [PATCH 14/18] Translated using Weblate (Italian)

Currently translated at 99.8% (1879 of 1882 strings)
---
 OsmAnd/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index ac56aed1f5..211cc911c5 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1646,7 +1646,7 @@
     <string name="rendering_attr_pisteGrooming_name">Piste da fondo</string>
     <string name="free">"Libera %1$s "</string>
     <string name="device_memory">Memoria dispositivo</string>
-    <string name="rendering_attr_pisteRoutes_name">Discese sciistiche</string>
+    <string name="rendering_attr_pisteRoutes_name">Piste da sci</string>
     <string name="roads_only">Solo strade</string>
     <string name="watch">Guarda</string>
     <string name="notes">Note</string>

From f421e396b51b0bcad5ca10613b484fcd70bd9aed Mon Sep 17 00:00:00 2001
From: Massimiliano Caniparoli <massic80@gmail.com>
Date: Thu, 14 Jan 2016 01:00:51 +0100
Subject: [PATCH 15/18] Translated using Weblate (Italian)

Currently translated at 27.2% (648 of 2380 strings)
---
 OsmAnd/res/values-it/phrases.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-it/phrases.xml b/OsmAnd/res/values-it/phrases.xml
index d9d7f471f2..85a57daa40 100644
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@@ -731,4 +731,7 @@
 	<string name="poi_parish">Ufficio parrocchiale</string>
 	<string name="poi_street_lamp">Lampione</string>
 
+	<string name="poi_ski_rental">Noleggio sci</string>
+
+	<string name="poi_ski_resort">Stazione sciistica</string>
 	</resources>

From d738f4022802349c32e5690eeb78c6e698998845 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Thu, 14 Jan 2016 08:58:14 +0100
Subject: [PATCH 16/18] Issue 2141

---
 OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
index c0fa999316..b4fd20b879 100644
--- a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
+++ b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
@@ -108,7 +108,9 @@ public class AlarmInfo implements LocationPoint {
 			alarmInfo = new AlarmInfo(AlarmInfoType.HAZARD, locInd);
 		} else if ("railway".equals(ruleType.getTag()) && "level_crossing".equals(ruleType.getValue())) {
 			alarmInfo = new AlarmInfo(AlarmInfoType.RAILWAY, locInd);
-		} else if ("crossing".equals(ruleType.getTag()) && "uncontrolled".equals(ruleType.getValue())){
+		// Issue 2141
+		//} else if ("crossing".equals(ruleType.getTag()) && "uncontrolled".equals(ruleType.getValue())){
+		} else if ("crossing".equals(ruleType.getTag()) && !"traffic_signals".equals(ruleType.getValue())){
 			alarmInfo = new AlarmInfo(AlarmInfoType.PEDESTRIAN, locInd);
 		}
 		if(alarmInfo != null) {

From bfe7552899e8f7ad503f4821b17b38dcd4504001 Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Thu, 14 Jan 2016 09:17:00 +0100
Subject: [PATCH 17/18] hold back fix for 2141

---
 OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
index b4fd20b879..c0fa999316 100644
--- a/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
+++ b/OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
@@ -108,9 +108,7 @@ public class AlarmInfo implements LocationPoint {
 			alarmInfo = new AlarmInfo(AlarmInfoType.HAZARD, locInd);
 		} else if ("railway".equals(ruleType.getTag()) && "level_crossing".equals(ruleType.getValue())) {
 			alarmInfo = new AlarmInfo(AlarmInfoType.RAILWAY, locInd);
-		// Issue 2141
-		//} else if ("crossing".equals(ruleType.getTag()) && "uncontrolled".equals(ruleType.getValue())){
-		} else if ("crossing".equals(ruleType.getTag()) && !"traffic_signals".equals(ruleType.getValue())){
+		} else if ("crossing".equals(ruleType.getTag()) && "uncontrolled".equals(ruleType.getValue())){
 			alarmInfo = new AlarmInfo(AlarmInfoType.PEDESTRIAN, locInd);
 		}
 		if(alarmInfo != null) {

From 64794a03f407defc03c52087529a096c4abb9d4e Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Wed, 13 Jan 2016 18:32:27 +0200
Subject: [PATCH 18/18] Map icon for Avoid Road marker.

---
 OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png  | Bin 0 -> 3120 bytes
 OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png  | Bin 0 -> 2193 bytes
 OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png | Bin 0 -> 3980 bytes
 .../res/drawable-xxhdpi/map_pin_avoid_road.png   | Bin 0 -> 5654 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png
 create mode 100644 OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png

diff --git a/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-hdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2718a056de86074d0024d0629e8204ccb8af383
GIT binary patch
literal 3120
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
BS}Fhl

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-mdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000000000000000000000000000000000..15784a07abc697b9050ec018fc4037837b334048
GIT binary patch
literal 2193
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xhdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000000000000000000000000000000000..da2257e42776745a4778136f4f474696aec68b24
GIT binary patch
literal 3980
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png b/OsmAnd/res/drawable-xxhdpi/map_pin_avoid_road.png
new file mode 100644
index 0000000000000000000000000000000000000000..b555ffea04ea14ea7a6e6a5a978c005864455f76
GIT binary patch
literal 5654
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

literal 0
HcmV?d00001