Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into live_monitoring_fixes

Browse source
This commit is contained in:
PavelRatushny 2017-07-20 18:56:16 +03:00
commit 578f9c82fc
114 changed files with 870 additions and 477 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java
View file

@ -37,8 +37,8 @@ public class GeocodingUtilities {
private static final Log log = PlatformUtil.getLog(GeocodingUtilities.class);
// Location to test parameters http://www.openstreetmap.org/#map=18/53.896473/27.540071 (hno 44)
// BUG http://www.openstreetmap.org/#map=19/50.9356/13.35348 (hno 26) street is
// Location to test parameters https://www.openstreetmap.org/#map=18/53.896473/27.540071 (hno 44)
// BUG https://www.openstreetmap.org/#map=19/50.9356/13.35348 (hno 26) street is
public static final float THRESHOLD_MULTIPLIER_SKIP_STREETS_AFTER = 5;
public static final float STOP_SEARCHING_STREET_WITH_MULTIPLIER_RADIUS = 250;
public static final float STOP_SEARCHING_STREET_WITHOUT_MULTIPLIER_RADIUS = 400;

2
OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -20,7 +20,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* reference : http://wiki.openstreetmap.org/wiki/Map_Features
* reference : https://wiki.openstreetmap.org/wiki/Map_Features
*/
public abstract class MapRenderingTypes {

8
OsmAnd-java/src/net/osmand/search/SearchUICore.java
View file

@ -372,7 +372,13 @@ public class SearchUICore {
SearchResultMatcher rm = new SearchResultMatcher(matcher, phrase, request, requestNumber, totalLimit);
rm.searchStarted(phrase);
if (TIMEOUT_BETWEEN_CHARS > 0 && delayedExecution) {
Thread.sleep(TIMEOUT_BETWEEN_CHARS);
long startTime = System.currentTimeMillis();
while (System.currentTimeMillis() - startTime <= TIMEOUT_BETWEEN_CHARS) {
if (rm.isCancelled()) {
return;
}
Thread.sleep(TIMEOUT_BEFORE_SEARCH);
}
} else if (TIMEOUT_BEFORE_SEARCH > 0) {
Thread.sleep(TIMEOUT_BEFORE_SEARCH);
}

44
OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java
View file

@ -266,20 +266,20 @@ public class GeoPointParserUtil {
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://openstreetmap.org/#map=11/34/-106
// https://openstreetmap.org/#map=11/34/-106
z = 11;
url = "https://openstreetmap.org/#map=" + z + "/" + ilat + "/" + ilon;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
// http://openstreetmap.org/#map=11/34.99393/-106.61568
// https://openstreetmap.org/#map=11/34.99393/-106.61568
url = "https://openstreetmap.org/#map=" + z + "/" + dlat + "/" + dlon;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://openstreetmap.org/#11/34.99393/-106.61568
// https://openstreetmap.org/#11/34.99393/-106.61568
url = "https://openstreetmap.org/#" + z + "/" + dlat + "/" + dlon;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
@ -300,52 +300,52 @@ public class GeoPointParserUtil {
// https://wiki.openstreetmap.org/wiki/Shortlink
// http://osm.org/go/TyFSutZ-?m=
// https://osm.org/go/TyFSutZ-?m=
// https://www.openstreetmap.org/?mlat=34.993933029174805&mlon=-106.61568069458008#map=15/34.99393/-106.61568
z = 15;
url = "http://osm.org/go/TyFYuF6P--?m=";
url = "https://osm.org/go/TyFYuF6P--?m=";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertApproximateGeoPoint(actual, new GeoParsedPoint(longLat, longLon, z));
// http://osm.org/go/TyFS--
// http://www.openstreetmap.org/#map=3/34.99/-106.70
// https://osm.org/go/TyFS--
// https://www.openstreetmap.org/#map=3/34.99/-106.70
z = 3;
url = "http://osm.org/go/TyFS--";
url = "https://osm.org/go/TyFS--";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertApproximateGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://osm.org/go/TyFYuF6P~~-?m // current shortlink format with "~"
// https://osm.org/go/TyFYuF6P~~-?m // current shortlink format with "~"
// https://www.openstreetmap.org/?mlat=34.993933029174805&mlon=-106.61568069458008#map=15/34.99393/-106.61568
z = 20;
url = "http://osm.org/go/TyFYuF6P~~-?m";
url = "https://osm.org/go/TyFYuF6P~~-?m";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertApproximateGeoPoint(actual, new GeoParsedPoint(longLat, longLon, z));
// http://osm.org/go/TyFYuF6P@@--?m= // old, deprecated shortlink format with "@"
// https://osm.org/go/TyFYuF6P@@--?m= // old, deprecated shortlink format with "@"
// https://www.openstreetmap.org/?mlat=34.993933029174805&mlon=-106.61568069458008#map=15/34.99393/-106.61568
z = 21;
url = "http://osm.org/go/TyFYuF6P@@--?m=";
url = "https://osm.org/go/TyFYuF6P@@--?m=";
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertApproximateGeoPoint(actual, new GeoParsedPoint(longLat, longLon, z));
// http://openstreetmap.de/zoom=11&lat=34&lon=-106
// https://openstreetmap.de/zoom=11&lat=34&lon=-106
z = 11;
url = "https://openstreetmap.de/zoom=" + z + "&lat=" + ilat + "&lon=" + ilon;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
// http://openstreetmap.de/zoom=11&lat=34.99393&lon=-106.61568
// https://openstreetmap.de/zoom=11&lat=34.99393&lon=-106.61568
url = "https://openstreetmap.de/zoom=" + z + "&lat=" + dlat + "&lon=" + dlon;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
// http://openstreetmap.de/lat=34.99393&lon=-106.61568&zoom=11
// https://openstreetmap.de/lat=34.99393&lon=-106.61568&zoom=11
url = "https://openstreetmap.de/lat=" + dlat + "&lon=" + dlon + "&zoom=" + z;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
@ -656,13 +656,13 @@ public class GeoPointParserUtil {
String urls[] = {
"https://openstreetmap.org/go/0LQ127-?m",
"http://osm.org/go/0LQ127-?m",
"http://osm.org/go/0EEQjE==",
"http://osm.org/go/0EEQjEEb",
"http://osm.org/go/0EE~jEEb",
"http://osm.org/go/0EE@jEEb",
"http://osm.org/go/~~~~",
"http://osm.org/go/@@@@",
"https://osm.org/go/0LQ127-?m",
"https://osm.org/go/0EEQjE==",
"https://osm.org/go/0EEQjEEb",
"https://osm.org/go/0EE~jEEb",
"https://osm.org/go/0EE@jEEb",
"https://osm.org/go/~~~~",
"https://osm.org/go/@@@@",
"https://www.openstreetmap.org/#map=0/0/0",
"https://www.openstreetmap.org/#map=0/180/180",
"https://www.openstreetmap.org/#map=0/-180/-180",

6
OsmAnd-java/src/net/osmand/util/MapUtils.java
View file

@ -302,9 +302,9 @@ public class MapUtils {
}
// Examples
// System.out.println(buildShortOsmUrl(51.51829d, 0.07347d, 16)); // http://osm.org/go/0EEQsyfu
// System.out.println(buildShortOsmUrl(52.30103d, 4.862927d, 18)); // http://osm.org/go/0E4_JiVhs
// System.out.println(buildShortOsmUrl(40.59d, -115.213d, 9)); // http://osm.org/go/TelHTB--
// System.out.println(buildShortOsmUrl(51.51829d, 0.07347d, 16)); // https://osm.org/go/0EEQsyfu
// System.out.println(buildShortOsmUrl(52.30103d, 4.862927d, 18)); // https://osm.org/go/0E4_JiVhs
// System.out.println(buildShortOsmUrl(40.59d, -115.213d, 9)); // https://osm.org/go/TelHTB--
public static String buildShortOsmUrl(double latitude, double longitude, int zoom) {
return BASE_SHORT_OSM_URL + createShortLinkString(latitude, longitude, zoom) + "?m";
}

7
OsmAnd/no_translate.xml
View file

@ -11,7 +11,7 @@
<string name="ga_dispatchPeriod">10</string>
<string name="ga_debug">true</string>
<string name="versionFeatures">+play_market -amazon -blackberry</string>
<string name="openstreetmap_copyright"><a href="http://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
<string name="openstreetmap_copyright"><a href="https://www.openstreetmap.org/copyright">&#169; OpenStreetMap</a></string>
<string name="app_edition"></string>
<string name="support_email">support@osmand.net</string>
<string name="preferred_locale_no_translate">Display language</string>
@ -26,5 +26,10 @@
<string name="twitter_address">https://twitter.com/osmandapp</string>
<string name="facebook_address">https://www.facebook.com/osmandapp</string>
<string name="vk_address">https://vk.com/osmandapp</string>
<string name="default_changeset_add">Add</string>
<string name="default_changeset_edit">Edit</string>
<string name="default_changeset_delete">Delete</string>
<string name="default_changeset_reopen">Reopen</string>
<string name="items_modified">items modified</string>
</resources>

BIN
OsmAnd/res/drawable-hdpi/image_text_osmand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-hdpi/image_text_osmand_inapp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-hdpi/image_text_osmand_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
OsmAnd/res/drawable-hdpi/image_text_osmand_plus.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
OsmAnd/res/drawable-hdpi/image_text_osmand_plus_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
OsmAnd/res/drawable-hdpi/map_bicycle_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
OsmAnd/res/drawable-hdpi/map_bicycle_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
OsmAnd/res/drawable-hdpi/map_car_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_car_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_default_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_default_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_pedestrian_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-hdpi/map_pedestrian_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_osmand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_osmand_inapp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_osmand_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_osmand_plus.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_osmand_plus_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-mdpi/map_bicycle_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-mdpi/map_bicycle_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-mdpi/map_car_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-mdpi/map_car_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-mdpi/map_default_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-mdpi/map_default_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-mdpi/map_pedestrian_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-mdpi/map_pedestrian_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

10
OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand"/>
</item>
</layer-list>

10
OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_free_dev.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand"/>
</item>
</layer-list>

10
OsmAnd/res/drawable-sw600dp-v21/first_splash_screen_plus.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand_plus"/>
</item>
</layer-list>

4
OsmAnd/res/drawable-sw600dp/first_splash_screen_free.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/map_background_color_light"/>
</shape>

4
OsmAnd/res/drawable-sw600dp/first_splash_screen_free_dev.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/map_background_color_light"/>
</shape>

4
OsmAnd/res/drawable-sw600dp/first_splash_screen_plus.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/map_background_color_light"/>
</shape>

BIN
OsmAnd/res/drawable-xhdpi/image_text_osmand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/image_text_osmand_inapp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
OsmAnd/res/drawable-xhdpi/image_text_osmand_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/image_text_osmand_plus.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-xhdpi/image_text_osmand_plus_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_bicycle_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_bicycle_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_car_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_car_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_default_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_default_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_pedestrian_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-xhdpi/map_pedestrian_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_osmand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_osmand_inapp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_osmand_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_osmand_plus.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_osmand_plus_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_bicycle_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_bicycle_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_car_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_car_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_default_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_default_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_pedestrian_location_lost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
OsmAnd/res/drawable-xxhdpi/map_pedestrian_location_lost_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_osmand.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_osmand_inapp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_osmand_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_osmand_plus.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_osmand_plus_osmlive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

4
OsmAnd/res/drawable/first_splash_screen_free.xml
View file

@ -2,9 +2,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center"
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand"/>
</item>
</layer-list>

4
OsmAnd/res/drawable/first_splash_screen_free_dev.xml
View file

@ -2,9 +2,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center"
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand"/>
</item>
</layer-list>

4
OsmAnd/res/drawable/first_splash_screen_plus.xml
View file

@ -2,9 +2,9 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:opacity="opaque">
<item android:drawable="@color/map_background_color_light"/>
<item>
<item android:top="@dimen/splash_screen_logo_top">
<bitmap
android:gravity="center"
android:gravity="center_horizontal|top"
android:src="@drawable/ic_logo_splash_osmand_plus"/>
</item>
</layer-list>

4
OsmAnd/res/values-ar/strings.xml
View file

@ -2569,8 +2569,8 @@
<string name="driving_region_automatic">آلي</string>
<string name="parking_options">خيارات مواقف السيارات</string>
<string name="full_version_thanks">شكرا لكم لاقتناء النسخة الكاملة من أوسماند !</string>
<string name="routing_attr_driving_style_speed_name">السرعة</string>
<string name="routing_attr_driving_style_safety_name">الأمان</string>
<string name="routing_attr_driving_style_speed_name">قبول الطرق الرئيسية</string>
<string name="routing_attr_driving_style_safety_name">تفضيل الشوارع الجانبية</string>
<string name="gpx_track">المسار</string>
<string name="select_gpx_folder">إختر مجلد المسار</string>
<string name="shared_string_tracks">المسارات</string>

3
OsmAnd/res/values-b+hsb/strings.xml
View file

@ -904,4 +904,5 @@
<string name="storage_directory_card">Składowanska karta</string>
<string name="coords_format">Format koordinatow</string>
<string name="coords_format_descr">Format za geografiske koordinaty</string>
</resources>
<string name="mapillary">Mapillary</string>
</resources>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -701,7 +701,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
<string name="target_point">Destinació %1$s</string>
<string name="target_points">Destinacions</string>
<string name="intermediate_point_too_far">La fita %1$s és massa lluny de la carretera més propera.</string>
<string name="arrived_at_intermediate_point">Heu arribat a la vostra fita</string>
<string name="arrived_at_intermediate_point">Heu arribat a la vostra destinació intermèdia</string>
<string name="context_menu_item_intermediate_point">Afegeix com una fita</string>
<string name="map_widget_intermediate_distance">Fita</string>
<string name="ending_point_too_far">El punt final és massa lluny de la carretera més propera.</string>

4
OsmAnd/res/values-cs/strings.xml
View file

@ -2554,9 +2554,9 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
<string name="routing_attr_relief_smoothness_factor_hills_name">Kopcovitý</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Méně kopcovitý</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Rovinatý</string>
<string name="routing_attr_driving_style_speed_name">Rychlý</string>
<string name="routing_attr_driving_style_speed_name">Preferovat hlavní silnice</string>
<string name="routing_attr_driving_style_balance_name">Vyvážený</string>
<string name="routing_attr_driving_style_safety_name">Bezpečný</string>
<string name="routing_attr_driving_style_safety_name">Preferovat vedlejší silnice</string>
<string name="relief_smoothness_factor_descr">Priorita terénu: rovinatý nebo kopcovitý</string>
<string name="shared_string_slope">Svah</string>
<string name="lang_ber">Berbersky</string>

6
OsmAnd/res/values-da/strings.xml
View file

@ -2651,7 +2651,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Kuperet</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Mindre kuperet</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Fladt</string>
<string name="routing_attr_driving_style_speed_name">Foretræk større veje</string>
<string name="routing_attr_driving_style_speed_name">Accepter større veje</string>
<string name="routing_attr_driving_style_balance_name">Balanceret</string>
<string name="routing_attr_driving_style_safety_name">Foretrækk sideveje</string>
<string name="relief_smoothness_factor_descr">Foretruknet terræn: fladt eller kuperet</string>
@ -2808,6 +2808,6 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
<string name="quick_action_resume_pause_navigation">Genoptag/pause navigation</string>
<string name="quick_action_resume_pause_navigation_descr">Tryk på knappen pause navigation eller genoptag, hvis den allerede var sat på pause.</string>
<string name="quick_action_show_navigation_finish_dialog">Vis Afslut navigation dialog</string>
<string name="quick_action_start_stop_navigation">Start/slut Navigation</string>
<string name="quick_action_start_stop_navigation_descr">Tryk på knappen for at starte navigationen eller stoppe den, hvis den allerede var begyndt.</string>
<string name="quick_action_start_stop_navigation">Start/slut navigation</string>
<string name="quick_action_start_stop_navigation_descr">Tryk på knappen for at starte navigation eller stoppe, hvis den allerede var begyndt.</string>
</resources>

5
OsmAnd/res/values-de/phrases.xml
View file

@ -3410,4 +3410,9 @@
<string name="poi_animal_shelter_mammal">Säugetiere</string>
<string name="poi_animal_shelter_fish">Fische</string>
<string name="poi_animal_shelter_type">Tierannahme</string>
<string name="poi_animal_shelter_purpose">Bestimmung</string>
<string name="poi_owner">Eigentümer</string>
</resources>

4
OsmAnd/res/values-eo/strings.xml
View file

@ -2487,9 +2487,9 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Malebena</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Malpli ebena</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Ebena</string>
<string name="routing_attr_driving_style_speed_name">Rapida</string>
<string name="routing_attr_driving_style_speed_name">Akcepti ĉefajn vojojn</string>
<string name="routing_attr_driving_style_balance_name">Ekvilibra</string>
<string name="routing_attr_driving_style_safety_name">Sekura</string>
<string name="routing_attr_driving_style_safety_name">Preferi flankajn vojojn</string>
<string name="routing_attr_relief_smoothness_factor_name">Elekti nivel-ombruman glatecon</string>
<string name="full_version_thanks">Dankon al ci por aĉeti la plenan version de OsmAnd!</string>
<string name="parking_options">Parkumadaj agordoj</string>

4
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2463,9 +2463,9 @@ Proporciona un código completo</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Empinado</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Poco empinado</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Plano (llanura)</string>
<string name="routing_attr_driving_style_speed_name">Velocidad</string>
<string name="routing_attr_driving_style_speed_name">Preferir caminos principales</string>
<string name="routing_attr_driving_style_balance_name">Equilibrado</string>
<string name="routing_attr_driving_style_safety_name">Seguridad</string>
<string name="routing_attr_driving_style_safety_name">Preferir caminos secundarios</string>
<string name="relief_smoothness_factor_descr">Terreno preferido: llano o empinado</string>
<string name="do_not_send_anonymous_app_usage">No enviar estadísticas de uso anónimas de la aplicación</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd recopila información acerca de las secciones que abres en la aplicación. No recopilamos datos de ubicación, ingresos en la aplicación o datos relacionados con las áreas que visualizas, buscas o descargas.</string>

4
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -2463,9 +2463,9 @@ Proporciona un código completo</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Empinado</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Poco empinado</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Plano (llanura)</string>
<string name="routing_attr_driving_style_speed_name">Velocidad</string>
<string name="routing_attr_driving_style_speed_name">Preferir caminos principales</string>
<string name="routing_attr_driving_style_balance_name">Equilibrado</string>
<string name="routing_attr_driving_style_safety_name">Seguridad</string>
<string name="routing_attr_driving_style_safety_name">Preferir caminos secundarios</string>
<string name="relief_smoothness_factor_descr">Terreno preferido: llano o empinado</string>
<string name="do_not_send_anonymous_app_usage">No enviar estadísticas de uso anónimas de la aplicación</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd recopila información acerca de las secciones que abres en la aplicación. No recopilamos datos de ubicación, ingresos en la aplicación o datos relacionados con las áreas que visualizas, buscas o descargas.</string>

4
OsmAnd/res/values-es/strings.xml
View file

@ -2436,9 +2436,9 @@ Por favor proporciona un código completo</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Empinado</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Poco empinado</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Llano</string>
<string name="routing_attr_driving_style_speed_name">Velocidad</string>
<string name="routing_attr_driving_style_speed_name">Preferir carreteras principales</string>
<string name="routing_attr_driving_style_balance_name">Equilibrado</string>
<string name="routing_attr_driving_style_safety_name">Seguridad</string>
<string name="routing_attr_driving_style_safety_name">Preferir carreteras secundarias</string>
<string name="relief_smoothness_factor_descr">Terreno preferido: llano o empinado</string>
<string name="lang_ber">Bereber</string>
<string name="do_not_send_anonymous_app_usage">No enviar estadísticas de uso anónimas de la aplicación</string>

4
OsmAnd/res/values-fr/strings.xml
View file

@ -2644,9 +2644,9 @@ représentant la zone : %1$s x %2$s</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Vallonné</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Moins vallonné</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Plat</string>
<string name="routing_attr_driving_style_speed_name">Rapide</string>
<string name="routing_attr_driving_style_speed_name">Privilégier les routes principales</string>
<string name="routing_attr_driving_style_balance_name">Équilibré</string>
<string name="routing_attr_driving_style_safety_name">Sûre</string>
<string name="routing_attr_driving_style_safety_name">Privilégier les routes secondaires</string>
<string name="full_version_thanks">Merci d\'avoir acheté la version complète d\'OsmAnd !</string>
<string name="routing_attr_relief_smoothness_factor_name">Sélectionnez les préférences de relief</string>
<string name="parking_options">Choix de stationnement</string>

38
OsmAnd/res/values-he/strings.xml
View file

@ -1213,4 +1213,42 @@
<string name="mapillary_menu_edit_text_hint">הקלדת שם משתמש</string>
<string name="mapillary_menu_descr_username">הצגת תמונות שנוספו על ידי משתמש מסוים.</string>
<string name="mapillary_menu_title_username">שם משתמש</string>
<string name="mapillary_menu_filter_description">אפשר לסנן תמונות לפי השולח או לפי תאריך. המסננים חלים רק על תקריב בגודל מסוים.</string>
<string name="map_widget_ruler_control">מד זווית</string>
<string name="shared_string_permissions">הרשאות</string>
<string name="import_gpx_failed_descr">ל־OsmAnd אין אפשרות לייבא את הקובץ. נא לוודא של־OsmAnd יש הרשאה לקרוא קבצים מהמיקום הזה.</string>
<string name="distance_moving">המרחק תוקן</string>
<string name="quick_action_resume_pause_navigation">הפסקה/המשך בניווט</string>
<string name="quick_action_resume_pause_navigation_descr">יש ללחוץ על כפתור זה כדי להפסיק את הניווט או כדי להמשיך אם הוא כבר הופסק.</string>
<string name="quick_action_show_navigation_finish_dialog">הצגת דו־שיח סיום הניווט</string>
<string name="quick_action_start_stop_navigation">התחלה/סיום הניווט</string>
<string name="quick_action_start_stop_navigation_descr">יש ללחוץ על כפתור זה כדי להתחיל בניווט או כדי לעצור אותו אם הוא כבר החל.</string>
<string name="store_tracks_in_monthly_directories_descrp">אחסון המסלולים המוקלטים בתת־תיקיות לפי חודש ההקלטה (למשל: 2017-01).</string>
<string name="mapillary_image">תמונת Mapillary</string>
<string name="open_mapillary">פתיחת Mapillary</string>
<string name="shared_string_install">התקנה</string>
<string name="improve_coverage_mapillary">שיפור כיסוי התמונות עם Mapillary</string>
<string name="improve_coverage_install_mapillary_desc">ניתן לצלם סדרת תמונות משלך ולצרף אותם למיקום הזה במפה.
\n
\nכדי לעשות זאת עליך להתקין את היישום של Mapillary מחנות היישומים Google Play.</string>
<string name="online_photos">תמונות מקוונות</string>
<string name="shared_string_add_photos">הוספת תמונות</string>
<string name="no_photos_descr">אין לנו תמונות במיקום זה</string>
<string name="mapillary_action_descr">ניתן לתרום עם נופים ברמת הרחוב למיקום זה עם Mapillary.</string>
<string name="mapillary_widget">וידג׳ט Mapillary</string>
<string name="mapillary_widget_descr">מאפשר לך לתרום במהירות ל־Mapillary</string>
<string name="mapillary_descr">תמונות מקוונות ברמת רחוב לכולם. היכרות עם מקומות חדשים, שיתוף פעולה וצילום העולם.</string>
<string name="mapillary">Mapillary</string>
<string name="plugin_mapillary_descr">תמונות ברמת הרחוב לכולם. להכיר מקומות, לשתף פעולה ולצלם את העולם.</string>
<string name="private_access_routing_req">היעד שלך ממוקם באיזור עם גישה פרטית לאפשר גישה לכבישים הפרטיים לצורך טיול זה?</string>
<string name="restart_search">חיפוש מחדש</string>
<string name="increase_search_radius">הגדלת רדיוס החיפוש</string>
<string name="nothing_found">לא נמצא כלום :(</string>
<string name="nothing_found_descr">יש לשנות את הביטוי לחיפוש או להגדיל את רדיוס החיפוש</string>
<string name="quick_action_showhide_osmbugs_title">הצגה/הסתרה של הערות OSM</string>
<string name="quick_action_osmbugs_show">הצגת הערות OSM</string>
<string name="quick_action_osmbugs_hide">הסתרת הערות OSM</string>
<string name="quick_action_showhide_osmbugs_descr">לחיצה על כפתור הפעולה תגרום להצגת או הסתרה של הערות OSM על המפה.</string>
<string name="sorted_by_distance">מסודר לפי מרחק</string>
<string name="search_favorites">חיפוש במועדפים</string>
</resources>

26
OsmAnd/res/values-hu/phrases.xml
View file

@ -201,7 +201,7 @@
<string name="poi_craft_electrician">Villanyszerelő</string>
<string name="poi_craft_gardener">Kertész</string>
<string name="poi_craft_jeweller">Ékszerész</string>
<string name="poi_craft_locksmith">Lakatos</string>
<string name="poi_craft_locksmith">Zárlakatos</string>
<string name="poi_craft_key_cutter">Kulcsmásoló</string>
<string name="poi_craft_photographer">Fényképész</string>
<string name="poi_craft_photographic_laboratory">Fotólabor</string>
@ -456,7 +456,7 @@
<string name="poi_swimming">Úszás</string>
<string name="poi_tennis">Tenisz</string>
<string name="poi_archaeological_site">Régészeti lelőhely</string>
<string name="poi_battlefield">Csatamező</string>
<string name="poi_battlefield">Csatatér</string>
<string name="poi_boundary_stone">Határkő</string>
<string name="poi_historic_cannon">Történelmi ágyú</string>
<string name="poi_rune_stone">Rúnakő</string>
@ -1358,7 +1358,7 @@
<string name="poi_memorial_plaque">Emléktábla</string>
<string name="poi_memorial_statue">Szobor</string>
<string name="poi_memorial_stone">Kő</string>
<string name="poi_memorial_stele">Sztélé</string>
<string name="poi_memorial_stele">Kopjafa, sztélé</string>
<string name="poi_memorial_bust">Mellszobor</string>
<string name="poi_memorial_vehicle">Jármű</string>
<string name="poi_memorial_obelisk">Obeliszk</string>
@ -1689,7 +1689,7 @@
<string name="poi_artwork_type_mosaic">Műalkotás típusa: mozaik</string>
<string name="poi_artwork_type_relief">Műalkotás típusa: dombormű</string>
<string name="poi_artwork_type_graffiti">Műalkotás típusa: graffiti</string>
<string name="poi_artwork_type_stele">Műalkotás típusa: sztélé</string>
<string name="poi_artwork_type_stele">Műalkotás típusa: kopjafa, sztélé</string>
<string name="poi_artwork_type_fountain">Műalkotás típusa: szökőkút</string>
<string name="poi_width">Szélesség</string>
@ -3410,4 +3410,20 @@
<string name="poi_owner">Tulajdonos</string>
</resources>
<string name="poi_animal_shelter_type">Fogadott állatok</string>
<string name="poi_animal_shelter_purpose">Cél</string>
<string name="poi_animal_shelter_wildlife">Vadon élő</string>
<string name="poi_animal_shelter_horse">Ló</string>
<string name="poi_animal_shelter_mammal">Emlős</string>
<string name="poi_animal_shelter_fish">Hal</string>
<string name="poi_animal_shelter_purpose_adoption_yes">Örökbeadás</string>
<string name="poi_animal_shelter_purpose_adoption_no">Nem adnak örökbe</string>
<string name="poi_animal_shelter_purpose_release_yes">Szabadon engedés</string>
<string name="poi_animal_shelter_purpose_release_no">Nem engedik szabadon</string>
<string name="poi_spaceport">Űrrepülőtér</string>
<string name="poi_lock_basin">Zsilipmedence</string>
</resources>

101
OsmAnd/res/values-it/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string>
@ -1220,7 +1221,7 @@ I dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni d
<string name="app_mode_boat">Barca</string>
<string name="app_mode_aircraft">Aereo</string>
<string name="map_widget_map_rendering">Disegno della mappa</string>
<string name="app_modes_choose_descr">Scegli fra le modalità d\'uso disponibili dell\'applicazione</string>
<string name="app_modes_choose_descr">Scegli i profili d\'uso del l\'applicazione da rendere visibili</string>
<string name="app_modes_choose">Profili applicazione</string>
<string name="amenity_type_seamark">Mare</string>
@ -1327,14 +1328,11 @@ I dati globali (fra i 70 gradi nord e 70 gradi sud) sono basati su misurazioni d
<string name="navigation_intent_invalid">Formato non valido: %s</string>
<string name="osmo_settings_uuid">ID univoco del dispositivo</string>
<string name="osmo_settings_descr">Configura le impostazioni di monitoraggio e imposta il canale di monitoraggio personale</string>
<string name="osmo_plugin_description">"Questo componente aggiuntivo fornisce parzialmente le funzionalità del monitoraggio di OpenStreetMap, vedi http://osmo.mobi.
Puoi tracciare in tempo reale tutti i dispositivi di un gruppo di partecipanti. Puoi anche visualizzare i punti e le tracce caricate dal gruppo a cui appartieni.
Il gruppo che non è stato rimosso da mesi viene allineato con le tue regole per la creazione di gruppi nel sito OsMo.mobi
"</string>
<string name="osmo_plugin_description">Questo componente aggiuntivo fornisce parzialmente le funzionalità del monitoraggio di OpenStreetMap, vedi http://osmo.mobi.
\n
\nPuoi tracciare in tempo reale tutti i dispositivi di un gruppo di partecipanti. Puoi anche visualizzare i punti e le tracce caricate dal gruppo a cui appartieni.
\n
\nIl gruppo che non è stato rimosso da mesi viene allineato con le tue regole per la creazione di gruppi nel sito OsMo.mobi</string>
<string name="osmo_plugin_name">Monitoraggio OpenStreetMap</string>
<string name="osmo_settings">OsMO</string>
<string name="keep_informing_never">Solo manualmente (tap sulla freccia)</string>
@ -1702,7 +1700,7 @@ Le tracce registrate possono essere condivise con i tuoi amici o essere usate pe
<string name="world_ski_missing">Per visualizzare le mappe per lo sci è necessario scaricare la mappa speciale offline</string>
<string name="nautical_maps_missing">Per visualizzare le mappe nautiche è necessario scaricare la mappa speciale offline</string>
<string name="rendering_attr_pisteGrooming_name">Finitura della pista</string>
<string name="free">"Libera %1$s "</string>
<string name="free">Libera %1$s</string>
<string name="device_memory">Memoria dispositivo</string>
<string name="rendering_attr_pisteRoutes_name">Piste da sci</string>
<string name="roads_only">Solo strade</string>
@ -2002,7 +2000,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
<string name="are_you_sure">Sei sicuro?</string>
<string name="unsaved_changes_will_be_lost">Tutte le modifiche non salvate andranno perse. Continuare?</string>
<string name="simulate_your_location_stop_descr">Arresta la simulazione del percorso</string>
<string name="simulate_your_location_descr">Simula utilizzando un GPX registrato o una percorso calcolato</string>
<string name="simulate_your_location_descr">Simula la posizione utilizzando un GPX registrato o una percorso calcolato</string>
<string name="downloads_left_template">%1$s download rimanenti</string>
<string name="favourites_edit_dialog_title">Informazioni preferite</string>
<string name="favourites_context_menu_add">Aggiungi preferito</string>
@ -2141,33 +2139,31 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
<string name="please_specify_poi_type_only_from_list">Specifica il corretto tipo di PDI o salta questo passaggio</string>
<string name="routing_attr_avoid_stairs_name">Evita le scale</string>
<string name="routing_attr_avoid_stairs_description">Evita le scale</string>
<string name="release_2_2">"
• Nuova interfaccia utente sensibile al contesto per le località selezionate sulla mappa e negli altri schermi
• La schermata della mappa è avviata direttamente se non è selezionato \"Mostra il pannello di controllo all\'avvio\"
• Configura quali e come vengono visualizzate le voci nel pannello di controllo
• Salta il pannello di controllo se preferisci i controlli dell\'app tipo menù
• Per scaricare mappe, regioni è possibile selezionarle direttamente tappando sulla mappa mondiale
• La ricerca di PDI ora supporta richieste più specifiche
• Migliorata la funzionalità modifica di PDI e OSM
• Riviste la struttura e l\'interfaccia di download dei dati della mappa
e altro…
"</string>
<string name="release_2_2">\\022 Nuova interfaccia utente sensibile al contesto per le località selezionate sulla mappa e negli altri schermi
\n
\n
\n • La schermata della mappa è avviata direttamente se non è selezionato \"Mostra il pannello di controllo all\'avvio\"
\n
\n
\n • Configura quali e come vengono visualizzate le voci nel pannello di controllo
\n
\n
\n • Salta il pannello di controllo se preferisci i controlli dell\'app tipo menù
\n
\n
\n • Per scaricare mappe, regioni è possibile selezionarle direttamente tappando sulla mappa mondiale
\n
\n
\n • La ricerca di PDI ora supporta richieste più specifiche
\n
\n
\n • Migliorata la funzionalità modifica di PDI e OSM
\n
\n
\n • Riviste la struttura e l\'interfaccia di download dei dati della mappa
\n
\n
\n e altro…</string>
<string name="dashboard_or_drawer_description">C\'è una nuova opzione per controllare l\'app attraverso il pannello di controllo personalizzabile o tramite il menù statico. La tua scelta può sempre essere modificata nelle impostazioni del pannello di controllo.</string>
<string name="shared_string_near">Vicino</string>
<string name="shared_string_hide">Nascondi</string>
@ -2689,9 +2685,9 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Collinoso</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Meno collinoso</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Pianeggiante</string>
<string name="routing_attr_driving_style_speed_name">Velocità</string>
<string name="routing_attr_driving_style_speed_name">Preferisci le strade principali</string>
<string name="routing_attr_driving_style_balance_name">Bilanciato</string>
<string name="routing_attr_driving_style_safety_name">Sicuro</string>
<string name="routing_attr_driving_style_safety_name">Preferisci byways</string>
<string name="relief_smoothness_factor_descr">Terreno preferito: pianeggiante o collinoso</string>
<string name="routing_attr_relief_smoothness_factor_name">Seleziona la fluttuazione della quota</string>
<string name="driving_region_automatic">Automatica</string>
@ -2851,4 +2847,25 @@ Copertura e qualità approssimativamente:
<string name="store_tracks_in_monthly_directories">Salva le tracce registrate in cartelle mensili</string>
<string name="store_tracks_in_monthly_directories_descrp">Salva le tracce registrate in sottocartelle per mese di registrazione (come 2017-01).</string>
<string name="shared_string_reset">Reimposta</string>
</resources>
<string name="quick_action_resume_pause_navigation_descr">Premi il pulsante per mettere in pausa la navigazione, oppure per riprenderla se è già in pausa.</string>
<string name="quick_action_show_navigation_finish_dialog">Mostra la finestra di dialogo Fine</string>
<string name="quick_action_start_stop_navigation">Inizio/Fine Navigazione</string>
<string name="quick_action_start_stop_navigation_descr">Premi questo pulsante per avviare la navigazione, o per fermarla se già avviata.</string>
<string name="rendering_value_translucent_pink_name">Rosa traslucido</string>
<string name="average">Media</string>
<string name="of">%1$d di %2$d</string>
<string name="ascent_descent">Guadagno/Perdita di quota</string>
<string name="moving_time">Tempo in movimento</string>
<string name="max_min">Max/Min</string>
<string name="min_max">Min/Max</string>
<string name="quick_action_resume_pause_navigation">Riprendi/Sospendi la Navigazione</string>
<string name="release_2_7">\\022 Componente aggiuntivo Mapillary con immagini stradali
\n
\n • Widget righello per la misurazione della distanza
\n
\n • Informazioni dettagliate e suddivisore delle tue tracce GPX
\n
\n • Altre migliorie e correzioni di errori
\n
\n</string>
</resources>

5
OsmAnd/res/values-sc/phrases.xml
View file

@ -2637,4 +2637,9 @@
<string name="poi_motorcycle_services">Servìtzios</string>
<string name="poi_motorcycle_type">Casta de mototzicleta</string>
<string name="poi_animal_shelter_type">Animales atzetados</string>
<string name="poi_animal_shelter_purpose">Punna</string>
<string name="poi_spaceport">Portu ispatziale</string>
</resources>

11
OsmAnd/res/values-sc/strings.xml
View file

@ -2559,16 +2559,16 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="points_delete_multiple">As a iscantzellare %1$d puntu/os. Seguru ses?</string>
<string name="track_points_category_name">Puntos importantes in custa àndala</string>
<string name="add_new_folder">Annanghe una cartella noa</string>
<string name="route_points_category_name">Puntos de colare in cust\'àndala</string>
<string name="route_points_category_name">Bortadas de colare in cust\'àndala</string>
<string name="shared_string_slope">Caladòrgia</string>
<string name="lang_ber">Bèrberu</string>
<string name="relief_smoothness_factor_descr">Terrinos preferidos: in paris o cun cùcuros</string>
<string name="routing_attr_relief_smoothness_factor_hills_name">Cùcuros/montigros</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Pagos cùcuros</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Terrinu in paris</string>
<string name="routing_attr_driving_style_speed_name">Lestru</string>
<string name="routing_attr_driving_style_speed_name">Privilègia sas istradas printzipales</string>
<string name="routing_attr_driving_style_balance_name">Bilantziadu</string>
<string name="routing_attr_driving_style_safety_name">Seguru</string>
<string name="routing_attr_driving_style_safety_name">Privilègia sas istradas segundàrias</string>
<string name="routing_attr_relief_smoothness_factor_name">Valore de variatzione de s\'artària</string>
<string name="full_version_thanks">Gràtzias pro àere comporadu sa versione intrea de OsmAnd!</string>
<string name="do_not_send_anonymous_app_usage">No imbies informatziones anònimas a pitzu de s\'impreu de s\'aplicatzione</string>
@ -2710,4 +2710,9 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="rendering_value_translucent_pink_name">Rosa translùtzidu</string>
<string name="average">Mèdiu</string>
<string name="ascent_descent">Ascendente/Discendente</string>
<string name="quick_action_resume_pause_navigation">Faghe sighire/Pone in pàusa su nàvigu</string>
<string name="quick_action_resume_pause_navigation_descr">Incarca custu butone pro pònnere in pàusa su nàvigu, o pru lu sighire si est giai in pàusa.</string>
<string name="quick_action_show_navigation_finish_dialog">Ammustra sa ventana pro sa fine de su nàvigu</string>
<string name="quick_action_start_stop_navigation">Incumintza/Acaba su nàvigu</string>
<string name="quick_action_start_stop_navigation_descr">Incarca custu butone pro incumintzare su nàvigu, o pro l\'acabare si est giai incumintzadu.</string>
</resources>

9
OsmAnd/res/values-uk/strings.xml
View file

@ -2667,8 +2667,8 @@
<string name="fonts_header">Шрифти для мапи</string>
<string name="right_side_navigation">Правосторонній рух</string>
<string name="routing_attr_driving_style_balance_name">Збалансований</string>
<string name="routing_attr_driving_style_safety_name">Безпечний</string>
<string name="routing_attr_driving_style_speed_name">Швидкісний</string>
<string name="routing_attr_driving_style_safety_name">Надавати перевагу путівцям</string>
<string name="routing_attr_driving_style_speed_name">Враховувати основні дороги</string>
<string name="animate_my_location">Анімувати моє місце розташування</string>
<string name="animate_my_location_desc">Задіяти анімацію мого місця розташування під час навігації</string>
<string name="do_not_show_startup_messages">Не показувати повідомлення при запуску</string>
@ -2944,4 +2944,9 @@
\n
\n</string>
<string name="rendering_value_translucent_pink_name">Напівпрозорий рожевий</string>
<string name="quick_action_resume_pause_navigation">Відновити/призупинити навігацію</string>
<string name="quick_action_resume_pause_navigation_descr">Натисніть цю кнопку, щоб призупинити навігацію або відновити її, якщо вона вже була призупинена.</string>
<string name="quick_action_show_navigation_finish_dialog">Показати вікно, щоб завершити навігацію</string>
<string name="quick_action_start_stop_navigation">Початок/завершення навігації</string>
<string name="quick_action_start_stop_navigation_descr">Натисніть цю кнопку, щоб запустити навігацію або зупинити її, якщо вона вже була запущена.</string>
</resources>

4
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2643,9 +2643,9 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="routing_attr_relief_smoothness_factor_hills_name">丘陵</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">小的丘陵</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">平地</string>
<string name="routing_attr_driving_style_speed_name">速度</string>
<string name="routing_attr_driving_style_speed_name">採用主要道路</string>
<string name="routing_attr_driving_style_balance_name">均衡</string>
<string name="routing_attr_driving_style_safety_name">安全性</string>
<string name="routing_attr_driving_style_safety_name">較喜歡小路</string>
<string name="relief_smoothness_factor_descr">偏愛的地形：平地或丘陵</string>
<string name="full_version_thanks">感謝您購買完整版的 OsmAnd！</string>
<string name="routing_attr_relief_smoothness_factor_name">選擇高度起伏</string>

30
OsmAnd/res/values/sizes.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="acceptable_touch_radius">48dp</dimen>
<dimen name="dialog_button_height">36dp</dimen>
<dimen name="undo_bottom_offset">15dp</dimen>
<dimen name="touch_slop">32dp</dimen>
@ -10,7 +12,7 @@
<dimen name="dashboard_land_width">360dp</dimen>
<dimen name="dashboard_map_toolbar">56dp</dimen>
<dimen name="dash_parking_height">78dp</dimen>
<dimen name="subHeaderPadding">2dp</dimen>
<dimen name="subHeaderMarginLeft">15dp</dimen>
<dimen name="showAllButtonMarginRight">14dp</dimen>
@ -30,15 +32,15 @@
<dimen name="dashCardMargin">4dp</dimen>
<dimen name="abp__shadow_height">4dp</dimen>
<dimen name="dashFABMargin">0dp</dimen>
<dimen name="list_content_padding">16dp</dimen>
<dimen name="list_header_padding">8dp</dimen>
<dimen name="list_header_top_margin">16dp</dimen>
<dimen name="list_header_settings_top_margin">10dp</dimen>
<dimen name="list_header_text_left_margin">12dp</dimen>
<dimen name="list_header_bottom_margin">8dp</dimen>
<dimen name="favorites_icon_right_margin">24dp</dimen>
<dimen name="local_index_check_right_margin">10dp</dimen>
<dimen name="favorites_icon_top_margin">13dp</dimen>
@ -50,8 +52,8 @@
<dimen name="gpx_small_icon_margin">3dp</dimen>
<dimen name="gpx_small_text_margin">14dp</dimen>
<dimen name="gpx_text_top_margin">6dp</dimen>
<dimen name="dashboard_parking_left_margin">16dp</dimen>
<dimen name="dashboard_parking_icon_size">48dp</dimen>
<!-- map buttons -->
@ -69,8 +71,8 @@
<dimen name="map_ruler_width">120dp</dimen>
<dimen name="map_ruler_bottom_margin">9dp</dimen>
<dimen name="map_alarm_size">78dp</dimen>
<dimen name="map_alarm_bottom_margin">87dp</dimen>
<dimen name="map_alarm_bottom_margin_land">57dp</dimen>
<dimen name="map_button_shadow_height">85dp</dimen>
@ -83,8 +85,8 @@
<dimen name="map_button_spacing_land">6dp</dimen>
<dimen name="map_button_margin">6dp</dimen>
<dimen name="map_routing_progress_width">100dp</dimen>
<dimen name="map_button_inset_shadow">2dp</dimen>
<dimen name="map_button_inset">2dp</dimen>
<dimen name="map_button_rect_rad">3dp</dimen>
@ -94,9 +96,9 @@
<dimen name="map_route_planning_land_width_minus_shadow">306dp</dimen>
<dimen name="map_route_planning_max_height">330dp</dimen>
<dimen name="map_minwidth_widget">100dp</dimen>
<dimen name="map_widget_text_size">23sp</dimen>
<dimen name="map_widget_text_size_small">15sp</dimen>
<dimen name="map_button_text_size">18sp</dimen>
@ -104,7 +106,7 @@
<dimen name="map_widget_text_bottom_margin">1sp</dimen>
<dimen name="map_widget_text_small_bottom_margin">3sp</dimen>
<dimen name="map_widget_icon_margin">2dp</dimen>
<dimen name="dash_margin">2dp</dimen>
<dimen name="dash_margin_h">6dp</dimen>

2
OsmAnd/res/values/strings.xml
View file

@ -119,7 +119,7 @@
<string name="routing_attr_relief_smoothness_factor_hills_name">Hilly</string>
<string name="routing_attr_relief_smoothness_factor_plains_name">Less hilly</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Flat</string>
<string name="routing_attr_driving_style_speed_name">Prefer major roads</string>
<string name="routing_attr_driving_style_speed_name">Accept major roads</string>
<string name="routing_attr_driving_style_balance_name">Balanced</string>
<string name="routing_attr_driving_style_safety_name">Prefer byways</string>
<string name="relief_smoothness_factor_descr">Preferred terrain: flat or hilly</string>

27
OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
View file

@ -18,11 +18,12 @@ import net.osmand.plus.R;
import net.osmand.plus.Version;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.inapp.InAppHelper;
public class SecondSplashScreenFragment extends Fragment {
public static final String TAG = "SecondSplashScreenFragment";
public static boolean SHOW = true;
private static final int SECOND_SPLASH_TIME_OUT = 5000;
private static final int SECOND_SPLASH_TIME_OUT = 8000;
private boolean started = false;
private FragmentActivity activity;
private OsmandApplication app;
@ -95,9 +96,19 @@ public class SecondSplashScreenFragment extends Fragment {
logoLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
ImageView text = new ImageView(activity);
if (Version.isFreeVersion(app)) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand));
if ((InAppHelper.isSubscribedToLiveUpdates() && InAppHelper.isFullVersionPurchased()) || InAppHelper.isSubscribedToLiveUpdates()) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive));
} else if (InAppHelper.isFullVersionPurchased()) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_inapp));
} else {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand));
}
} else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_plus));
if (InAppHelper.isSubscribedToLiveUpdates()) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_plus_osmlive));
} else {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_plus));
}
}
RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
textLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
@ -142,18 +153,14 @@ public class SecondSplashScreenFragment extends Fragment {
}
if (!started) {
started = true;
SecondSplashScreenFragment.SHOW = false;
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
if (activity instanceof MapActivity) {
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
if (app.getSettings().MAP_SCREEN_ORIENTATION.get() != activity.getRequestedOrientation()) {
activity.setRequestedOrientation(app.getSettings().MAP_SCREEN_ORIENTATION.get());
// can't return from this method we are not sure if activity will be recreated or not
}
if (activity instanceof MapActivity && !((MapActivity) activity).isActivityDestroyed()) {
((MapActivity)activity).dismissSecondSplashScreen();
}
activity.getSupportFragmentManager().beginTransaction().remove(SecondSplashScreenFragment.this).commitAllowingStateLoss();
}
}, SECOND_SPLASH_TIME_OUT);
}

