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

OsmAnd/res/values-be/phrases.xml

@@ -147,7 +147,7 @@
 	<string name="poi_bus_station">Аўтобусная станцыя</string>
 	<string name="poi_railway_station">Чыгуначная станцыя</string>
 	<string name="poi_railway_platform">Чыгуначная плятформа</string>
-	<string name="poi_railway_subway_entrance">Уваход у мэтро</string>
+	<string name="poi_subway_entrance">Уваход у мэтро</string>
 	<string name="poi_subway_station">Станцыя мэтро</string>
 	<string name="poi_taxi">Стаянка таксі</string>
 

OsmAnd/res/values-bg/phrases.xml

@@ -230,7 +230,7 @@
 	<string name="poi_fuel_biogas">E85</string>
 	<string name="poi_vehicle_ramp">Рампа за МПС</string>
 	<string name="poi_parking_entrance">Вход към паркинг</string>
-	<string name="poi_railway_subway_entrance">Вход към метро</string>
+	<string name="poi_subway_entrance">Вход към метро</string>
 	<string name="poi_bicycle_parking">Паркинг за велосипеди</string>
 
 	<string name="poi_aerialway_gondola">Гондола</string>

OsmAnd/res/values-ca/phrases.xml

@@ -123,7 +123,7 @@
 	<string name="poi_railway_station">Estació de tren</string>
 	<string name="poi_railway_platform">Andana</string>
 	<string name="poi_halt">Parada de tren (obsolet)</string>
-	<string name="poi_railway_subway_entrance">Entrada de metro</string>
+	<string name="poi_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estació de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 

OsmAnd/res/values-cs/phrases.xml

@@ -352,7 +352,7 @@
 	<string name="poi_railway_station">Železniční stanice</string>
 	<string name="poi_railway_platform">Železniční nástupiště</string>
 	<string name="poi_halt">Železniční zastávka</string>
-	<string name="poi_railway_subway_entrance">Vchod do metra</string>
+	<string name="poi_subway_entrance">Vchod do metra</string>
 	<string name="poi_subway_station">Stanice metra</string>
 	<string name="poi_railway_buffer_stop">Železniční zarážka</string>
 	<string name="poi_taxi">Stanoviště taxi</string>

OsmAnd/res/values-da/phrases.xml

@@ -142,7 +142,7 @@
         <string name="poi_bus_station">Busstation</string>
         <string name="poi_railway_station">Banegård</string>
         <string name="poi_railway_platform">Perron</string>
-        <string name="poi_railway_subway_entrance">Metroindgang</string>
+        <string name="poi_subway_entrance">Metroindgang</string>
         <string name="poi_subway_station">Metrostation</string>
         <string name="poi_taxi">Taxaholdeplads</string>
 

OsmAnd/res/values-de/phrases.xml

@@ -508,7 +508,7 @@
 	<string name="poi_stripclub">Stripclub</string>
 	<string name="poi_studio">Studio</string>
 	<string name="poi_suburb">Stadtteil</string>
-	<string name="poi_railway_subway_entrance">U-Bahnhofeingang</string>
+	<string name="poi_subway_entrance">U-Bahnhofeingang</string>
 	<string name="poi_subway_station">U-Bahnhof</string>
 	<string name="poi_craft_sun_protection">Lichtschutz</string>
 	<string name="poi_supermarket">Supermarkt</string>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -214,7 +214,7 @@
 	<string name="poi_railway_station">Estación de tren</string>
 	<string name="poi_railway_platform">Andén de tren</string>
 	<string name="poi_halt">Parada de tren</string>
-	<string name="poi_railway_subway_entrance">Entrada de subte</string>
+	<string name="poi_subway_entrance">Entrada de subte</string>
 	<string name="poi_subway_station">Estación de subte</string>
 	<string name="poi_railway_buffer_stop">Fin de vía</string>
 	<string name="poi_taxi">Parada de taxi</string>

OsmAnd/res/values-es/phrases.xml

@@ -143,7 +143,7 @@
 	<string name="poi_bus_station">Estación de autobús</string>
 	<string name="poi_railway_station">Estación de tren</string>
 	<string name="poi_halt">Parada de tren</string>
-	<string name="poi_railway_subway_entrance">Entrada de metro</string>
+	<string name="poi_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estación de metro</string>
 	<string name="poi_aerodrome">Aeropuerto</string>
 	<string name="poi_helipad">Helipuerto</string>

