Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd/res/values-be/strings.xml

@@ -2023,4 +2023,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="plugin_nautical_name">Марскія мапы</string>
     <string name="world_ski_missing">Для адлюстраваньня лыжных мап неабходна сьцягнуць адмысловыя мапы</string>
     <string name="nautical_maps_missing">Для адлюстраваньня марскіх мап неабходна сьцягнуць адмысловыя мапы</string>
-	</resources>
+	<string name="rendering_attr_pisteGrooming_name">Дагляд трасы</string>
+    </resources>

OsmAnd/res/values-ca/strings.xml

@@ -1884,10 +1884,16 @@
     <string name="gps_status">Estat del GPS</string>
     <string name="parking_place">Lloc d\'aparcament</string>
     <string name="remove_the_tag">Treure l\'etiqueta</string>
-    <string name="enable_plugin">Activa</string>
-	<string name="disable_plugin">Desactiva</string>
+    <string name="enable_plugin">Desactivat</string>
+	<string name="disable_plugin">Activat</string>
 <string name="plugin_description_title">Descripció</string>
 	<string name="plugin_settings_button_caption">Configuració</string>
 <string name="edit_group">Edició del grup</string>
     <string name="plugin_install_needs_network">Us cal una connexió a internet per instal·lar aquest connector.</string>
-</resources>
+<string name="plugin_ski_name">Pistes d\'esquí</string>
+    <string name="plugin_nautical_name">Cartes marines</string>
+    <string name="world_ski_missing">Per veure les pistes d\'esquí cal que baixeu un mapa específic</string>
+    <string name="nautical_maps_missing">Per accedir a cartes marines cal que baixeu un mapa específic</string>
+	<string name="enable_plugin2">Activa</string>
+	<string name="disable_plugin2">Desactiva</string>
+	</resources>

OsmAnd/res/values-da/strings.xml

@@ -1913,4 +1913,5 @@
     <string name="plugin_nautical_name">Søkort</string>
     <string name="world_ski_missing">For at vise skikort, skal det særlige offline kort hentes</string>
     <string name="nautical_maps_missing">For at vise søkort, skal det særlige offline kort hentes</string>
-	</resources>
+	<string name="rendering_attr_pisteGrooming_name">Piste preparering</string>
+    </resources>

OsmAnd/res/values-de/strings.xml

@@ -1935,7 +1935,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="osmo_specify_tracker_id">Bitte ID eingeben</string>
     <string name="home">Ausgangsposition</string>
     <string name="rendering_attr_publicTransportMode_name">Bus-, Trolleybus-, Sammeltaxi-Linien</string>
-	<string name="record_plugin_name">Zeichnen Sie Ihre Strecken auf</string>
+	<string name="record_plugin_name">Streckenaufzeichnung</string>
     <string name="int_hour">h</string>
     <string name="duration">Dauer</string>
     <string name="distance">Distanz</string>
@@ -2047,8 +2047,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="proxy_host_descr">Einen Proxy\'s Hostname einrichten (Bsp. 127.0.0.1)</string>
     <string name="proxy_port_title">Proxy-Port</string>
     <string name="proxy_port_descr">Einen Proxy\'s Port einrichten (Bsp. 8118)</string>
-    <string name="enable_plugin">Aktivieren</string>
-    <string name="disable_plugin">Deaktivieren</string>
+    <string name="enable_plugin">Deaktivieren</string>
+    <string name="disable_plugin">Aktivieren</string>
     <string name="plugin_description_title">Beschreibung</string>
 	<string name="plugin_settings_button_caption">Einstellungen</string>
 <string name="plugin_install_needs_network">Die Installation dieses Plugins benötigt eine Internet-Verbindung.</string>

OsmAnd/res/values-es/strings.xml

@@ -502,7 +502,7 @@
   <string name="route_head">Cabecera</string>
   <string name="first_time_continue">Después</string>
   <string name="first_time_download">Descargar regiones</string>
-  <string name="first_time_msg">Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
+  <string name="first_time_msg">Gracias por usar OsmAnd. Para muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
   <string name="search_poi_location">Buscando señal…</string>
   <string name="search_near_map">Buscar cerca del centro del mapa</string>
   <string name="search_nearby">Buscar cercanos</string>
@@ -1902,7 +1902,7 @@
 	<string name="version_settings_descr">Descargar versiones de desarrollo (nightly builds)</string>
     <string name="version_settings">Compilaciones</string>
     <string name="gps_status">Estado GPS</string>
-    <string name="rendering_attr_streetLighting_name">Iluminación de la calle</string>
+    <string name="rendering_attr_streetLighting_name">Alumbrado público</string>
     <string name="points">Puntos</string>
     <string name="tracks">Trazas</string>
     <string name="my_location">Mi ubicación</string>

OsmAnd/res/values-hu/strings.xml

@@ -1844,4 +1844,8 @@
 	<string name="plugin_install_needs_network">Internetkapcsolat szükséges a bővítmény telepítéséhez.</string>
 	<string name="get_plugin">Beszerzés</string>
 <string name="version_settings">Összeállítások</string>
-    </resources>
+    <string name="plugin_ski_name">Sítérképek</string>
+    <string name="plugin_nautical_name">Hajózási térképek</string>
+    <string name="world_ski_missing">A sítérképek megjelenítése érdekében a speciális kapcsolat nélküli térkép letöltése szükséges</string>
+    <string name="nautical_maps_missing">A hajózási térképek megjelenítése érdekében a speciális kapcsolat nélküli térkép letöltése szükséges</string>
+	</resources>

