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

Merge

Browse source
This commit is contained in:
Alexey Kulish 2017-07-10 10:12:36 +03:00
commit 74d1c3f907
16 changed files with 52 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -368,6 +368,12 @@ public class GeoPointParserUtil {
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
// https://maps.google.com/maps?q=loc:-21.8835112,-47.7838932 (Name)
url = "https://maps.google.com/maps?q=loc:" + dlat + "," + dlon + " (Name)" ;
System.out.println("url: " + url);
actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
// http://maps.google.com/maps/ll=34.99393,-106.61568,z=11
url = "http://maps.google.com/maps/ll=" + dlat + "," + dlon + ",z=" + z;

4
OsmAnd/.gitignore vendored
View file

@ -1,3 +1,7 @@
gradle
gradlew
gradlew.bat
valgrind/
bin/
dist/

8
OsmAnd/build.gradle
View file

@ -385,10 +385,10 @@ dependencies {
// compile project(':eclipse-compile:design')
// compile project(':eclipse-compile:cardview')
// compile project(':eclipse-compile:gridlayout')
compile 'com.android.support:gridlayout-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:gridlayout-v7:26.+'
compile 'com.android.support:cardview-v7:26.+'
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support:design:26.+'
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"

2
OsmAnd/project.properties
View file

@ -10,7 +10,7 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-23
target=android-26
dex.force.jumbo=true
android.library.reference.1=../eclipse-compile/appcompat
android.library.reference.2=../eclipse-compile/design

1
OsmAnd/res/values-az/strings.xml
View file

@ -1628,4 +1628,5 @@
<string name="number_of_edits">Düzəlişlərin sayı</string>
<string name="reports_for">Hesabat:</string>
<string name="file_name_containes_illegal_char">Fayl adında dəstəklənməyən simvol var</string>
<string name="store_tracks_in_monthly_directories">Qeyd edilən izləri aylıq qovluqlarda saxla</string>
</resources>

4
OsmAnd/res/values-da/phrases.xml
View file

@ -3490,4 +3490,6 @@
<string name="poi_motorcycle_type_standard">Standard</string>
<string name="poi_lock_basin">Slusebassin</string>
</resources>
<string name="poi_generator_output_electricity_no">Output (el): nej</string>
</resources>

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

@ -1868,7 +1868,7 @@
<string name="poi_payment_gift_card_no">Geschenkkarte nicht akzeptiert</string>
<string name="poi_payment_golden_crown_yes">Golden Crown</string>
<string name="poi_payment_golden_crown_no">Golden Crown Karte nicht akzeptiert</string>
<string name="poi_payment_pro100_yes">"PRO100 "</string>
<string name="poi_payment_pro100_yes">PRO100</string>
<string name="poi_payment_pro100_no">PRO100 Karte nicht akzeptiert</string>
<string name="poi_payment_union_card_yes">Union Karte</string>
<string name="poi_payment_union_card_no">Union Karte nicht akzeptiert</string>
@ -2273,7 +2273,7 @@
<string name="poi_tents_no">Zelten nicht gestattet</string>
<string name="poi_backcountry_yes">Ja</string>
<string name="poi_backcountry_no">Nein</string>
<string name="poi_scout_yes">Pfadfinderlager: ja</string>
<string name="poi_scout_yes">Ja</string>
<string name="poi_scout_no">Pfadfinderlager: nein</string>
<string name="poi_group_only_yes">Nur Gruppen: ja</string>
<string name="poi_group_only_no">Nur Gruppen: nein</string>
@ -3016,8 +3016,8 @@
<string name="poi_fuel_type">Typ</string>
<string name="poi_payment_type">Zahlungsart</string>
<string name="poi_additional_type">Zusätzlich</string>
<string name="poi_service_bicycle_charging_yes">Fahrrad laden: ja</string>
<string name="poi_service_bicycle_charging_no">Fahrrad laden: nein</string>
<string name="poi_service_bicycle_charging_yes">Ladestation: ja</string>
<string name="poi_service_bicycle_charging_no">Ladestation: nein</string>
<string name="poi_shop_craft">Geschäft für Kunsthandwerksbedarf</string>

16
OsmAnd/res/values-de/strings.xml
View file

@ -447,7 +447,7 @@ Einige der Kernfunktionen:
<string name="context_menu_item_search">In der Nähe suchen</string>
<string name="shared_string_save_as_gpx">Route als GPX-Track speichern</string>
<string name="route_successfully_saved_at">Route erfolgreich gespeichert als \'%1$s\'.</string>
<string name="filename_input">"Dateiname: "</string>
<string name="filename_input">Dateiname:</string>
<string name="file_with_name_already_exist">Datei mit gleichem Namen besteht bereits.</string>
<string name="shared_string_save">Speichern</string>
@ -634,7 +634,7 @@ Einige der Kernfunktionen:
<string name="shared_string_select_all">Alle markieren</string>
<string name="shared_string_refresh">Aktualisieren</string>
<string name="fast_route_mode">Schnellste Route</string>
<string name="fast_route_mode_descr">"Zur Berechnung der schnellsten Route aktivieren , für eine kraftstoffsparende Route deaktivieren "</string>
<string name="fast_route_mode_descr">Zur Berechnung der schnellsten Route aktivieren, für eine kraftstoffsparende Route deaktivieren</string>
<string name="tiles_to_download_estimated_size">Bei Zoomlevel {0} lade {1} Kacheln\n ({2} MB)</string>
<string name="shared_string_download_map">Karte herunterladen</string>
<string name="select_max_zoom_preload_area">Größte zu ladende Vergrößerung wählen</string>
@ -2110,7 +2110,7 @@ Lon %2$s</string>
<string name="are_you_sure">Sicher?</string>
<string name="unsaved_changes_will_be_lost">Alle ungesicherten Änderungen gehen verloren. Fortfahren?</string>
<string name="roads">Straßen</string>
<string name="show_free_version_banner_description">Auch bei OsmAnd+ das Banner der kostenlosen Version anzeigen</string>
<string name="show_free_version_banner_description">Auch in OsmAnd+ das Banner der kostenlosen Version anzeigen</string>
<string name="rendering_attr_hideProposed_name">Geplante Objekte</string>
<string name="shared_string_update">Aktualisieren</string>
@ -2497,10 +2497,10 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
<string name="give_permission">Berechtigung erteilen</string>
<string name="allow_access_location">Standortbestimmung zulassen</string>
<string name="first_usage_greeting">Erhalten Sie Wegbeschreibungen und entdecken Sie neue Orte ohne Internetverbindung</string>
<string name="search_my_location">Meinen Standort suchen</string>
<string name="search_my_location">Meinen Standort bestimmen</string>
<string name="no_update_info">Keine Aktualisierungen anzeigen</string>
<string name="skip_map_downloading">Herunterladen der Karten überspringen</string>
<string name="no_update_info_desc">Keine aktuellen Meldungen zu neuen Versionen, Angeboten von OsmAnd abfragen</string>
<string name="no_update_info_desc">Keine Versionsaktualisierungen oder OsmAnd-Angebote abfragen</string>
<string name="si_mi_meters">Meilen/Meter</string>
<string name="osm_live_banner_desc">Unbegrenzt Karten herunterladen und sie nicht nur einmal pro Monat, sondern wöchentlich, täglich oder stündlich aktualisieren.</string>
<string name="osmand_plus_banner_desc">Vollversion von OsmAnd mit unbegrenzten Karten-Downloads und monatlichen Kartenaktualisierungen.</string>
@ -2870,4 +2870,10 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="max_min">max/min</string>
<string name="shared_string_reset">Zurücksetzen</string>
<string name="ascent_descent">Aufstieg/Abstieg</string>
<string name="store_tracks_in_monthly_directories">Aufgezeichnete Tracks in Monatsordnern speichern</string>
<string name="store_tracks_in_monthly_directories_descrp">Aufgezeichnete Tracks in nach Aufzeichnungsmonat benannten Unterordnern speichern (z. B. 2017-01).</string>
<string name="map_widget_ruler_control_first_mode">Lineal</string>
<string name="map_widget_ruler_control_second_mode">Zirkel</string>
<string name="of">%1$d von %2$d</string>
<string name="moving_time">Zeit in Bewegung</string>
</resources>

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

@ -3456,4 +3456,6 @@
<string name="poi_motorcycle_type_standard">Estándar</string>
<string name="poi_lock_basin">Compuerta de cuenca</string>
</resources>
<string name="poi_generator_output_electricity_no">Salida (electricidad): No</string>
</resources>

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

@ -3218,4 +3218,6 @@
<string name="poi_motorcycle_type_standard">Estándar</string>
<string name="poi_lock_basin">Compuerta de cuenca</string>
</resources>
<string name="poi_generator_output_electricity_no">Salida (electricidad): No</string>
</resources>

2
OsmAnd/res/values-ru/phrases.xml
View file

@ -3426,6 +3426,6 @@
<string name="poi_motorcycle_type_dualsport">Двойного назначения</string>
<string name="poi_motorcycle_type_standard">Классика</string>
<string name="poi_generator_output_electricity_no">Не вырабатывает электричество</string>
</resources>

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

@ -1673,7 +1673,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="traffic_warning_speed_limit">Limite de lestresa</string>
<string name="traffic_warning_payment">Casellu</string>
<string name="traffic_warning_stop">Cartellu de Stop</string>
<string name="traffic_warning_border_control">Controllu doganale</string>
<string name="traffic_warning_border_control">Puntu de controllu</string>
<string name="traffic_warning_calming">Minimadore de lestresa</string>
<string name="traffic_warning_speed_camera">Autovelox</string>
<string name="traffic_warning">Avisu de tràficu</string>

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

@ -3395,4 +3395,6 @@
<string name="poi_motorcycle_type_dualsport">Dualsport</string>
<string name="poi_motorcycle_type_standard">Standard</string>
<string name="poi_generator_output_electricity_no">Output (electricity): no</string>
</resources>

4
OsmAndCore-sample/build.gradle
View file

@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.0"
dexOptions {
jumboMode true

6
build.gradle
View file

@ -1,9 +1,13 @@
buildscript {
repositories {
maven {
// Google Maven Repository
url 'https://maven.google.com'
}
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.+'
classpath 'com.google.gms:google-services:3.0.0'
}
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip