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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-07-10 01:39:56 +02:00
commit a8473c9603
6 changed files with 21 additions and 7 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

@ -369,6 +369,12 @@ public class GeoPointParserUtil {
actual = GeoPointParserUtil.parse(url); actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z)); 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 // http://maps.google.com/maps/ll=34.99393,-106.61568,z=11
url = "http://maps.google.com/maps/ll=" + dlat + "," + dlon + ",z=" + z; url = "http://maps.google.com/maps/ll=" + dlat + "," + dlon + ",z=" + z;
System.out.println("url: " + url); System.out.println("url: " + url);

4
OsmAnd/.gitignore vendored
View file

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

8
OsmAnd/build.gradle
View file

@ -385,10 +385,10 @@ dependencies {
// compile project(':eclipse-compile:design') // compile project(':eclipse-compile:design')
// compile project(':eclipse-compile:cardview') // compile project(':eclipse-compile:cardview')
// compile project(':eclipse-compile:gridlayout') // compile project(':eclipse-compile:gridlayout')
compile 'com.android.support:gridlayout-v7:25.3.1' compile 'com.android.support:gridlayout-v7:26.+'
compile 'com.android.support:cardview-v7:25.3.1' compile 'com.android.support:cardview-v7:26.+'
compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support:design:25.3.1' 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') 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" legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" 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. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-23 target=android-26
dex.force.jumbo=true dex.force.jumbo=true
android.library.reference.1=../eclipse-compile/appcompat android.library.reference.1=../eclipse-compile/appcompat
android.library.reference.2=../eclipse-compile/design android.library.reference.2=../eclipse-compile/design

2
OsmAndCore-sample/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion "25.0.0"
dexOptions { dexOptions {
jumboMode true jumboMode true

6
build.gradle
View file

@ -1,9 +1,13 @@
buildscript { buildscript {
repositories { repositories {
maven {
// Google Maven Repository
url 'https://maven.google.com'
}
mavenCentral() mavenCentral()
} }
dependencies { 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' classpath 'com.google.gms:google-services:3.0.0'
} }
} }