OsmAnd/res/values-fa/phrases.xml

@@ -147,7 +147,7 @@
 <string name="poi_railway_station">ایستگاه راه آهن (منسوخ)</string>
 <string name="poi_railway_platform">پلت فرم راه آهن (منسوخ)</string>
 <string name="poi_halt">ایستگاه راه آهن (منسوخ)</string>
-<string name="poi_railway_subway_entrance">ورودی مترو</string>
+<string name="poi_subway_entrance">ورودی مترو</string>
 <string name="poi_subway_station">ایستگاه مترو</string>
 <string name="poi_taxi">ایستگاه تاکسی</string>
 

OsmAnd/res/values-fr/phrases.xml

@@ -318,7 +318,7 @@
 	<string name="poi_stripclub">Club de strip-tease</string>
 	<string name="poi_studio">Studio d\'enregistrement</string>
 	<string name="poi_suburb">Quartier</string>
-	<string name="poi_railway_subway_entrance">Bouche de métro</string>
+	<string name="poi_subway_entrance">Bouche de métro</string>
 	<string name="poi_supermarket">Supermarché</string>
 	<string name="poi_survey_point">Point géodésique</string>
 	<string name="poi_swimming">Natation</string>

OsmAnd/res/values-fr/strings.xml

@@ -2027,7 +2027,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="favorite_category_name">Nom de la catégorie</string>
     <string name="favorite_category_add_new_title">Ajouter une catégorie</string>
     <string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'indiquer un autre nom.</string>
-    <string name="confirm_download_roadmaps">Êtes-vous certains de vouloir télécharger les routes alors que vous disposez d\'une carte complète ?</string>
+    <string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
     <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Tout mettre à jour (%1$s MB)</string>
@@ -2118,9 +2118,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="rendering_attr_currentTrackWidth_description">Largeur GPX</string>
     <string name="rendering_attr_roadStyle_description">Style pour les routes</string>
     <string name="copied_to_clipboard">Copié dans le presse-papier</string>
-    <string name="use_dashboard_btn">Démarrer avec le tableau de bord</string>
+    <string name="use_dashboard_btn">Utiliser le tableau de bord</string>
-    <string name="use_drawer_btn">Démarrer avec la carte</string>
+    <string name="use_drawer_btn">Utiliser le menu</string>
-    <string name="dashboard_or_drawer_title">Nouvelle option de démarrage</string>
+    <string name="dashboard_or_drawer_title"></string>
     <string name="dashboard_or_drawer_description">Définissez comment démarrer l\'application : avec la carte ou avec le tableau de bord ? Ce paramètre peut être modifié par la suite.</string>
     <string name="access_from_map_description">Afficher le bouton d\'accès au tableau de bord sur la carte</string>
     <string name="access_from_map">Accès depuis la carte</string>

OsmAnd/res/values-gl/phrases.xml

@@ -78,7 +78,7 @@
 	<string name="poi_public_transport_platform_trolleybus">Parada de trolebús</string>
 	<string name="poi_public_transport_platform_tram">Parada de tranvía</string>
 	<string name="poi_public_transport_station">Estación de transporte público</string>
-	<string name="poi_railway_subway_entrance">Entrada de metro</string>
+	<string name="poi_subway_entrance">Entrada de metro</string>
 	<string name="poi_subway_station">Estación de metro</string>
 	<string name="poi_taxi">Parada de taxis</string>
 

OsmAnd/res/values-hu/phrases.xml

@@ -67,7 +67,7 @@
 	<string name="poi_public_transport_platform_bus">Buszmegálló</string>
 	<string name="poi_public_transport_platform_trolleybus">Trolimegálló</string>
 	<string name="poi_public_transport_platform_tram">Villamosmegálló</string>
-	<string name="poi_railway_subway_entrance">Metró lejárat</string>
+	<string name="poi_subway_entrance">Metró lejárat</string>
 	<string name="poi_subway_station">Metrómegálló</string>
 	<string name="poi_taxi">Taxidroszt</string>
 

OsmAnd/res/values-it/phrases.xml

@@ -71,7 +71,7 @@
 	<string name="poi_public_transport_platform_tram">Fermata tram</string>
 	<string name="poi_public_transport_station">Stazione trasporto pubblico</string>
 	<string name="poi_bus_station">Stazione bus (obsoleto)</string>
-	<string name="poi_railway_subway_entrance">Entrata metropolitana</string>
+	<string name="poi_subway_entrance">Entrata metropolitana</string>
 	<string name="poi_subway_station">Stazione metropolitana</string>
 	<string name="poi_aerodrome">Aeroporto</string>
 	<string name="poi_helipad">Eliporto</string>

OsmAnd/res/values-ja/phrases.xml

@@ -207,7 +207,7 @@
 	<string name="poi_railway_station">鉄道駅(Railway station)</string>
 	<string name="poi_railway_platform">鉄道プラットホーム(Railway platform)</string>
 	<string name="poi_halt">鉄道停車位置(Railway stop)</string>
-	<string name="poi_railway_subway_entrance">地下鉄入り口(Subway entrance)</string>
+	<string name="poi_subway_entrance">地下鉄入り口(Subway entrance)</string>
 	<string name="poi_subway_station">地下鉄駅(Subway station)</string>
 	<string name="poi_railway_buffer_stop">鉄道用車止め(Railway buffer stop)</string>
 	<string name="poi_helipad">ヘリポート(Helipad)</string>

OsmAnd/res/values-ko/phrases.xml

@@ -141,7 +141,7 @@
 	<string name="poi_bus_station">버스 정류장</string>
 	<string name="poi_railway_station">기차역</string>
 	<string name="poi_railway_platform">철도 플랫폼</string>
-	<string name="poi_railway_subway_entrance">지하철 입구</string>
+	<string name="poi_subway_entrance">지하철 입구</string>
 	<string name="poi_subway_station">지하철 역</string>
 	<string name="poi_taxi">택시 승차장</string>
 

OsmAnd/res/values-nl/phrases.xml

@@ -135,7 +135,7 @@
 	<string name="poi_bus_station">Busstation</string>
 	<string name="poi_railway_station">Treinstation</string>
 	<string name="poi_railway_platform">Perron</string>
-	<string name="poi_railway_subway_entrance">Metro-ingang</string>
+	<string name="poi_subway_entrance">Metro-ingang</string>
 	<string name="poi_subway_station">Metrostation</string>
 	<string name="poi_taxi">Taxistandplaats</string>
 

OsmAnd/res/values-pl/phrases.xml

@@ -142,7 +142,7 @@
 	<string name="poi_bus_station">Dworzec autobusowy</string>
 	<string name="poi_railway_station">Stacja kolejowa</string>
 	<string name="poi_railway_platform">Peron kolejowy</string>
-	<string name="poi_railway_subway_entrance">Metro - wejście</string>
+	<string name="poi_subway_entrance">Metro - wejście</string>
 	<string name="poi_subway_station">Stacja metra</string>
 	<string name="poi_taxi">Postój TAXI</string>
 

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -219,7 +219,7 @@
 	<string name="poi_railway_station">Estação ferroviária</string>
 	<string name="poi_railway_platform">Plataforma ferroviária</string>
 	<string name="poi_halt">Parada ferroviária</string>
-	<string name="poi_railway_subway_entrance">Entrada do metrô</string>
+	<string name="poi_subway_entrance">Entrada do metrô</string>
 	<string name="poi_subway_station">Estação de metrô</string>
 	<string name="poi_vacuum_cleaner">Loja de aspiradores de pó</string>
 	<string name="poi_variety_store">Loja de variedades</string>

OsmAnd/res/values-ru/phrases.xml

@@ -171,7 +171,7 @@
 	<string name="poi_bus_station">Автобусная станция</string>
 	<string name="poi_railway_station">Железнодорожная станция</string>
 	<string name="poi_railway_platform">Железнодорожная платформа</string>
-	<string name="poi_railway_subway_entrance">Вход в метро</string>
+	<string name="poi_subway_entrance">Вход в метро</string>
 	<string name="poi_subway_station">Станция метро</string>
 	<string name="poi_taxi">Стоянка такси</string>
 

OsmAnd/res/values-sc/phrases.xml

@@ -120,7 +120,7 @@
 	<string name="poi_bus_station">Istatzione bus</string>
 	<string name="poi_railway_station">Istatzione de sos trenos</string>
 	<string name="poi_railway_platform">Piattaredda ferroviària</string>
