merge

2015-08-31 17:44:51 +03:00 · 2015-08-31 17:44:51 +03:00 · 960ca8331a
commit 960ca8331a
parent feb8c50042 c867505132
39 changed files with 2053 additions and 1446 deletions
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapRouteReaderAdapter.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapRouteReaderAdapter.java
@ -57,6 +57,7 @@ public class BinaryMapRouteReaderAdapter {
 		private float floatValue;
 		private int type;
        private List<RouteTypeCondition> conditions = null;
+		private int forward;

 		public RouteTypeRule(String t, String v) {
 			this.t = t.intern();
@ -75,6 +76,10 @@ public class BinaryMapRouteReaderAdapter {
 			}
 		}
 		
+		public int isForward() {
+			return forward;
+		}
+		
 		public String getTag() {
 			return t;
 		}
@ -174,6 +179,14 @@ public class BinaryMapRouteReaderAdapter {
 			} else if(t.equalsIgnoreCase("maxspeed") && v != null){
 				type = MAXSPEED;
 				floatValue = RouteDataObject.parseSpeed(v, 0);
+			} else if(t.equalsIgnoreCase("maxspeed:forward") && v != null){
+				type = MAXSPEED;
+				forward = 1;
+				floatValue = RouteDataObject.parseSpeed(v, 0);
+			} else if(t.equalsIgnoreCase("maxspeed:backward") && v != null){
+				type = MAXSPEED;
+				forward = -1;
+				floatValue = RouteDataObject.parseSpeed(v, 0);
            } else if (t.equalsIgnoreCase("lanes") && v != null) {
 				intValue = -1;
 				int i = 0;
--- a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
+++ b/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
@ -204,11 +204,16 @@ public class RouteDataObject {
 		return types;
 	}
 	
-	public float getMaximumSpeed(){
+	public float getMaximumSpeed(boolean direction){
 		int sz = types.length;
        float maxSpeed = 0;
 		for (int i = 0; i < sz; i++) {
 			RouteTypeRule r = region.quickGetEncodingRule(types[i]);
+			if(r.isForward() != 0) {
+				if((r.isForward() > 1) != direction) {
+					continue;
+				}
+			}
            float mx = r.maxSpeed();
            if (mx > 0) {
                maxSpeed = mx;
--- a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
@ -19,6 +19,9 @@ public class RenderingRuleStorageProperties {
 	public static final String TEST = "test";
 	public static final String DISABLE = "disable";
 	
+	
+	public static final String TEXT_ITALIC = "textItalic";
+	public static final String TEXT_BOLD= "textBold";
 	public static final String TEXT_LENGTH = "textLength";
 	public static final String NAME_TAG = "nameTag";
 	public static final String NAME_TAG2 = "nameTag2";
@ -59,7 +62,6 @@ public class RenderingRuleStorageProperties {
 	public static final String COLOR_0 = "color_0";
 	public static final String COLOR__1 = "color__1";
 	public static final String COLOR__2 = "color__2";
-	public static final String TEXT_BOLD = "textBold";
 	public static final String TEXT_ORDER = "textOrder";
 	public static final String ICON_ORDER = "iconOrder";
 	public static final String ICON_VISIBLE_SIZE = "iconVisibleSize";
@ -134,6 +136,7 @@ public class RenderingRuleStorageProperties {
 	public RenderingRuleProperty R_COLOR__1;
 	public RenderingRuleProperty R_COLOR__2;
 	public RenderingRuleProperty R_TEXT_BOLD;
+	public RenderingRuleProperty R_TEXT_ITALIC;
 	public RenderingRuleProperty R_TEXT_ORDER;
 	public RenderingRuleProperty R_ICON_ORDER;
 	public RenderingRuleProperty R_TEXT_MIN_DISTANCE;
@ -231,6 +234,7 @@ public class RenderingRuleStorageProperties {
 		R_TEXT_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(TEXT_COLOR));

 		R_TEXT_BOLD = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_BOLD));
+		R_TEXT_ITALIC = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ITALIC));
 		R_TEXT_ON_PATH = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ON_PATH));

 		// point
--- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java
@ -470,12 +470,12 @@ public class RenderingRulesStorage {
 	public static void main(String[] args) throws XmlPullParserException, IOException {
 		STORE_ATTTRIBUTES = true;
 //		InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml");
-		String file = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml";
-		Map<String, String> renderingConstants = new LinkedHashMap<String, String>();
-		InputStream is = new FileInputStream(file);
-		if(args != null && args.length > 0) {
-			is = new FileInputStream(args[0]);
+		String defaultFile = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml";
+		if(args.length > 0) {
+			defaultFile = args[0];
 		}
+		Map<String, String> renderingConstants = new LinkedHashMap<String, String>();
+		InputStream is = new FileInputStream(defaultFile);
 		try {
 			XmlPullParser parser = PlatformUtil.newXMLPullParser();
 			parser.setInput(is, "UTF-8");
@ -494,7 +494,6 @@ public class RenderingRulesStorage {
 		} finally {
 			is.close();
 		}
-		is = new FileInputStream(file);
 		RenderingRulesStorage storage = new RenderingRulesStorage("default", renderingConstants);
 		final RenderingRulesStorageResolver resolver = new RenderingRulesStorageResolver() {
 			@Override
@ -504,6 +503,7 @@ public class RenderingRulesStorage {
 				return depends;
 			}
 		};
+		is = new FileInputStream(defaultFile);
 		storage.parseRulesFromXmlInputStream(is, resolver);
 		
 //		storage = new RenderingRulesStorage("", null);
--- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java
+++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java
@ -1,7 +1,6 @@
 package net.osmand.render;

 import gnu.trove.iterator.TIntObjectIterator;
-import gnu.trove.map.hash.TIntObjectHashMap;

 import java.io.File;
 import java.io.FileInputStream;
@ -24,12 +23,17 @@ public class RenderingRulesStoragePrinter {
 	public static void main(String[] args) throws XmlPullParserException, IOException {
 		RenderingRulesStorage.STORE_ATTTRIBUTES = true;
 //		InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml");
-		String file = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml";
-		Map<String, String> renderingConstants = new LinkedHashMap<String, String>();
-		InputStream is = new FileInputStream(file);
-		if(args != null && args.length > 0) {
-			is = new FileInputStream(args[0]);
+		String defaultFile = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml";
+		if(args.length > 0) {
+			defaultFile = args[0];
 		}
+		String outputPath = ".";
+		if(args.length > 1) {
+			outputPath = args[1];
+		}
+		String name = "Style";
+		Map<String, String> renderingConstants = new LinkedHashMap<String, String>();
+		InputStream is = new FileInputStream(defaultFile);
 		// buggy attributes
 		try {
 			XmlPullParser parser = PlatformUtil.newXMLPullParser();
@ -49,7 +53,7 @@ public class RenderingRulesStoragePrinter {
 		} finally {
 			is.close();
 		}
-		is = new FileInputStream(file);
+		is = new FileInputStream(defaultFile);
 		RenderingRulesStorage storage = new RenderingRulesStorage("default", renderingConstants);
 		final RenderingRulesStorageResolver resolver = new RenderingRulesStorageResolver() {
 			@Override
@ -60,62 +64,48 @@ public class RenderingRulesStoragePrinter {
 			}
 		};
 		storage.parseRulesFromXmlInputStream(is, resolver);
-		new RenderingRulesStoragePrinter().printCppRules(storage, RenderingRulesStorage.ORDER_RULES);
+		new RenderingRulesStoragePrinter().printJavaFile(outputPath, name, storage);
+	
 	}
 	
-	protected void printCppRules(RenderingRulesStorage storage, int rules) throws IOException  {
-		TIntObjectHashMap<RenderingRule> rp = storage.tagValueGlobalRules[rules];
-		
-	}
-	
-	protected void printJavaFile(RenderingRulesStorage storage) throws IOException {
+	protected void printJavaFile(String path, String name, RenderingRulesStorage storage) throws IOException {
 		PrintStream out = System.out;
-		out = new PrintStream(
-				new File(
-						"/Users/victorshcherb/osmand/repos/android/OsmAnd-java/src/net/osmand/render/DefaultRenderingRulesStorage.java"));
-		out.println("\n\npackage net.osmand.render;\n\npublic class DefaultRenderingRulesStorage {");
+		out = new PrintStream(new File(path, name + "RenderingRulesStorage.java"));
+		out.println("\n\npackage net.osmand.render;\n\npublic class " + name + "RenderingRulesStorage {");
 		String defindent = "\t";
 		String indent = defindent;
-		out.println(""+indent + defindent +"RenderingRulesStorage storage;");
-		
-		out.println(
-		"\tprivate java.util.Map<String, String> createMap(int... attrs) {\n" +
-		"\t	java.util.Map<String, String> mp = new java.util.HashMap<String, String>();\n" +
-		"\t		for(int i = 0; i< attrs.length; i+=2) {\n" +
-		"\t			mp.put(storage.getStringValue(attrs[i]), storage.getStringValue(attrs[i+1]));\n" +
-		"\t		}\n"+
-		"\t	return mp;\n"+
-		"\t}");
-		
-		out.println(
-				"\tprivate java.util.Map<String, String> createMap(String... attrs) {\n" +
-				"\t	java.util.Map<String, String> mp = new java.util.HashMap<String, String>();\n" +
-				"\t		for(int i = 0; i< attrs.length; i+=2) {\n" +
-				"\t			mp.put(attrs[i], attrs[i+1]);\n" +
-				"\t		}\n"+
-				"\t	return mp;\n"+
-				"\t}");
-		
+		out.println("" + indent + defindent + "RenderingRulesStorage storage;");
+
+		out.println("\tprivate java.util.Map<String, String> createMap(int... attrs) {\n"
+				+ "\t	java.util.Map<String, String> mp = new java.util.HashMap<String, String>();\n"
+				+ "\t		for(int i = 0; i< attrs.length; i+=2) {\n"
+				+ "\t			mp.put(storage.getStringValue(attrs[i]), storage.getStringValue(attrs[i+1]));\n" + "\t		}\n"
+				+ "\t	return mp;\n" + "\t}");
+
+		out.println("\tprivate java.util.Map<String, String> createMap(String... attrs) {\n"
+				+ "\t	java.util.Map<String, String> mp = new java.util.HashMap<String, String>();\n"
+				+ "\t		for(int i = 0; i< attrs.length; i+=2) {\n" + "\t			mp.put(attrs[i], attrs[i+1]);\n" + "\t		}\n"
+				+ "\t	return mp;\n" + "\t}");
+
 		out.println("\n" + indent + "public void createStyle(RenderingRulesStorage storage) {");
-		out.println(""+indent + defindent +"this.storage=storage;");
-		out.println(""+indent + defindent +"storage.renderingName="+javaString(storage.renderingName)+";");
-		out.println(""+indent + defindent +"storage.internalRenderingName="+javaString(storage.internalRenderingName)+";");
+		out.println("" + indent + defindent + "this.storage=storage;");
+		out.println("" + indent + defindent + "storage.renderingName=" + javaString(storage.renderingName) + ";");
+		out.println("" + indent + defindent + "storage.internalRenderingName="
+				+ javaString(storage.internalRenderingName) + ";");
 		// init dictionary must be first here
-		out.println(""+indent + defindent +"initDictionary();");
-		out.println(""+indent + defindent +"initProperties();");
-		out.println(""+indent + defindent +"initConstants();");
-		out.println(""+indent + defindent +"initAttributes();");
-		out.println(""+indent + defindent +"initRules();");
-		out.println(""+indent +"}");
+		out.println("" + indent + defindent + "initDictionary();");
+		out.println("" + indent + defindent + "initProperties();");
+		out.println("" + indent + defindent + "initConstants();");
+		out.println("" + indent + defindent + "initAttributes();");
+		out.println("" + indent + defindent + "initRules();");
+		out.println("" + indent + "}");
 		printJavaInitConstants(storage, out, indent, defindent);
 		printJavaInitProperties(storage, out, indent, defindent);
 		printJavaInitRules(storage, out, indent, defindent);
 		printJavaInitAttributes(storage, out, indent, defindent);
 		// PRINT last one in order to initialize storage properly
 		printJavaInitDictionary(storage, out, indent, defindent);
-		

-		
 		out.println("\n\n}");
 	}
 	
--- a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
+++ b/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
@ -310,7 +310,7 @@ public class RouteResultPreparation {
 				additional.append("rtime = \"").append(res.getRoutingTime()).append("\" ");
 				additional.append("name = \"").append(name).append("\" ");
 //				float ms = res.getSegmentSpeed();
-				float ms = res.getObject().getMaximumSpeed();
+				float ms = res.getObject().getMaximumSpeed(res.isForwardDirection());
 				if(ms > 0) {
 					additional.append("maxspeed = \"").append(ms * 3.6f).append("\" ").append(res.getObject().getHighway()).append(" ");
 				}
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@ -58,6 +58,16 @@
 		<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value="" />
        <activity android:name="net.osmand.plus.activities.HelpActivity" />
        <activity android:name="net.osmand.plus.activities.ExitActivity" />
+        
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="net.osmand.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true" >
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/paths" />
+        </provider>

 		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
 			android:screenOrientation="unspecified" android:launchMode="singleTop">
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -19,7 +19,7 @@ apply plugin: 'com.android.application'

 android {
 	compileSdkVersion 21
-	buildToolsVersion "21.1.2"
+	buildToolsVersion "23.0.0"

 	signingConfigs {
 		development {
@ -38,7 +38,7 @@ android {
 	}

 	defaultConfig {
-		minSdkVersion 14
+		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
 		targetSdkVersion 21

 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@ -11,6 +11,10 @@
    -->

    <!-- Not translatable -->
+    <string name="last_release">
+        - New road indexes (including)
+        - 
+        </string>
    <string name="ga_api_key">UA-28342846-2</string>
    <string name="ga_dispatchPeriod">10</string>
    <string name="ga_debug">true</string>
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -1064,4 +1064,5 @@
 	<string name="poi_building">Будынак</string>

 <string name="poi_military_office">Ваенкамат</string>
+	<string name="poi_notary">Натарыўс</string>
 	</resources>
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@ -781,7 +781,7 @@
 	<string name="poi_notice">Senyal nàutica</string>
 	<string name="poi_pile">Torreta</string>
 	<string name="poi_radar_transponder">Radar transponedor</string>
-	<string name="poi_signal_station_traffic">Semàfor de tràfic nàutic</string>
+	<string name="poi_signal_station_traffic">Semàfor de trànsit nàutic</string>
 	<string name="poi_signal_station_warning">Semàfor d\'advertiment nàutic</string>
 	<string name="poi_small_craft_facility">Instal·lacions per naus petites</string>
 	<string name="poi_topmark">Boia amb format IALA</string>
@ -857,7 +857,7 @@
 	<string name="poi_entrance_exit">Sortida</string>

 	<string name="poi_coffee">Coffee shop</string>
-	<string name="poi_pasta">Pasta shop</string>
+	<string name="poi_pasta">Botiga de pasta</string>
 	<string name="poi_fashion">Botiga de moda</string>
 	<string name="poi_free_flying">Botiga de vol lliure</string>
 	<string name="poi_garden_furniture">Mobles de jardí</string>
@ -873,12 +873,12 @@
 	<string name="poi_weapons">Armeria</string>

 	<string name="poi_stile">Restricció de pas</string>
-	<string name="poi_horse_stile">Pas per cavalls</string>
+	<string name="poi_horse_stile">Pas per a cavalls</string>
 	<string name="poi_kissing_gate">porta laberíntica</string>
 	<string name="poi_sally_port">Porta llevadissa</string>
 	<string name="poi_swing_gate">Barrera griratòria</string>
 	<string name="poi_turnstile">Torn de pas</string>
-	<string name="poi_kent_carriage_gap">Pas exclusiu per carruatges</string>
+	<string name="poi_kent_carriage_gap">Pas exclusiu per a carruatges</string>
 	<string name="poi_breakwater">Escullera</string>
 	<string name="poi_groyne">Espigó</string>

@ -916,12 +916,12 @@
 	<string name="poi_brand">Marca</string>

 	<string name="poi_enforcement_traffic_signals">Control de tràfic: obeir el semàfor</string>
-	<string name="poi_enforcement_maxspeed">Control de tràfic: velocitat màxima</string>
-	<string name="poi_enforcement_maxheight">Control de tràfic: alçada màxima</string>
-	<string name="poi_enforcement_mindistance">Control de tràfic: distància mínima</string>
-	<string name="poi_enforcement_check">Control de compliment</string>
-	<string name="poi_enforcement_access">Control de tràfic: accés</string>
-	<string name="poi_enforcement_toll">Control de tràfic: peatge</string>
+	<string name="poi_enforcement_maxspeed">Control de trànsit: velocitat màxima</string>
+	<string name="poi_enforcement_maxheight">Control de trànsit: alçada màxima</string>
+	<string name="poi_enforcement_mindistance">Control de trànsit: distància mínima</string>
+	<string name="poi_enforcement_check">Control de trànsit</string>
+	<string name="poi_enforcement_access">Control de trànsit: accés</string>
+	<string name="poi_enforcement_toll">Control de trànsit: peatge</string>

 <string name="poi_furnace">Botiga de calefactors</string>
 	<string name="poi_trophy">Trofeus i distincions</string>
@ -933,7 +933,7 @@
 	<string name="poi_abandoned_poi">Objectes perduts</string>
 	<string name="poi_node_networks">Xarxa de nodes de senderisme/ciclisme</string>
 		<string name="poi_hiking_routes">Rutes de senderisme</string>
-		<string name="poi_traffic_enforcement">Control de tràfic</string>
+		<string name="poi_traffic_enforcement">Control de trànsit</string>
 	<string name="poi_route_hiking_iwn_poi">Ruta internacional de senderisme</string>
 	<string name="poi_route_hiking_nwn_poi">Ruta nacional de senderisme</string>
 	<string name="poi_route_hiking_rwn_poi">Ruta senderista regional</string>
@ -945,21 +945,21 @@
 	<string name="poi_access_destination">Accés a la destinació</string>
 	<string name="poi_access_permissive">Accés tolerat</string>
 	<string name="poi_access_customers">Accés de clients</string>
-	<string name="poi_access_delivery">Accés per lliuraments</string>
-	<string name="poi_access_agricultural">Accés per activitats agrícoles</string>
+	<string name="poi_access_delivery">Accés per a lliuraments</string>
+	<string name="poi_access_agricultural">Accés per a activitats agrícoles</string>

 	<string name="poi_monitoring_station">Centre de control</string>
 	<string name="poi_capital">Capital</string>
 	<string name="poi_fee_no">Sense cap cost</string>

-	<string name="poi_email">e-mail</string>
+	<string name="poi_email">Correu electrònic</string>
 	<string name="poi_fax">Fax</string>
 	<string name="poi_facebook">Facebook</string>
 	<string name="poi_mobile">Mòbil</string>
-	<string name="poi_animal_shelter_dog">Refugi per gossos</string>
-	<string name="poi_animal_shelter_cat">Refugi per gats</string>
-	<string name="poi_animal_shelter_dog_cat">Refugi per gossos i gats</string>
-	<string name="poi_animal_shelter_bird">Refugi per ocells</string>
+	<string name="poi_animal_shelter_dog">Refugi per a gossos</string>
+	<string name="poi_animal_shelter_cat">Refugi per a gats</string>
+	<string name="poi_animal_shelter_dog_cat">Refugi per a gossos i gats</string>
+	<string name="poi_animal_shelter_bird">Refugi per a ocells</string>

 <string name="poi_recycling_centre">Deixalleria</string>
 	<string name="poi_recycling_container">Contenidor</string>
@ -998,7 +998,7 @@
 	<string name="poi_recycling_tyres">Pneumàtics</string>
 	<string name="poi_recycling_tv_monitor">TV, monitors</string>
 	<string name="poi_recycling_rubble">Runes</string>
-	<string name="poi_recycling_cds">CDs</string>
+	<string name="poi_recycling_cds">CD</string>
 	<string name="poi_recycling_waste_oil">Oli residual</string>
 	<string name="poi_recycling_bottles">Ampolles</string>
 	<string name="poi_recycling_cork">Suro</string>
@ -1028,9 +1028,9 @@
 	<string name="poi_seasonal_autumn">Tardor</string>
 	<string name="poi_seasonal_winter">Hivern</string>

-	<string name="poi_recycling_waste">Rebuig (bosses de negres)</string>
+	<string name="poi_recycling_waste">Rebuig (bosses negres)</string>
 	<string name="poi_recycling_paper_packaging">Embalatge de paper</string>
-	<string name="poi_recycling_tetrapak">Tetra Pak</string>
+	<string name="poi_recycling_tetrapak">Brics</string>
 	<string name="poi_recycling_hydrargyrum">Mercuri</string>
 	<string name="poi_recycling_foil">Paper d\'alumini</string>
 	<string name="poi_recycling_styrofoam">Poliestirè extrudit</string>
@ -1059,4 +1059,84 @@
 	<string name="poi_building">Edifici</string>

 <string name="poi_military_office">Administració militar</string>
+	<string name="poi_office_religion">Administració religiosa</string>
+	<string name="poi_association">Administració d\'associació</string>
+	<string name="poi_financial">Administració financera</string>
+	<string name="poi_political_party">Administració de partit polític</string>
+	<string name="poi_notary">Notari</string>
+	<string name="poi_foundation">Administració de fundació</string>
+	<string name="poi_tax_advisor">Assessoria fiscal</string>
+
+	<string name="poi_religion_voodoo">Religió vudú</string>
+	<string name="poi_religion_unitarian_universalist">Religió unitarista universalista</string>
+	<string name="poi_religion_multifaith">Multi-religiós</string>
+	<string name="poi_religion_jain">Jainisme</string>
+	<string name="poi_religion_spiritualist">Espiritualisme</string>
+	<string name="poi_religion_bahai">Fe Bahai</string>
+	<string name="poi_religion_scientologist">Cienciologia</string>
+	<string name="poi_religion_pagan">Paganisme</string>
+	<string name="poi_religion_tenrikyo">Tenrikyo</string>
+	<string name="poi_religion_zoroastrian">Zoroastrisme</string>
+
+	<string name="poi_denomination_catholic">Religió catòlica</string>
+	<string name="poi_denomination_baptist">Església Baptista</string>
+	<string name="poi_denomination_roman_catholic">Catòlica Romana</string>
+	<string name="poi_denomination_orthodox">Ortodoxa</string>
+	<string name="poi_denomination_lutheran">Luterana</string>
+	<string name="poi_denomination_sunni">Sunnita</string>
+	<string name="poi_denomination_protestant">Protestant</string>
+	<string name="poi_denomination_methodist">Metodista</string>
+	<string name="poi_denomination_anglican">Anglicana</string>
+	<string name="poi_denomination_presbyterian">Presbiteriana</string>
+	<string name="poi_denomination_evangelical">Evangèlica</string>
+	<string name="poi_denomination_russian_orthodox">Ortodoxa Russa</string>
+	<string name="poi_denomination_pentecostal">Pentecostal</string>
+	<string name="poi_denomination_mormon">Mormó</string>
+	<string name="poi_denomination_jehovahs_witness">Testimonis de Jehovà</string>
+	<string name="poi_denomination_greek_orthodox">Ortodox grec</string>
+	<string name="poi_denomination_reformed">Calvinisme</string>
+	<string name="poi_denomination_seventh_day_adventist">Adventistes del setè dia</string>
+	<string name="poi_denomination_new_apostolic">Nova apostòlica</string>
+	<string name="poi_denomination_church_of_england">Església d\'Anglaterra</string>
+	<string name="poi_denomination_episcopal">Episcopal</string>
+	<string name="poi_denomination_shia">Xiisme</string>
+	<string name="poi_denomination_united">Església unida</string>
+	<string name="poi_denomination_greek_catholic">Catòlic grec</string>
+	<string name="poi_denomination_tibetan">Tibetà</string>
+	<string name="poi_denomination_united_reformed">Església unida reformada</string>
+	<string name="poi_denomination_church_of_scotland">Església d\'Escòcia</string>
+	<string name="poi_denomination_salvation_army">Exèrcit de salvació</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Església de crist</string>
+	<string name="poi_denomination_uniting">Església unificada</string>
+	<string name="poi_denomination_mennonite">Mennonisme</string>
+	<string name="poi_denomination_quaker">Quàquer</string>
+	<string name="poi_denomination_bulgarian_orthodox">Ortodox búlgar</string>
+	<string name="poi_denomination_assemblies_of_god">Assemblees de Déu</string>
+	<string name="poi_denomination_nondenominational">Sense denominació</string>
+	<string name="poi_denomination_adventist">Adventista</string>
+	<string name="poi_denomination_nazarene">Natzarens</string>
+	<string name="poi_denomination_united_methodist">Metodista Unida</string>
+	<string name="poi_denomination_congregational">Congregacional</string>
+	<string name="poi_denomination_old_believers">Antics creients</string>
+	<string name="poi_denomination_serbian_orthodox">Ortodoxa sèrbia</string>
+	<string name="poi_denomination_spiritist">Espiritista</string>
+	<string name="poi_denomination_armenian_apostolic">Apostòlica d\'Armènia</string>
+	<string name="poi_denomination_dutch_reformed">Holandesa reformada</string>
+	<string name="poi_denomination_apostolic">Apostòlica</string>
+	<string name="poi_denomination_reform">Reformada</string>
+	<string name="poi_denomination_latter_day_saints">Moviment dels Sants dels Últims Dies</string>
+	<string name="poi_denomination_church_of_christ">Església de Crist</string>
+	<string name="poi_denomination_united_church_of_christ">Església unida de Crist</string>
+	<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
+	<string name="poi_denomination_scientist">Materialista</string>
+	<string name="poi_denomination_romanian_orthodox">Ortodoxa Romanesa</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Església Ortodoxa Etíop</string>
+	<string name="poi_denomination_unitarian">Unitarista</string>
+	<string name="poi_denomination_coptic_orthodox">Copte ortodox</string>
+	<string name="poi_denomination_wesleyan">Wesleià</string>
+	<string name="poi_denomination_shaktism">Xactisme</string>
+	<string name="poi_denomination_shingon_shu">Shingon (budisme)</string>
+	<string name="poi_denomination_maronite">Maronita</string>
+	<string name="poi_denomination_mahayana">Budisme mahayana</string>
+
 	</resources>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -1071,4 +1071,84 @@
 	<string name="poi_building">Bygning</string>

 <string name="poi_military_office">Militærkontor</string>
+	<string name="poi_notary">Notar</string>
+	<string name="poi_political_party">Partikontor</string>
+	<string name="poi_tax_advisor">Skatterådgvliningskontor</string>
+
+	<string name="poi_office_religion">Religiøs kontor</string>
+	<string name="poi_association">Foreningskontor</string>
+	<string name="poi_financial">Finansiel kontor</string>
+	<string name="poi_foundation">Fondskontor</string>
+	<string name="poi_religion_voodoo">Voodoo</string>
+	<string name="poi_religion_scientologist">Scientolog</string>
+	<string name="poi_denomination_catholic">Katolsk</string>
+	<string name="poi_denomination_baptist">Baptist</string>
+	<string name="poi_denomination_roman_catholic">Romersk-katolsk</string>
+	<string name="poi_denomination_orthodox">Ortodoks</string>
+	<string name="poi_denomination_lutheran">Luthersk</string>
+	<string name="poi_denomination_sunni">Sunni</string>
+	<string name="poi_denomination_protestant">Protestant</string>
+	<string name="poi_denomination_methodist">Methodist</string>
+	<string name="poi_denomination_anglican">Anglikansk</string>
+	<string name="poi_denomination_presbyterian">Presbyteriansk</string>
+	<string name="poi_denomination_evangelical">Evangelisk</string>
+	<string name="poi_denomination_russian_orthodox">Russisk-ortodoks</string>
+	<string name="poi_denomination_pentecostal">Pinsebevægelsen</string>
+	<string name="poi_denomination_mormon">Mormon</string>
+	<string name="poi_denomination_jehovahs_witness">Jehovahs Vidner</string>
+	<string name="poi_denomination_reformed">Reformeret</string>
+	<string name="poi_denomination_episcopal">Episkopal</string>
+	<string name="poi_denomination_greek_catholic">Græsk-katolsk</string>
+	<string name="poi_denomination_tibetan">Tibetansk</string>
+	<string name="poi_denomination_salvation_army">Frelsens Hær</string>
+	<string name="poi_denomination_quaker">Kvæker</string>
+	<string name="poi_denomination_bulgarian_orthodox">Bulgarsk-ortodoks</string>
+	<string name="poi_denomination_adventist">Adventist</string>
+	<string name="poi_denomination_serbian_orthodox">Serbisk-ortodoks</string>
+	<string name="poi_denomination_spiritist">Spiritist</string>
+	<string name="poi_denomination_armenian_apostolic">Armensk apostolsk</string>
+	<string name="poi_denomination_dutch_reformed">Hollandsk reformeret</string>
+	<string name="poi_denomination_apostolic">Apostolsk</string>
+	<string name="poi_denomination_latter_day_saints">Sidste dages hellige</string>
+	<string name="poi_denomination_church_of_christ">Kristi kirke</string>
+	<string name="poi_denomination_georgian_orthodox">Georgisk-ortodoks</string>
+	<string name="poi_denomination_romanian_orthodox">Rumænsk-ortodoks</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Etiopisk-ortodoks tewahedo</string>
+	<string name="poi_denomination_coptic_orthodox">Koptisk-ortodoks</string>
+	<string name="poi_denomination_mahayana">Mahayana</string>
+
+	<string name="poi_religion_unitarian_universalist">Unitarisk universalistisk</string>
+	<string name="poi_religion_multifaith">Multireligiøse</string>
+	<string name="poi_religion_jain">Jainisme</string>
+	<string name="poi_religion_spiritualist">Spiritist</string>
+	<string name="poi_religion_bahai">Bahai</string>
+	<string name="poi_religion_pagan">Hedenskab</string>
+	<string name="poi_religion_tenrikyo">Tenrikyo</string>
+	<string name="poi_religion_zoroastrian">Zarathustrisme</string>
+
+	<string name="poi_denomination_greek_orthodox">Græsk-ortodoks</string>
+	<string name="poi_denomination_seventh_day_adventist">Syvende Dags Adventist</string>
+	<string name="poi_denomination_new_apostolic">Nyapostolsk</string>
+	<string name="poi_denomination_church_of_england">Den engelske kirke</string>
+	<string name="poi_denomination_shia">Shiisme</string>
+	<string name="poi_denomination_united_reformed">Forenede reformerte kirke</string>
+	<string name="poi_denomination_church_of_scotland">Den skotske kirke</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
+	<string name="poi_denomination_mennonite">Mennonit</string>
+	<string name="poi_denomination_assemblies_of_god">Assemblies of god</string>
+	<string name="poi_denomination_nondenominational">Non-denominational</string>
+	<string name="poi_denomination_nazarene">Nazarene</string>
+	<string name="poi_denomination_united_methodist">United methodist</string>
+	<string name="poi_denomination_congregational">Kongregationalisme</string>
+	<string name="poi_denomination_old_believers">Gammeltroende</string>
+	<string name="poi_denomination_united_church_of_christ">United church of christ</string>
+	<string name="poi_denomination_unitarian">Unitarisme</string>
+	<string name="poi_denomination_wesleyan">Wesleyan</string>
+	<string name="poi_denomination_shaktism">Shaktism</string>
+	<string name="poi_denomination_shingon_shu">Shingon buddhisme</string>
+	<string name="poi_denomination_maronite">Maronit</string>
+	<string name="poi_denomination_reform">Reformert</string>
+	<string name="poi_denomination_united">Forenede</string>
+	<string name="poi_denomination_uniting">Forenende</string>
+	<string name="poi_denomination_scientist">Videnskab</string>
 	</resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -147,7 +147,7 @@
 	<string name="poi_club_tourism">Tourismusverein</string>
 	<string name="poi_club_veterans">Veteranenklub</string>
 	<string name="poi_college">Hochschule</string>
-	<string name="poi_communication_tower">Kommunikationstumr</string>
+	<string name="poi_communication_tower">Kommunikationsturm</string>
 	<string name="poi_community_centre">Gemeindezentrum</string>
 	<string name="poi_company">Firma</string>
 	<string name="poi_compressed_air">Druckluft</string>
@ -699,7 +699,7 @@
 	<string name="poi_sailing">Segeln</string>
 	<string name="poi_apartment">Apartment</string>
 	<string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
-	<string name="poi_internet_access_wired">Internetzugang: Kabel</string>
+	<string name="poi_internet_access_wired">Internetzugang: Kabelgebunden</string>
 	<string name="poi_internet_access_public">Internetzugang: öffentlich</string>
 	<string name="poi_picnic_table">Picknicktisch</string>
 	<string name="poi_wine_cellar">Weinkeller</string>
@ -1014,4 +1014,17 @@
 	<string name="poi_instagram">Instagram</string>
 	<string name="poi_vk">VKontakte</string>
 	<string name="poi_google_plus">Google+</string>
+	<string name="poi_perfumery">Parfümerie</string>
+
+	<string name="poi_association">Geschäftsstelle</string>
+	<string name="poi_political_party">Parteibüro</string>
+	<string name="poi_notary">Notar</string>
+	<string name="poi_foundation">Stiftungsbüro</string>
+	<string name="poi_tax_advisor">Steuerberatung</string>
+
+	<string name="poi_military_office">Militärverwaltung</string>
+	<string name="poi_building">Gebäude</string>
+
+<string name="poi_office_religion">Büro einer Glaubensgemeinschaft</string>
+	<string name="poi_financial">Finanzverwaltung</string>
 	</resources>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -1828,4 +1828,5 @@
    <string name="osmand_parking_overdue">εκπρόθεσμο</string>
 	<string name="simulate_your_location">Προσομοίωση της θέση σας</string>
    <string name="rendering_value_highContrastRoads_name">Δρόμοι με υψηλή αντίθεση</string>
+	<string name="plugin_settings">Πρόσθετα</string>
 	</resources>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -1052,4 +1052,78 @@

 	<string name="poi_building">Edificio</string>

-</resources>
+<string name="poi_office_religion">Oficina religiosa</string>
+	<string name="poi_association">Asociación</string>
+	<string name="poi_financial">Oficina financiera</string>
+	<string name="poi_political_party">Partido político</string>
+	<string name="poi_notary">Escribano</string>
+	<string name="poi_foundation">Fundación</string>
+	<string name="poi_tax_advisor">Asesor fiscal</string>
+
+	<string name="poi_military_office">Oficina militar</string>
+	<string name="poi_religion_voodoo">Vudú</string>
+	<string name="poi_religion_unitarian_universalist">Unitariano universalista</string>
+	<string name="poi_religion_multifaith">Multireligioso</string>
+	<string name="poi_religion_jain">Jainista</string>
+	<string name="poi_religion_spiritualist">Espiritualista</string>
+	<string name="poi_religion_bahai">Bahaísta</string>
+	<string name="poi_religion_scientologist">Cienciologísta</string>
+	<string name="poi_religion_pagan">Pagano</string>
+	<string name="poi_religion_tenrikyo">Tenrikyō</string>
+	<string name="poi_religion_zoroastrian">Zoroástrica</string>
+
+	<string name="poi_denomination_catholic">Católica</string>
+	<string name="poi_denomination_baptist">Bautista</string>
+	<string name="poi_denomination_roman_catholic">Católica romana</string>
+	<string name="poi_denomination_orthodox">Ortodoxa</string>
+	<string name="poi_denomination_lutheran">Luterana</string>
+	<string name="poi_denomination_sunni">Sunita</string>
+	<string name="poi_denomination_protestant">Protestante</string>
+	<string name="poi_denomination_methodist">Metodista</string>
+	<string name="poi_denomination_anglican">Anglicana</string>
+	<string name="poi_denomination_presbyterian">Presbiteriana</string>
+	<string name="poi_denomination_evangelical">Evangélica</string>
+	<string name="poi_denomination_russian_orthodox">Ortodoxa rusa</string>
+	<string name="poi_denomination_pentecostal">Pentecostal</string>
+	<string name="poi_denomination_mormon">Mormóna</string>
+	<string name="poi_denomination_jehovahs_witness">Testigos de Jehová</string>
+	<string name="poi_denomination_greek_orthodox">Ortodoxa griega</string>
+	<string name="poi_denomination_seventh_day_adventist">Adventista del séptimo día</string>
+	<string name="poi_denomination_new_apostolic">Nueva apostólica</string>
+	<string name="poi_denomination_church_of_england">Iglesia de Inglaterra</string>
+	<string name="poi_denomination_episcopal">Episcopal</string>
+	<string name="poi_denomination_shia">Chiíta</string>
+	<string name="poi_denomination_greek_catholic">Católica griega</string>
+	<string name="poi_denomination_tibetan">Tibetana</string>
+	<string name="poi_denomination_church_of_scotland">Iglesia de Escocia</string>
+	<string name="poi_denomination_salvation_army">Ejército de salvación</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
+	<string name="poi_denomination_mennonite">Menonita</string>
+	<string name="poi_denomination_bulgarian_orthodox">Ortodoxa búlgara</string>
+	<string name="poi_denomination_assemblies_of_god">Asambleas de Dios</string>
+	<string name="poi_denomination_nondenominational">Sin denominación</string>
+	<string name="poi_denomination_adventist">Adventista</string>
+	<string name="poi_denomination_nazarene">Nazarena</string>
+	<string name="poi_denomination_united_methodist">Metodista Unida</string>
+	<string name="poi_denomination_congregational">Congregacional</string>
+	<string name="poi_denomination_old_believers">Antiguos creyentes</string>
+	<string name="poi_denomination_serbian_orthodox">Ortodoxa Serbia</string>
+	<string name="poi_denomination_spiritist">Espírita</string>
+	<string name="poi_denomination_armenian_apostolic">Apostólico armenio</string>
+	<string name="poi_denomination_dutch_reformed">Holandés reformado</string>
+	<string name="poi_denomination_apostolic">Apostólica</string>
+	<string name="poi_denomination_reform">Reformista</string>
+	<string name="poi_denomination_latter_day_saints">Santos del último día</string>
+	<string name="poi_denomination_church_of_christ">Iglesia de Cristo</string>
+	<string name="poi_denomination_united_church_of_christ">Iglesia Unida de Cristo</string>
+	<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
+	<string name="poi_denomination_scientist">Científica</string>
+	<string name="poi_denomination_romanian_orthodox">Ortodoxa rumana</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Tewahedo ortodoxa etíope</string>
+	<string name="poi_denomination_unitarian">Unitariana</string>
+	<string name="poi_denomination_coptic_orthodox">Ortodoxa copto</string>
+	<string name="poi_denomination_maronite">Maronita</string>
+	<string name="poi_denomination_mahayana">Mahāyāna</string>
+
+	<string name="poi_denomination_united_reformed">Reformada unida</string>
+	</resources>
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -1055,4 +1055,77 @@

 	<string name="poi_building">Edificio</string>

-</resources>
+<string name="poi_office_religion">Oficina religiosa</string>
+	<string name="poi_association">Asociación</string>
+	<string name="poi_financial">Oficina financiera</string>
+	<string name="poi_political_party">Partido político</string>
+	<string name="poi_notary">Escribano / notario</string>
+	<string name="poi_foundation">Fundación</string>
+	<string name="poi_tax_advisor">Asesor fiscal</string>
+
+	<string name="poi_military_office">Oficina militar</string>
+	<string name="poi_religion_voodoo">Vudú</string>
+	<string name="poi_religion_unitarian_universalist">Unitariano universalista</string>
+	<string name="poi_religion_multifaith">Multireligioso</string>
+	<string name="poi_religion_jain">Jainista</string>
+	<string name="poi_religion_spiritualist">Espiritualista</string>
+	<string name="poi_religion_bahai">Bahaísta</string>
+	<string name="poi_religion_scientologist">Cienciologísta</string>
+	<string name="poi_religion_pagan">Pagano</string>
+	<string name="poi_religion_tenrikyo">Tenrikyō</string>
+	<string name="poi_religion_zoroastrian">Zoroástrica</string>
+
+	<string name="poi_denomination_catholic">Católica</string>
+	<string name="poi_denomination_baptist">Bautista</string>
+	<string name="poi_denomination_roman_catholic">Católica romana</string>
+	<string name="poi_denomination_orthodox">Ortodoxa</string>
+	<string name="poi_denomination_lutheran">Luterana</string>
+	<string name="poi_denomination_sunni">Sunita</string>
+	<string name="poi_denomination_protestant">Protestante</string>
+	<string name="poi_denomination_methodist">Metodista</string>
+	<string name="poi_denomination_anglican">Anglicana</string>
+	<string name="poi_denomination_presbyterian">Presbiteriana</string>
+	<string name="poi_denomination_evangelical">Evangélica</string>
+	<string name="poi_denomination_russian_orthodox">Ortodoxa rusa</string>
+	<string name="poi_denomination_pentecostal">Pentecostal</string>
+	<string name="poi_denomination_mormon">Mormóna</string>
+	<string name="poi_denomination_jehovahs_witness">Testigos de Jehová</string>
+	<string name="poi_denomination_greek_orthodox">Ortodoxa griega</string>
+	<string name="poi_denomination_seventh_day_adventist">Adventista del séptimo día</string>
+	<string name="poi_denomination_new_apostolic">Nueva apostólica</string>
+	<string name="poi_denomination_church_of_england">Iglesia de Inglaterra</string>
+	<string name="poi_denomination_episcopal">Episcopal</string>
+	<string name="poi_denomination_shia">Chiíta</string>
+	<string name="poi_denomination_greek_catholic">Católica griega</string>
+	<string name="poi_denomination_tibetan">Tibetana</string>
+	<string name="poi_denomination_church_of_scotland">Iglesia de Escocia</string>
+	<string name="poi_denomination_salvation_army">Ejército de salvación</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
+	<string name="poi_denomination_mennonite">Menonita</string>
+	<string name="poi_denomination_bulgarian_orthodox">Ortodoxa búlgara</string>
+	<string name="poi_denomination_assemblies_of_god">Asambleas de Dios</string>
+	<string name="poi_denomination_nondenominational">Sin denominación</string>
+	<string name="poi_denomination_adventist">Adventista</string>
+	<string name="poi_denomination_nazarene">Nazarena</string>
+	<string name="poi_denomination_united_methodist">Metodista Unida</string>
+	<string name="poi_denomination_congregational">Congregacional</string>
+	<string name="poi_denomination_old_believers">Antiguos creyentes</string>
+	<string name="poi_denomination_serbian_orthodox">Ortodoxa Serbia</string>
+	<string name="poi_denomination_spiritist">Espírita</string>
+	<string name="poi_denomination_armenian_apostolic">Apostólico armenio</string>
+	<string name="poi_denomination_dutch_reformed">Holandés reformado</string>
+	<string name="poi_denomination_apostolic">Apostólica</string>
+	<string name="poi_denomination_reform">Reformista</string>
+	<string name="poi_denomination_latter_day_saints">Santos del último día</string>
+	<string name="poi_denomination_church_of_christ">Iglesia de Cristo</string>
+	<string name="poi_denomination_united_church_of_christ">Iglesia Unida de Cristo</string>
+	<string name="poi_denomination_georgian_orthodox">Ortodoxa georgiana</string>
+	<string name="poi_denomination_scientist">Científica</string>
+	<string name="poi_denomination_romanian_orthodox">Ortodoxa rumana</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Tewahedo ortodoxa etíope</string>
+	<string name="poi_denomination_unitarian">Unitariana</string>
+	<string name="poi_denomination_coptic_orthodox">Ortodoxa copto</string>
+	<string name="poi_denomination_maronite">Maronita</string>
+	<string name="poi_denomination_mahayana">Mahāyāna</string>
+
+	</resources>
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@ -1032,4 +1032,6 @@
 	<string name="poi_recycling_low_energy_bulbs">Ampoules basse consommation</string>
 	<string name="poi_building">Bâtiment</string>

-</resources>
+<string name="poi_political_party">Bureau de parti politique</string>
+	<string name="poi_notary">Notaire</string>
+	</resources>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -2156,4 +2156,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="next_proceed">Avanti</string>
 	<string name="opening_at">Apre alle</string>
 	<string name="closing_at">Chiude alle</string>
-</resources>
+<string name="av_locations_descr">File gpx con note locali</string>
+    <string name="av_locations">Località</string>
+    </resources>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -1054,4 +1054,24 @@
 	<string name="poi_building">Número</string>

 <string name="poi_military_office">Área militar</string>
+	<string name="poi_office_religion">Área religiosa</string>
+	<string name="poi_association">Escritório de Associação</string>
+	<string name="poi_financial">Escritório financeiro</string>
+	<string name="poi_political_party">Escritório de partido político</string>
+	<string name="poi_notary">Tabelião</string>
+	<string name="poi_foundation">Escritório de fundação</string>
+	<string name="poi_tax_advisor">Escritório de conselheiro fiscal</string>
+
+	<string name="poi_religion_voodoo">Voodoo</string>
+	<string name="poi_religion_multifaith">Multirreligiosa</string>
+	<string name="poi_religion_spiritualist">Espiritualista</string>
+	<string name="poi_religion_bahai">Bahai</string>
+	<string name="poi_religion_scientologist">Cientologista</string>
+	<string name="poi_religion_pagan">Pagão</string>
+	<string name="poi_religion_zoroastrian">Zoroastrismo</string>
+
+	<string name="poi_denomination_catholic">Católica</string>
+	<string name="poi_denomination_baptist">Batista</string>
+	<string name="poi_denomination_roman_catholic">Católica Romana</string>
+	<string name="poi_denomination_orthodox">Ortodoxo</string>
 	</resources>
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@ -1946,4 +1946,20 @@
 	<string name="successfully_uploaded_pattern">Uspešno poslano {0}/{1}</string>
 	<string name="try_again">Poskusi znova</string>
 	<string name="error_message_pattern">Napaka: {0}</string>
-</resources>
+<string name="plugin_settings">Vstavki</string>
+	<string name="dahboard_options_dialog_title">Možnosti nadzorne plošče</string>
+	<string name="shared_string_card_was_hidden">Kartica je bila skrita</string>
+	<string name="shared_string_undo">Razveljavi</string>
+	<string name="shared_string_skip">Preskoči</string>
+	<string name="app_name_osmand">OsmAnd</string>
+	<string name="commit_poi">Objavi točko POI</string>
+	<string name="basic_tab_title">Osnovno</string>
+	<string name="extended_tab_title">Razširjeno</string>
+	<string name="building_number">Številka zgradbe</string>
+	<string name="next_proceed">Naslenja</string>
+	<string name="opening_at">Odpiralni čas ob</string>
+	<string name="closing_at">Zapiralni čas ob</string>
+<string name="routing_attr_avoid_shuttle_train_name">Izogni se vožnji z vlakom</string>
+	<string name="routing_attr_avoid_shuttle_train_description">Izogni se vožnji z vlakom</string>
+    <string name="offline_maps_and_navigation">Zemljevidi za delo brez\npovezave in navigacijo</string>
+	</resources>
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@ -1052,4 +1052,54 @@
 	<string name="poi_building">建築物</string>

 <string name="poi_military_office">軍事辦公室</string>
+	<string name="poi_office_religion">宗教辦公室</string>
+	<string name="poi_association">社團辦公室</string>
+	<string name="poi_financial">金融辦公室</string>
+	<string name="poi_political_party">政黨辦公室</string>
+	<string name="poi_notary">公證人</string>
+	<string name="poi_foundation">基金會辦公室</string>
+	<string name="poi_tax_advisor">稅務顧問辦公室</string>
+
+	<string name="poi_religion_voodoo">巫毒教</string>
+	<string name="poi_religion_unitarian_universalist">一神普救派</string>
+	<string name="poi_religion_multifaith">多元宗教</string>
+	<string name="poi_religion_jain">耆那教</string>
+	<string name="poi_religion_spiritualist">唯靈論教</string>
+	<string name="poi_religion_bahai">巴海大同教</string>
+	<string name="poi_religion_scientologist">山達基教</string>
+	<string name="poi_religion_pagan">異教</string>
+	<string name="poi_religion_tenrikyo">天理教</string>
+	<string name="poi_religion_zoroastrian">祆教</string>
+
+	<string name="poi_denomination_catholic">天主教</string>
+	<string name="poi_denomination_baptist">浸信會</string>
+	<string name="poi_denomination_roman_catholic">羅馬天主教</string>
+	<string name="poi_denomination_orthodox">東正教</string>
+	<string name="poi_denomination_lutheran">路德教派</string>
+	<string name="poi_denomination_sunni">遜尼派</string>
+	<string name="poi_denomination_protestant">基督新教</string>
+	<string name="poi_denomination_methodist">衛理公會</string>
+	<string name="poi_denomination_anglican">英國國教</string>
+	<string name="poi_denomination_presbyterian">長老教會</string>
+	<string name="poi_denomination_evangelical">福音派</string>
+	<string name="poi_denomination_russian_orthodox">俄羅斯東正教</string>
+	<string name="poi_denomination_pentecostal">聖靈降臨派</string>
+	<string name="poi_denomination_mormon">摩門教</string>
+	<string name="poi_denomination_jehovahs_witness">耶和華見證人</string>
+	<string name="poi_denomination_greek_orthodox">希臘正教</string>
+	<string name="poi_denomination_reformed">改革宗教會</string>
+	<string name="poi_denomination_seventh_day_adventist">基督復臨安息日會</string>
+	<string name="poi_denomination_episcopal">聖公會</string>
+	<string name="poi_denomination_shia">什葉派</string>
+	<string name="poi_denomination_united">聯合教會</string>
+	<string name="poi_denomination_greek_catholic">希臘天主教</string>
+	<string name="poi_denomination_tibetan">西藏</string>
+	<string name="poi_denomination_united_reformed">英國聯合歸正教會</string>
+	<string name="poi_denomination_church_of_scotland">蘇格蘭長老會</string>
+	<string name="poi_denomination_salvation_army">救世軍</string>
+	<string name="poi_denomination_iglesia_ni_cristo">基督堂教會</string>
+	<string name="poi_denomination_uniting">聯合教會</string>
+	<string name="poi_denomination_mennonite">門諾會</string>
+	<string name="poi_denomination_quaker">貴格會</string>
+	<string name="poi_denomination_bulgarian_orthodox">保加利亞東正教</string>
 	</resources>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -2091,4 +2091,6 @@
 	<string name="opening_at">營業于</string>
 	<string name="closing_at">結束于</string>
 <string name="next_proceed">下頁</string>
-	</resources>
+	<string name="av_locations_descr">Gpx 檔案偕同地點注解</string>
+    <string name="av_locations">地點</string>
+    </resources>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -498,6 +498,13 @@
 	<string name="poi_educational_institution">Educational institution</string>
 	<string name="poi_studio">Studio</string>
 	<string name="poi_bookmaker">Bookmaker</string>
+	<string name="poi_office_religion">Religious office</string>
+	<string name="poi_association">Association office</string>
+	<string name="poi_financial">Financial office</string>
+	<string name="poi_political_party">Political party office</string>
+	<string name="poi_notary">Notary</string>
+	<string name="poi_foundation">Foundation office</string>
+	<string name="poi_tax_advisor">Tax advisor office</string>

 	<string name="poi_stadium">Stadium</string>
 	<string name="poi_sports_centre">Sports center</string>
@ -624,6 +631,77 @@
 	<string name="poi_religion_hindu">Place of worship: hindu</string>
 	<string name="poi_religion_shinto">Place of worship: shinto</string>
 	<string name="poi_religion_taoist">Place of worship: taoist</string>
+	<string name="poi_religion_voodoo">Voodoo</string>
+	<string name="poi_religion_unitarian_universalist">Unitarian universalist</string>
+	<string name="poi_religion_multifaith">Multifaith</string>
+	<string name="poi_religion_jain">Jain</string>
+	<string name="poi_religion_spiritualist">Spiritualist</string>
+	<string name="poi_religion_bahai">Bahai</string>
+	<string name="poi_religion_scientologist">Scientologist</string>
+	<string name="poi_religion_pagan">Pagan</string>
+	<string name="poi_religion_tenrikyo">Tenrikyo</string>
+	<string name="poi_religion_zoroastrian">Zoroastrian</string>
+
+	<string name="poi_denomination_catholic">Catholic</string>
+	<string name="poi_denomination_baptist">Baptist</string>
+	<string name="poi_denomination_roman_catholic">Roman catholic</string>
+	<string name="poi_denomination_orthodox">Orthodox</string>
+	<string name="poi_denomination_lutheran">Lutheran</string>
+	<string name="poi_denomination_sunni">Sunni</string>
+	<string name="poi_denomination_protestant">Protestant</string>
+	<string name="poi_denomination_methodist">Methodist</string>
+	<string name="poi_denomination_anglican">Anglican</string>
+	<string name="poi_denomination_presbyterian">Presbyterian</string>
+	<string name="poi_denomination_evangelical">Evangelical</string>
+	<string name="poi_denomination_russian_orthodox">Russian orthodox</string>
+	<string name="poi_denomination_pentecostal">Pentecostal</string>
+	<string name="poi_denomination_mormon">Mormon</string>
+	<string name="poi_denomination_jehovahs_witness">Jehovahs witness</string>
+	<string name="poi_denomination_greek_orthodox">Greek_orthodox</string>
+	<string name="poi_denomination_reformed">Reformed</string>
+	<string name="poi_denomination_seventh_day_adventist">Seventh_day_adventist</string>
+	<string name="poi_denomination_new_apostolic">New_apostolic</string>
+	<string name="poi_denomination_church_of_england">Church_of_england</string>
+	<string name="poi_denomination_episcopal">Episcopal</string>
+	<string name="poi_denomination_shia">Shia</string>
+	<string name="poi_denomination_united">United</string>
+	<string name="poi_denomination_greek_catholic">Greek catholic</string>
+	<string name="poi_denomination_tibetan">Tibetan</string>
+	<string name="poi_denomination_united_reformed">United reformed</string>
+	<string name="poi_denomination_church_of_scotland">Church of scotland</string>
+	<string name="poi_denomination_salvation_army">Salvation army</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
+	<string name="poi_denomination_uniting">Uniting</string>
+	<string name="poi_denomination_mennonite">Mennonite</string>
+	<string name="poi_denomination_quaker">Quaker</string>
+	<string name="poi_denomination_bulgarian_orthodox">Bulgarian orthodox</string>
+	<string name="poi_denomination_assemblies_of_god">Assemblies of god</string>
+	<string name="poi_denomination_nondenominational">Nondenominational</string>
+	<string name="poi_denomination_adventist">Adventist</string>
+	<string name="poi_denomination_nazarene">Nazarene</string>
+	<string name="poi_denomination_united_methodist">United methodist</string>
+	<string name="poi_denomination_congregational">Congregational</string>
+	<string name="poi_denomination_old_believers">Old believers</string>
+	<string name="poi_denomination_serbian_orthodox">Serbian orthodox</string>
+	<string name="poi_denomination_spiritist">Spiritist</string>
+	<string name="poi_denomination_armenian_apostolic">Armenian apostolic</string>
+	<string name="poi_denomination_dutch_reformed">Dutch reformed</string>
+	<string name="poi_denomination_apostolic">Apostolic</string>
+	<string name="poi_denomination_reform">Reform</string>
+	<string name="poi_denomination_latter_day_saints">Latter day saints</string>
+	<string name="poi_denomination_church_of_christ">Church of christ</string>
+	<string name="poi_denomination_united_church_of_christ">United church of christ</string>
+	<string name="poi_denomination_georgian_orthodox">Georgian orthodox</string>
+	<string name="poi_denomination_scientist">Scientist</string>
+	<string name="poi_denomination_romanian_orthodox">Romanian orthodox</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Ethiopian orthodox tewahedo</string>
+	<string name="poi_denomination_unitarian">Unitarian</string>
+	<string name="poi_denomination_coptic_orthodox">Coptic orthodox</string>
+	<string name="poi_denomination_wesleyan">Wesleyan</string>
+	<string name="poi_denomination_shaktism">Shaktism</string>
+	<string name="poi_denomination_shingon_shu">Shingon shu</string>
+	<string name="poi_denomination_maronite">Maronite</string>
+	<string name="poi_denomination_mahayana">Mahayana</string>

 	<string name="poi_internet_access_wlan">Internet access: wlan</string>
 	<string name="poi_internet_access_terminal">Internet access: terminal</string>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -9,6 +9,8 @@
         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="av_locations_descr">Gpx file with note locations</string>
+    <string name="av_locations">Locations</string>
    <string name="plugin_settings">Plugins</string>
 	<string name="routing_attr_avoid_shuttle_train_name">Avoid shuttle train</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Avoid shuttle train</string>
--- a/OsmAnd/res/xml/paths.xml
+++ b/OsmAnd/res/xml/paths.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+
+    <cache-path
+        name="share"
+        path="share" />
+
+</paths>
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@ -291,7 +291,7 @@ public class MapActivityLayers {

 	private void addFilterToList(final ContextMenuAdapter adapter, final List<PoiUIFilter> list, PoiUIFilter f) {
 		list.add(f);
-		Item it = adapter.item(f.getName()).selected(0);
+		Item it = adapter.item(f.getName()).selected(-1);
 		if (RenderingIcons.containsBigIcon(f.getSimplifiedId())) {
 			it.icon(RenderingIcons.getBigIconResourceId(f.getSimplifiedId()));
 		} else {
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
@ -285,6 +285,9 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
 					icon.setImageDrawable(null);
 				}
 				name = st.getTranslation();
+				if(st.isAdditional()) {
+					name += " (" + ((PoiType) st).getParentType().getTranslation() + ")"; 
+				}
 			}
 			label.setText(name);
 			return (row);
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@ -140,7 +140,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		public Recording(File f) {
 			this.file = f;
 		}
-
+		
 		private File file;

 		private double lat;
--- a/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/NotesFragment.java
@ -1,10 +1,15 @@
 package net.osmand.plus.audionotes;

+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

 import net.osmand.data.PointDescription;
+import net.osmand.plus.GPXUtilities;
+import net.osmand.plus.GPXUtilities.GPXFile;
+import net.osmand.plus.GPXUtilities.WptPt;
 import net.osmand.plus.IconsCache;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@ -17,12 +22,7 @@ import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
 import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.myplaces.FavoritesActivity;
-import net.osmand.plus.osmedit.OpenstreetmapPoint;
-import net.osmand.plus.osmedit.OpenstreetmapRemoteUtil;
-import net.osmand.plus.osmedit.OsmBugsRemoteUtil;
-import net.osmand.plus.osmedit.OsmNotesPoint;
-import net.osmand.plus.osmedit.OsmPoint;
-import net.osmand.plus.osmedit.OsmEditsFragment.BackupOpenstreetmapPointAsyncTask;
+import net.osmand.util.Algorithms;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@ -32,8 +32,8 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.FileProvider;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.PopupMenu;
 import android.view.LayoutInflater;
@ -67,6 +67,7 @@ public class NotesFragment extends OsmAndListFragment {
 	private ActionMode actionMode;

 	private ArrayList<AudioVideoNotesPlugin.Recording> selected = new ArrayList<>();
+	Recording shareLocationFile = new Recording(new File("."));

 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -218,21 +219,62 @@ public class NotesFragment extends OsmAndListFragment {
 		Intent intent = new Intent();
 		intent.setAction(Intent.ACTION_SEND_MULTIPLE);
 		intent.setType("image/*"); /* This example is sharing jpeg images. */
-
 		ArrayList<Uri> files = new ArrayList<Uri>();
-
 		for(Recording path : selected) {
-		    files.add(Uri.fromFile(path.getFile()));
+			if(path == shareLocationFile) {
+				File fl = generateGPXForRecordings(selected);
+				if(fl != null) {
+					files.add(FileProvider.getUriForFile(getActivity(), "net.osmand.fileprovider", fl));
+				}
+			} else {
+				File src = path.getFile();
+				File dst = new File(getActivity().getCacheDir(), "share/"+src.getName());
+				try {
+					Algorithms.fileCopy(src, dst);
+					files.add(FileProvider.getUriForFile(getActivity(), "net.osmand.fileprovider", dst));
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
 		}
 		intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, files);
+		intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 		startActivity(Intent.createChooser(intent, getString(R.string.share_note)));
 	}
 	
+	private File generateGPXForRecordings(ArrayList<Recording> selected) {
+//		File tmpFile = getMyApplication().getAppPath("cache/noteLocations.gpx");
+		File tmpFile = new File(getActivity().getCacheDir(), "share/noteLocations.gpx");
+		tmpFile.getParentFile().mkdirs();
+		GPXFile file = new GPXFile();
+		for(Recording r : selected) {
+			if(r != shareLocationFile) {
+				String desc = r.getDescriptionName(r.getFileName());
+				if(desc == null) {
+					desc = r.getFileName();
+				}
+				WptPt wpt = new WptPt();
+				wpt.lat = r.getLatitude();
+				wpt.lon = r.getLongitude();
+				wpt.name = desc;
+				wpt.link = r.getFileName();
+				wpt.time = r.getFile().lastModified();
+				wpt.category = r.getSearchHistoryType();
+				file.points.add(wpt);
+			}
+		}
+		GPXUtilities.writeGpxFile(tmpFile, file, getMyApplication());
+		return tmpFile;
+	}
+
 	private void enterDeleteMode(final int type) {
 		actionMode = getActionBarActivity().startSupportActionMode(new ActionMode.Callback() {

 			@Override
 			public boolean onCreateActionMode(final ActionMode mode, Menu menu) {
+				if(type == MODE_SHARE) {
+					listAdapter.insert(shareLocationFile, 0);
+				}
 				enableSelectionMode(true);
 				MenuItem item;
 				if(type == MODE_DELETE) {
@ -271,6 +313,9 @@ public class NotesFragment extends OsmAndListFragment {

 			@Override
 			public void onDestroyActionMode(ActionMode mode) {
+				if(type == MODE_SHARE) {
+					listAdapter.remove(shareLocationFile);
+				}
 				enableSelectionMode(false);
 				listAdapter.notifyDataSetInvalidated();
 			}
@ -307,10 +352,14 @@ public class NotesFragment extends OsmAndListFragment {
 			}

 			final AudioVideoNotesPlugin.Recording recording = getItem(position);
-			Drawable icon = DashAudioVideoNotesFragment.getNoteView(recording, row, getMyApplication());
-			icon.setColorFilter(getResources().getColor(R.color.color_distance), Mode.MULTIPLY);
-			((ImageView) row.findViewById(R.id.play)).setImageDrawable(getMyApplication().getIconsCache()
-					.getContentIcon(R.drawable.ic_play_dark));
+			if (recording == shareLocationFile) {
+				((TextView) row.findViewById(R.id.name)).setText(R.string.av_locations);
+				((TextView) row.findViewById(R.id.descr)).setText(R.string.av_locations_descr);
+			} else {
+				DashAudioVideoNotesFragment.getNoteView(recording, row, getMyApplication());
+			}
+//			((ImageView) row.findViewById(R.id.play)).setImageDrawable(getMyApplication().getIconsCache()
+//					.getContentIcon(R.drawable.ic_play_dark));
 			row.findViewById(R.id.play).setVisibility(View.GONE);
 			
 			
--- a/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
@ -99,6 +99,9 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
 	@Override
 	public void updateLayers(OsmandMapTileView mapView, MapActivity activity) {
 		if(isActive()) {
+			if(distanceCalculatorLayer == null) {
+				registerLayers(activity);
+			}
 			if(!mapView.isLayerVisible(distanceCalculatorLayer)) {
 				activity.getMapView().addLayer(distanceCalculatorLayer, 4.5f);
 			}
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@ -11,14 +11,13 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;

 import net.osmand.Location;
-import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.data.Amenity;
-import net.osmand.data.PointDescription;
 import net.osmand.data.Amenity.AmenityRoutePoint;
 import net.osmand.data.LocationPoint;
+import net.osmand.data.PointDescription;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
@ -258,7 +257,13 @@ public class WaypointHelper {
 	
 	public AlarmInfo calculateMostImportantAlarm(RouteDataObject ro, Location loc, 
 			MetricsConstants mc, boolean showCameras) {
-		float mxspeed = ro.getMaximumSpeed();
+		boolean direction = true;
+		if(loc.hasBearing()) {
+			double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) -  
+					loc.getBearing() / (2 * Math.PI));
+			direction = Math.abs(diff) < Math.PI;
+		}
+		float mxspeed = ro.getMaximumSpeed(direction);
 		float delta = app.getSettings().SPEED_LIMIT_EXCEED.get() / 3.6f;
 		AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, loc, delta);
 		if (speedAlarm != null) {
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@ -1,19 +1,6 @@
 package net.osmand.plus.osmedit;

-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.Toast;
+import java.util.List;

 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibleToast;
@ -37,7 +24,20 @@ import net.osmand.util.Algorithms;

 import org.apache.commons.logging.Log;

-import java.util.List;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Toast;


 public class OsmEditingPlugin extends OsmandPlugin {
@ -153,7 +153,6 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		OnContextMenuClick listener = new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int resId, int pos, boolean isChecked) {
-				LOG.debug("onContextMenuClick()");
 				if (resId == R.string.context_menu_item_create_poi) {
 					//getPoiActions(mapActivity).showCreateDialog(latitude, longitude);
 					EditPoiFragment editPoiFragment =
@ -169,11 +168,9 @@ public class OsmEditingPlugin extends OsmandPlugin {
 					}
 					osmBugsLayer.openBug(latitude, longitude);
 				} else if (resId == R.string.poi_context_menu_delete) {
-					LOG.debug("delete poi");
 					new EditPoiFragment.ShowDeleteDialogAsyncTask(mapActivity)
 							.execute((Amenity) selectedObj);
 				} else if (resId == R.string.poi_context_menu_modify) {
-					LOG.debug("edit poi");
 					EditPoiFragment.showEditInstance((Amenity) selectedObj, mapActivity);
 				}
 				return true;
--- a/OsmAnd/src/net/osmand/plus/render/TextRenderer.java
+++ b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java
@ -36,6 +36,10 @@ public class TextRenderer {
 	private Paint paintText;
 	private final Context context;
 	private Paint paintIcon;
+	private Typeface defaultTypeface;
+	private Typeface boldItalicTypeface;
+	private Typeface italicTypeface;
+	private Typeface boldTypeface;

 	static class TextDrawInfo {

@ -56,6 +60,7 @@ public class TextRenderer {
 		int textShadow = 0;
 		int textWrap = 0;
 		boolean bold = false;
+		boolean italic = false;
 		String shieldRes = null;
 		String shieldResIcon = null;
 		int textOrder = 100;
@ -78,6 +83,7 @@ public class TextRenderer {
 			}
 			textWrap = (int) rc.getComplexValue(render, render.ALL.R_TEXT_WRAP_WIDTH);
 			bold = render.getIntPropertyValue(render.ALL.R_TEXT_BOLD, 0) > 0;
+			italic = render.getIntPropertyValue(render.ALL.R_TEXT_ITALIC, 0) > 0;
 			minDistance = rc.getComplexValue(render, render.ALL.R_TEXT_MIN_DISTANCE);
 			if (render.isSpecified(render.ALL.R_TEXT_SHIELD)) {
 				shieldRes = render.getStringPropertyValue(render.ALL.R_TEXT_SHIELD);
@ -96,11 +102,16 @@ public class TextRenderer {
 		paintText.setStrokeWidth(1);
 		paintText.setColor(Color.BLACK);
 		paintText.setTextAlign(Align.CENTER);
-		paintText.setTypeface(Typeface.create("Droid Serif", Typeface.NORMAL)); //$NON-NLS-1$
+		defaultTypeface = Typeface.create("Droid Serif", Typeface.NORMAL);
+		boldItalicTypeface = Typeface.create("Droid Serif", Typeface.BOLD_ITALIC);
+		italicTypeface = Typeface.create("Droid Serif", Typeface.ITALIC);
+		boldTypeface = Typeface.create("Droid Serif", Typeface.BOLD);
+		paintText.setTypeface(defaultTypeface); //$NON-NLS-1$
 		paintText.setAntiAlias(true);

 		paintIcon = new Paint();
 		paintIcon.setStyle(Style.STROKE);
+		
 	}

 	public Paint getPaintText() {
@ -232,7 +243,17 @@ public class TextRenderer {
 				// sest text size before finding intersection (it is used there)
 				float textSize = text.textSize * rc.textScale ;
 				paintText.setTextSize(textSize);
+				if(text.bold && text.italic) {
+					paintText.setTypeface(boldItalicTypeface);
+				} else if(text.bold) {
+					paintText.setTypeface(boldTypeface);
+				} else if(text.italic) {
+					paintText.setTypeface(italicTypeface);
+				} else {
+					paintText.setTypeface(defaultTypeface);
+				}
 				paintText.setFakeBoldText(text.bold);
+				
 				paintText.setColor(text.textColor);
 				// align center y
 				text.centerY += (-paintText.ascent());
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
@ -666,7 +666,7 @@ public class RouteCalculationResult {
 	public float getCurrentMaxSpeed() {
 		RouteSegmentResult res = getCurrentSegmentResult();
 		if(res != null) {
-			return res.getObject().getMaximumSpeed();
+			return res.getObject().getMaximumSpeed(res.isForwardDirection());
 		}
 		return 0;
 	}
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@ -43,6 +43,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		public PointDescription getObjectName(Object o);

 		public boolean disableSingleTap();
+		
 		public boolean disableLongPressOnMap();
 	}
 	
@ -229,20 +230,17 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		}

 		if (disableLongPressOnMap()) {
-			LatLon latLon = selectObjectsForContextMenu(tileBox, point);
-			if (latLon != null) {
-				String description = getSelectedObjectDescription();
-				setLocation(latLon, description);
-				view.refreshMap();
-				return true;
-			} else {
-				return false;
-			}
+			return false;
+		}
+		LatLon latLon = selectObjectsForContextMenu(tileBox, point);
+		if (latLon != null) {
+			String description = getSelectedObjectDescription();
+			setLocation(latLon, description);
+		} else {
+			final double lat = tileBox.getLatFromPixel((int) point.x, (int) point.y);
+			final double lon = tileBox.getLonFromPixel((int) point.x, (int) point.y);
+			setLocation(new LatLon(lat, lon), null);
 		}
-
-		final double lat = tileBox.getLatFromPixel((int) point.x, (int) point.y);
-		final double lon = tileBox.getLonFromPixel((int) point.x, (int) point.y);
-		setLocation(new LatLon(lat, lon), null);
 		view.refreshMap();
 		return true;
 	}
@ -262,8 +260,8 @@ public class ContextMenuLayer extends OsmandMapLayer {

 	public boolean disableLongPressOnMap() {
 		boolean res = false;
-		for(OsmandMapLayer lt : view.getLayers()){
-			if(lt instanceof ContextMenuLayer.IContextMenuProvider) {
+		for (OsmandMapLayer lt : view.getLayers()) {
+			if (lt instanceof ContextMenuLayer.IContextMenuProvider) {
 				if (((IContextMenuProvider) lt).disableLongPressOnMap()) {
 					res = true;
 					break;
--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@ -302,7 +302,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		for (SelectedGpxFile g : selectedGPXFiles) {
 			List<TrkSegment> points = g.getPointsToDisplay();
 			boolean routePoints = g.isRoutePoints();
-			updatePaints(g.getColor(), g.isShowCurrentTrack(), routePoints, settings, tileBox);
+			updatePaints(g.getColor(), routePoints, g.isShowCurrentTrack(), settings, tileBox);
 			drawSegments(canvas, tileBox, points);
 		}
 	}
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@ -34,6 +34,7 @@ import net.osmand.plus.views.controls.MapRouteInfoControl;
 import net.osmand.router.RouteResultPreparation;
 import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
+import net.osmand.util.MapUtils;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
@ -298,7 +299,14 @@ public class RouteInfoWidgetsFactory {
 				if ((rh == null || !rh.isFollowingMode()) && trackingUtilities.isMapLinkedToLocation()) {
 					RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
 					if(ro != null) {
-						mx = ro.getMaximumSpeed();
+						boolean direction = true;
+						Location loc = locationProvider.getLastKnownLocation();
+						if(loc != null && loc.hasBearing()) {
+							double diff = MapUtils.alignAngleDifference(ro.directionRoute(0, true) -  
+									loc.getBearing() / (2 * Math.PI));
+							direction = Math.abs(diff) < Math.PI;
+						}
+						mx = ro.getMaximumSpeed(direction);
 					}
 				} else {
 					mx = rh.getCurrentMaxSpeed();