From 4cddb50dc552a0b7fc3b052348b025af60cc3837 Mon Sep 17 00:00:00 2001 From: Sarah Lensing Date: Fri, 5 Aug 2016 14:50:55 -0600 Subject: [PATCH] Migrate to Android SDK 1.0.8, Tangram 0.4.1 (#714) * Migrate to tangram 0.4.1 via android sdk 1.0.7 * Android SDK 1.0.8 --- app/build.gradle | 2 +- .../java/com/mapzen/erasermap/AndroidModule.java | 4 ++-- .../com/mapzen/erasermap/EraserMapApplication.java | 4 ---- .../mapzen/erasermap/controller/MainActivity.kt | 9 +++++---- .../mapzen/erasermap/model/AndroidAppSettings.kt | 4 ++-- .../com/mapzen/erasermap/model/AppSettings.kt | 4 ++-- .../com/mapzen/erasermap/model/MapzenLocation.kt | 2 +- .../mapzen/erasermap/model/MapzenLocationImpl.kt | 2 +- .../com/mapzen/erasermap/model/RouterFactory.kt | 2 +- .../erasermap/model/ValhallaHttpHandler.java | 3 +-- .../mapzen/erasermap/model/ValhallaRouteManager.kt | 2 +- .../erasermap/model/ValhallaRouterFactory.kt | 2 +- .../com/mapzen/erasermap/view/DistanceView.kt | 2 +- .../com/mapzen/erasermap/view/RouteModeView.kt | 4 ++-- .../com/mapzen/erasermap/view/SearchResultsView.kt | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../com/mapzen/erasermap/TestAndroidModule.java | 3 +-- .../com/mapzen/erasermap/model/TestAppSettings.kt | 7 +++---- .../mapzen/erasermap/model/TestMapzenLocation.kt | 6 +++--- .../com/mapzen/erasermap/model/TestRouter.kt | 14 +++++++------- .../mapzen/erasermap/model/TestRouterFactory.kt | 4 ++-- 21 files changed, 39 insertions(+), 45 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 486b8689..d9a4c4aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -128,7 +128,7 @@ gradle.startParameter.getTaskNames().each { task -> dependencies { compile 'com.android.support:appcompat-v7:23.4.0' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile 'com.mapzen:mapzen-android-sdk:1.0.7-SNAPSHOT' + compile 'com.mapzen:mapzen-android-sdk:1.0.8' compile 'com.google.dagger:dagger:2.0' compile 'com.google.dagger:dagger-compiler:2.0' compile 'javax.annotation:javax.annotation-api:1.2' diff --git a/app/src/main/java/com/mapzen/erasermap/AndroidModule.java b/app/src/main/java/com/mapzen/erasermap/AndroidModule.java index 70ed30b4..e9a341fa 100644 --- a/app/src/main/java/com/mapzen/erasermap/AndroidModule.java +++ b/app/src/main/java/com/mapzen/erasermap/AndroidModule.java @@ -1,7 +1,7 @@ package com.mapzen.erasermap; -import com.mapzen.android.ApiKeyConstants; -import com.mapzen.android.MapzenSearch; +import com.mapzen.android.core.ApiKeyConstants; +import com.mapzen.android.search.MapzenSearch; import com.mapzen.android.lost.api.LostApiClient; import com.mapzen.erasermap.model.AndroidAppSettings; import com.mapzen.erasermap.model.ApiKeys; diff --git a/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java b/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java index 75cbe926..34efb031 100644 --- a/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java +++ b/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java @@ -1,7 +1,6 @@ package com.mapzen.erasermap; import com.mapzen.erasermap.controller.MainActivity; -import com.mapzen.erasermap.model.ApiKeys; import com.mapzen.erasermap.receiver.MockLocationReceiver; import com.mapzen.erasermap.view.DistanceView; import com.mapzen.erasermap.view.InitActivity; @@ -12,9 +11,6 @@ import com.mapzen.erasermap.view.ViewAboutPreference; import com.mapzen.erasermap.view.VoiceNavigationController; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import android.app.Application; import javax.inject.Singleton; diff --git a/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt index 60246208..8de990dd 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt @@ -20,11 +20,11 @@ import android.widget.LinearLayout import android.widget.RadioButton import android.widget.RelativeLayout import android.widget.Toast -import com.mapzen.android.MapView -import com.mapzen.android.MapzenMap -import com.mapzen.android.MapzenSearch +import com.mapzen.android.graphics.MapView +import com.mapzen.android.graphics.MapzenMap +import com.mapzen.android.search.MapzenSearch import com.mapzen.android.lost.api.LocationServices -import com.mapzen.android.model.CameraType +import com.mapzen.android.graphics.model.CameraType import com.mapzen.erasermap.CrashReportService import com.mapzen.erasermap.EraserMapApplication import com.mapzen.erasermap.R @@ -241,6 +241,7 @@ class MainActivity : AppCompatActivity(), MainViewController, } private fun configureMapzenMap() { + mapzenMap?.setPersistMapData(true) mapzenMap?.setLongPressResponder({ x, y -> confidenceHandler.longPressed = true diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt index c9345d0a..81f06186 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt @@ -3,8 +3,8 @@ package com.mapzen.erasermap.model import android.content.Context import android.location.Location import android.preference.PreferenceManager -import com.mapzen.android.MapzenMap -import com.mapzen.android.MapzenRouter +import com.mapzen.android.graphics.MapzenMap +import com.mapzen.android.routing.MapzenRouter import com.mapzen.erasermap.EraserMapApplication import com.mapzen.erasermap.R import com.mapzen.pelias.SavedSearch diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt index d6198326..258dd433 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt @@ -2,8 +2,8 @@ package com.mapzen.erasermap.model import android.content.Context import android.location.Location -import com.mapzen.android.MapzenMap -import com.mapzen.android.MapzenRouter +import com.mapzen.android.graphics.MapzenMap +import com.mapzen.android.routing.MapzenRouter import com.mapzen.pelias.SavedSearch import java.io.File diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt index 88ca37b6..5412a2e1 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt @@ -1,7 +1,7 @@ package com.mapzen.erasermap.model import android.location.Location -import com.mapzen.android.MapzenMap +import com.mapzen.android.graphics.MapzenMap import com.mapzen.pelias.PeliasLocationProvider interface MapzenLocation : PeliasLocationProvider { diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt index 7e72fcad..21a65632 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt @@ -5,7 +5,7 @@ import android.graphics.PointF import android.location.Location import android.util.Log import android.view.WindowManager -import com.mapzen.android.MapzenMap +import com.mapzen.android.graphics.MapzenMap import com.mapzen.android.lost.api.LocationRequest import com.mapzen.android.lost.api.LocationServices import com.mapzen.android.lost.api.LostApiClient diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt index 825716e5..1323e288 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt @@ -1,7 +1,7 @@ package com.mapzen.erasermap.model import android.content.Context -import com.mapzen.android.MapzenRouter +import com.mapzen.android.routing.MapzenRouter interface RouterFactory { public fun getRouter(context: Context): MapzenRouter diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java index 316e4024..713c282a 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java @@ -1,7 +1,6 @@ package com.mapzen.erasermap.model; -import com.mapzen.android.TurnByTurnHttpHandler; -import com.mapzen.valhalla.HttpHandler; +import com.mapzen.android.routing.TurnByTurnHttpHandler; import retrofit.RequestInterceptor; import retrofit.RestAdapter; diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt index e9da09ed..a4bdc971 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt @@ -1,7 +1,7 @@ package com.mapzen.erasermap.model import android.content.Context -import com.mapzen.android.MapzenRouter +import com.mapzen.android.routing.MapzenRouter import com.mapzen.erasermap.BuildConfig import com.mapzen.model.ValhallaLocation import com.mapzen.pelias.SimpleFeature diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt index e1b86f29..19aa5ec8 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt @@ -1,7 +1,7 @@ package com.mapzen.erasermap.model import android.content.Context -import com.mapzen.android.MapzenRouter +import com.mapzen.android.routing.MapzenRouter public class ValhallaRouterFactory : RouterFactory { override fun getRouter(context: Context): MapzenRouter { diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt index 23ddd717..32085a4a 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt @@ -3,7 +3,7 @@ package com.mapzen.erasermap.view import android.content.Context import android.util.AttributeSet import android.widget.TextView -import com.mapzen.android.MapzenDistanceFormatter +import com.mapzen.android.routing.MapzenDistanceFormatter import com.mapzen.erasermap.EraserMapApplication import com.mapzen.erasermap.model.AppSettings import javax.inject.Inject diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt index 50114ebc..197ff9b6 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt @@ -15,8 +15,8 @@ import android.widget.Button import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView -import com.mapzen.android.MapzenMap -import com.mapzen.android.model.EaseType +import com.mapzen.android.graphics.MapzenMap +import com.mapzen.android.graphics.model.EaseType import com.mapzen.erasermap.EraserMapApplication import com.mapzen.erasermap.R import com.mapzen.erasermap.model.AppSettings diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt index 93df7bde..7640ef5c 100644 --- a/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt +++ b/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt @@ -11,7 +11,7 @@ import android.view.inputmethod.EditorInfo import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView -import com.mapzen.android.MapzenSearch +import com.mapzen.android.search.MapzenSearch import com.mapzen.erasermap.EraserMapApplication import com.mapzen.erasermap.R import com.mapzen.erasermap.controller.MainActivity diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2e3c2da4..f9d74da7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:background="@color/color_primary" tools:context=".MainActivity"> - = ArrayList() - public var isFetching: Boolean = false - public var units: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES - public var bearing: Float = 0f - public var name: String? = null +class TestRouter(context: Context) : MapzenRouter(context) { + var locations: ArrayList = ArrayList() + var isFetching: Boolean = false + var units: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES + var bearing: Float = 0f + var name: String? = null override fun clearLocations(): MapzenRouter { locations.clear() diff --git a/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt b/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt index d38ad1be..55a947ed 100644 --- a/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt +++ b/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt @@ -1,9 +1,9 @@ package com.mapzen.erasermap.model import android.content.Context -import com.mapzen.android.MapzenRouter +import com.mapzen.android.routing.MapzenRouter -public class TestRouterFactory : RouterFactory { +class TestRouterFactory : RouterFactory { companion object { var router: TestRouter? = null