-	<string name="poi_railway_subway_entrance">Intrada de sa metropolitana</string>
+	<string name="poi_subway_entrance">Intrada de sa metropolitana</string>
 	<string name="poi_subway_station">Istatzione de sa metropolitana</string>
 	<string name="poi_taxi">Postèggiu de sos taxi</string>
 

OsmAnd/res/values-sk/phrases.xml

@@ -158,7 +158,7 @@
 	<string name="poi_railway_platform">Železničné nástupište</string>
 	<string name="poi_halt">Železničná zastávka</string>
 	<string name="poi_bus_station">Autobusová stanica</string>
-	<string name="poi_railway_subway_entrance">Vchod do metra</string>
+	<string name="poi_subway_entrance">Vchod do metra</string>
 	<string name="poi_subway_station">Stanica metra</string>
 	<string name="poi_railway_buffer_stop">Železničná zarážka</string>
 	<string name="poi_taxi">Stanovište taxíkov</string>

OsmAnd/res/values-sv/strings.xml

@@ -1919,7 +1919,7 @@
     <string name="favorite_category_name">Kategorinamn</string>
     <string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
     <string name="file_size_in_mb">%.1f MB</string>
-    <string name="confirm_download_roadmaps">Är du säker på att du vill hämta vägkartan trots att du redan har en fullständig karta?</string>
+    <string name="confirm_download_roadmaps">Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan?</string>
     <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
     <string name="update_all">Uppdatera alla (%1$s MB)</string>
     <string name="free_downloads_used">Gratis nedladdningar hämtade</string>

OsmAnd/res/values-tr/phrases.xml

@@ -242,7 +242,7 @@
 	<string name="poi_railway_station">Tren İstasyonu</string>
 	<string name="poi_railway_platform">Demiryolu Platformu</string>
 	<string name="poi_halt">Tren durağı</string>
-	<string name="poi_railway_subway_entrance">Metro giriş</string>
+	<string name="poi_subway_entrance">Metro giriş</string>
 	<string name="poi_subway_station">Metro İstasyonu</string>
 	<string name="poi_railway_buffer_stop">Demir yolu tampon durağı</string>
 	<string name="poi_taxi">Taksi durağı</string>

OsmAnd/res/values-uk/phrases.xml

@@ -238,7 +238,7 @@
 	<string name="poi_garden_furniture">Магазин садових меблів</string>
 	<string name="poi_fuel_biogas">Біопаливо(Е85)</string>
 	<string name="poi_halt">Зупинка поїздів</string>
-	<string name="poi_railway_subway_entrance">Вхід в метро</string>
+	<string name="poi_subway_entrance">Вхід в метро</string>
 	<string name="poi_subway_station">Станція метро</string>
 	<string name="poi_taxi">Стоянка таксі</string>
 

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

@@ -215,7 +215,7 @@
 	<string name="poi_railway_station">火車站</string>
 	<string name="poi_railway_platform">鐵路月台</string>
 	<string name="poi_halt">火車站</string>
-	<string name="poi_railway_subway_entrance">捷運入口</string>
+	<string name="poi_subway_entrance">捷運入口</string>
 	<string name="poi_subway_station">捷運車站</string>
 	<string name="poi_railway_buffer_stop">鐵路止衝擋</string>
 	<string name="poi_taxi">計程車站</string>

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

@@ -1916,7 +1916,7 @@
     <string name="favorite_category_dublicate_message">已有指定的類別名稱。請定義其它名稱。</string>
     <string name="favorite_category_name">類別名稱</string>
     <string name="favorite_category_add_new_title">增加新的類別</string>
-    <string name="confirm_download_roadmaps">您確定要下載地圖的道路，即使您已擁有完整的地圖？</string>
+    <string name="confirm_download_roadmaps">您確定要下載只有道路的地圖，即使您已經擁有標準(完整的)地圖？</string>
     <string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">全部更新 (%1$s MB)</string>

OsmAnd/res/values/phrases.xml

@@ -247,7 +247,7 @@
 	<string name="poi_railway_station">Railway station</string>
 	<string name="poi_railway_platform">Railway platform</string>
 	<string name="poi_halt">Railway stop</string>
-	<string name="poi_railway_subway_entrance">Subway entrance</string>
+	<string name="poi_subway_entrance">Subway entrance</string>
 	<string name="poi_subway_station">Subway station</string>
 	<string name="poi_railway_buffer_stop">Railway buffer stop</string>
 	<string name="poi_taxi">Taxi stand</string>

OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java