OsmAnd/res/values-nl/strings.xml

@@ -2073,4 +2073,10 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="plugin_settings_button_caption">Instellingen</string>
 <string name="edit_group">Bewerk groep</string>
     <string name="plugin_install_needs_network">Om deze plugin te installeren is een internetverbinding nodig.</string>
+<string name="plugin_nautical_name">Nautische kaarten</string>
+    <string name="world_ski_missing">Om skikaarten te kunnen gebruiken moet u aparte kaarten downloaden.</string>
+    <string name="nautical_maps_missing">Om nautische kaarten te kunnen gebruiken moet u aparte kaarten downloaden.</string>
+	<string name="enable_plugin2">Activeren</string>
+	<string name="disable_plugin2">Deactiveren</string>
+	<string name="get_plugin">Verkrijg</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -1851,4 +1851,6 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="disable_plugin2">Disabìlita</string>
 	<string name="plugin_install_needs_network">Est netzessària sa cunnessione a ìnternet pro installare custu cumponente annuntilu (plugin).</string>
 	<string name="get_plugin">Iscàrriga</string>
-</resources>
+<string name="plugin_nautical_name">Mapas nàuticas</string>
+    <string name="world_ski_missing">Pro bìdere sas mapas ispetziales pro s\'iscì, depent èssere iscarrigadas</string>
+    </resources>

OsmAnd/res/values-sk/strings.xml

@@ -2060,4 +2060,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 <string name="enable_plugin2">Zapnúť</string>
 	<string name="disable_plugin2">Vypnúť</string>
 	<string name="get_plugin">Získať</string>
-</resources>
+<string name="plugin_ski_name">Lyžiarske mapy</string>
+    <string name="plugin_nautical_name">Námorné mapy</string>
+    <string name="world_ski_missing">Pre zobrazenie lyžiarskym máp je potrebné stiahnuť samostatnú lyžiarsku mapu pre offline použitie</string>
+    <string name="nautical_maps_missing">Pre zobrazenie námorných máp je potrebné stiahnuť samostatnú námornú mapu pre offline použitie</string>
+	</resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1905,4 +1905,5 @@
     <string name="plugin_nautical_name">航海地圖</string>
     <string name="world_ski_missing">要顯示滑雪地圖，需要有已下載的專用離線地圖</string>
     <string name="nautical_maps_missing">要顯示航海地圖，需要有已下載的專用離線地圖</string>
-	</resources>
+	<string name="rendering_attr_pisteGrooming_name">滑雪道修整</string>
+    </resources>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="rendering_attr_pisteGrooming_name">Piste grooming</string>
     <string name="plugin_ski_name">Ski Maps</string>
     <string name="plugin_nautical_name">Nautical Maps</string>
     <string name="world_ski_missing">In order to display ski maps, the special offline map needs to be downloaded</string>

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

@@ -183,6 +183,10 @@ public class SQLiteTileSource implements ITileSource {
 							urlTemplate = template;
 						}
 					}
+					int ruleId = list.indexOf("rule");
+					if(ruleId != -1) {
+						rule = cursor.getString(ruleId);
+					}
 					int tnumbering = list.indexOf("tilenumbering");
 					if(tnumbering != -1) {
 						inversiveZoom = "BigPlanet".equalsIgnoreCase(cursor.getString(tnumbering));

OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java

@@ -116,7 +116,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
 		if(!Algorithms.objectEquals(overlay, layer.getMap())){
 			if(overlay == null){
 				mapView.removeLayer(layer);
-			} else {
+			} else if (mapView.getMapRenderer() == null) {
 				mapView.addLayer(layer, layerOrder);
 			}
 			layer.setMap(overlay);

OsmAnd/src/net/osmand/plus/render/MapVectorLayer.java

@@ -106,9 +106,10 @@ public class MapVectorLayer extends BaseMapLayer {
 					cachedUnderlay = st.MAP_UNDERLAY.get();
 					ITileSource tileSource = st.getTileSourceByName(cachedUnderlay, false);
 					if (tileSource != null) {
-						TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
-						mapRenderer.setMapLayerProvider(-1, prov.instantiateProxy(true));
-						prov.swigReleaseOwnership();
+						// TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
+						// mapRenderer.setMapLayerProvider(-1, prov.instantiateProxy(true));
+						// prov.swigReleaseOwnership();
+						mapRenderer.setMapLayerProvider(-1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
 					} else {
 						mapRenderer.resetMapLayerProvider(-1);
 					}
@@ -123,9 +124,10 @@ public class MapVectorLayer extends BaseMapLayer {
 					cachedOverlay = st.MAP_OVERLAY.get();
 					ITileSource tileSource = st.getTileSourceByName(cachedOverlay, false);
 					if (tileSource != null) {
-						TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
-						mapRenderer.setMapLayerProvider(1, prov.instantiateProxy(true));
-						prov.swigReleaseOwnership();
+						//TileSourceProxyProvider prov = new TileSourceProxyProvider(view.getApplication(), tileSource);
+						//mapRenderer.setMapLayerProvider(1, prov.instantiateProxy(true));
+						//prov.swigReleaseOwnership();
+						mapRenderer.setMapLayerProvider(1, net.osmand.core.jni.OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)"));
 					} else {
 						mapRenderer.resetMapLayerProvider(1);
 					}