2
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -663,7 +663,7 @@ public class FavouritesDbHelper {
if (conn.getVersion() == 0 || DATABASE_VERSION != conn.getVersion()) {
if (readonly) {
conn.close();
conn = context.getSQLiteAPI().getOrCreateDatabase(FAVOURITE_DB_NAME, readonly);
conn = context.getSQLiteAPI().getOrCreateDatabase(FAVOURITE_DB_NAME, false);
}
if (conn.getVersion() == 0) {
onCreate(conn);

6
OsmAnd/src/net/osmand/plus/GPXDatabase.java
View file

@ -154,7 +154,7 @@ public class GPXDatabase {
if (version == 0 || DB_VERSION != version) {
if (readonly) {
conn.close();
conn = context.getSQLiteAPI().getOrCreateDatabase(DB_NAME, readonly);
conn = context.getSQLiteAPI().getOrCreateDatabase(DB_NAME, false);
}
version = conn.getVersion();
conn.setVersion(DB_VERSION);
@ -443,9 +443,9 @@ public class GPXDatabase {
public List<GpxDataItem> getItems() {
List<GpxDataItem> items = new ArrayList<>();
SQLiteConnection db = openConnection(true);
if (db != null){
if (db != null) {
try {
SQLiteCursor query = db.rawQuery(GPX_TABLE_SELECT , null);
SQLiteCursor query = db.rawQuery(GPX_TABLE_SELECT, null);
if (query.moveToFirst()) {
do {
items.add(readItem(query));

7
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -528,9 +528,10 @@ public class GpxSelectionHelper {
public void processPoints() {
update();
this.processedPointsToDisplay = gpxFile.proccessPoints();
if (this.processedPointsToDisplay.isEmpty()) {
this.processedPointsToDisplay = gpxFile.processRoutePoints();
routePoints = !this.processedPointsToDisplay.isEmpty();
List<TrkSegment> processedRoutePointsToDisplay = gpxFile.processRoutePoints();
if (!processedRoutePointsToDisplay.isEmpty()) {
this.processedPointsToDisplay.addAll(processedRoutePointsToDisplay);
routePoints = !processedRoutePointsToDisplay.isEmpty();
}
}

4
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -752,7 +752,7 @@ public class OsmandSettings {
public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumIntPreference<DrivingRegion>(
"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
protected boolean setValue(Object prefs, DrivingRegion val) {
if (val != null) {
if (val != null && !METRIC_SYSTEM_CHANGED_MANUALLY.get()) {
METRIC_SYSTEM.set(val.defMetrics);
}
return super.setValue(prefs, val);
@ -783,6 +783,8 @@ public class OsmandSettings {
;
}.makeGlobal().cache();
public final CommonPreference<Boolean> METRIC_SYSTEM_CHANGED_MANUALLY = new BooleanPreference("metric_system_changed_manually", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name
// cache of metrics constants as they are used very often
public final OsmandPreference<MetricsConstants> METRIC_SYSTEM = new EnumIntPreference<MetricsConstants>(

18
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -189,6 +189,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
private boolean mIsDestroyed = false;
private InAppHelper inAppHelper;
private SecondSplashScreenFragment secondSplashScreenFragment;
@Override
public void onCreate(Bundle savedInstanceState) {
setRequestedOrientation(AndroidUiHelper.getScreenOrientation(this));
@ -692,7 +694,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
FirstUsageWelcomeFragment.SHOW = false;
if (SecondSplashScreenFragment.SHOW) {
getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, new SecondSplashScreenFragment(), SecondSplashScreenFragment.TAG).commitAllowingStateLoss();
secondSplashScreenFragment = new SecondSplashScreenFragment();
getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, secondSplashScreenFragment, SecondSplashScreenFragment.TAG).commitAllowingStateLoss();
} else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
if (settings.MAP_SCREEN_ORIENTATION.get() != getRequestedOrientation()) {
@ -700,7 +703,16 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
// can't return from this method we are not sure if activity will be recreated or not
}
}
}
public void dismissSecondSplashScreen() {
SecondSplashScreenFragment.SHOW = false;
getSupportFragmentManager().beginTransaction().remove(secondSplashScreenFragment).commitAllowingStateLoss();
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
if (app.getSettings().MAP_SCREEN_ORIENTATION.get() != getRequestedOrientation()) {
setRequestedOrientation(app.getSettings().MAP_SCREEN_ORIENTATION.get());
// can't return from this method we are not sure if activity will be recreated or not
}
}
@Override
@ -1094,8 +1106,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
if (registry.getCurrentSelectedRenderer() != newRenderer) {
registry.setCurrentSelectedRender(newRenderer);
app.getResourceManager().getRenderer().clearCache();
mapView.resetDefaultColor();
mapView.refreshMap(true);
} else {
mapView.resetDefaultColor();
}
return null;
}

2
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -516,6 +516,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
restartApp();
} else if (id.equals(settings.OSMAND_THEME.getId())) {
restartApp();
} else if (id.equals(settings.METRIC_SYSTEM.getId())) {
settings.METRIC_SYSTEM_CHANGED_MANUALLY.set(true);
} else {
updateAllSettings();
}

2
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -386,7 +386,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
rot -= 360;
}
int abs = (int) (Math.abs(rot) * 100.0);
String rotString = abs / 100f + "";
String rotString = abs + "/100";
setAttribute.invoke(exInstance, "GPSImgDirection", rotString);
}
if (loc != null && loc.hasAltitude()) {

Some files were not shown because too many files have changed in this diff Show more