@@ -132,11 +132,11 @@ public class MenuBuilder {
 		ll.addView(llIcon);
 
 		ImageView iconView = new ImageView(view.getContext());
-		LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+		LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(dpToPx(24f), dpToPx(24f));
 		llIconParams.setMargins(dpToPx(16f), dpToPx(12f), dpToPx(32f), dpToPx(12f));
 		llIconParams.gravity = Gravity.CENTER_VERTICAL;
 		iconView.setLayoutParams(llIconParams);
-		iconView.setScaleType(ImageView.ScaleType.CENTER);
+		iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
 		iconView.setImageDrawable(icon);
 		llIcon.addView(iconView);
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java

@@ -75,11 +75,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
 		ll.addView(llIcon);
 
 		ImageView iconView = new ImageView(view.getContext());
-		LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+		LinearLayout.LayoutParams llIconParams = new LinearLayout.LayoutParams(dpToPx(24f), dpToPx(24f));
 		llIconParams.setMargins(dpToPx(16f), dpToPx(12f), dpToPx(32f), dpToPx(12f));
 		llIconParams.gravity = Gravity.CENTER_VERTICAL;
 		iconView.setLayoutParams(llIconParams);
-		iconView.setScaleType(ImageView.ScaleType.CENTER);
+		iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
 		iconView.setImageDrawable(icon);
 		llIcon.addView(iconView);
 

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AmenityMenuController.java

@@ -89,7 +89,21 @@ public class AmenityMenuController extends MenuController {
 	@Override
 	public void addPlainMenuItems(String typeStr, PointDescription pointDescription, LatLon latLon) {
 		if (!Algorithms.isEmpty(typeStr)) {
-			addPlainMenuItem(R.drawable.ic_action_info_dark, typeStr, false);
+			int resId = 0;
+			PoiCategory pc = amenity.getType();
+			if (!Algorithms.isEmpty(getNameStr())) {
+				resId = getLeftIconId();
+			}
+			if (resId == 0) {
+				resId = RenderingIcons.getBigIconResourceId(pc.getIconKeyName());
+			}
+			if (resId == 0) {
+				resId = getLeftIconId();
+			}
+			if (resId == 0) {
+				resId = R.drawable.ic_action_folder_stroke;
+			}
+			addPlainMenuItem(resId, typeStr, false);
 		}
 		addMyLocationToPlainItems(pointDescription, amenity.getLocation());
 	}

OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuBuilder.java

@@ -2,9 +2,12 @@ package net.osmand.plus.osmedit;
 
 import android.view.View;
 
+import net.osmand.osm.MapPoiTypes;
+import net.osmand.osm.PoiType;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
+import net.osmand.plus.render.RenderingIcons;
 
 import java.util.Map;
 
@@ -29,12 +32,35 @@ public class EditPOIMenuBuilder extends MenuBuilder {
 			OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
 
 			for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
-				String text;
 				if (EditPoiData.POI_TYPE_TAG.equals(e.getKey())) {
-					text = e.getValue();
+					String poiTranslation = e.getValue();
-				} else {
+					Map<String, PoiType> poiTypeMap = MapPoiTypes.getDefault().getAllTranslatedNames(false);
-					text = e.getKey() + "=" + e.getValue();
+					PoiType poiType = poiTypeMap.get(poiTranslation.toLowerCase());
+					int resId = 0;
+					if (poiType != null) {
+						String id = null;
+						if (RenderingIcons.containsBigIcon(poiType.getIconKeyName())) {
+							id = poiType.getIconKeyName();
+						} else if (RenderingIcons.containsBigIcon(poiType.getOsmTag() + "_" + poiType.getOsmValue())) {
+							id = poiType.getOsmTag() + "_" + poiType.getOsmValue();
+						}
+						if (id != null) {
+							resId = RenderingIcons.getBigIconResourceId(id);
+						}
+					}
+					if (resId == 0) {
+						resId = R.drawable.ic_action_folder_stroke;
+					}
+					buildRow(view, resId, poiTranslation, 0, false, 0);
+					break;
 				}
+			}
+
+			for (Map.Entry<String, String> e : point.getEntity().getTags().entrySet()) {
+				if (EditPoiData.POI_TYPE_TAG.equals(e.getKey())) {
+					continue;
+				}
+				String text = e.getKey() + "=" + e.getValue();
 				buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, 0);
 			}
 		}