diff --git a/.gitignore b/.gitignore
index adc0df64af..427bdce06e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.render.xml
*.render_template.xml
+poi_types.xml
*.map_styles_presets.xml
routing*.xml
rendering_types.xml
diff --git a/OsmAnd-java/build.xml b/OsmAnd-java/build.xml
index 0b9402e608..2af488526d 100644
--- a/OsmAnd-java/build.xml
+++ b/OsmAnd-java/build.xml
@@ -43,6 +43,9 @@
+
+
+
diff --git a/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java b/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
index 5751f0c1cb..5f798decc8 100644
--- a/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
+++ b/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java
@@ -8,16 +8,21 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import net.osmand.PlatformUtil;
import net.osmand.util.Algorithms;
-import net.osmand.util.LIFOBlockingDeque;
import org.apache.commons.logging.Log;
@@ -106,14 +111,34 @@ public class MapTileDownloader {
public MapTileDownloader(int numberOfThreads){
+
threadPoolExecutor = new ThreadPoolExecutor(numberOfThreads, numberOfThreads, TILE_DOWNLOAD_SECONDS_TO_WORK,
- TimeUnit.SECONDS, new LIFOBlockingDeque());
+ TimeUnit.SECONDS, createQueue());
// 1.6 method but very useful to kill non-running threads
// threadPoolExecutor.allowCoreThreadTimeOut(true);
pendingToDownload = Collections.synchronizedSet(new HashSet());
currentlyDownloaded = Collections.synchronizedSet(new HashSet());
}
+
+ protected BlockingQueue createQueue() {
+ boolean loaded = false;
+ try {
+ Class cl = Class.forName("java.util.concurrent.LinkedBlockingDeque");
+ loaded = cl != null;
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ if(!loaded) {
+ // for Android 2.2
+ return new LinkedBlockingQueue();
+ }
+ return createDeque();
+ }
+
+ protected static BlockingQueue createDeque() {
+ return new net.osmand.util.LIFOBlockingDeque();
+ }
public void addDownloaderCallback(IMapDownloaderCallback callback){
callbacks.add(callback);
diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
new file mode 100644
index 0000000000..f1d4e44757
--- /dev/null
+++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
@@ -0,0 +1,72 @@
+package net.osmand.osm;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import net.osmand.PlatformUtil;
+
+import org.apache.commons.logging.Log;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+public class MapPoiTypes {
+ private static MapPoiTypes DEFAULT_INSTANCE = null;
+ private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class);
+ private String resourceName;
+
+ public MapPoiTypes(String fileName){
+ this.resourceName = fileName;
+ }
+
+ public static MapPoiTypes getDefault() {
+ if(DEFAULT_INSTANCE == null){
+ DEFAULT_INSTANCE = new MapPoiTypes(null);
+ }
+ return DEFAULT_INSTANCE;
+ }
+
+ protected void init(){
+ InputStream is;
+ try {
+ if(resourceName == null){
+ is = MapRenderingTypes.class.getResourceAsStream("poi_types.xml"); //$NON-NLS-1$
+ } else {
+ is = new FileInputStream(resourceName);
+ }
+ long time = System.currentTimeMillis();
+ XmlPullParser parser = PlatformUtil.newXMLPullParser();
+ int tok;
+ parser.setInput(is, "UTF-8");
+ String parentCategory = null;
+ String poiParentCategory = null;
+ String poiParentPrefix = null;
+ String order = null;
+ while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ if (tok == XmlPullParser.START_TAG) {
+ String name = parser.getName();
+ if (name.equals("category")) { //$NON-NLS-1$
+ parentCategory = parser.getAttributeValue("","name");
+ poiParentCategory = parser.getAttributeValue("","poi_category");
+ poiParentPrefix = parser.getAttributeValue("","poi_prefix");
+ order = parser.getAttributeValue("","order");
+ }
+ }
+ }
+ log.info("Time to init " + (System.currentTimeMillis() - time)); //$NON-NLS-1$
+ is.close();
+ } catch (IOException e) {
+ log.error("Unexpected error", e); //$NON-NLS-1$
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ } catch (RuntimeException e) {
+ log.error("Unexpected error", e); //$NON-NLS-1$
+ e.printStackTrace();
+ throw e;
+ } catch (XmlPullParserException e) {
+ log.error("Unexpected error", e); //$NON-NLS-1$
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java b/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
index feca02e3cf..103698823b 100644
--- a/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
+++ b/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
@@ -349,7 +349,7 @@ public class OsmMapUtils {
*/
public static double polygonAreaPixels(List nodes, int zoom) {
double area = 0.;
- double mult = 1 / MapUtils.getPowZoom(Math.max(31 - (zoom + 8), 0));
+ double mult = 1 / MapUtils.getPowZoom((double)Math.max(31 - (zoom + 8), 0));
int j = nodes.size() - 1;
for (int i = 0; i < nodes.size(); i++) {
Node x = nodes.get(i);
diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 7667fda885..df07828b2a 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -97,6 +97,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable-large/Thumbs.db b/OsmAnd/res/drawable-large/Thumbs.db
new file mode 100644
index 0000000000..c3d48fe357
Binary files /dev/null and b/OsmAnd/res/drawable-large/Thumbs.db differ
diff --git a/OsmAnd/res/layout/action_item.xml b/OsmAnd/res/layout/action_item.xml
index 775fcce695..5f0bf408fc 100644
--- a/OsmAnd/res/layout/action_item.xml
+++ b/OsmAnd/res/layout/action_item.xml
@@ -1,28 +1,27 @@
-
+
-
+
+
+
-
-
\ No newline at end of file
diff --git a/OsmAnd/res/layout/alert.xml b/OsmAnd/res/layout/alert.xml
index 817467e1d2..a1f16b2867 100644
--- a/OsmAnd/res/layout/alert.xml
+++ b/OsmAnd/res/layout/alert.xml
@@ -1,12 +1,18 @@
+ android:id="@+id/layout"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
-
+
diff --git a/OsmAnd/res/layout/animate_route.xml b/OsmAnd/res/layout/animate_route.xml
index b6d0c1a576..e86bf89bb6 100644
--- a/OsmAnd/res/layout/animate_route.xml
+++ b/OsmAnd/res/layout/animate_route.xml
@@ -1,9 +1,13 @@
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/calculate_route.xml b/OsmAnd/res/layout/calculate_route.xml
index 894e9ac3c9..e62075b0bd 100644
--- a/OsmAnd/res/layout/calculate_route.xml
+++ b/OsmAnd/res/layout/calculate_route.xml
@@ -2,15 +2,24 @@
-
+ android:orientation="vertical">
+
+
+
+ android:orientation="horizontal">
@@ -20,24 +29,23 @@
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
- android:layout_marginTop="5dp" >
+ android:layout_marginTop="5dp">
+ android:orientation="vertical">
+ android:layout_height="wrap_content">
-
+ android:textSize="18sp" />
-
+ android:textSize="18sp" />
-
-
-
+ android:layout_height="wrap_content">
-
+ android:textSize="18sp">
+
-
+ android:layout_marginRight="5dp"
+ android:textSize="18sp" />
-
+
diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml
index c5745ca82b..551605f45b 100644
--- a/OsmAnd/res/layout/change_order_item.xml
+++ b/OsmAnd/res/layout/change_order_item.xml
@@ -7,10 +7,15 @@
android:layout_marginTop="2dip"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
- android:weightSum="1" android:background="@color/color_white">
+ android:weightSum="1"
+ android:background="@color/color_white">
+
+
-
-
+
+
+ android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/check_item_rel.xml b/OsmAnd/res/layout/check_item_rel.xml
index 963005c60f..d646c5a9e3 100644
--- a/OsmAnd/res/layout/check_item_rel.xml
+++ b/OsmAnd/res/layout/check_item_rel.xml
@@ -2,7 +2,7 @@
+ android:layout_gravity="center_vertical">
+ android:gravity="center_vertical" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/configuration_dialog.xml b/OsmAnd/res/layout/configuration_dialog.xml
index 9fea56916e..9616a88e83 100644
--- a/OsmAnd/res/layout/configuration_dialog.xml
+++ b/OsmAnd/res/layout/configuration_dialog.xml
@@ -2,16 +2,19 @@
+ android:orientation="vertical">
+
+
-
-
+ android:layout_height="fill_parent">
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_build_list_item.xml b/OsmAnd/res/layout/download_build_list_item.xml
index a961c2f760..da648ef5d9 100644
--- a/OsmAnd/res/layout/download_build_list_item.xml
+++ b/OsmAnd/res/layout/download_build_list_item.xml
@@ -1,11 +1,22 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_index.xml b/OsmAnd/res/layout/download_index.xml
index f36b0549b0..0e0cd8badc 100644
--- a/OsmAnd/res/layout/download_index.xml
+++ b/OsmAnd/res/layout/download_index.xml
@@ -3,7 +3,7 @@
android:id="@+id/MainLayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:orientation="vertical" >
+ android:orientation="vertical">
-
+
-
-
-
-
+
-
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/download_tiles.xml b/OsmAnd/res/layout/download_tiles.xml
index 6f1d444e0a..585a90f330 100644
--- a/OsmAnd/res/layout/download_tiles.xml
+++ b/OsmAnd/res/layout/download_tiles.xml
@@ -1,25 +1,63 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/drawer_list_doubleitem.xml b/OsmAnd/res/layout/drawer_list_doubleitem.xml
index 62df52bd38..7d45ba680c 100644
--- a/OsmAnd/res/layout/drawer_list_doubleitem.xml
+++ b/OsmAnd/res/layout/drawer_list_doubleitem.xml
@@ -1,43 +1,49 @@
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="24dp"
+ android:paddingRight="16dp">
-
-
-
+
+
+
+
+
-
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/drawer_list_item.xml b/OsmAnd/res/layout/drawer_list_item.xml
index 018fc14f55..bda3867a34 100644
--- a/OsmAnd/res/layout/drawer_list_item.xml
+++ b/OsmAnd/res/layout/drawer_list_item.xml
@@ -18,16 +18,16 @@
tools:src="@drawable/ic_action_info_dark" />
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:layout_marginBottom="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginLeft="11dp"
+ tools:text="Some title text" />
-
-
-
-
-
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dp"
+ android:minHeight="40dp"
+ android:layout_marginBottom="5dp">
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/OsmAnd/res/layout/drawer_list_sub_header.xml b/OsmAnd/res/layout/drawer_list_sub_header.xml
index b25762c5a7..4e5fc2e781 100644
--- a/OsmAnd/res/layout/drawer_list_sub_header.xml
+++ b/OsmAnd/res/layout/drawer_list_sub_header.xml
@@ -1,20 +1,22 @@
-
-
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:paddingBottom="4dp"
+ android:paddingLeft="24dp">
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml
index aef8b3823d..de61bc44fd 100644
--- a/OsmAnd/res/layout/editing_poi.xml
+++ b/OsmAnd/res/layout/editing_poi.xml
@@ -1,213 +1,249 @@
-
-
-
+ android:layout_height="fill_parent" >
-
-
-
-
-
-
+ android:orientation="vertical" >
-
+
-
-
-
-
-
+
-
-
+
-
-
+
+
-
-
-
+
-
-
+
+
+
-
-
-
-
-
+
-
-
-
+
-
-
-
-
-
+
+
-
-
+
-
-
-
+
-
-
+
+
+
-
-
-
+
-
-
-
-
+
+
+
+
+
-
-
+
-
+
+
+
-
+
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi_filter.xml b/OsmAnd/res/layout/editing_poi_filter.xml
index 3761a5b150..1e0ebe7af2 100644
--- a/OsmAnd/res/layout/editing_poi_filter.xml
+++ b/OsmAnd/res/layout/editing_poi_filter.xml
@@ -1,7 +1,13 @@
-
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_poi_filter_list.xml b/OsmAnd/res/layout/editing_poi_filter_list.xml
index eac56265ce..6b58341f50 100644
--- a/OsmAnd/res/layout/editing_poi_filter_list.xml
+++ b/OsmAnd/res/layout/editing_poi_filter_list.xml
@@ -1,14 +1,19 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/editing_tile_source.xml b/OsmAnd/res/layout/editing_tile_source.xml
index 9550e79d74..669b5439dc 100644
--- a/OsmAnd/res/layout/editing_tile_source.xml
+++ b/OsmAnd/res/layout/editing_tile_source.xml
@@ -1,19 +1,19 @@
+ android:layout_height="fill_parent">
+ android:orientation="vertical">
+
+ android:stretchColumns="1">
@@ -28,31 +28,32 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
- android:text="" >
+ android:text="">
-
+
+
-
+ android:text="@string/edit_tilesource_choose_existing">
-
+ android:layout_marginRight="5dp">
-
+
-
+ android:minLines="2"
+ android:text="">
-
+
-
+ android:text="">
-
+
-
+ android:text="">
-
+
+ android:text="@string/edit_tilesource_expiration_time" />
-
+ android:text="">
-
+
+ android:orientation="vertical">
-
+ android:groupIndicator="@android:color/transparent">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index d819751060..80d958f620 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -6,7 +6,7 @@
android:paddingBottom="5dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
- android:paddingTop="5dp" >
+ android:paddingTop="5dp">
-
-
-
+
+
-
+
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/expandable_list_item_category_btn.xml b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
index 57a87555b5..4eb673ba56 100644
--- a/OsmAnd/res/layout/expandable_list_item_category_btn.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
@@ -6,7 +6,7 @@
android:paddingBottom="5dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
- android:paddingTop="5dp" >
+ android:paddingTop="5dp">
-
-
-
+
+
+ android:layout_gravity="right">
-
+ android:gravity="center_vertical" />
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fav_group_edit.xml b/OsmAnd/res/layout/fav_group_edit.xml
index 0693fc6cdc..35711533ab 100644
--- a/OsmAnd/res/layout/fav_group_edit.xml
+++ b/OsmAnd/res/layout/fav_group_edit.xml
@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:paddingLeft="7dp"
android:paddingRight="7dp"
- android:stretchColumns="1" >
+ android:stretchColumns="1">
@@ -18,27 +18,24 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- />
+ android:layout_marginRight="5dp" />
+ android:layout_height="wrap_content">
-
+ android:text="@string/osmo_edit_color">
-
+ android:layout_marginRight="5dp">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml
index d2fcd8c292..a9eaa2c80f 100644
--- a/OsmAnd/res/layout/favourite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favourite_edit_dialog.xml
@@ -1,17 +1,41 @@
-
-
-
-
-
-
-
-
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="3dp"
+ android:paddingRight="3dp"
+ android:stretchColumns="1">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/favourites_list_item.xml b/OsmAnd/res/layout/favourites_list_item.xml
index 32bcf856ce..1cdf302156 100644
--- a/OsmAnd/res/layout/favourites_list_item.xml
+++ b/OsmAnd/res/layout/favourites_list_item.xml
@@ -1,21 +1,38 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gl_surface.xml b/OsmAnd/res/layout/gl_surface.xml
index 5a93699ddb..d4a823c22a 100644
--- a/OsmAnd/res/layout/gl_surface.xml
+++ b/OsmAnd/res/layout/gl_surface.xml
@@ -2,6 +2,6 @@
+ android:layout_height="match_parent">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_item_list_item.xml b/OsmAnd/res/layout/gpx_item_list_item.xml
index 572a2f4a04..1b20a3f4ea 100644
--- a/OsmAnd/res/layout/gpx_item_list_item.xml
+++ b/OsmAnd/res/layout/gpx_item_list_item.xml
@@ -6,17 +6,16 @@
android:paddingBottom="4dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="4dp" >
+ android:paddingTop="4dp">
+ android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="3dp">
-
+ android:layout_marginLeft="2dp">
-
+ android:layout_gravity="center_vertical">
-
+ android:maxLines="25">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml
index edc2905ea3..d92bd97e78 100644
--- a/OsmAnd/res/layout/layers_list_activity_item.xml
+++ b/OsmAnd/res/layout/layers_list_activity_item.xml
@@ -12,22 +12,23 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
- android:layout_marginBottom="4dip"
+ android:layout_marginBottom="4dip"
android:gravity="center_vertical"
android:text="@string/layer_poi"
android:textSize="18sp"
- android:layout_weight="1"/>
+ android:layout_weight="1" />
-
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_bigtextview.xml b/OsmAnd/res/layout/list_bigtextview.xml
index 3971c75ab4..7e7cf0bf2d 100644
--- a/OsmAnd/res/layout/list_bigtextview.xml
+++ b/OsmAnd/res/layout/list_bigtextview.xml
@@ -1,7 +1,7 @@
+ android:layout_height="wrap_content">
-
+ android:textSize="20sp">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_item_bidforfix.xml b/OsmAnd/res/layout/list_item_bidforfix.xml
index bdde2dbc7e..aff746d785 100644
--- a/OsmAnd/res/layout/list_item_bidforfix.xml
+++ b/OsmAnd/res/layout/list_item_bidforfix.xml
@@ -3,7 +3,7 @@
android:id="@+id/bidforfixitemlayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@android:color/white" >
+ android:background="@android:color/white">
-
+
+ android:layout_gravity="center_vertical" />
+ android:textColor="@color/color_black"
+ android:layout_weight="1" />
-
-
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_menu_item_native.xml b/OsmAnd/res/layout/list_menu_item_native.xml
index e4c0daf796..ba3ba5bf85 100644
--- a/OsmAnd/res/layout/list_menu_item_native.xml
+++ b/OsmAnd/res/layout/list_menu_item_native.xml
@@ -6,47 +6,48 @@
android:orientation="horizontal"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip">
-
+
-
+ android:layout_gravity="center_vertical" />
+
+ android:layout_weight="1" />
-
-
+
-
-
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/list_textview.xml b/OsmAnd/res/layout/list_textview.xml
index fb11d5fd3c..5b8c8fe10e 100644
--- a/OsmAnd/res/layout/list_textview.xml
+++ b/OsmAnd/res/layout/list_textview.xml
@@ -1,6 +1,6 @@
-
-
+
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index ab2daae1d3..61b01dbcd2 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -1,23 +1,28 @@
-
-
-
-
-
-
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 60b04f8445..5c1e9a0248 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,19 +1,52 @@
-
+
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_openstreetmap.xml b/OsmAnd/res/layout/local_openstreetmap.xml
index ffbf4bfcd4..5284128c31 100644
--- a/OsmAnd/res/layout/local_openstreetmap.xml
+++ b/OsmAnd/res/layout/local_openstreetmap.xml
@@ -1,11 +1,16 @@
-
+
-
+
diff --git a/OsmAnd/res/layout/local_openstreetmap_list_item.xml b/OsmAnd/res/layout/local_openstreetmap_list_item.xml
index 9311406a47..556b1c6952 100644
--- a/OsmAnd/res/layout/local_openstreetmap_list_item.xml
+++ b/OsmAnd/res/layout/local_openstreetmap_list_item.xml
@@ -1,7 +1,15 @@
-
+
-
+
diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml
index 6e501ee2aa..fe649dba0e 100644
--- a/OsmAnd/res/layout/main.xml
+++ b/OsmAnd/res/layout/main.xml
@@ -2,21 +2,21 @@
+ android:layout_height="match_parent">
-
+ android:orientation="vertical">
-
+
-
-
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp">
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml
index 2ff8192857..62fe03b004 100644
--- a/OsmAnd/res/layout/menu.xml
+++ b/OsmAnd/res/layout/menu.xml
@@ -1,81 +1,244 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="net.osmand.access.AccessibleLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/background">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/mode_toggles.xml b/OsmAnd/res/layout/mode_toggles.xml
index 94983bdf88..4465909510 100644
--- a/OsmAnd/res/layout/mode_toggles.xml
+++ b/OsmAnd/res/layout/mode_toggles.xml
@@ -2,8 +2,10 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/navigate_point.xml
index 1374e002bc..9d555ba690 100644
--- a/OsmAnd/res/layout/navigate_point.xml
+++ b/OsmAnd/res/layout/navigate_point.xml
@@ -1,29 +1,100 @@
-
-
-
+ xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/notification.xml b/OsmAnd/res/layout/notification.xml
index 7345890252..3a6abe5e3e 100644
--- a/OsmAnd/res/layout/notification.xml
+++ b/OsmAnd/res/layout/notification.xml
@@ -1,12 +1,18 @@
+ android:id="@+id/layout"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:background="@color/color_black">
-
+
diff --git a/OsmAnd/res/layout/open_bug.xml b/OsmAnd/res/layout/open_bug.xml
index d2af1fb61d..959553adee 100644
--- a/OsmAnd/res/layout/open_bug.xml
+++ b/OsmAnd/res/layout/open_bug.xml
@@ -1,44 +1,53 @@
-
+
+
+
+
-
-
+ android:inputType="textMultiLine" />
-
-
+
+
+
-
-
+
+
+
diff --git a/OsmAnd/res/layout/open_hours_edit.xml b/OsmAnd/res/layout/open_hours_edit.xml
index 1a598acc9d..3719f4b0a6 100644
--- a/OsmAnd/res/layout/open_hours_edit.xml
+++ b/OsmAnd/res/layout/open_hours_edit.xml
@@ -1,11 +1,31 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/open_hours_list_item.xml b/OsmAnd/res/layout/open_hours_list_item.xml
index 1fca33b6cd..f2a52fc64f 100644
--- a/OsmAnd/res/layout/open_hours_list_item.xml
+++ b/OsmAnd/res/layout/open_hours_list_item.xml
@@ -1,14 +1,24 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
-
-
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_connect_to_device.xml b/OsmAnd/res/layout/osmo_connect_to_device.xml
index a8b1c08ada..341444a152 100644
--- a/OsmAnd/res/layout/osmo_connect_to_device.xml
+++ b/OsmAnd/res/layout/osmo_connect_to_device.xml
@@ -4,14 +4,14 @@
android:layout_height="wrap_content"
android:paddingLeft="7dp"
android:paddingRight="7dp"
- android:stretchColumns="1" >
+ android:stretchColumns="1">
+ android:layout_span="2">
-
-
+
+
+ android:layout_height="fill_parent">
+ android:stretchColumns="1">
@@ -67,9 +67,9 @@
android:paddingLeft="3dp" />
-
+
-
+
+
+ android:stretchColumns="1">
@@ -18,8 +18,7 @@
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:text="" >
+ android:layout_marginRight="5dp">
@@ -27,21 +26,19 @@
+ android:layout_height="wrap_content">
-
+ android:text="@string/osmo_edit_color" />
-
+ android:layout_marginRight="5dp" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_group_item.xml b/OsmAnd/res/layout/osmo_group_item.xml
index c191f2bbfd..2eb6ad6de3 100644
--- a/OsmAnd/res/layout/osmo_group_item.xml
+++ b/OsmAnd/res/layout/osmo_group_item.xml
@@ -6,7 +6,7 @@
android:paddingBottom="5dp"
android:paddingLeft="3dp"
android:paddingRight="4dp"
- android:paddingTop="5dp" >
+ android:paddingTop="5dp">
-
+ android:textSize="18sp" />
-
+ android:layout_gravity="center_vertical">
+ android:paddingTop="5dp">
-
+
+ android:layout_marginLeft="3dp" />
diff --git a/OsmAnd/res/layout/osmo_groups_list.xml b/OsmAnd/res/layout/osmo_groups_list.xml
index 49e6df1dcb..d176236cb2 100644
--- a/OsmAnd/res/layout/osmo_groups_list.xml
+++ b/OsmAnd/res/layout/osmo_groups_list.xml
@@ -2,10 +2,10 @@
+ android:orientation="vertical">
+
+
-
-
+ style="@style/OsmandListView" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osmo_groups_list_footer.xml b/OsmAnd/res/layout/osmo_groups_list_footer.xml
index c706f26af3..475fe4f9f0 100644
--- a/OsmAnd/res/layout/osmo_groups_list_footer.xml
+++ b/OsmAnd/res/layout/osmo_groups_list_footer.xml
@@ -1,7 +1,7 @@
+ android:layout_height="match_parent">
+ android:orientation="vertical">
+ android:orientation="horizontal">
+ android:layout_marginTop="3dp">
-
+
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_black">
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/parking_set_time_limit.xml b/OsmAnd/res/layout/parking_set_time_limit.xml
index 372490bbb7..bc17432004 100644
--- a/OsmAnd/res/layout/parking_set_time_limit.xml
+++ b/OsmAnd/res/layout/parking_set_time_limit.xml
@@ -2,20 +2,20 @@
+ android:orientation="vertical">
-
+
+ android:layout_gravity="center_horizontal">
+ android:gravity="center_horizontal">
+ android:layout_height="wrap_content">
+ android:layout_height="wrap_content">
+ android:orientation="vertical">
-
-
-
+ android:id="@+id/RouteTargets">
+
+
+
+
+ android:layout_height="wrap_content">
-
+ android:textSize="18sp">
-
+ android:textSize="18sp">
-
-
+
+
-
-
-
+
+
+ android:layout_height="wrap_content">
-
+ android:textSize="18sp">
+
-
+ android:textSize="18sp">
-
+
+
-
+
-
-
+
+
-
+
+
-
+
+
-
+ android:src="@drawable/ax_1_navigation_next_item_light" />
+
-
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_settings.xml b/OsmAnd/res/layout/plan_route_settings.xml
index f25eb3004b..7a8bcaa2cc 100644
--- a/OsmAnd/res/layout/plan_route_settings.xml
+++ b/OsmAnd/res/layout/plan_route_settings.xml
@@ -2,7 +2,7 @@
+ android:orientation="vertical">
-
+ android:textSize="18sp">
-
+ android:textSize="18sp">
-
+ android:layout_height="fill_parent">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plugins.xml b/OsmAnd/res/layout/plugins.xml
index 38c8cc5ea5..36ce93f075 100644
--- a/OsmAnd/res/layout/plugins.xml
+++ b/OsmAnd/res/layout/plugins.xml
@@ -1,11 +1,20 @@
-
-
-
+
-
+
+
+
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 57b31e2d77..e9ed0a9194 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -2,44 +2,53 @@
+ android:orientation="vertical">
-
-
-
-
-
-
+ android:background="?attr/expandable_category_color"
+ android:paddingBottom="3dp"
+ android:paddingTop="6dp">
+
+
+
+
+
+
+
+
+
+ android:visibility="gone">
diff --git a/OsmAnd/res/layout/print_dialog.xml b/OsmAnd/res/layout/print_dialog.xml
index 20bb1c032b..b76ddb1083 100644
--- a/OsmAnd/res/layout/print_dialog.xml
+++ b/OsmAnd/res/layout/print_dialog.xml
@@ -1,7 +1,7 @@
+ android:layout_height="match_parent">
-
-
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/OsmAnd/res/layout/route_info_list_item.xml b/OsmAnd/res/layout/route_info_list_item.xml
index 70a7c17aa9..ea1419e676 100644
--- a/OsmAnd/res/layout/route_info_list_item.xml
+++ b/OsmAnd/res/layout/route_info_list_item.xml
@@ -1,13 +1,13 @@
+ android:layout_height="wrap_content">
+ android:orientation="vertical">
+ android:orientation="vertical">
-
+ android:text="">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_point_info.xml b/OsmAnd/res/layout/route_point_info.xml
index 229b525b40..c94414c441 100644
--- a/OsmAnd/res/layout/route_point_info.xml
+++ b/OsmAnd/res/layout/route_point_info.xml
@@ -1,30 +1,32 @@
-
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+
+ android:id="@+id/name"
+ android:layout_marginLeft="6dp"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="10dp"
+ android:layout_weight="1" />
+ android:id="@+id/date_or_distance"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="5dp"
+ android:layout_gravity="center_vertical" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_steps_main.xml b/OsmAnd/res/layout/route_steps_main.xml
index ab49941f19..6a9094be2b 100644
--- a/OsmAnd/res/layout/route_steps_main.xml
+++ b/OsmAnd/res/layout/route_steps_main.xml
@@ -1,33 +1,39 @@
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
-
-
+
-
+
+
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/save_directions_dialog.xml b/OsmAnd/res/layout/save_directions_dialog.xml
index ba047aaa3a..adc600c5ce 100644
--- a/OsmAnd/res/layout/save_directions_dialog.xml
+++ b/OsmAnd/res/layout/save_directions_dialog.xml
@@ -1,16 +1,54 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 46decbeef8..76fdec98c3 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -2,132 +2,120 @@
+ android:layout_height="fill_parent">
+ android:orientation="vertical">
+ custom:maxVisibleWidth="800dp">
+ android:stretchColumns="1">
+ android:layout_marginLeft="5dp">
-
+ android:text="@string/search_address_region" />
+ android:layout_width="150dp"
+ android:ellipsize="end"
+ android:lines="1"
+ android:scrollHorizontally="true"
+ android:text="@string/ChooseCountry" />
-
+ android:contentDescription="@string/default_buttons_reset" />
+ android:layout_marginLeft="5dp">
-
+ android:text="@string/search_address_city" />
+ android:layout_width="150dp"
+ android:ellipsize="end"
+ android:lines="1"
+ android:scrollHorizontally="true"
+ android:text="@string/choose_city" />
-
+ android:contentDescription="@string/default_buttons_reset" />
+ android:layout_marginLeft="5dp">
-
+ android:text="@string/search_address_street" />
+ android:layout_width="150dp"
+ android:ellipsize="end"
+ android:lines="1"
+ android:scrollHorizontally="true"
+ android:text="@string/choose_street" />
-
+ android:contentDescription="@string/default_buttons_reset" />
+ android:layout_marginLeft="5dp">
-
+ android:text="@string/search_address_building" />
+ android:layout_width="150dp"
+ android:ellipsize="end"
+ android:lines="1"
+ android:scrollHorizontally="true"
+ android:text="@string/choose_building" />
-
+ android:contentDescription="@string/default_buttons_reset" />
@@ -137,22 +125,20 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_span="3"
- android:orientation="horizontal" >
+ android:orientation="horizontal">
-
+ android:text="@string/search_address_building_option" />
-
+ android:text="@string/search_address_street_option" />
diff --git a/OsmAnd/res/layout/search_address_offline.xml b/OsmAnd/res/layout/search_address_offline.xml
index ac5e732bc5..04697204fa 100644
--- a/OsmAnd/res/layout/search_address_offline.xml
+++ b/OsmAnd/res/layout/search_address_offline.xml
@@ -2,14 +2,13 @@
+ android:orientation="vertical">
-
+ android:layout_weight="1">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address_offline_list_item.xml b/OsmAnd/res/layout/search_address_offline_list_item.xml
index 692b32550c..c5a536481b 100644
--- a/OsmAnd/res/layout/search_address_offline_list_item.xml
+++ b/OsmAnd/res/layout/search_address_offline_list_item.xml
@@ -1,11 +1,20 @@
-
-
-
+
+
+
+
+
diff --git a/OsmAnd/res/layout/search_address_online.xml b/OsmAnd/res/layout/search_address_online.xml
index e267e580fc..5f4f01397e 100644
--- a/OsmAnd/res/layout/search_address_online.xml
+++ b/OsmAnd/res/layout/search_address_online.xml
@@ -2,21 +2,20 @@
+ android:orientation="vertical">
-
+ android:layout_marginTop="5dp">
+
-
+ android:layout_height="wrap_content"
+ android:visibility="invisible">
-
+ android:text="">
+ android:text="@string/search_button">
-
+ style="@style/OsmandListView">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_address_online_list_item.xml b/OsmAnd/res/layout/search_address_online_list_item.xml
index d5a29bb999..26eb651487 100644
--- a/OsmAnd/res/layout/search_address_online_list_item.xml
+++ b/OsmAnd/res/layout/search_address_online_list_item.xml
@@ -2,7 +2,7 @@
+ android:orientation="horizontal">
+ android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_by_name.xml b/OsmAnd/res/layout/search_by_name.xml
index cc3b7e9ef4..f328604317 100644
--- a/OsmAnd/res/layout/search_by_name.xml
+++ b/OsmAnd/res/layout/search_by_name.xml
@@ -1,25 +1,50 @@
-
-
-
- -->
+
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index 2c22789476..0644c3fe95 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -2,7 +2,7 @@
+ android:orientation="horizontal">
+ android:layout_weight="1" />
-
+
-
+ android:layout_weight="0" />
+
-
-
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:background="@drawable/ic_background_topofsearchactivities">
+
+
+
+ android:layout_height="0dp" />
+ android:layout_weight="1" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_main_tab_header.xml b/OsmAnd/res/layout/search_main_tab_header.xml
index ec886291a6..c98ab1aaf8 100644
--- a/OsmAnd/res/layout/search_main_tab_header.xml
+++ b/OsmAnd/res/layout/search_main_tab_header.xml
@@ -2,5 +2,4 @@
+ android:id="@+id/TabImage" />
diff --git a/OsmAnd/res/layout/search_transport.xml b/OsmAnd/res/layout/search_transport.xml
index 3ac0d8a76d..f72cf32be7 100644
--- a/OsmAnd/res/layout/search_transport.xml
+++ b/OsmAnd/res/layout/search_transport.xml
@@ -1,28 +1,25 @@
-
-
+
+ android:orientation="vertical">
+ android:orientation="horizontal">
-
+ android:layout_height="wrap_content" />
+ android:layout_weight="1" />
+ android:layout_gravity="center">
-
+ style="@style/OsmandListView" />
-
+ android:layout_alignParentTop="true"
+ style="@style/OsmandListView" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_list_item.xml b/OsmAnd/res/layout/search_transport_list_item.xml
index 3a2324dede..cf8df22051 100644
--- a/OsmAnd/res/layout/search_transport_list_item.xml
+++ b/OsmAnd/res/layout/search_transport_list_item.xml
@@ -1,13 +1,21 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
-
-
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml
index fee1c31308..6d6004cb57 100644
--- a/OsmAnd/res/layout/search_transport_route_item.xml
+++ b/OsmAnd/res/layout/search_transport_route_item.xml
@@ -1,17 +1,27 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchbyname_list.xml b/OsmAnd/res/layout/searchbyname_list.xml
index 69b7677411..27472aa85d 100644
--- a/OsmAnd/res/layout/searchbyname_list.xml
+++ b/OsmAnd/res/layout/searchbyname_list.xml
@@ -1,9 +1,14 @@
-
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingBottom="3dp"
+ android:paddingTop="3dp">
+
+
diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml
index 0f61b978f4..fbf521e2c9 100644
--- a/OsmAnd/res/layout/searchpoi.xml
+++ b/OsmAnd/res/layout/searchpoi.xml
@@ -1,14 +1,36 @@
-
-
+
-
-
-
-
-
-
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoi_list.xml b/OsmAnd/res/layout/searchpoi_list.xml
index 68f956bfc7..9dd44d3f2e 100644
--- a/OsmAnd/res/layout/searchpoi_list.xml
+++ b/OsmAnd/res/layout/searchpoi_list.xml
@@ -1,31 +1,42 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index d6169b4204..dc8f8d16ab 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -1,18 +1,32 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingBottom="5dp"
+ android:paddingTop="5dp">
-
-
-
-
+
+
+
+
+
diff --git a/OsmAnd/res/layout/selected_track_edit.xml b/OsmAnd/res/layout/selected_track_edit.xml
index 046941d040..d40aa29f22 100644
--- a/OsmAnd/res/layout/selected_track_edit.xml
+++ b/OsmAnd/res/layout/selected_track_edit.xml
@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:paddingLeft="7dp"
android:paddingRight="7dp"
- android:stretchColumns="1" >
+ android:stretchColumns="1">
@@ -18,27 +18,24 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- />
+ android:layout_marginRight="5dp" />
+ android:layout_height="wrap_content">
-
+ android:text="@string/gpx_split_interval">
-
+ android:layout_marginRight="5dp">
diff --git a/OsmAnd/res/layout/send_gpx_osm.xml b/OsmAnd/res/layout/send_gpx_osm.xml
index 36b7c7eab8..3dbfb20d3f 100644
--- a/OsmAnd/res/layout/send_gpx_osm.xml
+++ b/OsmAnd/res/layout/send_gpx_osm.xml
@@ -1,29 +1,68 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout/sherpafy_browse_tour.xml b/OsmAnd/res/layout/sherpafy_browse_tour.xml
index 7b0090974d..a367fa0947 100644
--- a/OsmAnd/res/layout/sherpafy_browse_tour.xml
+++ b/OsmAnd/res/layout/sherpafy_browse_tour.xml
@@ -1,5 +1,4 @@
-
@@ -9,12 +8,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
+ android:background="@color/color_white" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/sherpafy_drawer_list_item.xml b/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
index b2b84112df..5f3db49b2b 100644
--- a/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
+++ b/OsmAnd/res/layout/sherpafy_drawer_list_item.xml
@@ -4,7 +4,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="8dp"
- android:paddingTop="8dp" >
+ android:paddingTop="8dp">
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/sherpafy_tour_row">
-
+
-
-
-
-
+
-
-
+
-
+
+
-
+
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/sherpafy_loading.xml b/OsmAnd/res/layout/sherpafy_loading.xml
index 965fe8f724..4f4723c51b 100644
--- a/OsmAnd/res/layout/sherpafy_loading.xml
+++ b/OsmAnd/res/layout/sherpafy_loading.xml
@@ -1,14 +1,13 @@
+ android:layout_height="fill_parent">
-
+ android:orientation="horizontal">
-
@@ -12,15 +11,15 @@
android:visibility="gone" />
+ android:layout_height="fill_parent">
+ android:orientation="vertical">
+ android:orientation="horizontal">
+ android:orientation="horizontal">
-
-
-
+ android:layout_marginRight="8dp">
+
+
+
+
+ android:orientation="vertical">
-
+ style="@style/OsmandListView">
\ No newline at end of file
diff --git a/OsmAnd/res/layout/tab_content.xml b/OsmAnd/res/layout/tab_content.xml
index 7812a9efac..55549c7832 100644
--- a/OsmAnd/res/layout/tab_content.xml
+++ b/OsmAnd/res/layout/tab_content.xml
@@ -1,118 +1,116 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+ android:layout_weight="0" />
-
-
+ android:layout_height="0dp" />
+ android:layout_weight="1" />
-
+
diff --git a/OsmAnd/res/layout/tips_and_tricks.xml b/OsmAnd/res/layout/tips_and_tricks.xml
index 4bd78b65d5..79406ae754 100644
--- a/OsmAnd/res/layout/tips_and_tricks.xml
+++ b/OsmAnd/res/layout/tips_and_tricks.xml
@@ -1,19 +1,51 @@
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/update_index_list_item.xml b/OsmAnd/res/layout/update_index_list_item.xml
index 6d7ad49bcf..219cf37151 100644
--- a/OsmAnd/res/layout/update_index_list_item.xml
+++ b/OsmAnd/res/layout/update_index_list_item.xml
@@ -1,31 +1,34 @@
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="1dp"
+ android:paddingBottom="1dp"
+ android:paddingRight="8dp">
-
+
-
+
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index 322da1c2df..7e333477bf 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -1,37 +1,40 @@
-
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
+ android:minHeight="40dp"
+ android:layout_marginRight="3dp">
-
+
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_reached.xml b/OsmAnd/res/layout/waypoint_reached.xml
index 78545c36d5..5206990fce 100644
--- a/OsmAnd/res/layout/waypoint_reached.xml
+++ b/OsmAnd/res/layout/waypoint_reached.xml
@@ -1,60 +1,65 @@
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/view_transparent_selection"
+ android:id="@+id/package_delivered_layout"
+ android:minHeight="48dp"
+ android:descendantFocusability="blocksDescendants">
-
-
-
+
-
+
-
+
-
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_title.xml b/OsmAnd/res/layout/waypoint_title.xml
index 8049485e42..762bfe0849 100644
--- a/OsmAnd/res/layout/waypoint_title.xml
+++ b/OsmAnd/res/layout/waypoint_title.xml
@@ -1,13 +1,14 @@
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="5dp"
+ android:layout_marginRight="3dp"
+ android:descendantFocusability="blocksDescendants">
+
+ android:visibility="gone" />
-
-
+
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index bc2f1956f4..d3cb9d133f 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1998,4 +1998,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
Уключаць экран тэлефона пры набліжэньні да павароту
Ніколі
%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.
-
+ Пашыраны
+
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index c61a946f02..117fc310e9 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -845,9 +845,8 @@ OsmAnd е с отворен код и активно да се развива.
\n\t* \'По посоката на движение\' - Картата ще се завърта в зависимост от вашата посока на движение.
\n\t* \'По компаса\' - Картата ще бъде ориентирана по вградения компас.
- Успешно сваляне
- \n\t\n\tЗа използване \'Меню\' -> \'Настройки на екрана\' -> \'Карти…\' -> \'Offline vector maps\'.
-
+ "Успешно сваляне
+\n\t\n\tЗа да използвате активирайте \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Offline векторни карти\'. "
Дневен/нощен режим
Можете да променяте изгледа на картата от дневен (ярък) към нощен (тъмен). Тъмният изглед е подходящ за безопасно шофиране нощем.
\n\nПревключването между дневен и нощен изглед можете да направите в \'Меню\' -> \'Настройки на екрана…\' ->\'Дневен/нощен изглед\'.
@@ -1018,7 +1017,7 @@ OsmAnd е с отворен код и активно да се развива.
Обръщане посоката на GPX
Ползвай текущата крайна цел
Преминахте по целия маршрут
- За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' -> \'Настройки изглед\' -> \'Карти…\' -> \'Офлайн векторни карти\'.
+ За този район има карта в офлайн режим.\n\t\n\tАктивирайте я от \'Меню\' → \'Настройки карта\' → \'Карта източник…\' → \'Офлайн векторни карти\'.
Канал за гласовите напътствия
Избор на звуков канал за гласовите напътствия (зависи от настройките на Вашето устройство)
Канал за гласови данни (за предпочитане)
@@ -1652,7 +1651,7 @@ OsmAnd е с отворен код и активно да се развива.
Изберете максималната разрешена маса (тегло) на МПС
Копиране файловете на OsmAnd
Камион
- Автобусни и тролейбусни линии
+ Автобусни, тролейбусни, маршрутни линии
Запис на Вашето пътуване
ч.
Продължителност
@@ -1759,10 +1758,10 @@ OsmAnd е с отворен код и активно да се развива.
Ляв панел
Покажи
Настройка на картата
- Трамваи и влакове
+ Трамвайни и влакови маршрути
%1$s изисква това разрешение за да изключи екрана с цел пестене на енергия.
Включи екрана
- Включи екрана, когато приближава завой
+ Включване на екрана на телефона, когато наближава завой
Никога
Избери на картата
Избягване на пътища…
@@ -1771,4 +1770,9 @@ OsmAnd е с отворен код и активно да се развива.
Автобусни линии
Маршрути на влакове
Тролейбусни линии
+ "Промени в версия 1.9: * Актуализирани карти със показване на пътната настилка, транспортни слоеве и туристически символи * Търсене POI по маршрута * Маркиране на пътя като непроходим за сесията * По лесно изтегляне и актуализиране на карти * Получаване на визуално и аудио уведомление при приближаване до точката * Показване на маршрута и информация към него * Поддръжка на пътни платна * Поддръжка на Android Wear * Много промени в потребителския интерфейс * Отделна настройка за големината на текста на картата * Специални аудио уведомления в случай че сте напуснали пътя * OsMo вход * Фикс в несъвместимоста на OsMo версията "
+ Сподели пътя с такси
+ В близост до
+ Устройството не е намерено
+ OsMo услугата е недостъпна:\n- проверете връзката;\n- проверете настройките;\n- намерете ни в Twitter: https://twitter.com/OsMomobi
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 398abb365c..ee919fea90 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1837,7 +1837,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
Serbi
Xinès simplificat
Xinès tradicional
- Mode subterrani
+ Rutes de subterrani
Continua la navegació
Suspèn la navegació
Escala senderista SAC (Club Alpí Suís)
@@ -1876,7 +1876,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
h
Durada
Distància
- Mode transport públic
+ "Rutes de bus, troleibus i tramvia"
Desa la traça a un arxiu GPX
L\'enregistrament de la posició en un arxiu GPX es pot activar o desactivar utilitzant el giny associat, a la pantalla del mapa
Interval d\'enregistrament
@@ -1925,7 +1925,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
Comparteix rutes de taxi
Rutes de troleibús
Rutes de bus
- Tramvia i tren
+ Rutes de tramvia i tren
Selecciona en el mapa
Evita carreteres…
Amaga
@@ -1933,4 +1933,5 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
Activa la pantalla del mòbil en aproximar-se a un gir
"%1$s necessita aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."
Mai
-
+ Avançat
+
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index c45ba76da3..cb585696c5 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1773,4 +1773,5 @@ s často kladenými otázkami.
" OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara "
%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.
Nikdy
-
+ Pokročilé
+
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 776eeb7915..21bd8a59d3 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1859,4 +1859,5 @@ Nogle af de centrale funktioner:
Tænd for skærmen når et sving nærmer sig
%1$s behøver denne tilladelse til at slukke for skærmen for strømbesparende funktion.
Aldrig
-
+ Avanceret
+
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 9836de5b8b..7dfdb12676 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1683,4 +1683,12 @@
Αριστερός πίνακας
Εμφάνιση
Διαμόρφωση χάρτη
-
+ Δρομολόγια τραμ και τρένων
+ Δρομολόγια τρένου
+ Δρομολόγια τραμ
+ Δρομολόγια τρόλεϋ
+ Δρομολόγια λεωφορείων
+ Μεταφορές
+ Γραμμή κατάστασης
+ Ανοχή ορίου ταχύτητας
+
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 4462cd4f51..09b937d14e 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1918,4 +1918,5 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
Encender pantalla al aproximarse a un giro
%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.
Nunca
-
+ Avanzado
+
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 11e199800f..a3ad68e2a3 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1860,4 +1860,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
Allumer l\'écran à l\'approche d\'une bifurcation
%1$s a besoin de cette permission pour éteindre l\'écran en mode économie d\'énergie.
Jamais
-
+ Avancé
+
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index c0c0dea2ef..d207583dea 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -231,7 +231,7 @@
Inverti direzione GPX
Usa il punto di destinazione attuale
Percorri tutta la traccia
- Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\'→\'Strati mappa\'→\'Fonte Mappa…\'→\'Mappe vettoriali offline\'.
+ Mappa vettoriale offline presente per quest\'area.\n\t\n\tPer usarla attivare \'Menu\' → \'Configura la mappa\' → \'Sorgente mappa…\' → \'Mappe vettoriali offline\'.
Canale d\'uscita della voce guida
Scegli il canale per la guida vocale (dipendente dal sistema)
Audio chiamate vocali
@@ -269,7 +269,7 @@
\n\nScegli poi un modo per condividere la tua posizione. Le opzioni sono: E-Mail, SMS o semplicemente copia le coordinate sugli appunti.
Punti Preferiti
- "I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nNel menu contestuale per ogni punto \'Utilizza posizione\' scegliere \'Aggiungi ai favoriti\' e quindi immettere un nome per esso.\n\nDopo il salvataggio, il punto preferito sarà accessibile nel \'Menu\'→\'I miei luoghi\'. Premendo su una qualsiasi voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, attiva nella schermata della mappa il livello \'Preferiti\' dal menù \'Strati mappa\'. "
+ "I punti usati di frequente possono essere salvati come Preferiti in questo modo:\n\nPer qualsiasi punto, nel menu contestuale \'Utilizza la posizione…\' scegliere \'Aggiungi ai Preferiti\' e quindi immettere un nome.\n\nDopo il salvataggio, il punto sarà accessibile attraverso \'Menu\' → \'I miei luoghi\'. Premendo su una voce della lista dei \'Preferiti\', appariranno le opzioni per impostarlo come destinazione, modificarlo o eliminarlo.\n\nPer visualizzare tutti i punti preferiti direttamente sulla mappa, nella schermata della mappa attiva il livello \'Preferiti\' da \'Menu\' → \'Configura la mappa\'. "
OSM Online con immagini
Errore nella ricerca offline
Impossibile leggere geo intent \'%s\'
@@ -2026,4 +2026,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
Accendi lo schermo all\'approssimarsi di una svolta
Mai
%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.
-
+ Avanzato
+
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 5931a75e97..e9abb4c1fb 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2084,4 +2084,5 @@
교차로에 접근할 때 전화 화면 켜기
%1$의 절전 기능에 대한 화면을 해제 하려면 이 권한이 필요 합니다.
결코
-
+ 고급
+
diff --git a/OsmAnd/res/values-ku/strings.xml b/OsmAnd/res/values-ku/strings.xml
index 93376ca7d8..692bae9021 100644
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@@ -1,5 +1,6 @@
-
- دەستپێکه
+
+
+ donya hich wafay bom niya, zhyan hich khoshi bom niya, mrdn jegay shanaziya
زانیاری دەنگ/ڤیدیۆ
دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت
پشاندە
@@ -8,4 +9,4 @@
ڤیدیۆ تۆمارکه
دەنگ تۆمارکه
کامێرا له به رده ست نيه
-
\ No newline at end of file
+
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 33081a48e0..b3f305ebc0 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -42,8 +42,8 @@
Auto-zoom kart
Hold posisjon på veien under navigering
Hold på vei
- OsmAnd er et navigeringsprogram for offline og online kart og som er åpen kildekode
- Global mobilkartvisning & navigering for offline og nettbasert OSM-kart
+ Global mobilkartvisning & navigering for offline og nettbaserte OSM-kart
+ Global mobilkartvisning & navigering for offline og nettbaserte OSM-kart
Transportmodus:
Velg transportmåte
Soloppgang: %1$s \nSolnedgang: %2$s
@@ -88,7 +88,7 @@
Vis trafikkvarsler
Unngå bomveier
Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)
- Ruten blir beregnet på nytt når sted blir funnet
+ Rute blir beregnet når posisjon blir funnet
Timer
Minutter
Bilen ble parkert her:
@@ -110,22 +110,22 @@
Klikk her for å laste ned eller oppdatere offline-data. \nKlikk eksisterende element for å se flere detaljer, trykk og hold for å deaktivere eller slette. Gjeldende data på enheten (%1$s ledig):
Startpunkt er ennå ikke bestemt
Posisjon ennå ikke kjent
- Nettbaserte kart og kartfliser
+ Nettbaserte- og flis-kart
Offline-kart (vektor)
Last ned og håndter offline-kart lagret på enheten
Aktiver programtillegg for nettbaserte kart for å velge ulike kartkilder
- Nettbaserte kart (fliser)
- Bruk nettbaserte kart (laste ned og mellomlagre fliser på SD-kort)
+ Nettbaserte- og flis-kart
+ Bruk nettbaserte kart (last ned og bufre fliser på SD-kort)
Nettbaserte kart
Still inn nettbaserte eller hurtigbufrede flis-kartkilder
Kartinnstillinger
Still inn kartvisningen
Vektorkart vises trolig raskere. Fungerer kanskje ikke bra på enkelte enheter.
- Rask opptegning
+ Intern opptegning
Vis målestokk
Info
- Tilbake til sted
+ Tilbake til posisjon
Hjelp
Vis detaljer
Tilgjengelighetsmoduler for gamle Android-versjoner
@@ -204,7 +204,7 @@
Asia
Oseania
Verdens- og emnekart
- Verdensomspennende Wikipedia
+ Verdensomspennende Wikipedia-interessepunkter
Talepakker (opptak, begrenset funksjonalitet)
Talepakker (TTS kunstig tale, foretrekk)
Wikipedia (offline)
@@ -221,12 +221,11 @@
Still inn visning og generelle programinnstillinger
Globale programinnstillinger
Kartorientering
- \tDu kan velge hvordan kartvisningen roteres ved å gjentatte ganger klikke på kompassikonet.
- \n\tValgene er:
- \n\t\'Ingen rotasjon (nord er opp)\' - Kart vil ikke roteres. Nord vil alltid være opp
- \n\t\'I bevegelsesretning\' - Kartorienteringen justeres kontinuerlig til bevegelsesretningen
- \n\t\'Ifølge kompass\' - Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten
-
+ "Du kan slå av/på om og hvordan kartvisningen roteres ved å gjentatte ganger klikke på kartskjermens kompassikon.
+\n\nValgene er:
+\n\t* \'Ingen rotasjon (nord er opp)\': Kart vil ikke roteres. Nord vil alltid være opp
+\n\t* \'I bevegelsesretning\': Kartorienteringen justeres kontinuerlig til bevegelsesretningen
+\n\t* \'Ifølge kompass\': Kartrotasjon tilpasses kontinuerlig til kompassavlesningen for enheten "
"Nedlasting vellykket.
\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'. "
Dag/natt-modus
@@ -253,12 +252,12 @@
Fil med dette navnet finnes allerede.
GPX-rute
Flere interessepunktkategorier funnet som samsvarer med søket:
- Lokale data til å søke interessepunkter er ikke til stede.
+ Lokale data til å søke interessepunkter foreligger ikke.
Søk på navn
Interessepunktfilen \'%1$s\' er overflødig og kan slettes.
Lokal fil for å opprettholde interessepunktendringer ikke funnet og kunne ikke opprettes.
Oppgrader OsmAnd+
- Server inneholder kartfiler som ikke er kompatible med din nåværende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.
+ Server inneholder kartfiler som ikke er kompatible med din gjeldende versjon av programmet. For å laste ned og bruke dem, oppgrader programmet til nyere versjon.
Endre navn
Vis på kart
Søker posisjon…
@@ -276,7 +275,7 @@
Filnavn:
Fil med samme navn finnes allerede.
Lagre
- Lagre rute
+ Lagre anvisninger
Vis flere kartdetaljer
Favorittpunkt(er) vellykket slettet.
Du kommer til å slette %1$d favoritt(er) og %2$d favorittgruppe(r). Er du sikker?
@@ -313,7 +312,7 @@
Ingen
En nettbasert navigeringstjeneste er valgt, men ingen internett-tilkobling er tilgjengelig.
Språk ikke støttet
- Det valgte språket støttes ikke av den installerte Android TTS(tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.
+ Det valgte språket støttes ikke av den installerte Android TTS (tekst-til-tale)-motoren. Vil du gå til markedet for å se etter en annen TTS-motor? Ellers vil det forhåndsinnstilte TTS-språket brukes.
Manglende data
Offline-vektorkart foreligger for dette stedet.
\n\t\n\tFor å bruke aktiver \'Meny\' → \'Still inn kart\' → \'Kartkilde…\' → \'Offline vektorkart\'.
@@ -323,10 +322,10 @@
\n\nI lokalmenyen \'Bruk posisjon\' for et punkt, velg alternativet \'Legg til i favoritter\' og skriv deretter inn et navn for den.
\n\nEtter å ha lagret en favoritt er den tilgjengelig via \'Meny\' → \'Mine steder\'. Trykking på en oppføring i \'Favoritter\'-listen gir muligheter som å navigere til den, redigere eller slette den.
\n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "
- Søk adresse ved bruk av offline-kart
+ Søk geografisk plassering
System
Velg visningsspråk
- Språk
+ Visningsspråk
Velg en kartkilde
"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
\n\nUnder \'Kartkilde…\' kan du velge å bruke de forhåndslastede offline vektorkartene (standard, trengs også for offline navigering), eller forhåndsdefinerte (nettbaserte eller bufret offline) fliskilder (aktiver programtillegget for \'Nettbaserte kart\' under \'Innstillinger\' → \'Programtillegg\' for dette), eller kart manuelt opprettet ved bruk av f.eks. OsmAndMapCreator på en PC.
@@ -355,7 +354,7 @@
\n\nEn markør-boks kan skjules igjen ved å trykke lenge på den. "
Hjelp
"OsmAnd er et navigeringsprogram med mange funksjoner.
-\n\tSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "
+\n\nSom en grunnleggende innføring er noen brukertips og triks lenket til via \'Meny\' → \'Hjelp\' fra kartskjermen. "
Neste
Forrige
Endre lengde- og hastighetsenhet
@@ -404,7 +403,7 @@
Dag/natt-modus
Laste ned {0} fil(er) ({1} MB)?
{0} element(er) valgt
- Filtrer nedlastede
+ Nedlastet
Fravelg alle
Velg alle
Gjenoppfrisk
@@ -414,7 +413,7 @@
Last ned kart
Vektor-opptegning
Velg utseende på opptegningen
- nettsted
+ Nettsted
Telefon
Søk transport
Transportresultater (ingen mål):
@@ -494,8 +493,8 @@
Søker…
Søker adresse…
Husnummer, gate, by
- Offline
- Internett
+ Offline-søk
+ Nettbasert søk
Maks. nettbasert zoom
Velg maksimalt zoomnivå å laste ned for nettbaserte kartseksjoner
Total distanse %1$s, reisetid %2$d t %3$d m.
@@ -503,7 +502,7 @@
Navigeringstjeneste
Lagringsmappe på SD-kortet ikke tilgjengelig
Laste ned {0} - {1} ?
- Offline-data for {0} finnes allerede ({1}). Vil du oppdatere det ({2}) ?
+ Offline-data for {0} finnes allerede ({1}). Vil du oppdatere ({2}) ?
Adresse
Nedlasting vellykket
I/O feil oppstod
@@ -537,7 +536,7 @@
Vis OpenStreet-feil
Favoritter
Legg til i favoritter
- Bruk lokale eller engelske navn
+ Velg mellom lokale og engelske navn
Bruk engelske navn i kartene
Programinnstillinger
Søk adresse
@@ -545,13 +544,13 @@
Velg gate
Velg by
Velg land
- Vis synsretningen
+ Vis synsretning
Aktiver 3D-visning av kartet
3D-kartvisning
Vis interessepunkt over kart (bruk sist valgte filter)
Vis interessepunkt
Velg kilden til nettbaserte eller hurtigbufrede kartdeler
- Flislegg kartkilde
+ Fliskartkilde
Kartkilde
Bruk internett
Vis sted
@@ -640,7 +639,7 @@
Ankomsttid
Kart
Foretrekk motorveier
- Foretrekk …
+ Foretrekk…
Foretrekk motorveier
ingen
Velg programtema
@@ -654,13 +653,13 @@
Stopp OsMoDroid
Start OsMoDroid
Meld om GPX-rutepunkter
- Meddel…
+ Meld om…
Still inn for å meddele gatenavn, trafikkvarsler (tvungne stopp, fartsdumper), fotoboksvarsler, fartsgrenser
Meddel gatenavn (TTS)
- Meddel fartsgrense
+ Meld om fartsgrense
Meld om fotobokser
Meld trafikkvarsler
- "Endringer i 1.5:↵ →\n\t* Stemmevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for opplesning (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "
+ "Endringer i 1.5:↵ →\n\t* Talevarslinger om fartsgrenser og fotobokser ↵ →\n\t* Flere muligheter for talemeldinger (gatenavn blir meddelt) ↵ →\n\t* Kartikoner i høy oppløsning ↵ →\n\t* Flere endringer i brukergrensesnittet ↵ →\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https-håndtering "
Oppgi OSM brukernavn og passord i Innstillinger
Slett mellomliggende rutepunkter
Behold mellomliggende rutepunkter
@@ -669,18 +668,18 @@
Anvisninger fra
Kart:
Br %1$.3f, Le %2$.3f
- Aktuell posisjon
+ Gjeldende posisjon
Til:
Via:
Fra:
- Mål %1$s
- Velg som mål
+ Reisemål %1$s
+ Sett som reisemål
Velg by eller gate først
Søk etter gaten i nabobyer
Kartstiler
- Utgave:
+ Versjon:
Om
Versjonsinformasjon, lisenser, prosjektmedlemmer
Hjelp
@@ -692,7 +691,7 @@
URL
Velg eksisterende…
Navn
- Definer/rediger …
+ Definer/rediger…
OsmAnd offline ruteplanlegging kan ta veldig lang tid (eller ikke virke noen ganger) for punkter mere enn 200km fra hverandre. Man kan da legge til mellomliggende rutepunkter for bedre ytelse.
Ingen auto-zoom
Nært hold
@@ -763,14 +762,14 @@
Portugisisk (Brasil)
Nord-Amerika - Canada
adresser (hele landet)
- Korreksjon av høyde (verden)
- Sjømerkene(verden)
- Bitcoinbetalinger (verden)
+ Høydekorrigering (verden)
+ Sjømerker (verden)
+ Bitcoin-betalinger (verden)
Oversiktskart (verden)
Skikart (verden)
Kroatisk
Beregn OsmAnd rutesegment uten internett
- Beregn OsmAnd rute for første og siste rute segment
+ Beregn OsmAnd-rute for første og siste rutesegment
Unik enhets-id
Still inn overvåking og personlig overvåkingskanal
@@ -946,4 +945,124 @@
Ugyldig format: %s
Fjern alle
Samletaxi-ruter
-
+ Fortsett navigering
+ Midlertidig stopp navigering
+ Skjul skog og kratt
+ Færre detaljer
+ Sorter etter avstand
+ Sorter etter navn
+ \n\nTrykk og hold for å se på kartet
+ "Rutepunkter: %1$s "
+ Laster gater…
+ Laster byer…
+ Koordinater er ugyldige!
+ Tilbake til OsmAnd-kart
+ Legg til kommentar
+ Kommentar ble vellykket lagt til
+ Ingen bygninger funnet.
+ Laster gater/bygninger…
+ OpenStreetMap-overvåking
+ Favorittpunktnavn er endret til %1$s for å unngå dupliserte navn.
+ Punkt %1$s
+ Mine favoritter
+ Sentrer på skjermen
+ rød
+ rosa
+ orange
+ brun
+ gul
+ lyseblå
+ blå
+ grønn
+
+ Info
+ Loggeintervall
+ Beskrivelse
+ Beregn rute mellom punkter
+ Serbisk
+ Forenklet kinesisk
+ Tradisjonell kinesisk
+ Legg til som målpunkt
+ Velg GPX …
+ Velg på kart…
+ Favoritt…
+ Ruteinnstillinger
+ Ruteinformasjon
+ Beregn OsmAnd offline-rute
+ Lastebil
+ Flisdata: %1$s
+ Elliptisk mercator
+ Slett punkt
+ tid
+ presisjon
+ fart
+ høyde
+ Punkt
+ Ikke vis igjen
+ Bruk magnetisk sensor
+ %1$d filer igjen
+ Stopp navigering
+ Husnummer
+ Velg adresse
+ Velg favoritt
+ Kotedata
+ Vis
+ Programtillegg for koter
+ Still inn lyd og video
+ "Lyd/video-innstillinger "
+ Stopp
+ OsmAnd-programtillegg for offline koter
+ Avstandsmåling
+ Stopp
+ Koter
+ Programtillegg for koter
+ Andre kart
+ Bare veier
+ Koter
+ Vanlige kart
+ Rene veikart
+ OsMoDroid-programtillegg
+ Høydekorrigering
+ Søk landsbyer/postnummer
+ Velg når det skal vises rene veikart:
+ Rene veikart
+ OsmAnd kart & navigering
+ OsmAnd+ kart & navigering
+ Synsretning
+ Privat
+ Del rute som GPX-fil
+ Endre gjennomsiktighet (0 - gjennomsiktig, 255 - ugjennomsiktig)
+ Avanserte innstillinger
+ Trykk på et programtillegg for å aktivere eller deaktivere det. (Omstart av OsmAnd kan være nødvendig.)
+ Synlighet
+ Beskrivelse
+ Gjennomsiktig tema
+ Aldri
+ Utgave
+ Eksporter
+ Bruk gjeldende mål
+ Del en posisjon
+ Feil oppstod i offline-søk
+ Send posisjon
+ Administrative
+ Lagre
+ Transportrute
+ Pakker ut fil…
+ Stoppested
+ Stoppesteder
+ Laster ned…
+ Laster postnummer…
+ Lukk
+ Laster data…
+ Avansert
+ Muliggjør å laste ned offline koter og relieff-skygger (\'Innstillinger\' → \'Karthåndtering\' → \'Last ned\' → Velg ønsket karttype).
+ "Oppdaterte kartdata er viktig for offline kartvisning, for interessepunkt/adresse-søk og for offline navigering. OsmAnd tilbyr en filbehandler for kart til å laste ned disse offline-kartene og for å se etter tilgjengelige oppdateringer.
+\n\nFor å laste ned kart gå til \'Innstillinger\' → \'Karthåndtering\' → \'Last ned\'.
+\n\nEtter at den globale regionlisten er hentet fra internett, trykk på en oppføring for å laste ned eller oppdatere en fil. Vær oppmerksom på filtypevelgeren nær toppen av skjermen for å velge den typen nedlasting du ønsker (vanlige kart, relieff-overlegg etc.).
+\n\nDu kan filtrere regionlisten ved å skrive noen bokstaver, eller du kan velge alternativet \'Innstillinger\' → \'Filtrer nedlastede\' for å se oppdateringer bare for de dataene som allerede er på enheten.
+\n\n\t* Oppføringer i \'grønt\' indikerer datafiler identiske på enhet og server
+\n\t* Oppføringer i \'blått\' indikerer tilgjengelige oppdateringer på server
+\n\t* Oppføringer i kursiv skrift indikerer data deaktiverte på enheten "
+ Takk for at du bruker OsmAnd. For mange funksjoner i dette programmet trenger du noen regionale offline-data som du kan laste ned via \'Innstillinger\' → \'Karthåndtering\'. Etterpå vil du være i stand til å se kart, finne adresser, lete etter interessepunkter og finne offentlig transport.
+ Last ned
+
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 128355f2ee..44ee30092d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -28,6 +28,7 @@
Спальные принадлежности
Бутик
Магазин ковров
+ Благотворительный магазин
Бытовая химия, косметика
Одежда
Детская одежда
@@ -331,6 +332,7 @@
Академическая гребля
Рэгби-юнион
Рэгби-лиг
+ Парусный спорт
Стрельба
Катание на роликах (коньках)
Скейтборд
@@ -396,30 +398,30 @@
Фуникулёр
Курорт
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Клуб любителей искусства
+ Астрономический клуб
+ Компьютерный клуб
+ Настольные игры
+ Мотоклуб
+ Спортивный клуб
+ Игровой клуб
+ Автоклуб
+ Шахматный клуб
+ Киноклуб
+ Фанклуб
+ Клуб рыболовов
+ Клуб ветеранов
+ Клуб любителей Linux
+ Театральный клуб
+ Исторический клуб
+ Музыкальный клуб
+ Клуб этнической культуры
+ Клуб натуралистов
+ Фотоклуб
+ Клуб охотников
+ Оружейный клуб
+ Туристический клуб
+ Благотворительский клуб
Библиотека
Художественный центр
@@ -443,64 +445,64 @@
Аквапарк
Парк
-
-
-
-
-
-
-
-
-
+ Кафе
+ Летнее кафе
+ Ресторан
+ Фастфуд (быстрое питание)
+ Бар
+ Паб
+ Ресторанный дворик
+ Питьевая вода
+ Установка для барбекю
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Ремонт с/х техники
+ Плетение из лозы
+ Пасека
+ Кузница
+ Пивоварня
+ Верфь
+ Переплётная мастерская
+ Столярная мастерская
+ Укладка ковров, ковролина
+ Кейтеринг
+ Часовая мастерская
+ Пошив, ремонт одежды
+ Электрик
+ Садовник, ландшафтный дизайнер
+ Стеклорезная мастерская
+ Рукодельные штуки, украшения
+ Монтаж кондиционеров, систем вентиляции
+ Услуги по утеплению помещений
+ Ювелирная мастерская
+ Слесарные работы
+ Изготовление ключей
+ Металлоконструкции
+ Изготовление, подгонка очков, линз
+ Маляр
+ Паркетные работы
+ Фотограф
+ Фотолаборатория
+ Штукатурные работы
+ Сантехник
+ Гончарная мастерская
+ Оснастка для яхт, катеров
+ Кровельщик
+ Пошив и ремонт автокресел
+ Пошив и ремонт парусов
+ Пилорама
+ Возведение строительных лесов
+ Скульптор
+ Обувная мастерская
+ Изготовление выставочных стендов
+ Камнерезная мастерская
+ Изготовление навесов, жалюзи
+ Трубочист
+ Ателье
+ Плиточные работы
+ Жестянщик, лудильщик
+ Драпировщик, обивка мебели
+ Часовщик
+ Изготовление окон
Ритуальные услуги
Сборка компьютеров
@@ -591,11 +593,11 @@
-
-
-
-
-
-
-
+ Военный аэродром
+ Военный бункер
+ Бараки
+ Опасная зона
+ Военное стрельбище
+ Военно-морская база
+ Место ядерного взрыва
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 8d20bad10b..4831e24774 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1771,7 +1771,7 @@
Снизьте скорость
Скоростной радар
Ограничение скорости
- Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение
+ Выберите допустимое значение превышения скорости выше которого вы получите голосовое предупреждение.
Допустимое значение превышения скорости
Тест нативной визуализации
Название избранной точки было изменено на %1$s для возможности сохранения строки со смайликом в файл.
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 38061f4e18..e7822205ef 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -495,8 +495,8 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
Zoom automàticu mapa
Arrea sa positzione in subra de sas istradas durante su nàvigu
Arrea in subra de sas istradas
- Interrumpe sa mùsica pro faghere sos annuntzios
- Interrumpe sa mùsica
+ Firma sa mùsica pro fàghere sos annùntzios
+ Firma sa mùsica
"Mudas in sa 0.8.2:
\n\t* Megiorau su calculu de sas àndalas
\n\t* Widgets dinàmicos pro sas mapas
@@ -1780,4 +1780,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
Cua
Mai
%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.
-
+ Avantzadas
+
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 189ef3f0c5..9f97136ee5 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2033,4 +2033,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
Skryť
%1$s potrebuje toto oprávnenie na vypnutie obrazovky pre šetrenie energiou.
Nikdy
-
+ Pokročilé
+
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 6ee640ad10..47ba00a9ec 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1730,4 +1730,5 @@
Slå på skärmen när jag närmar mig en sväng
%1$s behöver denna tillåtelse för att stänga av skärmen för strömsparningsfunktionen.
Aldrig
-
+ Avancerat
+
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 10a6bf7bba..d21474157e 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
+ Advanced
Bus, trolleybus, shuttle routes
Tram and train routes
Subway routes
diff --git a/OsmAnd/src/net/osmand/core/android/GLActivity.java b/OsmAnd/src/net/osmand/core/android/GLActivity.java
index e92dac0dad..fd588dd5fb 100644
--- a/OsmAnd/src/net/osmand/core/android/GLActivity.java
+++ b/OsmAnd/src/net/osmand/core/android/GLActivity.java
@@ -54,11 +54,11 @@ public class GLActivity extends Activity {
private ResolvedMapStyle _mapStyle;
private ObfsCollection _obfsCollection;
private MapPresentationEnvironment _mapPresentationEnvironment;
- private Primitiviser _primitiviser;
- private BinaryMapDataProvider _binaryMapDataProvider;
- private BinaryMapPrimitivesProvider _binaryMapPrimitivesProvider;
- private BinaryMapStaticSymbolsProvider _binaryMapStaticSymbolsProvider;
- private BinaryMapRasterLayerProvider _binaryMapRasterLayerProvider;
+ private MapPrimitiviser _mapPrimitiviser;
+ private ObfMapObjectsProvider _obfMapObjectsProvider;
+ private MapPrimitivesProvider _mapPrimitivesProvider;
+ private MapObjectsSymbolsProvider _mapObjectsSymbolsProvider;
+ private MapRasterLayerProvider _mapRasterLayerProvider;
private OnlineRasterMapLayerProvider _onlineMapRasterLayerProvider;
private IMapRenderer _mapRenderer;
private GpuWorkerThreadPrologue _gpuWorkerThreadPrologue;
@@ -194,19 +194,19 @@ public class GLActivity extends Activity {
_displayDensityFactor,
"en"); //TODO: here should be current locale
//mapPresentationEnvironment->setSettings(configuration.styleSettings);
- _primitiviser = new Primitiviser(
+ _mapPrimitiviser = new MapPrimitiviser(
_mapPresentationEnvironment);
- _binaryMapDataProvider = new BinaryMapDataProvider(
+ _obfMapObjectsProvider = new ObfMapObjectsProvider(
_obfsCollection);
- _binaryMapPrimitivesProvider = new BinaryMapPrimitivesProvider(
- _binaryMapDataProvider,
- _primitiviser,
+ _mapPrimitivesProvider = new MapPrimitivesProvider(
+ _obfMapObjectsProvider,
+ _mapPrimitiviser,
_rasterTileSize);
- _binaryMapStaticSymbolsProvider = new BinaryMapStaticSymbolsProvider(
- _binaryMapPrimitivesProvider,
+ _mapObjectsSymbolsProvider = new MapObjectsSymbolsProvider(
+ _mapPrimitivesProvider,
_rasterTileSize);
- _binaryMapRasterLayerProvider = new BinaryMapRasterLayerProvider_Software(
- _binaryMapPrimitivesProvider);
+ _mapRasterLayerProvider = new MapRasterLayerProvider_Software(
+ _mapPrimitivesProvider);
_onlineMapRasterLayerProvider = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
@@ -222,14 +222,14 @@ public class GLActivity extends Activity {
atlasRendererConfiguration.setReferenceTileSizeOnScreenInPixels(_referenceTileSize);
_mapRenderer.setConfiguration(AtlasMapRendererConfiguration.Casts.downcastTo_MapRendererConfiguration(atlasRendererConfiguration));
- _mapRenderer.addSymbolsProvider(_binaryMapStaticSymbolsProvider);
+ _mapRenderer.addSymbolsProvider(_mapObjectsSymbolsProvider);
updateView();
/*
IMapRasterLayerProvider mapnik = OnlineTileSources.getBuiltIn().createProviderFor("Mapnik (OsmAnd)");
if (mapnik == null)
Log.e(TAG, "Failed to create mapnik");
*/
- _mapRenderer.setMapLayerProvider(0, _binaryMapRasterLayerProvider);
+ _mapRenderer.setMapLayerProvider(0, _mapRasterLayerProvider);
_glSurfaceView = (GLSurfaceView) findViewById(R.id.glSurfaceView);
//TODO:_glSurfaceView.setPreserveEGLContextOnPause(true);
@@ -289,29 +289,29 @@ public class GLActivity extends Activity {
_mapPresentationEnvironment = null;
}
- if (_primitiviser != null) {
- _primitiviser.delete();
- _primitiviser = null;
+ if (_mapPrimitiviser != null) {
+ _mapPrimitiviser.delete();
+ _mapPrimitiviser = null;
}
- if (_binaryMapDataProvider != null) {
- _binaryMapDataProvider.delete();
- _binaryMapDataProvider = null;
+ if (_obfMapObjectsProvider != null) {
+ _obfMapObjectsProvider.delete();
+ _obfMapObjectsProvider = null;
}
- if (_binaryMapPrimitivesProvider != null) {
- _binaryMapPrimitivesProvider.delete();
- _binaryMapPrimitivesProvider = null;
+ if (_mapPrimitivesProvider != null) {
+ _mapPrimitivesProvider.delete();
+ _mapPrimitivesProvider = null;
}
- if (_binaryMapStaticSymbolsProvider != null) {
- _binaryMapStaticSymbolsProvider.delete();
- _binaryMapStaticSymbolsProvider = null;
+ if (_mapObjectsSymbolsProvider != null) {
+ _mapObjectsSymbolsProvider.delete();
+ _mapObjectsSymbolsProvider = null;
}
- if (_binaryMapRasterLayerProvider != null) {
- _binaryMapRasterLayerProvider.delete();
- _binaryMapRasterLayerProvider = null;
+ if (_mapRasterLayerProvider != null) {
+ _mapRasterLayerProvider.delete();
+ _mapRasterLayerProvider = null;
}
if (_mapRenderer != null) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 2b8184403d..cd3ba8bca1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -839,7 +839,7 @@ public class MapActivity extends AccessibleActivity implements
if (mDevicePolicyManager != null && mDeviceAdmin != null) {
final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get();
- if (screenPowerSave > 0) {
+ if (screenPowerSave > 0 && settings.MAP_ACTIVITY_ENABLED.get()) {
if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) {
try {
mDevicePolicyManager.lockNow();
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index d8de09029f..e4b7343b36 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -348,8 +348,12 @@ public class MapActivityActions implements DialogProvider {
standardId == R.string.context_menu_item_destination_point) {
boolean dest = standardId == R.string.context_menu_item_destination_point;
String selected = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName();
+ String target = null;
+ if(dest && selected != null){
+ target = selected.replaceAll(getString(R.string.context_menu_item_destination_point), "");
+ }
targets.navigateToPoint(new LatLon(latitude, longitude), true,
- dest ? -1 : targets.getIntermediatePoints().size(), selected);
+ dest ? -1 : targets.getIntermediatePoints().size(), dest? target : selected);
if(targets.getIntermediatePoints().size() > 0) {
openIntermediatePointsDialog();
}
@@ -650,7 +654,7 @@ public class MapActivityActions implements DialogProvider {
}
public void prepareConfigureMap() {
- prepareOptionsMenu(new ConfigureMapMenu().createListAdapter(mapActivity));
+ prepareOptionsMenu(new ConfigureMapMenu().createListAdapter(mapActivity, true));
}
private ContextMenuAdapter createOptionsMenu() {
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 05eea78699..af8591497b 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -148,7 +148,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
public void updateSettings(){
if (mapView != null) {
- if (settings.ROTATE_MAP.get() != OsmandSettings.ROTATE_MAP_COMPASS || routePlanningMode) {
+ if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE || routePlanningMode) {
mapView.setRotate(0);
}
mapView.setMapPosition(settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index a6293ccb71..6d26e5696b 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -35,7 +35,7 @@ public class ConfigureMapMenu {
private boolean allModes = false;
- public ContextMenuAdapter createListAdapter(final MapActivity ma) {
+ public ContextMenuAdapter createListAdapter(final MapActivity ma, final boolean advanced) {
ContextMenuAdapter adapter = new ContextMenuAdapter(ma, allModes);
adapter.setDefaultLayoutId(R.layout.drawer_list_item);
adapter.item(R.string.configure_map).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
@@ -52,12 +52,26 @@ public class ConfigureMapMenu {
@Override
public void onClick(boolean result) {
allModes = true;
- ma.getMapActions().prepareOptionsMenu(createListAdapter(ma));
+ ma.getMapActions().prepareOptionsMenu(createListAdapter(ma, advanced));
}
});
createLayersItems(adapter, ma);
- createRenderingAttributeItems(adapter, ma);
+ if (!advanced){
+ adapter.item(R.string.btn_advanced_mode).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light)
+ .selected(advanced ? 1 : 0)
+ .listen(new OnContextMenuClick() {
+ @Override
+ public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) {
+ ma.getMapActions().prepareOptionsMenu(createListAdapter(ma, isChecked));
+ return false;
+ }
+ }).reg();
+ }
+
+ if (advanced) {
+ createRenderingAttributeItems(adapter, ma);
+ }
return adapter;
}
@@ -191,7 +205,7 @@ public class ConfigureMapMenu {
}
adapter.setItemDescription(pos, getRenderDescr(activity));
dialog.dismiss();
- activity.getMapActions().prepareOptionsMenu(createListAdapter(activity));
+ activity.getMapActions().prepareOptionsMenu(createListAdapter(activity, true));
}
});
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 364df26bd7..3f0e10aada 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -100,7 +100,6 @@ public class DownloadActivity extends SherlockFragmentActivity {
tabHost.setCurrentTab(0);
-
settings = ((OsmandApplication)getApplication()).getSettings();
indeterminateProgressBar = (ProgressBar) findViewById(R.id.IndeterminateProgressBar);
@@ -448,7 +447,11 @@ public class DownloadActivity extends SherlockFragmentActivity {
public void downloadedIndexes(){
for(WeakReference ref : fragList) {
Fragment f = ref.get();
- if(f instanceof DownloadIndexFragment) {
+ if(f instanceof LocalIndexesFragment){
+ if(!f.isDetached()){
+ ((LocalIndexesFragment) f).reloadData();
+ }
+ } else if(f instanceof DownloadIndexFragment) {
if(!f.isDetached()) {
DownloadIndexAdapter adapter = ((DownloadIndexAdapter)((DownloadIndexFragment) f).getExpandableListAdapter());
if (adapter != null) {
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 2b830af740..19ebdb4e53 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -114,8 +114,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
public void onResume() {
super.onResume();
if (asyncLoader == null || asyncLoader.getResult() == null) {
- asyncLoader = new LoadLocalIndexTask();
- asyncLoader.execute(getActivity());
+ reloadData();
}
getExpandableListView().setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
@@ -131,8 +130,13 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
}
});
}
-
-
+
+ public void reloadData() {
+ asyncLoader = new LoadLocalIndexTask();
+ asyncLoader.execute(getActivity());
+ }
+
+
private void showContextMenu(final LocalIndexInfo info) {
Builder builder = new AlertDialog.Builder(getActivity());
final ContextMenuAdapter adapter = new ContextMenuAdapter(getActivity());
@@ -241,6 +245,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
@Override
protected void onPreExecute() {
getDownloadActivity().setSupportProgressBarIndeterminateVisibility(true);
+ listAdapter.clear();
}
@Override
@@ -383,9 +388,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
protected void onPostExecute(String result) {
getDownloadActivity().setProgressBarIndeterminateVisibility(false);
AccessibleToast.makeText(getDownloadActivity(), result, Toast.LENGTH_LONG).show();
- listAdapter.clear();
- reloadIndexes();
-
+ if (operation == RESTORE_OPERATION){
+ listAdapter.clear();
+ reloadIndexes();
+ }
}
}
@@ -470,7 +476,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
for(LocalIndexInfo info : getDownloadActivity().getLocalIndexInfos()){
listAdapter.addLocalIndexInfo(info);
}
- listAdapter.notifyDataSetChanged();
+ listAdapter.sortData();
}
ActionBar actionBar = getDownloadActivity().getSupportActionBar();
//hide action bar from downloadindexfragment
@@ -773,10 +779,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
final Collator cl = Collator.getInstance();
for(List i : data.values()) {
Collections.sort(i, new Comparator() {
-
@Override
public int compare(LocalIndexInfo lhs, LocalIndexInfo rhs) {
- return cl.compare(lhs.getName(), rhs.getName());
+ return cl.compare(getNameToDisplay(lhs), getNameToDisplay(rhs));
}
});
}
@@ -800,6 +805,10 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
LocalIndexInfo c = findCategory(i, i.isBackupedData());
if(c != null){
data.get(c).remove(i);
+ if (data.get(c).size() == 0){
+ data.remove(c);
+ category.remove(c);
+ }
}
}
listAdapter.notifyDataSetChanged();
@@ -892,14 +901,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
}
TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
- String mapDescr = getMapDescription(child.getFileName());
- String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
-
- if (mapDescr.length() > 0){
- viewName.setText(mapDescr + " - " + mapName);
- } else {
- viewName.setText(mapName);
- }
+ viewName.setText(getNameToDisplay(child));
if (child.isNotSupported()) {
viewName.setTextColor(warningColor);
viewName.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
@@ -957,6 +959,17 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
return v;
}
+ private String getNameToDisplay(LocalIndexInfo child) {
+ String mapDescr = getMapDescription(child.getFileName());
+ String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
+
+ if (mapDescr.length() > 0){
+ return mapDescr + " - " + mapName;
+ } else {
+ return mapName;
+ }
+ }
+
@Override
public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
View v = convertView;
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index fd193284d1..3a123d86af 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -84,7 +84,7 @@ public class UpdatesIndexFragment extends SherlockListFragment {
return;
}
- List download = e.createDownloadEntry(getMyApplication(), getDownloadActivity().getDownloadType(), new ArrayList());
+ List download = e.createDownloadEntry(getMyApplication(), e.getType(), new ArrayList());
if (download.size() > 0) {
getDownloadActivity().getEntriesToDownload().put(e, download);
getDownloadActivity().updateDownloadButton(true);
diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
index efca4cf05d..04beefd12c 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java
@@ -124,6 +124,7 @@ public class AvoidSpecificRoads {
}
});
+ bld.setPositiveButton(R.string.default_buttons_ok, null);
bld.show();
}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index b55c1a07e5..1bafa0240f 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -57,7 +57,7 @@ public class WaypointHelper {
public static final int FAVORITES = 3;
public static final int ALARMS = 4;
public static final int MAX = 5;
- public static final int[] SEARCH_RADIUS_VALUES = {50, 100, 250, 500, 1000, 1500};
+ public static final int[] SEARCH_RADIUS_VALUES = {50, 100, 150, 250, 500, 1000, 1500};
private List> locationPoints = new ArrayList>();
private ConcurrentHashMap locationPointsStates = new ConcurrentHashMap();
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index 7d49fdae14..176f3aa7ef 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -41,6 +41,7 @@ import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.view.Gravity;
import android.view.View;
+import android.view.WindowManager;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
@@ -312,6 +313,9 @@ public class EditingPOIActivity implements DialogProvider {
private Dialog createPOIDialog(final int dialogID, Bundle args) {
final Dialog dlg = new Dialog(ctx);
dlg.setContentView(R.layout.editing_poi);
+
+ dlg.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);;
+
nameText = ((EditText)dlg.findViewById(R.id.Name));
openingHours = ((EditText)dlg.findViewById(R.id.OpeningHours));
typeText = ((AutoCompleteTextView)dlg.findViewById(R.id.Type));
diff --git a/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java b/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
index 69eeb661f0..1fbfb61893 100644
--- a/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
+++ b/OsmAnd/src/net/osmand/plus/views/corenative/NativeQtLibrary.java
@@ -12,10 +12,10 @@ import javax.microedition.khronos.egl.EGLSurface;
import net.osmand.core.android.CoreResourcesFromAndroidAssetsCustom;
import net.osmand.core.jni.AtlasMapRendererConfiguration;
-import net.osmand.core.jni.BinaryMapDataProvider;
-import net.osmand.core.jni.BinaryMapPrimitivesProvider;
-import net.osmand.core.jni.BinaryMapRasterLayerProvider_Software;
-import net.osmand.core.jni.BinaryMapStaticSymbolsProvider;
+import net.osmand.core.jni.ObfMapObjectsProvider;
+import net.osmand.core.jni.MapPrimitivesProvider;
+import net.osmand.core.jni.MapRasterLayerProvider_Software;
+import net.osmand.core.jni.MapObjectsSymbolsProvider;
import net.osmand.core.jni.IMapRenderer;
import net.osmand.core.jni.Logger;
import net.osmand.core.jni.MapPresentationEnvironment;
@@ -26,7 +26,7 @@ import net.osmand.core.jni.ObfsCollection;
import net.osmand.core.jni.OnlineRasterMapLayerProvider;
import net.osmand.core.jni.OnlineTileSources;
import net.osmand.core.jni.OsmAndCore;
-import net.osmand.core.jni.Primitiviser;
+import net.osmand.core.jni.MapPrimitiviser;
import net.osmand.core.jni.QIODeviceLogSink;
import net.osmand.core.jni.ResolvedMapStyle;
import net.osmand.plus.OsmandApplication;
@@ -158,15 +158,15 @@ public class NativeQtLibrary {
MapPresentationEnvironment presentation = notGc(new MapPresentationEnvironment(mapStyle, displayDensityFactor, "en"));
//TODO: here should be current locale
//mapPresentationEnvironment->setSettings(configuration.styleSettings);
- BinaryMapPrimitivesProvider binaryMapPrimitivesProvider = notGc(new BinaryMapPrimitivesProvider(
- notGc(new BinaryMapDataProvider(obfsCollection)),
- notGc(new Primitiviser(presentation)), rasterTileSize));
- BinaryMapRasterLayerProvider_Software binaryMapRasterLayerProvider = notGc(new BinaryMapRasterLayerProvider_Software(
- binaryMapPrimitivesProvider));
- mapRenderer.setMapLayerProvider(0, binaryMapRasterLayerProvider);
- BinaryMapStaticSymbolsProvider binaryMapStaticSymbolsProvider = notGc(new BinaryMapStaticSymbolsProvider(
- binaryMapPrimitivesProvider, rasterTileSize));
- mapRenderer.addSymbolsProvider(binaryMapStaticSymbolsProvider);
+ MapPrimitivesProvider mapPrimitivesProvider = notGc(new MapPrimitivesProvider(
+ notGc(new ObfMapObjectsProvider(obfsCollection)),
+ notGc(new MapPrimitiviser(presentation)), rasterTileSize));
+ MapRasterLayerProvider_Software mapRasterLayerProvider = notGc(new MapRasterLayerProvider_Software(
+ mapPrimitivesProvider));
+ mapRenderer.setMapLayerProvider(0, mapRasterLayerProvider);
+ MapObjectsSymbolsProvider mapObjectsSymbolsProvider = notGc(new MapObjectsSymbolsProvider(
+ mapPrimitivesProvider, rasterTileSize));
+ mapRenderer.addSymbolsProvider(mapObjectsSymbolsProvider);
} else {
OnlineRasterMapLayerProvider onlineMapRasterLayerProvider = notGc(OnlineTileSources.getBuiltIn()
.createProviderFor("Mapnik (OsmAnd)"));