Skip to content

Commit

Permalink
Upgrade to osmdroid 6.1.11 + code cleanup + upgrade of other dependen…
Browse files Browse the repository at this point in the history
…cies.
MKergall committed Aug 21, 2021
1 parent 71c96d8 commit 74b1a8d
Showing 8 changed files with 19 additions and 299 deletions.
13 changes: 5 additions & 8 deletions NooTous/build.gradle
Original file line number Diff line number Diff line change
@@ -32,13 +32,10 @@ android {

dependencies {

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation 'androidx.navigation:navigation-fragment:2.3.0'
implementation 'androidx.navigation:navigation-ui:2.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.navigation:navigation-fragment:2.3.5'
implementation 'androidx.navigation:navigation-ui:2.3.5'
implementation project(path: ':OSMBonusPack')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
12 changes: 6 additions & 6 deletions OSMBonusPack/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
minSdkVersion 16
targetSdkVersion 28
versionCode 67
versionName "6.7-SNAPSHOT"
targetSdkVersion 30
versionCode 68
versionName "6.8-SNAPSHOT"
}
buildTypes {
release {
@@ -23,9 +23,9 @@ android {
}

dependencies {
api 'org.osmdroid:osmdroid-android:6.1.10'
api 'org.osmdroid:osmdroid-android:6.1.11'
implementation 'org.apache.commons:commons-lang3:3.8.1'
api 'com.google.code.gson:gson:2.8.6'
implementation 'com.squareup.okhttp3:okhttp:4.7.2'
implementation 'androidx.core:core:1.2.0'
implementation 'androidx.core:core:1.5.0'
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@

import org.osmdroid.bonuspack.R;
import org.osmdroid.bonuspack.utils.BonusPackHelper;
import org.osmdroid.bonuspack.utils.DouglasPeuckerReducer;
import org.osmdroid.util.BoundingBox;
import org.osmdroid.util.GeoPoint;
import org.osmdroid.util.PointReducer;

import java.util.ArrayList;

@@ -91,7 +91,7 @@ public ArrayList<GeoPoint> getRouteLow(){
if (mRouteLow == null){
//Simplify the route (divide number of points by around 10):
int n = mRouteHigh.size();
mRouteLow = DouglasPeuckerReducer.reduceWithTolerance(mRouteHigh, 1500.0);
mRouteLow = PointReducer.reduceWithTolerance(mRouteHigh, 1500.0);
Log.d(BonusPackHelper.LOG_TAG, "Road reduced from "+n+" to "+mRouteLow.size()+ " points");
}
return mRouteLow;

This file was deleted.

6 changes: 3 additions & 3 deletions OSMBonusPackTuto/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
applicationId "com.example.osmbonuspacktuto"
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
}
@@ -35,7 +35,7 @@ dependencies {
// including as local lib
/*
compile(name: 'osmbonuspack_v6.7.0', ext: 'aar')
implementation 'org.osmdroid:osmdroid-android:6.1.10'
implementation 'org.osmdroid:osmdroid-android:6.1.11'
implementation 'org.apache.commons:commons-lang3:3.8.1'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.squareup.okhttp3:okhttp:4.7.2'
4 changes: 2 additions & 2 deletions OSMNavigator/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 30

defaultConfig {
applicationId "com.osmnavigator"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
versionCode 25
versionName "2.5"
}
Original file line number Diff line number Diff line change
@@ -179,7 +179,7 @@ public class MapActivity extends Activity implements MapEventsReceiver, Location
OnlineTileSourceBase MAPBOXSATELLITELABELLED;
boolean mNightMode;

static final String userAgent = "OsmNavigator/2.4";
static final String userAgent = BuildConfig.APPLICATION_ID+"/"+BuildConfig.VERSION_NAME;

static String graphHopperApiKey;
static String flickrApiKey;

0 comments on commit 74b1a8d

Please sign in to comment.