Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java

@@ -52,6 +52,13 @@ public class PrecalculatedRouteDirection {
 	private PrecalculatedRouteDirection(PrecalculatedRouteDirection parent, int s1, int s2) {
 		this.minSpeed = parent.minSpeed;
 		this.maxSpeed = parent.maxSpeed;
+		boolean inverse = false;
+		if (s1 > s2) {
+			int tmp = s1;
+			s1 = s2;
+			s2 = tmp;
+			inverse = true;
+		}
 		tms = new float[s2 - s1 + 1];
 		pointsX = new int[s2 - s1 + 1];
 		pointsY = new int[s2 - s1 + 1];
@@ -61,7 +68,7 @@ public class PrecalculatedRouteDirection {
 			pointsY[shiftInd] = parent.pointsY[i];
 //			indexedPoints.registerObjectXY(parent.pointsX.get(i), parent.pointsY.get(i), pointsX.size() - 1);
 			quadTree.insert(shiftInd, parent.pointsX[i], parent.pointsY[i]);
-			tms[shiftInd] = parent.tms[i] - parent.tms[s2];
+			tms[shiftInd] = parent.tms[i] - parent.tms[inverse ? s1 : s2];
 		}
 	}
 	

OsmAnd/no_translate.xml

@@ -6,7 +6,7 @@
 
     <!-- Not translatable -->
     <string name="full_version_price">€5,99</string>
-    <string name="osm_live">OSM Live (Beta)</string>
+    <string name="osm_live">OsmAnd Live</string>
     <string name="ga_api_key">UA-28342846-2</string>
     <string name="ga_dispatchPeriod">10</string>
     <string name="ga_debug">true</string>

OsmAnd/res/values-de/strings.xml

@@ -2220,7 +2220,7 @@ Aktuell sind nur {2} MB verfügbar.</string>
     <string name="number_of_recipients">Anzahl der Empfänger</string>
     <string name="osm_user_stat">Bearbeitungen %1$s, Rang %2$s, Gesamtbearbeitungen %3$s</string>
     <string name="osm_editors_ranking">OSM-Bearbeiter-Rangliste</string>
-    <string name="osm_live_subscription">OSM-Live-Abonnement</string>
+    <string name="osm_live_subscription">OsmAnd-Live-Abonnement</string>
     <string name="osm_live_subscribe_btn">Abonnieren</string>
     <string name="osm_live_user_public_name">Öffentlicher Name</string>
     <string name="osm_live_hide_user_name">Meinen Namen nicht in Berichten anzeigen</string>
@@ -2232,7 +2232,7 @@ Aktuell sind nur {2} MB verfügbar.</string>
     <string name="osm_live_enter_user_name">Bitte einen öffentlichen Namen eingeben</string>
     <string name="osm_live_thanks">Vielen Dank für Ihr Abonnement von Live Aktualisierungen!</string>
     <string name="osm_live_subscription_settings">Abonnementeinstellungen</string>
-    <string name="osm_live_ask_for_purchase">Bitte kaufen Sie zuerst ein OSM-Live-Abonnement</string>
+    <string name="osm_live_ask_for_purchase">Bitte kaufen Sie zuerst ein OsmAnd-Live-Abonnement</string>
 
     <string name="osm_live_region_desc">Teile Ihrer Spende werden an OSM-Mitwirkende weitergegeben, die diese Region bearbeiten</string>
     <string name="osm_live_header">Dieses Abonnement schaltet stündliche Updates für die gesamten weltweiten Karten frei. 
@@ -2297,7 +2297,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
     <string name="access_autoannounce_period">Zeit zwischen automatischen Ansagen</string>
     <string name="map_widget_magnetic_bearing">Magnetische Peilung</string>
     <string name="access_no_destination">Ziel ist nicht festgelegt</string>
-    <string name="use_osm_live_routing">OSM Live Navigation</string>
+    <string name="use_osm_live_routing">OsmAnd Live Navigation</string>
 	<string name="map_widget_battery">Akkustand</string>
 <string name="move_marker_bottom_sheet_title">Karte bewegen, um die Position der Markierung zu verändern</string>
     <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->

OsmAnd/res/values-ru/strings.xml

@@ -224,7 +224,7 @@
     <string name="number_of_gpx_files_selected_pattern">%s GPX трека(ов) выбрано</string>
     <string name="change_markers_position">Переместить курсор</string>
     <string name="current_track">Текущий путь</string>
-    <string name="use_osm_live_routing">Навигация OSM Live</string>
+    <string name="use_osm_live_routing">Навигация OsmAnd Live</string>
     <string name="map_widget_battery">Заряд батареи</string>
     <string name="move_marker_bottom_sheet_title">Переместите карту чтобы изменить положение курсора</string>
     <!-- string name="lat_lon_pattern">Широта: %1$.5f Долгота: %2$.5f</string -->
@@ -2151,7 +2151,7 @@
     <string name="osm_live_enter_email">Пожалуйста, введите корректный адрес электронной почты</string>
     <string name="osm_live_thanks">Благодарим вас за подписку на автообновления!</string>
     <string name="osm_live_subscription_settings">Параметры подписки</string>
-    <string name="osm_live_ask_for_purchase">Пожалуйста сначала приобретите подписку OSM Live</string>
+    <string name="osm_live_ask_for_purchase">Пожалуйста сначала приобретите подписку OsmAnd Live</string>
 
     <string name="osm_live_header">Эта подписка позволяет получать ежечасное обновление для всех карт мира.
 Часть доходов переводится сообществу OSM и выплачивается за каждый вклад в OSM.
@@ -2242,8 +2242,8 @@
     <string name="access_direction_audio_feedback_descr">Индицировать звуком направление на целевую точку</string>
     <string name="access_direction_haptic_feedback">Тактильная индикация направления</string>
     <string name="access_direction_haptic_feedback_descr">Индицировать вибрацией направление на целевую точку</string>
-<string name="osm_live_subscription">Подписка OSM Live</string>
-    <string name="use_osm_live_routing_description">Включить навигацию с учетом автообновлений OSM Live (Beta)</string>
+<string name="osm_live_subscription">Подписка OsmAnd Live</string>
+    <string name="use_osm_live_routing_description">Включить навигацию с учетом автообновлений OsmAnd Live</string>
 	<string name="lang_es_us">Испанский (американский)</string>
     <string name="lang_en_gb">Английский (Соединенное Королевство)</string>
     <string name="lang_hu_formal">Венгерский (официальный)</string>

OsmAnd/res/values/strings.xml

@@ -250,7 +250,7 @@
     <string name="release_2_8">
 	\u2022 Completely reworked map markers with guidelines and route planning\n\n
 	\u2022 Measure distance tool offering snap to road feature and saving points as track\n\n
-	\u2022 OSM Live: bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n
+	\u2022 OsmAnd Live: bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n
 	</string>
     <string name="auto_split_recording_title">Auto-split recordings after gap</string>
     <string name="auto_split_recording_descr">Start new segment after gap of 6 min, new track after gap of 2 h, or new file after longer gap if date has changed.</string>
@@ -402,8 +402,8 @@
     <string name="access_direction_audio_feedback_descr">Indicate target point direction by sound</string>
     <string name="access_direction_haptic_feedback">Direction haptic feedback</string>
     <string name="access_direction_haptic_feedback_descr">Indicate target point direction by vibration</string>
-    <string name="use_osm_live_routing_description">Enable navigation for OSM Live changes (Beta)</string>
-    <string name="use_osm_live_routing">OSM Live navigation</string>
+    <string name="use_osm_live_routing_description">Enable navigation for OsmAnd Live changes</string>
+    <string name="use_osm_live_routing">OsmAnd Live navigation</string>
     <string name="access_no_destination">Destination is not set</string>
     <string name="map_widget_magnetic_bearing">Magnetic bearing</string>
     <string name="map_widget_bearing">Relative bearing</string>
@@ -488,7 +488,7 @@
     <string name="number_of_recipients">Number of recipients</string>
     <string name="osm_user_stat">Edits %1$s, rank %2$s, total edits %3$s</string>
     <string name="osm_editors_ranking">OSM Editors ranking</string>
-    <string name="osm_live_subscription">OSM Live subscription</string>
+    <string name="osm_live_subscription">OsmAnd Live subscription</string>
     <string name="osm_live_subscribe_btn">Subscribe</string>
     <string name="osm_live_email_desc">We need it to provide you information about contributions</string>
     <string name="osm_live_user_public_name">Public Name</string>
@@ -503,7 +503,7 @@
     <string name="osm_live_thanks">Thank you for subscribing to live updates!</string>
     <string name="osm_live_region_desc">Part of your donation will be sent to OSM users who submit changes to the map in that region</string>
     <string name="osm_live_subscription_settings">Subscription settings</string>
-    <string name="osm_live_ask_for_purchase">Please purchase OSM Live subscription first</string>
+    <string name="osm_live_ask_for_purchase">Please purchase OsmAnd Live subscription first</string>
     <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
         Part of the income goes back to the OSM community and is paid for each OSM contribution. 
         If you love OsmAnd and OSM and want to support them, this is the perfect way to do it.</string>
@@ -700,6 +700,7 @@
     <string name="rendering_attr_currentTrackColor_description">GPX color</string>
     <string name="rendering_attr_currentTrackWidth_name">GPX width</string>
     <string name="rendering_attr_currentTrackWidth_description">GPX width</string>
+    <string name="rendering_value_darkyellow_name">Dark yellow</string>
     <string name="rendering_value_red_name">Red</string>
     <string name="rendering_value_translucent_red_name">Translucent red</string>
     <string name="rendering_value_orange_name">Orange</string>

OsmAnd/src/net/osmand/plus/OsmandPlugin.java

@@ -330,6 +330,16 @@ public abstract class OsmandPlugin {
 		return lst;
 	}
 
+	public static List<OsmandPlugin> getEnabledVisiblePlugins() {
+		ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
+		for (OsmandPlugin p : allPlugins) {
+			if (p.isActive() && p.isVisible()) {
+				lst.add(p);
+			}
+		}
+		return lst;
+	}
+
 	public static List<OsmandPlugin> getNotEnabledPlugins() {
 		ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
 		for (OsmandPlugin p : allPlugins) {
@@ -340,6 +350,16 @@ public abstract class OsmandPlugin {
 		return lst;
 	}
 
+	public static List<OsmandPlugin> getNotEnabledVisiblePlugins() {
+		ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
+		for (OsmandPlugin p : allPlugins) {
+			if (!p.isActive() && p.isVisible()) {
+				lst.add(p);
+			}
+		}
+		return lst;
+	}
+
 	@SuppressWarnings("unchecked")
 	public static <T extends OsmandPlugin> T getEnabledPlugin(Class<T> clz) {
 		for (OsmandPlugin lr : getEnabledPlugins()) {