From 2dc9919fccb109c34e91a2085c84ef9479ae7927 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Tue, 4 Jun 2024 16:16:50 +0200 Subject: [PATCH 01/21] Upgrade dependencies, build tools & configurations --- app/build.gradle | 2 -- gradle.properties | 5 ++++- gradle/dependencies.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f16ba96cf..4f1b9ba30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,8 +74,6 @@ dependencies { implementation dependenciesList.androidxRecyclerView implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.androidxCardView - implementation dependenciesList.androidxAppcompat - implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.gmsLocation diff --git a/gradle.properties b/gradle.properties index 869da16e3..076d0a55f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,10 @@ VERSION_NAME=3.0.0 # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048M +org.gradle.jvmargs=-Xmx2048M \ + --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ + --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED android.useAndroidX=true android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 51e4e5ac9..e61560ad7 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -116,4 +116,4 @@ ext { dependencyUpdates : "com.github.ben-manes:gradle-versions-plugin:${pluginVersion.dependencyUpdates}", kotlinGradle : "org.jetbrains.kotlin:kotlin-gradle-plugin:${androidVersions.kotlinVersion}", ] -} \ No newline at end of file +} From ff41955da59a147b5aa871d02c1734d208cddf9c Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Tue, 4 Jun 2024 17:16:06 +0200 Subject: [PATCH 02/21] Set Java & Kotlin version by toolchain --- libandroid-navigation/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle index e5c87ced2..e47620984 100644 --- a/libandroid-navigation/build.gradle +++ b/libandroid-navigation/build.gradle @@ -12,6 +12,16 @@ kotlin { jvmToolchain(17) } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +kotlin { + jvmToolchain(17) +} + android { namespace 'com.mapbox.services.android.navigation' From 32972ebd6bf883dfcc979324cc068b390ede08a2 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Tue, 4 Jun 2024 17:18:20 +0200 Subject: [PATCH 03/21] Remove unused butterknife dependency --- app/build.gradle | 2 ++ gradle.properties | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4f1b9ba30..f16ba96cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,6 +74,8 @@ dependencies { implementation dependenciesList.androidxRecyclerView implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.androidxCardView + implementation dependenciesList.androidxAppcompat + implementation dependenciesList.androidxConstraintLayout implementation dependenciesList.gmsLocation diff --git a/gradle.properties b/gradle.properties index 076d0a55f..869da16e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,7 @@ VERSION_NAME=3.0.0 # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048M \ - --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ - --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +org.gradle.jvmargs=-Xmx2048M android.useAndroidX=true android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. From a49e0d84db0335514d6017f0d13e0bd8aa41a020 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Mon, 10 Jun 2024 00:30:12 +0200 Subject: [PATCH 04/21] Fix maven (local) publishing, Set MapLibre artifact configuration --- gradle/artifact-settings.gradle | 6 +++--- gradle/mvn-push-android.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index 546b4644b..39a5c6115 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -1,14 +1,14 @@ ext { - navigationArtifactGroupId = 'com.mapbox.mapboxsdk' + navigationArtifactGroupId = 'org.maplibre.navigation' navigationArtifactId = 'android' navigationArtifactTitle = 'MapLibre Navigation SDK for Android' navigationArtifactDescription = 'MapLibre Navigation SDK for Android' navigationDeveloperName = 'MapLibre' navigationDeveloperId = 'maplibre' - mavogatopmDeveloperMail = 'maplibre@maplibre.org' + navigationDeveloperMail = 'maplibre@maplibre.org' navigationArtifactUrl = 'https://github.com/maplibre/maplibre-navigation-android' navigationArtifactScmUrl = 'scm:git@github.com:maplibre/maplibre-navigation-android.git' navigationArtifactLicenseName = 'MIT' navigationArtifactLicenseUrl = 'https://opensource.org/license/MIT' versionName = project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : System.getenv('VERSION_NAME') -} \ No newline at end of file +} diff --git a/gradle/mvn-push-android.gradle b/gradle/mvn-push-android.gradle index 944263b2a..d44393120 100644 --- a/gradle/mvn-push-android.gradle +++ b/gradle/mvn-push-android.gradle @@ -50,7 +50,7 @@ publishing { developer { id = project.ext.navigationDeveloperId name = project.ext.navigationDeveloperName - email = project.ext.mavogatopmDeveloperMail + email = project.ext.navigationDeveloperMail } } scm { From 5eff287639622acdff91da6cecee65f2246f11f6 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Mon, 10 Jun 2024 23:07:40 +0200 Subject: [PATCH 05/21] Fix Maven publishing config --- gradle/artifact-settings.gradle | 2 +- libandroid-navigation/build.gradle | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index 39a5c6115..5a69af074 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -1,5 +1,5 @@ ext { - navigationArtifactGroupId = 'org.maplibre.navigation' + navigationArtifactGroupId = 'com.mapbox.mapboxsdk' navigationArtifactId = 'android' navigationArtifactTitle = 'MapLibre Navigation SDK for Android' navigationArtifactDescription = 'MapLibre Navigation SDK for Android' diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle index e47620984..e5c87ced2 100644 --- a/libandroid-navigation/build.gradle +++ b/libandroid-navigation/build.gradle @@ -12,16 +12,6 @@ kotlin { jvmToolchain(17) } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} - -kotlin { - jvmToolchain(17) -} - android { namespace 'com.mapbox.services.android.navigation' From d4ecb4b2c0747ad04f2538ecd3f42b60b1a53327 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Fri, 7 Jun 2024 14:24:24 +0200 Subject: [PATCH 06/21] Upgrade MapLibre to latest major version --- .../OnNavigationReadyIdlingResource.java | 11 +- .../navigation/testapp/MainActivity.java | 4 +- .../testapp/MockNavigationActivity.kt | 42 +++---- .../testapp/NavigationApplication.java | 6 +- .../testapp/NavigationUIActivity.kt | 39 ++++--- .../testapp/SnapToRouteNavigationActivity.kt | 25 ++--- .../android/navigation/testapp/Utils.java | 7 +- .../res/layout/activity_mock_navigation.xml | 2 +- .../res/layout/activity_navigation_ui.xml | 2 +- .../activity_snap_to_route_navigation.xml | 2 +- build.gradle | 1 + gradle/dependencies.gradle | 12 +- libandroid-navigation-ui/build.gradle | 4 +- .../ui/v5/LocationEngineConductor.java | 2 +- .../ui/v5/MapConnectivityController.java | 4 +- .../ui/v5/MapboxNavigationActivity.java | 2 +- .../navigation/ui/v5/NavigationContract.java | 2 +- .../ui/v5/NavigationLauncherOptions.java | 2 +- ...gationOnCameraTrackingChangedListener.java | 2 +- .../navigation/ui/v5/NavigationPresenter.java | 2 +- .../navigation/ui/v5/NavigationView.java | 18 +-- .../ui/v5/NavigationViewEventDispatcher.java | 2 +- .../navigation/ui/v5/NavigationViewModel.java | 6 +- .../ui/v5/NavigationViewOptions.java | 2 +- .../v5/NavigationViewRouteEngineListener.java | 2 +- .../ui/v5/NavigationViewRouter.java | 7 +- .../ui/v5/NavigationViewSubscriber.java | 2 +- .../navigation/ui/v5/ThemeSwitcher.java | 2 +- .../navigation/ui/v5/ViewRouteListener.java | 2 +- .../ui/v5/camera/CameraAnimationDelegate.java | 12 +- .../CameraOverviewCancelableCallback.java | 10 +- .../ui/v5/camera/DynamicCamera.java | 20 ++-- .../ui/v5/camera/NavigationCamera.java | 40 +++---- ...vigationCameraTrackingChangedListener.java | 2 +- .../NavigationCameraTransitionListener.java | 2 +- .../ui/v5/camera/NavigationCameraUpdate.java | 2 +- .../ui/v5/camera/ResetCancelableCallback.java | 4 +- .../ui/v5/listeners/RouteListener.java | 2 +- .../ui/v5/map/FeatureFilterTask.java | 4 +- .../ui/v5/map/LocationFpsDelegate.java | 10 +- .../navigation/ui/v5/map/MapFpsDelegate.java | 2 +- .../ui/v5/map/MapLayerInteractor.java | 22 ++-- .../ui/v5/map/MapPaddingAdjustor.java | 10 +- .../navigation/ui/v5/map/MapWayName.java | 4 +- .../ui/v5/map/NavigationMapboxMap.java | 62 +++++------ .../ui/v5/map/NavigationSymbolManager.java | 10 +- .../ui/v5/map/OnFeatureFilteredCallback.java | 2 +- .../v5/map/SymbolOnStyleLoadedListener.java | 8 +- .../ui/v5/map/WaynameFeatureFilter.java | 20 ++-- .../ui/v5/map/WaynameFeatureFinder.java | 8 +- .../ui/v5/route/FeatureProcessingTask.java | 8 +- .../navigation/ui/v5/route/MapRouteArrow.java | 66 +++++------ .../ui/v5/route/MapRouteClickListener.java | 18 +-- .../ui/v5/route/MapRouteLayerProvider.java | 48 ++++---- .../navigation/ui/v5/route/MapRouteLine.java | 30 ++--- .../ui/v5/route/MapRouteSourceProvider.java | 6 +- .../ui/v5/route/MapboxRouteFetcher.java | 39 +++++-- .../ui/v5/route/NavigationMapRoute.java | 26 ++--- .../ui/v5/route/NavigationRoute.java | 105 +++++++++++++++--- .../route/OnPrimaryRouteUpdatedCallback.java | 2 +- .../OnRouteFeaturesProcessedCallback.java | 4 +- .../ui/v5/route/PrimaryRouteUpdateTask.java | 4 +- .../navigation/ui/v5/utils/MapUtils.java | 8 +- .../layout-land/navigation_view_layout.xml | 2 +- .../res/layout/navigation_view_layout.xml | 2 +- .../ui/v5/LocationEngineConductorTest.java | 2 +- .../v5/NavigationViewEventDispatcherTest.java | 2 +- ...NavigationViewRouteEngineListenerTest.java | 2 +- .../ui/v5/NavigationViewRouterTest.java | 6 +- .../navigation/ui/v5/TestRouteBuilder.java | 2 +- .../ui/v5/TestRouteProgressBuilder.java | 4 +- .../ui/v5/camera/DynamicCameraTest.java | 18 +-- .../ui/v5/camera/NavigationCameraTest.java | 40 +++---- ...tionCameraTrackingChangedListenerTest.java | 2 +- ...avigationCameraTransitionListenerTest.java | 2 +- .../ui/v5/map/LocationFpsDelegateTest.java | 22 ++-- .../ui/v5/map/MapFpsDelegateTest.java | 2 +- .../ui/v5/map/MapLayerInteractorTest.java | 32 +++--- .../ui/v5/map/MapPaddingAdjustorTest.java | 16 +-- .../navigation/ui/v5/map/MapWayNameTest.java | 8 +- .../ui/v5/map/NavigationMapboxMapTest.java | 22 ++-- .../v5/map/NavigationSymbolManagerTest.java | 8 +- .../map/SymbolOnStyleLoadedListenerTest.java | 6 +- .../ui/v5/map/WaynameFeatureFilterTest.java | 6 +- .../ui/v5/map/WaynameFeatureFinderTest.java | 4 +- .../v5/route/MapRouteClickListenerTest.java | 4 +- .../ui/v5/route/MapRouteLineTest.java | 14 +-- .../ui/v5/route/NavigationMapRouteTest.java | 38 +++---- .../ui/v5/route/NavigationRouteTest.java | 9 +- .../v5/route/PrimaryRouteUpdateTaskTest.java | 4 +- .../engine/GoogleLocationEngineImpl.java | 8 +- .../engine/LocationEngineProvider.java | 8 +- .../replay/ReplayRouteLocationConverter.java | 8 +- .../replay/ReplayRouteLocationEngine.java | 12 +- .../v5/models/DirectionsJsonObject.java | 4 +- .../v5/models/DirectionsResponse.java | 4 +- .../navigation/v5/models/DirectionsRoute.java | 4 +- .../v5/models/DirectionsWaypoint.java | 2 +- .../navigation/v5/models/RouteOptions.java | 4 +- .../v5/models/StepIntersection.java | 2 +- .../navigation/v5/models/StepManeuver.java | 2 +- .../v5/models/utils/FormatUtils.java | 2 +- .../v5/models/utils/ParseUtils.java | 2 +- .../v5/navigation/MapboxNavigation.java | 2 +- .../v5/navigation/NavigationHelper.java | 14 +-- .../NavigationLocationEngineListener.java | 6 +- .../NavigationLocationEngineUpdater.java | 8 +- .../v5/navigation/NavigationMapRoute.java | 92 +++++++-------- .../navigation/NavigationRouteProcessor.java | 2 +- .../v5/navigation/NavigationService.java | 2 +- .../v5/navigation/camera/Camera.java | 2 +- .../v5/navigation/camera/SimpleCamera.java | 6 +- .../v5/offroute/OffRouteDetector.java | 10 +- .../routeprogress/MetricsRouteProgress.java | 2 +- .../v5/routeprogress/RouteLegProgress.java | 2 +- .../v5/routeprogress/RouteProgress.java | 2 +- .../navigation/v5/snap/SnapToRoute.java | 12 +- .../v5/utils/DistanceFormatter.java | 16 +-- .../android/navigation/v5/utils/MapUtils.java | 18 +-- .../navigation/v5/utils/MeasurementUtils.java | 12 +- .../navigation/v5/utils/RouteUtils.java | 2 +- .../navigation/v5/utils/ToleranceUtils.java | 8 +- .../android/navigation/v5/BaseTest.java | 2 +- .../navigation/v5/MockLocationBuilder.java | 8 +- .../navigation/v5/TestRouteBuilder.java | 2 +- .../v5/TestRouteProgressBuilder.java | 4 +- .../ReplayRouteLocationConverterTest.java | 4 +- .../navigation/FasterRouteDetectorTest.java | 2 +- .../v5/navigation/MapboxNavigationTest.java | 2 +- .../NavigationEventDispatcherTest.java | 2 +- .../v5/navigation/NavigationHelperTest.java | 6 +- .../NavigationRouteProcessorTest.java | 6 +- .../v5/offroute/OffRouteDetectorTest.java | 4 +- .../routeprogress/RouteStepProgressTest.java | 12 +- .../v5/utils/MeasurementUtilsTest.java | 4 +- .../navigation/v5/utils/RouteUtilsTest.java | 2 +- .../v5/utils/ToleranceUtilsTest.java | 10 +- .../v5/utils/ValidationUtilsTest.java | 2 +- 138 files changed, 789 insertions(+), 678 deletions(-) diff --git a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java b/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java index ba64b4c1d..86f3ab72a 100644 --- a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java +++ b/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java @@ -8,15 +8,16 @@ import androidx.test.espresso.IdlingResource; import com.google.gson.GsonBuilder; -import com.mapbox.api.directions.v5.DirectionsAdapterFactory; -import com.mapbox.api.directions.v5.models.DirectionsResponse; -import com.mapbox.api.directions.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; +import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; +import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.geojson.Point; +import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute; + import com.mapbox.services.android.navigation.testapp.R; import com.mapbox.services.android.navigation.ui.v5.NavigationView; import com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions; import com.mapbox.services.android.navigation.ui.v5.OnNavigationReadyCallback; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute; +import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java b/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java index 1f68f783b..e51dbd9b0 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.mapbox.mapboxsdk.location.permissions.PermissionsListener; -import com.mapbox.mapboxsdk.location.permissions.PermissionsManager; +import org.maplibre.android.location.permissions.PermissionsListener; +import org.maplibre.android.location.permissions.PermissionsManager; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt index a156f656d..e16adc9d0 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt @@ -11,31 +11,31 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar -import com.mapbox.api.directions.v5.DirectionsCriteria.METRIC -import com.mapbox.api.directions.v5.models.DirectionsResponse -import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.annotations.MarkerOptions -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory -import com.mapbox.mapboxsdk.geometry.LatLng -import com.mapbox.mapboxsdk.location.LocationComponent -import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions -import com.mapbox.mapboxsdk.location.modes.CameraMode -import com.mapbox.mapboxsdk.location.modes.RenderMode -import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.maps.OnMapReadyCallback -import com.mapbox.mapboxsdk.maps.Style +import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.geojson.Point +import org.maplibre.android.annotations.MarkerOptions +import org.maplibre.android.camera.CameraUpdateFactory +import org.maplibre.android.geometry.LatLng +import org.maplibre.android.location.LocationComponent +import org.maplibre.android.location.LocationComponentActivationOptions +import org.maplibre.android.location.modes.CameraMode +import org.maplibre.android.location.modes.RenderMode +import org.maplibre.android.maps.MapLibreMap +import org.maplibre.android.maps.OnMapReadyCallback +import org.maplibre.android.maps.Style import com.mapbox.services.android.navigation.testapp.databinding.ActivityMockNavigationBinding import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute import com.mapbox.services.android.navigation.v5.instruction.Instruction import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine import com.mapbox.services.android.navigation.v5.milestone.* +import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria import com.mapbox.services.android.navigation.v5.models.DirectionsRoute import com.mapbox.services.android.navigation.v5.navigation.* import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress -import com.mapbox.turf.TurfConstants -import com.mapbox.turf.TurfMeasurement +import org.maplibre.turf.TurfConstants +import org.maplibre.turf.TurfMeasurement import okhttp3.Request import retrofit2.Call import retrofit2.Callback @@ -46,13 +46,13 @@ import java.lang.ref.WeakReference class MockNavigationActivity : AppCompatActivity(), OnMapReadyCallback, - MapboxMap.OnMapClickListener, + MapLibreMap.OnMapClickListener, ProgressChangeListener, NavigationEventListener, MilestoneEventListener, OffRouteListener { private val BEGIN_ROUTE_MILESTONE = 1001 - private lateinit var mapboxMap: MapboxMap + private lateinit var mapboxMap: MapLibreMap // Navigation related variables private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() @@ -141,7 +141,7 @@ class MockNavigationActivity : } } - override fun onMapReady(mapboxMap: MapboxMap) { + override fun onMapReady(mapboxMap: MapLibreMap) { this.mapboxMap = mapboxMap mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) @@ -226,7 +226,7 @@ class MockNavigationActivity : this.accessToken(getString(R.string.mapbox_access_token)) this.origin(origin) this.destination(destination) - this.voiceUnits(METRIC) + this.voiceUnits(DirectionsCriteria.METRIC) this.alternatives(true) this.baseUrl(getString(R.string.base_url)) } @@ -239,8 +239,8 @@ class MockNavigationActivity : Timber.d("Url: %s", (call.request() as Request).url.toString()) response.body()?.let { response -> if (response.routes().isNotEmpty()) { - val maplibreResponse = com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(response.toJson()); - val directionsRoute = DirectionsRoute.fromJson(maplibreResponse.routes().first().toJson()) + val maplibreResponse = DirectionsResponse.fromJson(response.toJson()); + val directionsRoute = maplibreResponse.routes().first() this@MockNavigationActivity.route = directionsRoute navigationMapRoute?.addRoutes(maplibreResponse.routes()) } diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java index 760327800..1979e65e2 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java @@ -2,8 +2,8 @@ import android.app.Application; -import com.mapbox.mapboxsdk.BuildConfig; -import com.mapbox.mapboxsdk.Mapbox; +import org.maplibre.android.BuildConfig; +import org.maplibre.android.MapLibre; import timber.log.Timber; @@ -17,7 +17,7 @@ public void onCreate() { Timber.plant(new Timber.DebugTree()); } - Mapbox.getInstance(getApplicationContext()); + MapLibre.getInstance(getApplicationContext()); } } diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt index 7b3b793fb..addbb184f 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt @@ -6,28 +6,27 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar -import com.mapbox.api.directions.v5.DirectionsCriteria -import com.mapbox.api.directions.v5.models.DirectionsResponse -import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.annotations.MarkerOptions -import com.mapbox.mapboxsdk.camera.CameraPosition -import com.mapbox.mapboxsdk.geometry.LatLng -import com.mapbox.mapboxsdk.location.LocationComponent -import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions -import com.mapbox.mapboxsdk.location.modes.CameraMode -import com.mapbox.mapboxsdk.location.modes.RenderMode -import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.maps.OnMapReadyCallback -import com.mapbox.mapboxsdk.maps.Style +import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.geojson.Point +import org.maplibre.android.annotations.MarkerOptions +import org.maplibre.android.camera.CameraPosition +import org.maplibre.android.geometry.LatLng +import org.maplibre.android.location.LocationComponent +import org.maplibre.android.location.LocationComponentActivationOptions +import org.maplibre.android.location.modes.CameraMode +import org.maplibre.android.location.modes.RenderMode +import org.maplibre.android.maps.MapLibreMap +import org.maplibre.android.maps.OnMapReadyCallback +import org.maplibre.android.maps.Style import com.mapbox.services.android.navigation.testapp.databinding.ActivityNavigationUiBinding import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute -import com.mapbox.services.android.navigation.v5.milestone.* +import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria import com.mapbox.services.android.navigation.v5.models.DirectionsRoute import com.mapbox.services.android.navigation.v5.navigation.* -import com.mapbox.turf.TurfConstants -import com.mapbox.turf.TurfMeasurement +import org.maplibre.turf.TurfConstants +import org.maplibre.turf.TurfMeasurement import okhttp3.Request import retrofit2.Call import retrofit2.Callback @@ -37,8 +36,8 @@ import timber.log.Timber class NavigationUIActivity : AppCompatActivity(), OnMapReadyCallback, - MapboxMap.OnMapClickListener { - private lateinit var mapboxMap: MapboxMap + MapLibreMap.OnMapClickListener { + private lateinit var mapboxMap: MapLibreMap // Navigation related variables private var route: DirectionsRoute? = null @@ -101,7 +100,7 @@ class NavigationUIActivity : } } - override fun onMapReady(mapboxMap: MapboxMap) { + override fun onMapReady(mapboxMap: MapLibreMap) { this.mapboxMap = mapboxMap mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) @@ -200,7 +199,7 @@ class NavigationUIActivity : Timber.d("Url: %s", (call.request() as Request).url.toString()) response.body()?.let { response -> if (response.routes().isNotEmpty()) { - val maplibreResponse = com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(response.toJson()); + val maplibreResponse = DirectionsResponse.fromJson(response.toJson()); this@NavigationUIActivity.route = maplibreResponse.routes().first() navigationMapRoute?.addRoutes(maplibreResponse.routes()) binding.startRouteLayout.visibility = View.VISIBLE diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt b/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt index 209eb6241..740b37f6d 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt @@ -3,20 +3,19 @@ package com.mapbox.services.android.navigation.testapp import android.location.Location import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.api.directions.v5.models.DirectionsResponse -import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.location.LocationComponent -import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions -import com.mapbox.mapboxsdk.location.OnLocationCameraTransitionListener -import com.mapbox.mapboxsdk.location.modes.CameraMode -import com.mapbox.mapboxsdk.location.modes.RenderMode -import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.maps.OnMapReadyCallback -import com.mapbox.mapboxsdk.maps.Style +import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.geojson.Point +import org.maplibre.android.location.LocationComponent +import org.maplibre.android.location.LocationComponentActivationOptions +import org.maplibre.android.location.OnLocationCameraTransitionListener +import org.maplibre.android.location.modes.CameraMode +import org.maplibre.android.location.modes.RenderMode +import org.maplibre.android.maps.MapLibreMap +import org.maplibre.android.maps.OnMapReadyCallback +import org.maplibre.android.maps.Style import com.mapbox.services.android.navigation.testapp.databinding.ActivitySnapToRouteNavigationBinding import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine -import com.mapbox.services.android.navigation.v5.milestone.* import com.mapbox.services.android.navigation.v5.models.DirectionsRoute import com.mapbox.services.android.navigation.v5.navigation.* import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener @@ -42,7 +41,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, ProgressChangeListener { private lateinit var binding: ActivitySnapToRouteNavigationBinding - private lateinit var mapboxMap: MapboxMap + private lateinit var mapboxMap: MapLibreMap private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() private lateinit var navigation: MapboxNavigation private var route: DirectionsRoute? = null @@ -75,7 +74,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, private var locationComponent: LocationComponent? = null - override fun onMapReady(mapboxMap: MapboxMap) { + override fun onMapReady(mapboxMap: MapLibreMap) { this.mapboxMap = mapboxMap mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java b/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java index 49919c247..4f8928569 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java +++ b/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java @@ -9,10 +9,9 @@ import androidx.annotation.NonNull; import androidx.core.content.res.ResourcesCompat; -import com.mapbox.mapboxsdk.Mapbox; -import com.mapbox.mapboxsdk.annotations.Icon; -import com.mapbox.mapboxsdk.annotations.IconFactory; -import com.mapbox.mapboxsdk.geometry.LatLng; +import org.maplibre.android.annotations.Icon; +import org.maplibre.android.annotations.IconFactory; +import org.maplibre.android.geometry.LatLng; import java.util.Random; diff --git a/app/src/main/res/layout/activity_mock_navigation.xml b/app/src/main/res/layout/activity_mock_navigation.xml index 24b095302..0f4ba3da5 100644 --- a/app/src/main/res/layout/activity_mock_navigation.xml +++ b/app/src/main/res/layout/activity_mock_navigation.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" tools:context=".MockNavigationActivity"> - - - * 0 zoom is the world view, while 22 (default max threshold) is the closest you can position * the camera to the map. @@ -121,7 +123,7 @@ private double createZoom(RouteInformation routeInformation) { /** * Creates a camera position with the current location and upcoming maneuver location. *

- * Using {@link MapboxMap#getCameraForLatLngBounds(LatLngBounds, int[])} with a {@link LatLngBounds} + * Using {@link MapLibreMap#getCameraForLatLngBounds(LatLngBounds, int[])} with a {@link LatLngBounds} * that includes the current location and upcoming maneuver location. * * @param location for current location diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java index 19129cbd2..2403b6564 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java @@ -10,18 +10,18 @@ import androidx.fragment.app.FragmentActivity; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdate; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; -import com.mapbox.mapboxsdk.constants.MapboxConstants; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.geometry.LatLngBounds; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener; -import com.mapbox.mapboxsdk.location.OnLocationCameraTransitionListener; -import com.mapbox.mapboxsdk.location.modes.CameraMode; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.geojson.Point; +import org.maplibre.android.camera.CameraPosition; +import org.maplibre.android.camera.CameraUpdate; +import org.maplibre.android.camera.CameraUpdateFactory; +import org.maplibre.android.constants.MapLibreConstants; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.geometry.LatLngBounds; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.location.OnCameraTrackingChangedListener; +import org.maplibre.android.location.OnLocationCameraTransitionListener; +import org.maplibre.android.location.modes.CameraMode; +import org.maplibre.android.maps.MapLibreMap; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import com.mapbox.services.android.navigation.v5.navigation.camera.Camera; import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; @@ -45,7 +45,7 @@ * Updates the map camera while navigating. *

* This class listens to the progress of {@link MapboxNavigation} and moves - * the {@link MapboxMap} camera based on the location updates. + * the {@link MapLibreMap} camera based on the location updates. * * @since 0.6.0 */ @@ -78,7 +78,7 @@ public class NavigationCamera implements LifecycleObserver { = new NavigationCameraTransitionListener(this); private final OnCameraTrackingChangedListener cameraTrackingChangedListener = new NavigationCameraTrackingChangedListener(this); - private MapboxMap mapboxMap; + private MapLibreMap mapboxMap; private LocationComponent locationComponent; private MapboxNavigation navigation; private RouteInformation currentRouteInformation; @@ -107,7 +107,7 @@ public void onProgressChange(Location location, RouteProgress routeProgress) { * @param navigation for listening to location updates * @param locationComponent for managing camera mode */ - public NavigationCamera(@NonNull MapboxMap mapboxMap, @NonNull MapboxNavigation navigation, + public NavigationCamera(@NonNull MapLibreMap mapboxMap, @NonNull MapboxNavigation navigation, @NonNull LocationComponent locationComponent) { this.mapboxMap = mapboxMap; this.navigation = navigation; @@ -125,7 +125,7 @@ public NavigationCamera(@NonNull MapboxMap mapboxMap, @NonNull MapboxNavigation * @param mapboxMap for moving the camera * @param locationComponent for managing camera mode */ - public NavigationCamera(@NonNull MapboxMap mapboxMap, LocationComponent locationComponent) { + public NavigationCamera(@NonNull MapLibreMap mapboxMap, LocationComponent locationComponent) { this.mapboxMap = mapboxMap; this.locationComponent = locationComponent; this.animationDelegate = new CameraAnimationDelegate(mapboxMap); @@ -136,7 +136,7 @@ public NavigationCamera(@NonNull MapboxMap mapboxMap, LocationComponent location /** * Used for testing only. */ - NavigationCamera(MapboxMap mapboxMap, MapboxNavigation navigation, ProgressChangeListener progressChangeListener, + NavigationCamera(MapLibreMap mapboxMap, MapboxNavigation navigation, ProgressChangeListener progressChangeListener, LocationComponent locationComponent, RouteInformation currentRouteInformation) { this.mapboxMap = mapboxMap; this.locationComponent = locationComponent; @@ -231,7 +231,7 @@ public void showRouteOverview(int[] padding) { * @see CameraUpdateMode for how this update interacts with the current tracking */ public void update(NavigationCameraUpdate update) { - animationDelegate.render(update, MapboxConstants.ANIMATION_DURATION, null); + animationDelegate.render(update, MapLibreConstants.ANIMATION_DURATION, null); } /** @@ -253,7 +253,7 @@ public void update(NavigationCameraUpdate update, int durationMs) { * Animate the camera to a new location defined within {@link CameraUpdate} passed to the * {@link NavigationCameraUpdate} using a transition animation that evokes powered flight. The animation will * last a specified amount of time given in milliseconds. A callback can be used to be notified when animating - * the camera stops. During the animation, a call to {@link MapboxMap#getCameraPosition()} returns an intermediate + * the camera stops. During the animation, a call to {@link MapLibreMap#getCameraPosition()} returns an intermediate * location of the camera in flight. If the camera is in a tracking mode, * this animation is going to be ignored, or break the tracking, based on the {@link CameraUpdateMode}. * @@ -268,7 +268,7 @@ public void update(NavigationCameraUpdate update, int durationMs) { * isn't required, leave it as null. * @see CameraUpdateMode for how this update interacts with the current tracking */ - public void update(NavigationCameraUpdate update, int durationMs, @Nullable MapboxMap.CancelableCallback callback) { + public void update(NavigationCameraUpdate update, int durationMs, @Nullable MapLibreMap.CancelableCallback callback) { animationDelegate.render(update, durationMs, callback); } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java index 4c864547e..2927dd13f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener; +import org.maplibre.android.location.OnCameraTrackingChangedListener; class NavigationCameraTrackingChangedListener implements OnCameraTrackingChangedListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java index 28ed51884..5aa2535a1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.location.OnLocationCameraTransitionListener; +import org.maplibre.android.location.OnLocationCameraTransitionListener; class NavigationCameraTransitionListener implements OnLocationCameraTransitionListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java index e697ccad1..0e7934b2b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; -import com.mapbox.mapboxsdk.camera.CameraUpdate; +import org.maplibre.android.camera.CameraUpdate; /** * Used with {@link NavigationCamera#update(NavigationCameraUpdate)}. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java index 08088a3b6..a9b39971c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java @@ -1,8 +1,8 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapLibreMap; -class ResetCancelableCallback implements MapboxMap.CancelableCallback { +class ResetCancelableCallback implements MapLibreMap.CancelableCallback { private final NavigationCamera camera; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java index 63ac5a361..94293af93 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java @@ -1,7 +1,7 @@ package com.mapbox.services.android.navigation.ui.v5.listeners; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; /** * A listener that can be implemented and added to {@link com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions} to diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java index e5c6558a3..102f92d4c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java @@ -3,8 +3,8 @@ import android.location.Location; import android.os.AsyncTask; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java index 20060c891..867ba66af 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java @@ -2,10 +2,10 @@ import androidx.annotation.NonNull; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.maps.MapLibreMap; -class LocationFpsDelegate implements MapboxMap.OnCameraIdleListener { +class LocationFpsDelegate implements MapLibreMap.OnCameraIdleListener { private static final int ZOOM_LEVEL_FIVE = 5; private static final int ZOOM_LEVEL_TEN = 10; @@ -18,12 +18,12 @@ class LocationFpsDelegate implements MapboxMap.OnCameraIdleListener { private static final int MAX_ANIMATION_FPS_FIFTEEN = 15; private static final int MAX_ANIMATION_FPS_TWENTY_FIVE = 25; private static final int MAX_ANIMATION_FPS = Integer.MAX_VALUE; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; private final LocationComponent locationComponent; private int currentFps = MAX_ANIMATION_FPS; private boolean isEnabled = true; - LocationFpsDelegate(@NonNull MapboxMap mapboxMap, @NonNull LocationComponent locationComponent) { + LocationFpsDelegate(@NonNull MapLibreMap mapboxMap, @NonNull LocationComponent locationComponent) { this.mapboxMap = mapboxMap; this.locationComponent = locationComponent; mapboxMap.addOnCameraIdleListener(this); diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java index d947e2efd..c9e65b2fc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java @@ -2,7 +2,7 @@ import android.content.Context; -import com.mapbox.mapboxsdk.maps.MapView; +import org.maplibre.android.maps.MapView; import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; import com.mapbox.services.android.navigation.ui.v5.camera.OnTrackingModeChangedListener; import com.mapbox.services.android.navigation.ui.v5.camera.OnTrackingModeTransitionListener; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java index 6279c8700..c20250e40 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java @@ -2,18 +2,18 @@ import android.graphics.Color; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.SymbolLayer; import java.util.List; -import static com.mapbox.mapboxsdk.style.layers.Property.NONE; -import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; +import static org.maplibre.android.style.layers.Property.NONE; +import static org.maplibre.android.style.layers.Property.VISIBLE; +import static org.maplibre.android.style.layers.PropertyFactory.lineColor; +import static org.maplibre.android.style.layers.PropertyFactory.lineWidth; +import static org.maplibre.android.style.layers.PropertyFactory.visibility; import static com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; class MapLayerInteractor { @@ -21,9 +21,9 @@ class MapLayerInteractor { private static final float DEFAULT_WIDTH = 20f; private static final int LAST_INDEX = 0; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; - MapLayerInteractor(MapboxMap mapboxMap) { + MapLayerInteractor(MapLibreMap mapboxMap) { this.mapboxMap = mapboxMap; } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java index 7414efa06..41757903a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.res.Resources; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; import com.mapbox.services.android.navigation.ui.v5.R; class MapPaddingAdjustor { @@ -12,17 +12,17 @@ class MapPaddingAdjustor { private static final int BOTTOMSHEET_PADDING_MULTIPLIER = 4; private static final int WAYNAME_PADDING_MULTIPLIER = 2; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; private final int[] defaultPadding; private int[] customPadding; - MapPaddingAdjustor(MapView mapView, MapboxMap mapboxMap) { + MapPaddingAdjustor(MapView mapView, MapLibreMap mapboxMap) { this.mapboxMap = mapboxMap; defaultPadding = calculateDefaultPadding(mapView); } // Testing only - MapPaddingAdjustor(MapboxMap mapboxMap, int[] defaultPadding) { + MapPaddingAdjustor(MapLibreMap mapboxMap, int[] defaultPadding) { this.mapboxMap = mapboxMap; this.defaultPadding = defaultPadding; } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java index 97b3f193d..9f63d4557 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java @@ -5,8 +5,8 @@ import android.os.AsyncTask; import androidx.annotation.NonNull; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java index a8a9878f8..f8d79958f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java @@ -13,21 +13,21 @@ import androidx.fragment.app.FragmentActivity; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions; -import com.mapbox.mapboxsdk.location.LocationComponentOptions; -import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener; -import com.mapbox.mapboxsdk.location.modes.RenderMode; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.style.sources.Source; -import com.mapbox.mapboxsdk.style.sources.VectorSource; +import org.maplibre.geojson.Point; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.location.LocationComponentActivationOptions; +import org.maplibre.android.location.LocationComponentOptions; +import org.maplibre.android.location.OnCameraTrackingChangedListener; +import org.maplibre.android.location.modes.RenderMode; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.OnMapReadyCallback; +import org.maplibre.android.maps.Style; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.style.sources.Source; +import org.maplibre.android.style.sources.VectorSource; import com.mapbox.services.android.navigation.ui.v5.R; import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; @@ -42,7 +42,7 @@ import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MINIMUM_MAP_ZOOM; /** - * Wrapper class for {@link MapboxMap}. + * Wrapper class for {@link MapLibreMap}. *

* This class initializes various map-related components and plugins that are * useful for providing a navigation-driven map experience. @@ -67,7 +67,7 @@ public class NavigationMapboxMap { = new MapWayNameChangedListener(onWayNameChangedListeners); private NavigationMapSettings settings = new NavigationMapSettings(); private MapView mapView; - private MapboxMap mapboxMap; + private MapLibreMap mapboxMap; private LocationComponent locationComponent; private MapPaddingAdjustor mapPaddingAdjustor; private NavigationSymbolManager navigationSymbolManager; @@ -87,7 +87,7 @@ public class NavigationMapboxMap { * @param mapView for map size and Context * @param mapboxMap for APIs to interact with the map */ - public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap) { + public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this.mapView = mapView; this.mapboxMap = mapboxMap; initializeLocationComponent(mapView, mapboxMap); @@ -137,7 +137,7 @@ public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapboxMap mapboxMa } // Package private (no modifier) for testing purposes - NavigationMapboxMap(MapboxMap mapboxMap, MapLayerInteractor layerInteractor, MapPaddingAdjustor adjustor) { + NavigationMapboxMap(MapLibreMap mapboxMap, MapLayerInteractor layerInteractor, MapPaddingAdjustor adjustor) { this.layerInteractor = layerInteractor; initializeWayName(mapboxMap, adjustor); } @@ -176,7 +176,7 @@ public void addDestinationMarker(Point position) { * Please note, the map will manage all markers added. Calling {@link NavigationMapboxMap#clearMarkers()} * will clear all destination / custom markers that have been added to the map. * - * @param options for the custom {@link com.mapbox.mapboxsdk.plugins.annotation.Symbol} + * @param options for the custom {@link org.maplibre.android.plugins.annotation.Symbol} */ public void addCustomMarker(SymbolOptions options) { navigationSymbolManager.addCustomSymbolFor(options); @@ -491,13 +491,13 @@ public void updateLocationVisibilityTo(boolean isVisible) { } /** - * Provides the {@link MapboxMap} originally given in the constructor. + * Provides the {@link MapLibreMap} originally given in the constructor. *

* This method gives access to all map-related APIs. * * @return map provided in the constructor */ - public MapboxMap retrieveMap() { + public MapLibreMap retrieveMap() { return mapboxMap; } @@ -596,7 +596,7 @@ public void adjustLocationIconWith(int[] customPadding) { } @SuppressLint("MissingPermission") - private void initializeLocationComponent(MapView mapView, MapboxMap map) { + private void initializeLocationComponent(MapView mapView, MapLibreMap map) { locationComponent = map.getLocationComponent(); map.setMinZoomPreference(NAVIGATION_MINIMUM_MAP_ZOOM); map.setMaxZoomPreference(NAVIGATION_MAXIMUM_MAP_ZOOM); @@ -625,11 +625,11 @@ private boolean isValid(@AnyRes int resId) { return resId != -1 && (resId & 0xff000000) != 0 && (resId & 0x00ff0000) != 0; } - private void initializeMapPaddingAdjustor(MapView mapView, MapboxMap mapboxMap) { + private void initializeMapPaddingAdjustor(MapView mapView, MapLibreMap mapboxMap) { mapPaddingAdjustor = new MapPaddingAdjustor(mapView, mapboxMap); } - private void initializeNavigationSymbolManager(MapView mapView, MapboxMap mapboxMap) { + private void initializeNavigationSymbolManager(MapView mapView, MapLibreMap mapboxMap) { Bitmap markerBitmap = ThemeSwitcher.retrieveThemeMapMarker(mapView.getContext()); mapboxMap.getStyle().addImage(MAPBOX_NAVIGATION_MARKER_NAME, markerBitmap); SymbolManager symbolManager = new SymbolManager(mapView, mapboxMap, mapboxMap.getStyle()); @@ -638,25 +638,25 @@ private void initializeNavigationSymbolManager(MapView mapView, MapboxMap mapbox mapView.addOnDidFinishLoadingStyleListener(onStyleLoadedListener); } - private void initializeMapLayerInteractor(MapboxMap mapboxMap) { + private void initializeMapLayerInteractor(MapLibreMap mapboxMap) { layerInteractor = new MapLayerInteractor(mapboxMap); } - private void initializeRoute(MapView mapView, MapboxMap map) { + private void initializeRoute(MapView mapView, MapLibreMap map) { Context context = mapView.getContext(); int routeStyleRes = ThemeSwitcher.retrieveNavigationViewStyle(context, R.attr.navigationViewRouteStyle); mapRoute = new NavigationMapRoute(null, mapView, map, routeStyleRes); } - private void initializeCamera(MapboxMap map, LocationComponent locationComponent) { + private void initializeCamera(MapLibreMap map, LocationComponent locationComponent) { mapCamera = new NavigationCamera(map, locationComponent); } - private void initializeLocationFpsDelegate(MapboxMap map, LocationComponent locationComponent) { + private void initializeLocationFpsDelegate(MapLibreMap map, LocationComponent locationComponent) { locationFpsDelegate = new LocationFpsDelegate(map, locationComponent); } - private void initializeWayName(MapboxMap mapboxMap, MapPaddingAdjustor paddingAdjustor) { + private void initializeWayName(MapLibreMap mapboxMap, MapPaddingAdjustor paddingAdjustor) { if (mapWayName != null) { return; } @@ -667,7 +667,7 @@ private void initializeWayName(MapboxMap mapboxMap, MapPaddingAdjustor paddingAd mapWayName.addOnWayNameChangedListener(internalWayNameChangedListener); } - private void initializeStreetsSource(MapboxMap mapboxMap) { + private void initializeStreetsSource(MapLibreMap mapboxMap) { List sources = mapboxMap.getStyle().getSources(); Source sourceV7 = findSourceByUrl(sources, MAPBOX_STREETS_V7_URL); Source sourceV8 = findSourceByUrl(sources, MAPBOX_STREETS_V8_URL); diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java index 71c7cd632..59e11090f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java @@ -2,11 +2,11 @@ import androidx.annotation.NonNull; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import org.maplibre.geojson.Point; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java index c3e1bfbcd..ff3757a7a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; -import com.mapbox.geojson.Feature; +import org.maplibre.geojson.Feature; interface OnFeatureFilteredCallback { void onFeatureFiltered(@NonNull Feature feature); diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java index 14a4baa4e..960be52d3 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java @@ -2,17 +2,17 @@ import android.graphics.Bitmap; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; import static com.mapbox.services.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; class SymbolOnStyleLoadedListener implements MapView.OnDidFinishLoadingStyleListener { - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; private final Bitmap markerBitmap; - SymbolOnStyleLoadedListener(MapboxMap mapboxMap, Bitmap markerBitmap) { + SymbolOnStyleLoadedListener(MapLibreMap mapboxMap, Bitmap markerBitmap) { this.mapboxMap = mapboxMap; this.markerBitmap = markerBitmap; } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java index d265b031c..dbe163a73 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java @@ -4,22 +4,22 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Geometry; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.Point; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Geometry; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.MultiLineString; +import org.maplibre.geojson.Point; +import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import static com.mapbox.turf.TurfConstants.UNIT_METRES; -import static com.mapbox.turf.TurfMeasurement.along; -import static com.mapbox.turf.TurfMisc.lineSlice; -import static com.mapbox.turf.TurfMisc.lineSliceAlong; +import static org.maplibre.turf.TurfConstants.UNIT_METRES; +import static org.maplibre.turf.TurfMeasurement.along; +import static org.maplibre.turf.TurfMisc.lineSlice; +import static org.maplibre.turf.TurfMisc.lineSliceAlong; class WaynameFeatureFilter { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java index 04981365f..0a1753750 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java @@ -2,16 +2,16 @@ import android.graphics.PointF; -import com.mapbox.geojson.Feature; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.geojson.Feature; +import org.maplibre.android.maps.MapLibreMap; import java.util.List; class WaynameFeatureFinder { - private MapboxMap mapboxMap; + private MapLibreMap mapboxMap; - WaynameFeatureFinder(MapboxMap mapboxMap) { + WaynameFeatureFinder(MapLibreMap mapboxMap) { this.mapboxMap = mapboxMap; } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java index d9ce02c96..f65ddbe76 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java @@ -5,10 +5,10 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.core.constants.Constants; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java index 0690b98d7..389b83d4a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java @@ -10,45 +10,45 @@ import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.content.res.AppCompatResources; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.PropertyFactory; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; -import com.mapbox.mapboxsdk.utils.MathUtils; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.Property; +import org.maplibre.android.style.layers.PropertyFactory; +import org.maplibre.android.style.layers.SymbolLayer; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; +import org.maplibre.android.utils.MathUtils; import com.mapbox.services.android.navigation.ui.v5.R; import com.mapbox.services.android.navigation.ui.v5.utils.MapImageUtils; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static com.mapbox.mapboxsdk.style.expressions.Expression.color; -import static com.mapbox.mapboxsdk.style.expressions.Expression.get; -import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate; -import static com.mapbox.mapboxsdk.style.expressions.Expression.linear; -import static com.mapbox.mapboxsdk.style.expressions.Expression.step; -import static com.mapbox.mapboxsdk.style.expressions.Expression.stop; -import static com.mapbox.mapboxsdk.style.expressions.Expression.zoom; -import static com.mapbox.mapboxsdk.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP; -import static com.mapbox.mapboxsdk.style.layers.Property.NONE; -import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; +import static org.maplibre.android.style.expressions.Expression.color; +import static org.maplibre.android.style.expressions.Expression.get; +import static org.maplibre.android.style.expressions.Expression.interpolate; +import static org.maplibre.android.style.expressions.Expression.linear; +import static org.maplibre.android.style.expressions.Expression.step; +import static org.maplibre.android.style.expressions.Expression.stop; +import static org.maplibre.android.style.expressions.Expression.zoom; +import static org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP; +import static org.maplibre.android.style.layers.Property.NONE; +import static org.maplibre.android.style.layers.Property.VISIBLE; +import static org.maplibre.android.style.layers.PropertyFactory.iconAllowOverlap; +import static org.maplibre.android.style.layers.PropertyFactory.iconIgnorePlacement; +import static org.maplibre.android.style.layers.PropertyFactory.visibility; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_BEARING; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_LAYER_ID; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_OFFSET; @@ -90,9 +90,9 @@ class MapRouteArrow { private GeoJsonSource arrowHeadGeoJsonSource; private final MapView mapView; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; - MapRouteArrow(MapView mapView, MapboxMap mapboxMap, @StyleRes int styleRes) { + MapRouteArrow(MapView mapView, MapLibreMap mapboxMap, @StyleRes int styleRes) { this.mapView = mapView; this.mapboxMap = mapboxMap; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java index f74a98be1..d0aafa435 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java @@ -3,21 +3,21 @@ import androidx.annotation.NonNull; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; -class MapRouteClickListener implements MapboxMap.OnMapClickListener { +class MapRouteClickListener implements MapLibreMap.OnMapClickListener { private final MapRouteLine routeLine; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java index 6540c1297..9e9d0f6fb 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java @@ -2,32 +2,32 @@ import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.expressions.Expression; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.Property; +import org.maplibre.android.style.layers.SymbolLayer; import com.mapbox.services.android.navigation.ui.v5.utils.MapImageUtils; -import static com.mapbox.mapboxsdk.style.expressions.Expression.color; -import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential; -import static com.mapbox.mapboxsdk.style.expressions.Expression.get; -import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate; -import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; -import static com.mapbox.mapboxsdk.style.expressions.Expression.match; -import static com.mapbox.mapboxsdk.style.expressions.Expression.product; -import static com.mapbox.mapboxsdk.style.expressions.Expression.stop; -import static com.mapbox.mapboxsdk.style.expressions.Expression.switchCase; -import static com.mapbox.mapboxsdk.style.expressions.Expression.zoom; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconPitchAlignment; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconSize; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineCap; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineColor; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineJoin; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineWidth; +import static org.maplibre.android.style.expressions.Expression.color; +import static org.maplibre.android.style.expressions.Expression.exponential; +import static org.maplibre.android.style.expressions.Expression.get; +import static org.maplibre.android.style.expressions.Expression.interpolate; +import static org.maplibre.android.style.expressions.Expression.literal; +import static org.maplibre.android.style.expressions.Expression.match; +import static org.maplibre.android.style.expressions.Expression.product; +import static org.maplibre.android.style.expressions.Expression.stop; +import static org.maplibre.android.style.expressions.Expression.switchCase; +import static org.maplibre.android.style.expressions.Expression.zoom; +import static org.maplibre.android.style.layers.PropertyFactory.iconAllowOverlap; +import static org.maplibre.android.style.layers.PropertyFactory.iconIgnorePlacement; +import static org.maplibre.android.style.layers.PropertyFactory.iconImage; +import static org.maplibre.android.style.layers.PropertyFactory.iconPitchAlignment; +import static org.maplibre.android.style.layers.PropertyFactory.iconSize; +import static org.maplibre.android.style.layers.PropertyFactory.lineCap; +import static org.maplibre.android.style.layers.PropertyFactory.lineColor; +import static org.maplibre.android.style.layers.PropertyFactory.lineJoin; +import static org.maplibre.android.style.layers.PropertyFactory.lineWidth; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.DESTINATION_MARKER_NAME; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.HEAVY_CONGESTION_VALUE; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MODERATE_CONGESTION_VALUE; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java index e698e73e6..a0afc1abd 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java @@ -10,17 +10,17 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.expressions.Expression; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.SymbolLayer; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; import com.mapbox.services.android.navigation.ui.v5.R; import com.mapbox.services.android.navigation.ui.v5.utils.MapUtils; @@ -29,10 +29,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; -import static com.mapbox.mapboxsdk.style.layers.Property.NONE; -import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; +import static org.maplibre.android.style.expressions.Expression.literal; +import static org.maplibre.android.style.layers.Property.NONE; +import static org.maplibre.android.style.layers.Property.VISIBLE; +import static org.maplibre.android.style.layers.PropertyFactory.visibility; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java index 4c64a16f7..3fbbbfb21 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java @@ -1,8 +1,8 @@ package com.mapbox.services.android.navigation.ui.v5.route; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; class MapRouteSourceProvider { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java index 9e705b24d..06f33c846 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java @@ -17,6 +17,7 @@ import com.mapbox.services.android.navigation.v5.utils.TextUtils; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -80,7 +81,7 @@ public NavigationRoute.Builder buildRequest(Location location, RouteProgress pro .origin(origin, bearing, BEARING_TOLERANCE) .routeOptions(options); - List remainingWaypoints = routeUtils.calculateRemainingWaypoints(progress); + List remainingWaypoints = toMapboxPointList(routeUtils.calculateRemainingWaypoints(progress)); if (remainingWaypoints == null) { Timber.e("An error occurred fetching a new route"); return null; @@ -94,7 +95,7 @@ public NavigationRoute.Builder buildRequest(Location location, RouteProgress pro private void addDestination(List remainingWaypoints, NavigationRoute.Builder builder) { if (!remainingWaypoints.isEmpty()) { - builder.destination(retrieveDestinationWaypoint(remainingWaypoints)); + builder.destination(toMapLibrePoint(retrieveDestinationWaypoint(remainingWaypoints))); } } @@ -106,7 +107,7 @@ private Point retrieveDestinationWaypoint(List remainingWaypoints) { private void addWaypoints(List remainingCoordinates, NavigationRoute.Builder builder) { if (!remainingCoordinates.isEmpty()) { for (Point coordinate : remainingCoordinates) { - builder.addWaypoint(coordinate); + builder.addWaypoint(toMapLibrePoint(coordinate)); } } } @@ -167,10 +168,10 @@ private boolean invalid(Context context, Location location, RouteProgress routeP return context == null || location == null || routeProgress == null; } - private Callback directionsResponseCallback = new Callback() { + private Callback directionsResponseCallback = new Callback<>() { @Override - public void onResponse(@NonNull Call call, - @NonNull Response response) { + public void onResponse(@NonNull Call call, + @NonNull Response response) { if (!response.isSuccessful()) { return; } @@ -184,7 +185,7 @@ public void onResponse(@NonNull Call call, @NonNull Throwable throwable) { + public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { updateListenersWithError(throwable); } }; @@ -200,4 +201,28 @@ private void updateListenersWithError(Throwable throwable) { listener.onErrorReceived(throwable); } } + + private List toMapboxPointList(List pointList) { + List mapboxPointList = new ArrayList<>(); + for (org.maplibre.geojson.Point point : pointList) { + mapboxPointList.add(toMapboxPoint(point)); + } + return mapboxPointList; + } + + private Point toMapboxPoint(org.maplibre.geojson.Point point) { + return Point.fromLngLat(point.longitude(), point.latitude()); + } + + private List toMapLibrePointList(List pointList) { + List mapboxPointList = new ArrayList<>(); + for (Point point : pointList) { + mapboxPointList.add(toMapLibrePoint(point)); + } + return mapboxPointList; + } + + private org.maplibre.geojson.Point toMapLibrePoint(Point point) { + return org.maplibre.geojson.Point.fromLngLat(point.longitude(), point.latitude()); + } } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java index 5ece59226..8a9e9795d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java @@ -14,9 +14,9 @@ import androidx.fragment.app.Fragment; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; import com.mapbox.services.android.navigation.ui.v5.R; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; @@ -44,7 +44,7 @@ public class NavigationMapRoute implements LifecycleObserver { @StyleRes private final int styleRes; private final String belowLayer; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; private final MapView mapView; private MapRouteClickListener mapRouteClickListener; private MapRouteProgressChangeListener mapRouteProgressChangeListener; @@ -62,7 +62,7 @@ public class NavigationMapRoute implements LifecycleObserver { * @param mapboxMap the MapboxMap to apply route with * @since 0.4.0 */ - public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap) { + public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this(null, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -74,7 +74,7 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap * @param belowLayer optionally pass in a layer id to place the route line below * @since 0.4.0 */ - public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, + public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(null, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -89,7 +89,7 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap * @since 0.4.0 */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap) { + @NonNull MapLibreMap mapboxMap) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -104,7 +104,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @since 0.4.0 */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @Nullable String belowLayer) { + @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -118,7 +118,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @param styleRes a style resource with custom route colors, scale, etc. */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes) { + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes) { this(navigation, mapView, mapboxMap, styleRes, null); } @@ -133,7 +133,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @param belowLayer optionally pass in a layer id to place the route line below */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes, + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer) { this.styleRes = styleRes; this.belowLayer = belowLayer; @@ -150,7 +150,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie // For testing only NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, MapRouteClickListener mapClickListener, MapView.OnDidFinishLoadingStyleListener didFinishLoadingStyleListener, MapRouteProgressChangeListener progressChangeListener) { @@ -167,7 +167,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie // For testing only NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, MapRouteClickListener mapClickListener, MapView.OnDidFinishLoadingStyleListener didFinishLoadingStyleListener, MapRouteProgressChangeListener progressChangeListener, @@ -317,7 +317,7 @@ public void onStop() { removeListeners(); } - private MapRouteLine buildMapRouteLine(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, + private MapRouteLine buildMapRouteLine(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer) { Context context = mapView.getContext(); MapRouteDrawableProvider drawableProvider = new MapRouteDrawableProvider(context); diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java index c74939d91..f8cb3dfe2 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java @@ -6,23 +6,27 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.api.directions.v5.DirectionsCriteria; import com.mapbox.api.directions.v5.MapboxDirections; -import com.mapbox.api.directions.v5.models.DirectionsResponse; -import com.mapbox.api.directions.v5.models.RouteLeg; -import com.mapbox.geojson.Point; +import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; +import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteOptions; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; import com.mapbox.services.android.navigation.v5.utils.TextUtils; +import com.mapbox.geojson.Point; + +import java.io.IOException; import java.util.List; import java.util.Locale; import okhttp3.Interceptor; +import okhttp3.Request; +import okio.Timeout; import retrofit2.Call; import retrofit2.Callback; +import retrofit2.Response; /** @@ -77,7 +81,68 @@ static Builder builder(Context context, LocaleUtils localeUtils) { * @since 0.5.0 */ public void getRoute(Callback callback) { - mapboxDirections.enqueueCall(callback); + mapboxDirections.enqueueCall(toMapboxCallback(callback)); + } + + private Callback toMapboxCallback(Callback callback) { + return new Callback<>() { + @Override + public void onResponse(Call call, Response response) { + callback.onResponse(toMapLibreCall(call), toMapLibreResponse(response)); + } + + @Override + public void onFailure(Call call, Throwable t) { + callback.onFailure(toMapLibreCall(call), t); + } + }; + } + + private Response toMapLibreResponse(Response response) { + if (response.isSuccessful()) { + return Response.success(response.code(), toMapLibreDirectionsResponse(response.body())); + } else { + return Response.error(response.errorBody(), response.raw()); + } + } + + private Call toMapLibreCall(Call call) { + return new Call<>() { + @Override + public Response execute() throws IOException { + return toMapLibreResponse(call.execute()); + } + + @Override + public void enqueue(Callback callback) { + call.enqueue(toMapboxCallback(callback)); + } + + @Override + public boolean isExecuted() { + return call.isExecuted(); + } + + @Override + public void cancel() { + call.cancel(); + } + + @Override + public boolean isCanceled() { + return call.isCanceled(); + } + + @Override + public Call clone() { + return toMapLibreCall(call.clone()); + } + + @Override + public Request request() { + return call.request(); + } + }; } /** @@ -88,7 +153,7 @@ public void getRoute(Callback callback) { * @since 1.0.0 */ public Call getCall() { - return mapboxDirections.cloneCall(); + return toMapLibreCall(mapboxDirections.cloneCall()); } public void cancelCall() { @@ -154,8 +219,8 @@ public Builder profile(@NonNull @DirectionsCriteria.ProfileCriteria String profi * @return this builder for chaining options together * @since 0.5.0 */ - public Builder origin(@NonNull Point origin) { - origin(origin, null, null); + public Builder origin(@NonNull org.maplibre.geojson.Point origin) { + origin(toMapboxPoint(origin), null, null); return this; } @@ -172,7 +237,7 @@ public Builder origin(@NonNull Point origin) { * @return this builder for chaining options together * @since 0.5.0 */ - public Builder origin(@NonNull Point origin, @Nullable Double angle, + public Builder origin(@NonNull com.mapbox.geojson.Point origin, @Nullable Double angle, @Nullable Double tolerance) { directionsBuilder.origin(origin); directionsBuilder.addBearing(angle, tolerance); @@ -188,8 +253,8 @@ public Builder origin(@NonNull Point origin, @Nullable Double angle, * @return this builder for chaining options together * @since 0.50 */ - public Builder destination(@NonNull Point destination) { - destination(destination, null, null); + public Builder destination(@NonNull org.maplibre.geojson.Point destination) { + destination(toMapboxPoint(destination), null, null); return this; } @@ -225,8 +290,8 @@ public Builder destination(@NonNull Point destination, @Nullable Double angle, * @return this builder for chaining options together * @since 0.5.0 */ - public Builder addWaypoint(@NonNull Point waypoint) { - directionsBuilder.addWaypoint(waypoint); + public Builder addWaypoint(@NonNull org.maplibre.geojson.Point waypoint) { + directionsBuilder.addWaypoint(toMapboxPoint(waypoint)); directionsBuilder.addBearing(null, null); return this; } @@ -271,7 +336,7 @@ public Builder waypointIndices(@NonNull List waypointIndices) { directionsBuilder.waypointIndices(waypointIndices); return this; } - + /** * Optionally set whether to try to return alternative routes. An alternative is classified as a * route that is significantly different then the fastest route, but also still reasonably fast. @@ -587,4 +652,16 @@ public NavigationRoute build() { return new NavigationRoute(directionsBuilder.build()); } } + + private static com.mapbox.services.android.navigation.v5.models.DirectionsResponse toMapLibreDirectionsResponse(com.mapbox.api.directions.v5.models.DirectionsResponse directionsResponse) { + return com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(directionsResponse.toJson()); + } + + private static com.mapbox.api.directions.v5.models.DirectionsResponse toMapboxDirectionsResponse(com.mapbox.services.android.navigation.v5.models.DirectionsResponse directionsResponse) { + return com.mapbox.api.directions.v5.models.DirectionsResponse.fromJson(directionsResponse.toJson()); + } + + private static Point toMapboxPoint(org.maplibre.geojson.Point point) { + return Point.fromLngLat(point.longitude(), point.latitude()); + } } \ No newline at end of file diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java index 0cd9fd2a2..e18283432 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.route; -import com.mapbox.geojson.FeatureCollection; +import org.maplibre.geojson.FeatureCollection; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java index 3725c98fd..14e64679b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java @@ -1,8 +1,8 @@ package com.mapbox.services.android.navigation.ui.v5.route; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; import java.util.HashMap; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java index 050630238..b8a764a83 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java @@ -2,8 +2,8 @@ import android.os.Handler; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java index ba7c96e40..e9b7523d3 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java @@ -3,9 +3,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.layers.Layer; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.layers.Layer; /** * Utils class useful for performing map operations such as adding sources, layers, and more. @@ -28,7 +28,7 @@ private MapUtils() { * @deprecated use {@link #addLayerToMap(Style, Layer, String)} */ @Deprecated - public static void addLayerToMap(@NonNull MapboxMap mapboxMap, @NonNull Layer layer, + public static void addLayerToMap(@NonNull MapLibreMap mapboxMap, @NonNull Layer layer, @Nullable String idBelowLayer) { if (layer != null && mapboxMap.getStyle().getLayer(layer.getId()) != null) { return; diff --git a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml index eb473391f..f5187a56b 100644 --- a/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml +++ b/libandroid-navigation-ui/src/main/res/layout-land/navigation_view_layout.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - buildRouteCoordinatesFrom(RouteProgress routeProgress) { @NonNull private DynamicCamera buildDynamicCamera() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); return new DynamicCamera(mapboxMap); } diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java index 8de0ac99f..58e764960 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java @@ -1,11 +1,11 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdate; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.location.OnLocationCameraTransitionListener; -import com.mapbox.mapboxsdk.location.modes.CameraMode; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.camera.CameraPosition; +import org.maplibre.android.camera.CameraUpdate; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.location.OnLocationCameraTransitionListener; +import org.maplibre.android.location.modes.CameraMode; +import org.maplibre.android.maps.MapLibreMap; import com.mapbox.services.android.navigation.ui.v5.BaseTest; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; @@ -86,7 +86,7 @@ public void onResetCamera_trackingIsResumed() { @Test public void onResetCamera_dynamicCameraIsReset() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(mock(CameraPosition.class)); MapboxNavigation navigation = mock(MapboxNavigation.class); DynamicCamera dynamicCamera = mock(DynamicCamera.class); @@ -123,12 +123,12 @@ public void onResumeWithNullLocation_progressListenerIsAdded() { @Test public void update_defaultIsIgnoredWhileTracking() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); when(locationComponent.getCameraMode()).thenReturn(CameraMode.TRACKING_GPS); when(mapboxMap.getLocationComponent()).thenReturn(locationComponent); CameraUpdate cameraUpdate = mock(CameraUpdate.class); - MapboxMap.CancelableCallback callback = mock(MapboxMap.CancelableCallback.class); + MapLibreMap.CancelableCallback callback = mock(MapLibreMap.CancelableCallback.class); NavigationCameraUpdate navigationCameraUpdate = new NavigationCameraUpdate(cameraUpdate); NavigationCamera camera = buildCamera(mapboxMap); @@ -139,12 +139,12 @@ public void update_defaultIsIgnoredWhileTracking() { @Test public void update_defaultIsAcceptedWithNoTracking() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); when(locationComponent.getCameraMode()).thenReturn(CameraMode.NONE); when(mapboxMap.getLocationComponent()).thenReturn(locationComponent); CameraUpdate cameraUpdate = mock(CameraUpdate.class); - MapboxMap.CancelableCallback callback = mock(MapboxMap.CancelableCallback.class); + MapLibreMap.CancelableCallback callback = mock(MapLibreMap.CancelableCallback.class); NavigationCameraUpdate navigationCameraUpdate = new NavigationCameraUpdate(cameraUpdate); NavigationCamera camera = buildCamera(mapboxMap); @@ -155,12 +155,12 @@ public void update_defaultIsAcceptedWithNoTracking() { @Test public void update_overrideIsAcceptedWhileTracking() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); when(locationComponent.getCameraMode()).thenReturn(CameraMode.TRACKING_GPS); when(mapboxMap.getLocationComponent()).thenReturn(locationComponent); CameraUpdate cameraUpdate = mock(CameraUpdate.class); - MapboxMap.CancelableCallback callback = mock(MapboxMap.CancelableCallback.class); + MapLibreMap.CancelableCallback callback = mock(MapLibreMap.CancelableCallback.class); NavigationCameraUpdate navigationCameraUpdate = new NavigationCameraUpdate(cameraUpdate); navigationCameraUpdate.setMode(CameraUpdateMode.OVERRIDE); NavigationCamera camera = buildCamera(mapboxMap); @@ -172,12 +172,12 @@ public void update_overrideIsAcceptedWhileTracking() { @Test public void update_overrideSetsLocationComponentCameraModeNone() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); when(locationComponent.getCameraMode()).thenReturn(CameraMode.TRACKING_GPS); when(mapboxMap.getLocationComponent()).thenReturn(locationComponent); CameraUpdate cameraUpdate = mock(CameraUpdate.class); - MapboxMap.CancelableCallback callback = mock(MapboxMap.CancelableCallback.class); + MapLibreMap.CancelableCallback callback = mock(MapLibreMap.CancelableCallback.class); NavigationCameraUpdate navigationCameraUpdate = new NavigationCameraUpdate(cameraUpdate); navigationCameraUpdate.setMode(CameraUpdateMode.OVERRIDE); NavigationCamera camera = buildCamera(mapboxMap); @@ -188,23 +188,23 @@ public void update_overrideSetsLocationComponentCameraModeNone() { } private NavigationCamera buildCamera() { - return new NavigationCamera(mock(MapboxMap.class), mock(MapboxNavigation.class), mock(LocationComponent.class)); + return new NavigationCamera(mock(MapLibreMap.class), mock(MapboxNavigation.class), mock(LocationComponent.class)); } - private NavigationCamera buildCamera(MapboxMap mapboxMap) { + private NavigationCamera buildCamera(MapLibreMap mapboxMap) { return new NavigationCamera(mapboxMap, mock(MapboxNavigation.class), mock(LocationComponent.class)); } private NavigationCamera buildCamera(LocationComponent locationComponent) { - return new NavigationCamera(mock(MapboxMap.class), mock(MapboxNavigation.class), locationComponent); + return new NavigationCamera(mock(MapLibreMap.class), mock(MapboxNavigation.class), locationComponent); } private NavigationCamera buildCamera(MapboxNavigation navigation, ProgressChangeListener listener) { - return new NavigationCamera(mock(MapboxMap.class), navigation, listener, + return new NavigationCamera(mock(MapLibreMap.class), navigation, listener, mock(LocationComponent.class), mock(RouteInformation.class)); } - private NavigationCamera buildCamera(MapboxMap mapboxMap, MapboxNavigation navigation, + private NavigationCamera buildCamera(MapLibreMap mapboxMap, MapboxNavigation navigation, RouteInformation routeInformation) { return new NavigationCamera(mapboxMap, navigation, mock(ProgressChangeListener.class), mock(LocationComponent.class), routeInformation); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java index ef85b3642..60fc82926 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.location.modes.CameraMode; +import org.maplibre.android.location.modes.CameraMode; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java index 23aa1e5f0..00818d068 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.camera; -import com.mapbox.mapboxsdk.location.modes.CameraMode; +import org.maplibre.android.location.modes.CameraMode; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java index 9eb67c132..ba9907482 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java @@ -1,8 +1,8 @@ package com.mapbox.services.android.navigation.ui.v5.map; -import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.camera.CameraPosition; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; @@ -18,7 +18,7 @@ public class LocationFpsDelegateTest { @Test public void onCameraIdle_newFpsIsSetZoom16() { double zoom = 16d; - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(buildCameraPosition(zoom)); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -31,7 +31,7 @@ public void onCameraIdle_newFpsIsSetZoom16() { @Test public void onCameraIdle_newFpsIsSetZoom14() { double zoom = 14d; - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(buildCameraPosition(zoom)); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -44,7 +44,7 @@ public void onCameraIdle_newFpsIsSetZoom14() { @Test public void onCameraIdle_newFpsIsSetZoom10() { double zoom = 10d; - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(buildCameraPosition(zoom)); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -57,7 +57,7 @@ public void onCameraIdle_newFpsIsSetZoom10() { @Test public void onCameraIdle_newFpsIsSet5() { double zoom = 5d; - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(buildCameraPosition(zoom)); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -69,7 +69,7 @@ public void onCameraIdle_newFpsIsSet5() { @Test public void onStart_idleListenerAdded() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -80,7 +80,7 @@ public void onStart_idleListenerAdded() { @Test public void onStop_idleListenerRemoved() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -91,7 +91,7 @@ public void onStop_idleListenerRemoved() { @Test public void updateEnabled_falseResetsToMax() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); @@ -102,7 +102,7 @@ public void updateEnabled_falseResetsToMax() { @Test public void isEnabled_returnsFalseWhenSet() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); LocationComponent locationComponent = mock(LocationComponent.class); LocationFpsDelegate locationFpsDelegate = new LocationFpsDelegate(mapboxMap, locationComponent); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java index 60de5ecb9..b542f2b57 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java @@ -4,7 +4,7 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.StepManeuver; -import com.mapbox.mapboxsdk.maps.MapView; +import org.maplibre.android.maps.MapView; import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java index 56f3ae0cd..9d470fe8d 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java @@ -1,21 +1,21 @@ package com.mapbox.services.android.navigation.ui.v5.map; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.layers.CircleLayer; -import com.mapbox.mapboxsdk.style.layers.HeatmapLayer; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.PropertyValue; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.layers.CircleLayer; +import org.maplibre.android.style.layers.HeatmapLayer; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.Property; +import org.maplibre.android.style.layers.PropertyValue; +import org.maplibre.android.style.layers.SymbolLayer; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; +import static org.maplibre.android.style.layers.PropertyFactory.visibility; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -31,7 +31,7 @@ public void updateLayerVisibility_visibilityIsSet() { LineLayer anySymbolOrLineLayer = mock(LineLayer.class); when(anySymbolOrLineLayer.getSourceLayer()).thenReturn("any"); List layers = buildLayerListWith(anySymbolOrLineLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); @@ -46,7 +46,7 @@ public void updateLayerVisibility_visibilityIsNotSet() { SymbolLayer anySymbolOrLineLayer = mock(SymbolLayer.class); when(anySymbolOrLineLayer.getSourceLayer()).thenReturn("any"); List layers = buildLayerListWith(anySymbolOrLineLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); @@ -60,7 +60,7 @@ public void updateLayerVisibility_visibilityIsNotSet() { public void updateLayerVisibility_visibilityIsNotSetIfInvalidLayer() { CircleLayer invalidLayer = mock(CircleLayer.class); List layers = buildLayerListWith(invalidLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); @@ -76,7 +76,7 @@ public void isLayerVisible_visibleReturnsTrue() { when(anySymbolOrLineLayer.getSourceLayer()).thenReturn("any"); when(anySymbolOrLineLayer.getVisibility()).thenReturn(visibility(Property.VISIBLE)); List layers = buildLayerListWith(anySymbolOrLineLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); @@ -92,7 +92,7 @@ public void isLayerVisible_visibleReturnsFalse() { when(anySymbolOrLineLayer.getSourceLayer()).thenReturn("any"); when(anySymbolOrLineLayer.getVisibility()).thenReturn(visibility(Property.NONE)); List layers = buildLayerListWith(anySymbolOrLineLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); @@ -106,7 +106,7 @@ public void isLayerVisible_visibleReturnsFalse() { public void isLayerVisible_visibleReturnsFalseIfInvalidLayer() { HeatmapLayer invalidLayer = mock(HeatmapLayer.class); List layers = buildLayerListWith(invalidLayer); - MapboxMap map = mock(MapboxMap.class); + MapLibreMap map = mock(MapLibreMap.class); when(map.getStyle()).thenReturn(mock(Style.class)); when(map.getStyle().getLayers()).thenReturn(layers); MapLayerInteractor layerInteractor = new MapLayerInteractor(map); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java index 1ac034736..7a7fd8b5e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.ui.v5.map; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; @@ -14,7 +14,7 @@ public class MapPaddingAdjustorTest { @Test public void adjustLocationIconWith_customPaddingIsSet() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; int[] customPadding = {0, 0, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -26,7 +26,7 @@ public void adjustLocationIconWith_customPaddingIsSet() { @Test public void isUsingDefault_falseAfterCustomPaddingIsSet() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; int[] customPadding = {0, 0, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -38,7 +38,7 @@ public void isUsingDefault_falseAfterCustomPaddingIsSet() { @Test public void isUsingDefault_trueWithoutCustomPadding() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -48,7 +48,7 @@ public void isUsingDefault_trueWithoutCustomPadding() { @Test public void updatePaddingWithZero_updatesMapToZeroPadding() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -59,7 +59,7 @@ public void updatePaddingWithZero_updatesMapToZeroPadding() { @Test public void updatePaddingWithZero_retainsCustomPadding() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; int[] customPadding = {0, 350, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -73,7 +73,7 @@ public void updatePaddingWithZero_retainsCustomPadding() { @Test public void updatePaddingWithDefault_defaultIsRestoredAfterCustom() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; int[] customPadding = {0, 0, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); @@ -86,7 +86,7 @@ public void updatePaddingWithDefault_defaultIsRestoredAfterCustom() { @Test public void retrieveCurrentPadding_returnsCurrentMapPadding() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); int[] defaultPadding = {0, 250, 0, 0}; MapPaddingAdjustor paddingAdjustor = new MapPaddingAdjustor(mapboxMap, defaultPadding); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java index 69706888e..bc2cae3ca 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java @@ -4,10 +4,10 @@ import android.location.Location; import androidx.annotation.NonNull; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.style.layers.PropertyValue; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.Point; +import org.maplibre.android.style.layers.PropertyValue; +import org.maplibre.android.style.layers.SymbolLayer; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java index ea77e4b0d..cbbfb7989 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java @@ -1,15 +1,15 @@ package com.mapbox.services.android.navigation.ui.v5.map; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.location.LocationComponent; -import com.mapbox.mapboxsdk.location.modes.RenderMode; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; -import com.mapbox.mapboxsdk.style.sources.Source; -import com.mapbox.mapboxsdk.style.sources.VectorSource; +import org.maplibre.geojson.Point; +import org.maplibre.android.location.LocationComponent; +import org.maplibre.android.location.modes.RenderMode; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.style.sources.GeoJsonSource; +import org.maplibre.android.style.sources.Source; +import org.maplibre.android.style.sources.VectorSource; import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute; import com.mapbox.services.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; @@ -228,7 +228,7 @@ public void onInitializeWayName_existingV7StreetSourceIsUsed() { String urlV7 = "mapbox://mapbox.mapbox-streets-v7"; List sources = buildMockSourcesWith(urlV7); when(style.getSources()).thenReturn(sources); - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getStyle()).thenReturn(style); MapLayerInteractor layerInteractor = mock(MapLayerInteractor.class); MapPaddingAdjustor adjustor = mock(MapPaddingAdjustor.class); @@ -289,7 +289,7 @@ public void onInitializeWayName_exisitingV8StreetSourceIsUsed() { String urlV7 = "mapbox://mapbox.mapbox-streets-v8"; List sources = buildMockSourcesWith(urlV7); when(style.getSources()).thenReturn(sources); - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getStyle()).thenReturn(style); MapLayerInteractor layerInteractor = mock(MapLayerInteractor.class); MapPaddingAdjustor adjustor = mock(MapPaddingAdjustor.class); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java index 2427b1ec5..a4fdeca8e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java @@ -1,9 +1,9 @@ package com.mapbox.services.android.navigation.ui.v5.map; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import org.maplibre.geojson.Point; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java index eb43f977f..18e534326 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java @@ -2,8 +2,8 @@ import android.graphics.Bitmap; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.maps.Style; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.maps.Style; import org.junit.Test; @@ -17,7 +17,7 @@ public class SymbolOnStyleLoadedListenerTest { @Test public void onDidFinishLoadingStyle_markerIsAdded() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); Style style = mock(Style.class); when(mapboxMap.getStyle()).thenReturn(style); Bitmap markerBitmap = mock(Bitmap.class); diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java index ac57b197a..47afd082e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java @@ -7,9 +7,9 @@ import androidx.annotation.NonNull; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java index a7f397387..56654ae2c 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java @@ -2,7 +2,7 @@ import android.graphics.PointF; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; @@ -13,7 +13,7 @@ public class WaynameFeatureFinderTest { @Test public void queryRenderedFeatures_mapboxMapIsCalled() { - MapboxMap mapboxMap = mock(MapboxMap.class); + MapLibreMap mapboxMap = mock(MapLibreMap.class); WaynameFeatureFinder featureFinder = new WaynameFeatureFinder(mapboxMap); PointF point = mock(PointF.class); String[] layerIds = {"id", "id"}; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java index 7d7dd3c67..e37db3d9e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java @@ -2,8 +2,8 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.core.constants.Constants; -import com.mapbox.geojson.LineString; -import com.mapbox.mapboxsdk.geometry.LatLng; +import org.maplibre.geojson.LineString; +import org.maplibre.android.geometry.LatLng; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java index 6923a7d9d..318f21cb4 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java @@ -24,13 +24,13 @@ import androidx.annotation.NonNull; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; -import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; +import org.maplibre.android.maps.Style; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.SymbolLayer; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; import com.mapbox.services.android.navigation.ui.v5.BaseTest; import com.mapbox.services.android.navigation.ui.v5.R; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java index 57d3258a0..269e324e7 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java @@ -6,8 +6,8 @@ import static org.mockito.Mockito.verify; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; import org.junit.Test; @@ -21,7 +21,7 @@ public class NavigationMapRouteTest { public void checksMapClickListenerIsAddedAtConstructionTime() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -38,7 +38,7 @@ public void checksMapClickListenerIsAddedAtConstructionTime() { public void checksDidFinishLoadingStyleListenerIsAddedAtConstructionTime() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -56,7 +56,7 @@ public void checksDidFinishLoadingStyleListenerIsAddedAtConstructionTime() { public void checksMapRouteProgressChangeListenerIsAddedAtConstructionTime() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -74,7 +74,7 @@ public void checksMapRouteProgressChangeListenerIsAddedAtConstructionTime() { public void checksMapClickListenerIsNotAddedIfIsMapClickListenerAdded() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -93,7 +93,7 @@ public void checksMapClickListenerIsNotAddedIfIsMapClickListenerAdded() { public void checksDidFinishLoadingStyleListenerIsNotAddedIfIsDidFinishLoadingStyleListenerAdded() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -113,7 +113,7 @@ public void checksDidFinishLoadingStyleListenerIsNotAddedIfIsDidFinishLoadingSty public void checksMapClickListenerIsRemovedInOnStop() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -132,7 +132,7 @@ public void checksMapClickListenerIsRemovedInOnStop() { public void checksDidFinishLoadingStyleListenerIsRemovedInOnStop() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -152,7 +152,7 @@ public void checksDidFinishLoadingStyleListenerIsRemovedInOnStop() { public void checksMapRouteProgressChangeListenerIsRemovedInOnStop() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -172,7 +172,7 @@ public void checksMapRouteProgressChangeListenerIsRemovedInOnStop() { public void addProgressChangeListener_mapRouteProgressChangeListenerIsAdded() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -194,7 +194,7 @@ public void addProgressChangeListener_mapRouteProgressChangeListenerIsAdded() { public void removeProgressChangeListener_mapRouteProgressChangeListenerIsRemoved() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -216,7 +216,7 @@ public void removeProgressChangeListener_mapRouteProgressChangeListenerIsRemoved public void addRoutes_mapRouteProgressChangeListenerIsAdded() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -238,7 +238,7 @@ public void addRoutes_mapRouteProgressChangeListenerIsAdded() { public void updateRouteVisibilityTo_routeLineVisibilityIsUpdated() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -260,7 +260,7 @@ public void updateRouteVisibilityTo_routeLineVisibilityIsUpdated() { public void removeRoute_routeLineVisibilityIsUpdated() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -281,7 +281,7 @@ public void removeRoute_routeLineVisibilityIsUpdated() { public void removeRoute_routeArrowVisibilityIsUpdated() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -302,7 +302,7 @@ public void removeRoute_routeArrowVisibilityIsUpdated() { public void updateRouteVisibilityTo_progressChangeVisibilityIsUpdated() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -324,7 +324,7 @@ public void updateRouteVisibilityTo_progressChangeVisibilityIsUpdated() { public void updateRouteArrowVisibilityTo_routeArrowReceivesNewVisibility() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = @@ -346,7 +346,7 @@ public void updateRouteArrowVisibilityTo_routeArrowReceivesNewVisibility() { public void showAlternativeRoutes_mapRouteProgressChangeListenerIsAdded() { MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); MapView mockedMapView = mock(MapView.class); - MapboxMap mockedMapboxMap = mock(MapboxMap.class); + MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; MapRouteClickListener mockedMapClickListener = mock(MapRouteClickListener.class); MapView.OnDidFinishLoadingStyleListener mockedDidFinishLoadingStyleListener = diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java index edaef8fab..111a73e32 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java @@ -5,7 +5,8 @@ import com.mapbox.services.android.navigation.ui.v5.BaseTest; import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; + import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; import org.junit.Before; @@ -92,7 +93,7 @@ public void addWaypointNamesIncludedInRequest() { public void addingPointAndBearingKeepsCorrectOrder() throws Exception { NavigationRoute navigationRoute = NavigationRoute.builder(context, localeUtils) .accessToken(BaseTest.ACCESS_TOKEN) - .origin(Point.fromLngLat(1.0, 2.0), 90d, 90d) + .origin(com.mapbox.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) .addBearing(2.0, 3.0) .destination(Point.fromLngLat(1.0, 5.0)) .build(); @@ -106,8 +107,8 @@ public void addingPointAndBearingKeepsCorrectOrder() throws Exception { public void reverseOriginDestinationDoesntMessUpBearings() throws Exception { NavigationRoute navigationRoute = NavigationRoute.builder(context, localeUtils) .accessToken(BaseTest.ACCESS_TOKEN) - .destination(Point.fromLngLat(1.0, 5.0), 1d, 5d) - .origin(Point.fromLngLat(1.0, 2.0), 90d, 90d) + .destination(com.mapbox.geojson.Point.fromLngLat(1.0, 5.0), 1d, 5d) + .origin(com.mapbox.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) .build(); assertThat(navigationRoute.getCall().request().url().toString(), diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java index 5891e3054..e4218673f 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java +++ b/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java @@ -7,8 +7,8 @@ import android.os.Handler; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java index 521aba291..b5d8ce124 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java @@ -18,10 +18,10 @@ import com.google.android.gms.location.Priority; import com.google.android.gms.tasks.OnFailureListener; import com.google.android.gms.tasks.OnSuccessListener; -import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback; -import com.mapbox.mapboxsdk.location.engine.LocationEngineImpl; -import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest; -import com.mapbox.mapboxsdk.location.engine.LocationEngineResult; +import org.maplibre.android.location.engine.LocationEngineCallback; +import org.maplibre.android.location.engine.LocationEngineImpl; +import org.maplibre.android.location.engine.LocationEngineRequest; +import org.maplibre.android.location.engine.LocationEngineResult; import java.util.Collections; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java index 325f37c97..d5aae4cde 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java @@ -9,9 +9,9 @@ import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; -import com.mapbox.mapboxsdk.location.engine.LocationEngineProxy; -import com.mapbox.mapboxsdk.location.engine.MapboxFusedLocationEngineImpl; +import org.maplibre.android.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngineProxy; +import org.maplibre.android.location.engine.MapLibreFusedLocationEngineImpl; /** @@ -61,6 +61,6 @@ public static LocationEngine getBestLocationEngine(@NonNull Context context) { private static LocationEngine getLocationEngine(Context context, boolean isGoogle) { return isGoogle ? new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext())) : - new LocationEngineProxy<>(new MapboxFusedLocationEngineImpl(context.getApplicationContext())); + new LocationEngineProxy<>(new MapLibreFusedLocationEngineImpl(context.getApplicationContext())); } } diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java index 43b174851..ee71d338a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java @@ -2,12 +2,12 @@ import android.location.Location; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.utils.Constants; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; import java.util.Collections; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java index 8f56b979a..fc91c304c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java @@ -9,12 +9,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; -import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback; -import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest; -import com.mapbox.mapboxsdk.location.engine.LocationEngineResult; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.android.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngineCallback; +import org.maplibre.android.location.engine.LocationEngineRequest; +import org.maplibre.android.location.engine.LocationEngineResult; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import java.util.ArrayList; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java index 9011f4020..a361a94ab 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java @@ -1,8 +1,8 @@ package com.mapbox.services.android.navigation.v5.models; import com.google.gson.GsonBuilder; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.PointAsCoordinatesTypeAdapter; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.PointAsCoordinatesTypeAdapter; import java.io.Serializable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java index f350e49d1..f956f19a0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java @@ -7,8 +7,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.PointAsCoordinatesTypeAdapter; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.PointAsCoordinatesTypeAdapter; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java index 13a095554..89e265a3e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java @@ -8,8 +8,8 @@ import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; import com.google.gson.annotations.SerializedName; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.PointAsCoordinatesTypeAdapter; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.PointAsCoordinatesTypeAdapter; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java index 82b4988a0..d24a7947e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; import com.google.gson.annotations.SerializedName; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; /** * An input coordinate snapped to the roads network. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java index 148877e09..8dea7ca51 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java @@ -7,8 +7,8 @@ import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; import com.google.gson.annotations.SerializedName; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.PointAsCoordinatesTypeAdapter; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.PointAsCoordinatesTypeAdapter; import com.mapbox.services.android.navigation.v5.models.utils.FormatUtils; import com.mapbox.services.android.navigation.v5.models.utils.ParseUtils; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java index 07d3b1d76..f36675b2f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java @@ -7,7 +7,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; import com.google.gson.annotations.SerializedName; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java index 2a1b95e3d..0cb264d99 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java @@ -10,7 +10,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapter; import com.google.gson.annotations.SerializedName; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java index e421c2642..ba9766fc5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.ArrayList; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java index fb7b0bf88..6da721b31 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java @@ -2,7 +2,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java index 31145c4f7..4d9fe5888 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; import com.mapbox.services.android.navigation.v5.milestone.Milestone; import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java index 4e46e59f2..76544f0d1 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java @@ -15,10 +15,10 @@ import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.StepIntersection; import com.mapbox.services.android.navigation.v5.models.StepManeuver; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; import com.mapbox.services.android.navigation.v5.milestone.Milestone; import com.mapbox.services.android.navigation.v5.offroute.OffRoute; import com.mapbox.services.android.navigation.v5.offroute.OffRouteCallback; @@ -28,9 +28,9 @@ import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import com.mapbox.services.android.navigation.v5.snap.Snap; import com.mapbox.services.android.navigation.v5.utils.MathUtils; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.ArrayList; import java.util.Collections; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineListener.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineListener.java index a84025aff..8a55f05e8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineListener.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineListener.java @@ -4,9 +4,9 @@ import androidx.annotation.NonNull; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; -import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback; -import com.mapbox.mapboxsdk.location.engine.LocationEngineResult; +import org.maplibre.android.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngineCallback; +import org.maplibre.android.location.engine.LocationEngineResult; import com.mapbox.services.android.navigation.v5.location.LocationValidator; class NavigationLocationEngineListener implements LocationEngineCallback { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java index 282a94f21..02e89294a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java @@ -7,10 +7,10 @@ import androidx.annotation.NonNull; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; -import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback; -import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest; -import com.mapbox.mapboxsdk.location.engine.LocationEngineResult; +import org.maplibre.android.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngineCallback; +import org.maplibre.android.location.engine.LocationEngineRequest; +import org.maplibre.android.location.engine.LocationEngineResult; import com.mapbox.services.android.navigation.v5.utils.RouteUtils; import timber.log.Timber; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java index 3ad50afff..cf80c01df 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java @@ -1,21 +1,21 @@ package com.mapbox.services.android.navigation.v5.navigation; -import static com.mapbox.mapboxsdk.style.expressions.Expression.color; -import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential; -import static com.mapbox.mapboxsdk.style.expressions.Expression.get; -import static com.mapbox.mapboxsdk.style.expressions.Expression.interpolate; -import static com.mapbox.mapboxsdk.style.expressions.Expression.linear; -import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; -import static com.mapbox.mapboxsdk.style.expressions.Expression.match; -import static com.mapbox.mapboxsdk.style.expressions.Expression.step; -import static com.mapbox.mapboxsdk.style.expressions.Expression.stop; -import static com.mapbox.mapboxsdk.style.expressions.Expression.zoom; -import static com.mapbox.mapboxsdk.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP; -import static com.mapbox.mapboxsdk.style.layers.Property.NONE; -import static com.mapbox.mapboxsdk.style.layers.Property.VISIBLE; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconAllowOverlap; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconIgnorePlacement; -import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; +import static org.maplibre.android.style.expressions.Expression.color; +import static org.maplibre.android.style.expressions.Expression.exponential; +import static org.maplibre.android.style.expressions.Expression.get; +import static org.maplibre.android.style.expressions.Expression.interpolate; +import static org.maplibre.android.style.expressions.Expression.linear; +import static org.maplibre.android.style.expressions.Expression.literal; +import static org.maplibre.android.style.expressions.Expression.match; +import static org.maplibre.android.style.expressions.Expression.step; +import static org.maplibre.android.style.expressions.Expression.stop; +import static org.maplibre.android.style.expressions.Expression.zoom; +import static org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP; +import static org.maplibre.android.style.layers.Property.NONE; +import static org.maplibre.android.style.layers.Property.VISIBLE; +import static org.maplibre.android.style.layers.PropertyFactory.iconAllowOverlap; +import static org.maplibre.android.style.layers.PropertyFactory.iconIgnorePlacement; +import static org.maplibre.android.style.layers.PropertyFactory.visibility; import android.content.Context; import android.content.res.TypedArray; @@ -37,22 +37,22 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.layers.LineLayer; -import com.mapbox.mapboxsdk.style.layers.Property; -import com.mapbox.mapboxsdk.style.layers.PropertyFactory; -import com.mapbox.mapboxsdk.style.layers.SymbolLayer; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; -import com.mapbox.mapboxsdk.utils.MathUtils; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.maps.MapView; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.style.expressions.Expression; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.layers.LineLayer; +import org.maplibre.android.style.layers.Property; +import org.maplibre.android.style.layers.PropertyFactory; +import org.maplibre.android.style.layers.SymbolLayer; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; +import org.maplibre.android.utils.MathUtils; import com.mapbox.services.android.navigation.R; import com.mapbox.services.android.navigation.v5.route.MapRouteProgressChangeListener; import com.mapbox.services.android.navigation.v5.route.OnRouteSelectionChangeListener; @@ -61,9 +61,9 @@ import com.mapbox.services.android.navigation.v5.utils.Constants; import com.mapbox.services.android.navigation.v5.utils.MapImageUtils; import com.mapbox.services.android.navigation.v5.utils.MapUtils; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.ArrayList; import java.util.Collections; @@ -88,7 +88,7 @@ * @since 0.4.0 */ public class NavigationMapRoute implements MapView.OnDidFinishLoadingStyleListener, - MapboxMap.OnMapClickListener, LifecycleObserver { + MapLibreMap.OnMapClickListener, LifecycleObserver { private static final String CONGESTION_KEY = "congestion"; private static final String SOURCE_KEY = "source"; @@ -157,7 +157,7 @@ public class NavigationMapRoute implements MapView.OnDidFinishLoadingStyleListen private int destinationWaypointIcon; private MapboxNavigation navigation; - private final MapboxMap mapboxMap; + private final MapLibreMap mapboxMap; private final HashMap routeLineStrings; private final List featureCollections; private final List directionsRoutes; @@ -183,7 +183,7 @@ public class NavigationMapRoute implements MapView.OnDidFinishLoadingStyleListen * @param mapboxMap the MapboxMap to apply route with * @since 0.4.0 */ - public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap) { + public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this(null, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -195,7 +195,7 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap * @param belowLayer optionally pass in a layer id to place the route line below * @since 0.4.0 */ - public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap, + public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(null, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -210,7 +210,7 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapboxMap mapboxMap * @since 0.4.0 */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap) { + @NonNull MapLibreMap mapboxMap) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -225,7 +225,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @since 0.4.0 */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @Nullable String belowLayer) { + @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -239,7 +239,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @param styleRes a style resource with custom route colors, scale, etc. */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes) { + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes) { this(navigation, mapView, mapboxMap, styleRes, null); } @@ -254,7 +254,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie * @param belowLayer optionally pass in a layer id to place the route line below */ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, - @NonNull MapboxMap mapboxMap, @StyleRes int styleRes, + @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer) { this.styleRes = styleRes; this.mapView = mapView; @@ -901,7 +901,7 @@ public void placeRouteBelow(String layerId) { showAlternativeRoutes(alternativesVisible); } - private void drawWaypointMarkers(@NonNull MapboxMap mapboxMap, @Nullable Drawable originMarker, + private void drawWaypointMarkers(@NonNull MapLibreMap mapboxMap, @Nullable Drawable originMarker, @Nullable Drawable destinationMarker) { if (originMarker == null || destinationMarker == null) { return; @@ -1068,7 +1068,7 @@ public void onDidFinishLoadingStyle() { * into the constructor. *

* This method will add the {@link ProgressChangeListener} that was originally added so updates - * to the {@link MapboxMap} continue. + * to the {@link MapLibreMap} continue. * * @since 0.15.0 */ @@ -1084,7 +1084,7 @@ public void onStart() { * into the constructor. *

* This method will remove the {@link ProgressChangeListener} that was originally added so updates - * to the {@link MapboxMap} discontinue. + * to the {@link MapLibreMap} discontinue. * * @since 0.15.0 */ diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java index 6789d8184..37ed0f164 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java @@ -7,7 +7,7 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.StepIntersection; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.offroute.OffRoute; import com.mapbox.services.android.navigation.v5.offroute.OffRouteCallback; import com.mapbox.services.android.navigation.v5.offroute.OffRouteDetector; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java index 93687e964..c39c8ad12 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.location.LocationValidator; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java index b8bd63892..efc66b3dd 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java @@ -1,6 +1,6 @@ package com.mapbox.services.android.navigation.v5.navigation.camera; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java index 3d46f2717..e8ce362a4 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java @@ -1,10 +1,10 @@ package com.mapbox.services.android.navigation.v5.navigation.camera; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.utils.Constants; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; import java.util.Collections; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java index c26e5793c..56108962d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java @@ -3,14 +3,14 @@ import android.location.Location; import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import com.mapbox.services.android.navigation.v5.utils.RingBuffer; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java index f6b921148..5c5ce5be5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java @@ -8,7 +8,7 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.StepManeuver; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; public class MetricsRouteProgress { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java index 53595f32c..dcd2fc053 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java @@ -7,7 +7,7 @@ import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.LegStep; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java index 39234f8ea..207be918f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java @@ -6,7 +6,7 @@ import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.StepIntersection; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java index 29559ec88..5754ec13c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java @@ -8,15 +8,15 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import com.mapbox.services.android.navigation.v5.utils.MathUtils; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java index af060e947..e2d5fbaec 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java @@ -10,24 +10,24 @@ import androidx.annotation.NonNull; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.R; import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; import com.mapbox.services.android.navigation.v5.routeprogress.MetricsRouteProgress; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfConversion; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfConversion; +import org.maplibre.turf.TurfMeasurement; import java.text.NumberFormat; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import static com.mapbox.turf.TurfConstants.UNIT_FEET; -import static com.mapbox.turf.TurfConstants.UNIT_KILOMETERS; -import static com.mapbox.turf.TurfConstants.UNIT_METERS; -import static com.mapbox.turf.TurfConstants.UNIT_MILES; +import static org.maplibre.turf.TurfConstants.UNIT_FEET; +import static org.maplibre.turf.TurfConstants.UNIT_KILOMETERS; +import static org.maplibre.turf.TurfConstants.UNIT_METERS; +import static org.maplibre.turf.TurfConstants.UNIT_MILES; public class DistanceFormatter { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java index 6ac1d3799..f4cda045d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java @@ -3,12 +3,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.FeatureCollection; -import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.style.layers.Layer; -import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.FeatureCollection; +import org.maplibre.android.maps.MapLibreMap; +import org.maplibre.android.style.layers.Layer; +import org.maplibre.android.style.sources.GeoJsonOptions; +import org.maplibre.android.style.sources.GeoJsonSource; + +import org.maplibre.android.maps.MapLibreMap; /** * Utils class useful for performing map operations such as adding sources, layers, and more. @@ -30,7 +32,7 @@ private MapUtils() { * @param sourceId the source's id for identifying it when adding layers * @since 0.8.0 */ - public static void updateMapSourceFromFeatureCollection(@NonNull MapboxMap mapboxMap, + public static void updateMapSourceFromFeatureCollection(@NonNull MapLibreMap mapboxMap, @Nullable FeatureCollection collection, @NonNull String sourceId) { if (collection == null) { @@ -57,7 +59,7 @@ public static void updateMapSourceFromFeatureCollection(@NonNull MapboxMap mapbo * @param idBelowLayer optionally providing the layer which the new layer should be placed below * @since 0.8.0 */ - public static void addLayerToMap(@NonNull MapboxMap mapboxMap, @NonNull Layer layer, + public static void addLayerToMap(@NonNull MapLibreMap mapboxMap, @NonNull Layer layer, @Nullable String idBelowLayer) { try { if (mapboxMap.getStyle().getLayer(layer.getId()) != null) { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java index cf870ea30..1832fddef 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java @@ -1,13 +1,13 @@ package com.mapbox.services.android.navigation.v5.utils; import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.geojson.Feature; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.geojson.Feature; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; -import static com.mapbox.turf.TurfConstants.UNIT_METERS; +import static org.maplibre.turf.TurfConstants.UNIT_METERS; public final class MeasurementUtils { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java index 00798a2ee..053717adb 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java @@ -15,7 +15,7 @@ import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.RouteOptions; import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; import com.mapbox.services.android.navigation.v5.milestone.Milestone; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java index 3ba2363a7..273475279 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java @@ -1,12 +1,12 @@ package com.mapbox.services.android.navigation.v5.utils; import com.mapbox.services.android.navigation.v5.models.StepIntersection; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.turf.TurfClassification; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfClassification; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java index 10419a77d..e0955aedd 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java @@ -5,7 +5,7 @@ import androidx.annotation.Nullable; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import java.io.IOException; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java index 1f9e143b1..486705e08 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java @@ -6,11 +6,11 @@ import androidx.annotation.NonNull; import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; import java.util.List; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java index 170d592c2..e0e8ab322 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java @@ -9,7 +9,7 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.utils.Constants; import java.io.IOException; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java index 0d3e857be..479a37597 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java @@ -7,8 +7,8 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.StepIntersection; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java index 036cf07b9..e26cacff0 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java @@ -1,7 +1,7 @@ package com.mapbox.services.android.navigation.v5.location.replay; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java index 2462a215d..ff9a3c9ae 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java @@ -8,7 +8,7 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.route.FasterRoute; import com.mapbox.services.android.navigation.v5.route.FasterRouteDetector; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java index 74e6dda94..c58759ca7 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java @@ -2,7 +2,7 @@ import android.content.Context; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; import com.mapbox.services.android.navigation.v5.milestone.Milestone; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java index ad7c6f297..14252b633 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java @@ -10,7 +10,7 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; import com.mapbox.services.android.navigation.v5.milestone.Milestone; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java index b2dc1e61c..e0b3f8a16 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java @@ -13,9 +13,9 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.StepIntersection; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.milestone.Milestone; import com.mapbox.services.android.navigation.v5.milestone.StepMilestone; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java index b5fe20189..a800e6db3 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java @@ -3,9 +3,9 @@ import android.content.Context; import android.location.Location; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; -import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; +import org.maplibre.android.location.engine.LocationEngine; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java index 3376ec7b1..4226e2855 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java @@ -3,8 +3,8 @@ import android.location.Location; import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java index 356aa817b..2021dbcaa 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java @@ -7,14 +7,14 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.utils.Constants; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; -import com.mapbox.turf.TurfMisc; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; +import org.maplibre.turf.TurfMisc; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java index 03adacc6d..317973182 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java @@ -4,8 +4,8 @@ import com.mapbox.services.android.navigation.v5.models.LegStep; import com.mapbox.services.android.navigation.v5.models.StepManeuver; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; import com.mapbox.services.android.navigation.v5.BaseTest; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java index 7f7c44900..2d9d2d553 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java @@ -10,7 +10,7 @@ import com.mapbox.services.android.navigation.v5.models.RouteLeg; import com.mapbox.services.android.navigation.v5.models.RouteOptions; import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java index c4f10ebe3..ee6291cce 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java @@ -3,14 +3,14 @@ import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.Point; -import com.mapbox.geojson.utils.PolylineUtils; +import org.maplibre.geojson.LineString; +import org.maplibre.geojson.Point; +import org.maplibre.geojson.utils.PolylineUtils; import com.mapbox.services.android.navigation.v5.BaseTest; import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.turf.TurfConstants; -import com.mapbox.turf.TurfMeasurement; +import org.maplibre.turf.TurfConstants; +import org.maplibre.turf.TurfMeasurement; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java index be500f93d..25df5274f 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java +++ b/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java @@ -2,7 +2,7 @@ import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.geojson.Point; +import org.maplibre.geojson.Point; import com.mapbox.services.android.navigation.v5.BaseTest; import org.junit.Test; From 00790479df237654f8d6ed210a244cfb6d86cd53 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Fri, 7 Jun 2024 23:51:51 +0200 Subject: [PATCH 07/21] Change package names to `org.maplibre.navigation.android` --- app/build.gradle | 2 +- .../NavigationViewOrientationTest.java | 103 ---------- .../java/testapp/NavigationViewTest.java | 37 ---- .../action/OrientationChangeAction.java | 65 ------ .../activity/BaseNavigationActivityTest.java | 75 ------- .../OnNavigationReadyIdlingResource.java | 120 ----------- app/src/main/AndroidManifest.xml | 2 +- .../CustomNavigationNotification.java | 10 +- .../android/example}/MainActivity.java | 2 +- .../example}/MockNavigationActivity.kt | 63 ++++-- .../example}/NavigationApplication.java | 2 +- .../android/example}/NavigationUIActivity.kt | 27 +-- .../android/example}/SampleItem.java | 2 +- .../example}/SnapToRouteNavigationActivity.kt | 40 ++-- .../navigation/android/example}/Utils.java | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../res/layout/activity_mock_navigation.xml | 2 +- .../activity_snap_to_route_navigation.xml | 2 +- libandroid-navigation-ui/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 4 +- .../ui/v5/instruction/NodeVerifier.java | 7 - .../turnlane/TurnLaneDrawableMap.java | 24 --- .../ui/v5/listeners/NavigationListener.java | 33 --- .../ui/v5/CancelBtnClickListener.java | 2 +- .../ui/v5/ConnectivityStatusProvider.java | 2 +- .../ui/v5/DamerauLevenshteinAlgorithm.java | 2 +- .../ui/v5/LocationEngineConductor.java | 8 +- .../ui/v5/MapConnectivityController.java | 2 +- .../ui/v5/MapboxNavigationActivity.java | 12 +- .../ui/v5/MobileNetworkChecker.java | 2 +- .../ui/v5/MultiOnClickListener.java | 2 +- .../navigation/ui/v5/NavigationButton.java | 2 +- .../navigation/ui/v5/NavigationContract.java | 4 +- .../v5/NavigationInstructionListListener.java | 4 +- .../navigation/ui/v5/NavigationLauncher.java | 9 +- .../ui/v5/NavigationLauncherOptions.java | 4 +- ...gationOnCameraTrackingChangedListener.java | 2 +- .../navigation/ui/v5/NavigationPresenter.java | 4 +- .../navigation/ui/v5/NavigationUiOptions.java | 4 +- .../navigation/ui/v5/NavigationView.java | 35 ++-- .../ui/v5/NavigationViewEventDispatcher.java | 25 +-- .../ui/v5/NavigationViewInstanceState.java | 2 +- .../navigation/ui/v5/NavigationViewModel.java | 56 +++--- ...gationViewModelProgressChangeListener.java | 6 +- .../ui/v5/NavigationViewOptions.java | 25 +-- .../v5/NavigationViewRouteEngineListener.java | 4 +- .../ui/v5/NavigationViewRouter.java | 16 +- .../ui/v5/NavigationViewSubscriber.java | 4 +- .../ui/v5/NavigationViewWayNameListener.java | 4 +- .../ui/v5/OnNavigationReadyCallback.java | 2 +- .../ui/v5/RecenterBtnClickListener.java | 2 +- .../navigation/ui/v5/RecenterButton.java | 6 +- .../navigation/ui/v5/RouteCallStatus.java | 2 +- .../navigation/ui/v5/RouteComparator.java | 8 +- .../ui/v5/RouteOverviewBtnClickListener.java | 2 +- .../android/navigation/ui/v5/SoundButton.java | 2 +- .../ui/v5/SummaryBottomSheetCallback.java | 2 +- .../navigation/ui/v5/ThemeSwitcher.java | 4 +- .../navigation/ui/v5/ViewRouteListener.java | 4 +- .../navigation/ui/v5/WifiNetworkChecker.java | 2 +- .../navigation/ui/v5/alert/AlertView.java | 6 +- .../v5/alert/AlertViewAnimatorListener.java | 2 +- .../ui/v5/camera/CameraAnimationDelegate.java | 2 +- .../CameraOverviewCancelableCallback.java | 2 +- .../ui/v5/camera/CameraUpdateMode.java | 2 +- .../ui/v5/camera/DynamicCamera.java | 12 +- .../ui/v5/camera/NavigationCamera.java | 22 +- ...vigationCameraTrackingChangedListener.java | 2 +- .../NavigationCameraTransitionListener.java | 2 +- .../ui/v5/camera/NavigationCameraUpdate.java | 2 +- .../camera/OnTrackingModeChangedListener.java | 2 +- .../OnTrackingModeTransitionListener.java | 2 +- .../ui/v5/camera/ResetCancelableCallback.java | 2 +- .../v5/instruction/AbbreviationCreator.java | 4 +- .../v5/instruction/AbbreviationVerifier.java | 4 +- .../v5/instruction/BannerComponentNode.java | 4 +- .../v5/instruction/BannerComponentTree.java | 6 +- .../instruction/BannerInstructionModel.java | 10 +- .../ui/v5/instruction/BannerShield.java | 4 +- .../ui/v5/instruction/ExitSignCreator.java | 6 +- .../ui/v5/instruction/ExitSignVerifier.java | 4 +- .../ui/v5/instruction/ImageCreator.java | 12 +- .../ui/v5/instruction/ImageVerifier.java | 4 +- .../InstructionListTransitionListener.java | 4 +- .../ui/v5/instruction/InstructionLoader.java | 6 +- .../ui/v5/instruction/InstructionModel.java | 6 +- .../ui/v5/instruction/InstructionTarget.java | 2 +- .../ui/v5/instruction/InstructionView.java | 54 ++--- .../v5/instruction/NavigationAlertView.java | 13 +- .../ui/v5/instruction/NodeCreator.java | 4 +- .../ui/v5/instruction/NodeVerifier.java | 7 + .../ui/v5/instruction/TextCreator.java | 4 +- .../ui/v5/instruction/TextVerifier.java | 4 +- .../ui/v5/instruction/TextViewUtils.java | 2 +- .../ui/v5/instruction/UrlDensityMap.java | 4 +- .../v5/instruction/maneuver/ManeuverView.java | 34 ++-- .../instruction/maneuver/ManeuverViewMap.java | 36 ++-- .../maneuver/ManeuverViewUpdate.java | 2 +- .../maneuver/ManeuversStyleKit.java | 2 +- .../instruction/turnlane/TurnLaneAdapter.java | 6 +- .../turnlane/TurnLaneDrawableMap.java | 17 ++ .../v5/instruction/turnlane/TurnLaneView.java | 4 +- .../turnlane/TurnLaneViewData.java | 18 +- .../turnlane/TurnLaneViewHolder.java | 4 +- .../listeners/BannerInstructionsListener.java | 4 +- .../v5/listeners/InstructionListListener.java | 2 +- .../ui/v5/listeners/NavigationListener.java | 37 ++++ .../ui/v5/listeners/RouteListener.java | 10 +- .../listeners/SpeechAnnouncementListener.java | 7 +- .../ui/v5/map/FeatureFilterTask.java | 2 +- .../FpsDelegateProgressChangeListener.java | 6 +- .../ui/v5/map/LocationFpsDelegate.java | 2 +- .../ui/v5/map/MapBatteryMonitor.java | 2 +- .../navigation/ui/v5/map/MapFpsDelegate.java | 18 +- .../ui/v5/map/MapLayerInteractor.java | 4 +- .../ui/v5/map/MapPaddingAdjustor.java | 4 +- .../navigation/ui/v5/map/MapWayName.java | 6 +- .../ui/v5/map/MapWayNameChangedListener.java | 2 +- .../map/MapWaynameProgressChangeListener.java | 6 +- .../ui/v5/map/NavigationMapSettings.java | 6 +- .../ui/v5/map/NavigationMapboxMap.java | 21 +- .../map/NavigationMapboxMapInstanceState.java | 2 +- .../ui/v5/map/NavigationSymbolManager.java | 2 +- .../ui/v5/map/OnFeatureFilteredCallback.java | 2 +- .../ui/v5/map/OnWayNameChangedListener.java | 6 +- .../v5/map/SymbolOnStyleLoadedListener.java | 4 +- .../navigation/ui/v5/map/WayNameView.java | 6 +- .../ui/v5/map/WaynameFeatureFilter.java | 2 +- .../ui/v5/map/WaynameFeatureFinder.java | 2 +- .../navigation/ui/v5/package-info.java | 2 +- .../ui/v5/route/FeatureProcessingTask.java | 8 +- .../navigation/ui/v5/route/MapRouteArrow.java | 116 ++++------- .../ui/v5/route/MapRouteClickListener.java | 4 +- .../ui/v5/route/MapRouteDrawableProvider.java | 2 +- .../ui/v5/route/MapRouteLayerProvider.java | 32 +-- .../navigation/ui/v5/route/MapRouteLine.java | 26 +-- .../route/MapRouteProgressChangeListener.java | 8 +- .../ui/v5/route/MapRouteSourceProvider.java | 2 +- .../ui/v5/route/MapboxRouteFetcher.java | 18 +- .../ui/v5/route/NavigationMapRoute.java | 8 +- .../ui/v5/route/NavigationRoute.java | 23 +-- .../route/OnPrimaryRouteUpdatedCallback.java | 2 +- .../OnRouteFeaturesProcessedCallback.java | 4 +- .../route/OnRouteSelectionChangeListener.java | 4 +- .../ui/v5/route/PrimaryRouteUpdateTask.java | 6 +- .../ui/v5/route/RouteConstants.java | 2 +- .../ui/v5/summary/SummaryBottomSheet.java | 20 +- .../ui/v5/summary/SummaryModel.java | 12 +- .../summary/list/InstructionListAdapter.java | 10 +- .../list/InstructionListPresenter.java | 16 +- .../v5/summary/list/InstructionListView.java | 2 +- .../summary/list/InstructionViewHolder.java | 6 +- .../ui}/v5/utils/MapImageUtils.java | 2 +- .../navigation/ui/v5/utils/MapUtils.java | 2 +- .../navigation/ui/v5/utils/ViewUtils.java | 2 +- .../ui/v5/voice/AndroidSpeechPlayer.java | 2 +- .../ui/v5/voice/Api14UtteranceListener.java | 2 +- .../ui/v5/voice/Api26AudioFocusDelegate.java | 2 +- .../ui/v5/voice/AudioFocusDelegate.java | 2 +- .../v5/voice/AudioFocusDelegateProvider.java | 2 +- .../ui/v5/voice/NavigationSpeechListener.java | 2 +- .../ui/v5/voice/NavigationSpeechPlayer.java | 6 +- .../ui/v5/voice/SpeechAnnouncement.java | 7 +- .../ui/v5/voice/SpeechAnnouncementMap.java | 2 +- .../ui/v5/voice/SpeechAnnouncementUpdate.java | 2 +- .../ui/v5/voice/SpeechAudioFocusDelegate.java | 2 +- .../ui/v5/voice/SpeechAudioFocusManager.java | 2 +- .../ui/v5/voice/SpeechListener.java | 2 +- .../navigation/ui/v5/voice/SpeechPlayer.java | 6 +- .../ui/v5/voice/SpeechPlayerProvider.java | 6 +- .../ui/v5/voice/UtteranceListener.java | 2 +- .../instruction_content_layout.xml | 2 +- .../res/layout-land/instruction_layout.xml | 6 +- .../layout-land/instruction_layout_alt.xml | 2 +- .../layout-land/navigation_view_layout.xml | 8 +- .../layout-land/sub_instruction_layout.xml | 2 +- .../main/res/layout/activity_navigation.xml | 2 +- .../res/layout/instruction_content_layout.xml | 2 +- .../res/layout/instruction_view_layout.xml | 4 +- .../res/layout/navigation_view_layout.xml | 8 +- .../res/layout/sub_instruction_layout.xml | 2 +- .../res/layout/turn_lane_listitem_layout.xml | 2 +- .../android/navigation/ui/v5/BaseTest.java | 6 +- .../ui/v5/ConnectivityStatusProviderTest.java | 3 +- .../ui/v5/LocationEngineConductorTest.java | 4 +- ...onOnCameraTrackingChangedListenerTest.java | 4 +- .../ui/v5/NavigationPresenterTest.java | 6 +- .../v5/NavigationViewEventDispatcherTest.java | 27 +-- ...onViewModelProgressChangeListenerTest.java | 6 +- .../ui/v5/NavigationViewModelTest.java | 13 +- ...NavigationViewRouteEngineListenerTest.java | 6 +- .../ui/v5/NavigationViewRouterTest.java | 19 +- .../ui/v5/NavigationViewSubscriberTest.java | 5 +- .../v5/NavigationViewWayNameListenerTest.java | 7 +- .../navigation/ui/v5/RouteCallStatusTest.java | 3 +- .../navigation/ui/v5/TestRouteBuilder.java | 10 +- .../ui/v5/TestRouteProgressBuilder.java | 14 +- .../alert/AlertViewAnimatorListenerTest.java | 4 +- .../ui/v5/camera/DynamicCameraTest.java | 15 +- .../ui/v5/camera/NavigationCameraTest.java | 11 +- ...tionCameraTrackingChangedListenerTest.java | 4 +- ...avigationCameraTransitionListenerTest.java | 4 +- .../camera/ResetCancelableCallbackTest.java | 4 +- .../instruction/AbbreviationCreatorTest.java | 6 +- .../instruction/BannerComponentTreeTest.java | 6 +- .../v5/instruction/BannerComponentsFaker.java | 4 +- .../v5/instruction/InstructionLoaderTest.java | 4 +- .../ui/v5/instruction/UrlDensityMapTest.java | 10 +- .../turnlane/TurnLaneViewDataTest.java | 7 +- .../ui/v5/map/LocationFpsDelegateTest.java | 3 +- .../ui/v5/map/MapFpsDelegateTest.java | 19 +- .../ui/v5/map/MapLayerInteractorTest.java | 3 +- .../ui/v5/map/MapPaddingAdjustorTest.java | 3 +- .../v5/map/MapWayNameChangedListenerTest.java | 4 +- .../navigation/ui/v5/map/MapWayNameTest.java | 6 +- .../ui/v5/map/NavigationMapboxMapTest.java | 20 +- .../v5/map/NavigationSymbolManagerTest.java | 3 +- .../map/SymbolOnStyleLoadedListenerTest.java | 5 +- .../ui/v5/map/WaynameFeatureFilterTest.java | 3 +- .../ui/v5/map/WaynameFeatureFinderTest.java | 3 +- .../v5/route/MapRouteClickListenerTest.java | 7 +- .../ui/v5/route/MapRouteLineTest.java | 12 +- .../MapRouteProgressChangeListenerTest.java | 9 +- .../ui/v5/route/NavigationMapRouteTest.java | 11 +- .../ui/v5/route/NavigationRouteTest.java | 11 +- .../v5/route/PrimaryRouteUpdateTaskTest.java | 4 +- .../list/InstructionListPresenterTest.java | 18 +- .../voice/NavigationSpeechListenerTest.java | 7 +- .../v5/voice/NavigationSpeechPlayerTest.java | 7 +- .../ui/v5/voice/SpeechAnnouncementTest.java | 5 +- .../ui/v5/voice/SpeechPlayerProviderTest.java | 7 +- libandroid-navigation/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 4 +- .../v5/milestone/MilestoneEventListener.java | 9 - .../navigation/v5/models/package-info.java | 4 - .../navigation/v5/offroute/package-info.java | 6 - .../navigation/v5/utils/ManeuverMap.java | 188 ------------------ .../navigation/v5/utils/span/SpanItem.java | 6 - .../navigation}/android/core/FileUtils.java | 2 +- .../connectivity/ConnectivityListener.java | 2 +- .../connectivity/ConnectivityReceiver.java | 2 +- .../core/crashreporter/CrashReport.java | 2 +- .../crashreporter/CrashReportBuilder.java | 2 +- .../MapboxUncaughtExceptionHanlder.java | 4 +- .../v5/exception/NavigationException.java | 2 +- .../navigation/v5/exception/package-info.java | 2 +- .../v5/instruction/Instruction.java | 4 +- .../v5/instruction/package-info.java | 2 +- .../v5/location/LocationValidator.java | 2 +- .../v5/location/MetricsLocation.java | 2 +- .../engine/GoogleLocationEngineImpl.java | 2 +- .../engine/LocationEngineProvider.java | 6 +- .../navigation/v5/location/engine/Utils.java | 2 +- .../v5/location/replay/GpxParser.java | 2 +- .../v5/location/replay/ParseGpxTask.java | 2 +- .../location/replay/ReplayJsonRouteDto.java | 2 +- .../replay/ReplayJsonRouteLocationMapper.java | 2 +- .../replay/ReplayLocationDispatcher.java | 2 +- .../v5/location/replay/ReplayLocationDto.java | 2 +- .../replay/ReplayLocationListener.java | 2 +- .../replay/ReplayRouteLocationConverter.java | 6 +- .../replay/ReplayRouteLocationEngine.java | 4 +- .../v5/location/replay/TimestampAdapter.java | 2 +- .../milestone/BannerInstructionMilestone.java | 15 +- .../navigation/v5/milestone/Milestone.java | 11 +- .../v5/milestone/MilestoneEventListener.java | 9 + .../navigation/v5/milestone/Operation.java | 2 +- .../v5/milestone/RouteMilestone.java | 4 +- .../v5/milestone/StepMilestone.java | 6 +- .../navigation/v5/milestone/Trigger.java | 2 +- .../v5/milestone/TriggerProperty.java | 4 +- .../milestone/VoiceInstructionMilestone.java | 17 +- .../navigation/v5/milestone/package-info.java | 2 +- .../android/navigation/v5/models/Admin.java | 2 +- .../v5/models/BannerComponents.java | 2 +- .../v5/models/BannerInstructions.java | 2 +- .../navigation/v5/models/BannerText.java | 2 +- .../navigation/v5/models/BannerView.java | 2 +- .../android/navigation/v5/models/Closure.java | 2 +- .../navigation/v5/models/Congestion.java | 2 +- .../v5/models/DirectionsAdapterFactory.java | 2 +- .../v5/models/DirectionsCriteria.java | 2 +- .../navigation/v5/models/DirectionsError.java | 2 +- .../v5/models/DirectionsJsonObject.java | 2 +- .../v5/models/DirectionsResponse.java | 2 +- .../navigation/v5/models/DirectionsRoute.java | 2 +- .../v5/models/DirectionsWaypoint.java | 2 +- .../navigation/v5/models/Incident.java | 2 +- .../v5/models/IntersectionLanes.java | 2 +- .../navigation/v5/models/LegAnnotation.java | 2 +- .../android/navigation/v5/models/LegStep.java | 2 +- .../v5/models/ManeuverModifier.java | 2 +- .../navigation/v5/models/MapboxStreetsV8.java | 2 +- .../navigation/v5/models/MaxSpeed.java | 2 +- .../navigation/v5/models/RestStop.java | 2 +- .../navigation/v5/models/RouteLeg.java | 2 +- .../navigation/v5/models/RouteOptions.java | 6 +- .../navigation/v5/models/SpeedLimit.java | 2 +- .../v5/models/StepIntersection.java | 2 +- .../navigation/v5/models/StepManeuver.java | 2 +- .../navigation/v5/models/TollCollection.java | 2 +- .../v5/models/VoiceInstructions.java | 2 +- .../navigation/v5/models/WalkingOptions.java | 2 +- .../models/WalkingOptionsAdapterFactory.java | 2 +- .../navigation/v5/models/package-info.java | 4 + .../v5/models/utils/FormatUtils.java | 2 +- .../v5/models/utils/ParseUtils.java | 2 +- .../v5/navigation/MapboxNavigation.java | 41 ++-- .../MapboxNavigationNotification.java | 35 ++-- .../navigation/MapboxNavigationOptions.java | 8 +- .../v5/navigation/NavigationConstants.java | 18 +- .../navigation/NavigationEngineFactory.java | 18 +- .../navigation/NavigationEventDispatcher.java | 18 +- .../navigation/NavigationEventListener.java | 2 +- .../NavigationFasterRouteListener.java | 10 +- .../v5/navigation/NavigationHelper.java | 38 ++-- .../v5/navigation/NavigationIndices.java | 2 +- .../NavigationLifecycleMonitor.java | 2 +- .../NavigationLocationEngineListener.java | 4 +- .../NavigationLocationEngineUpdater.java | 6 +- .../navigation/NavigationLocationUpdate.java | 2 +- .../v5/navigation/NavigationMapRoute.java | 22 +- .../NavigationNotificationProvider.java | 6 +- .../navigation/NavigationRouteProcessor.java | 46 ++--- .../v5/navigation/NavigationService.java | 8 +- .../v5/navigation/NavigationTimeFormat.java | 2 +- .../RouteProcessorBackgroundThread.java | 6 +- .../RouteProcessorHandlerCallback.java | 12 +- .../RouteProcessorThreadListener.java | 8 +- .../v5/navigation/SdkVersionChecker.java | 2 +- .../v5/navigation/camera/Camera.java | 7 +- .../navigation/camera/RouteInformation.java | 6 +- .../v5/navigation/camera/SimpleCamera.java | 9 +- .../notification/NavigationNotification.java | 14 +- .../v5/navigation/package-info.java | 2 +- .../navigation/v5/offroute/OffRoute.java | 6 +- .../v5/offroute/OffRouteCallback.java | 4 +- .../v5/offroute/OffRouteDetector.java | 14 +- .../v5/offroute/OffRouteListener.java | 2 +- .../navigation/v5/offroute/package-info.java | 6 + .../navigation/v5/route/FasterRoute.java | 9 +- .../v5/route/FasterRouteDetector.java | 25 ++- .../v5/route/FasterRouteListener.java | 4 +- .../route/MapRouteProgressChangeListener.java | 10 +- .../route/OnRouteSelectionChangeListener.java | 4 +- .../navigation/v5/route/RouteFetcher.java | 8 +- .../navigation/v5/route/RouteListener.java | 6 +- .../routeprogress/CurrentLegAnnotation.java | 4 +- .../routeprogress/MetricsRouteProgress.java | 10 +- .../routeprogress/ProgressChangeListener.java | 2 +- .../v5/routeprogress/RouteLegProgress.java | 15 +- .../v5/routeprogress/RouteProgress.java | 14 +- .../v5/routeprogress/RouteStepProgress.java | 10 +- .../v5/routeprogress/package-info.java | 2 +- .../android/navigation/v5/snap/Snap.java | 11 +- .../navigation/v5/snap/SnapToRoute.java | 19 +- .../navigation/v5/snap/package-info.java | 2 +- .../navigation/v5/utils/Constants.java | 2 +- .../v5/utils/DistanceFormatter.java | 10 +- .../navigation/v5/utils/LocaleUtils.java | 4 +- .../navigation/v5/utils/ManeuverMap.java | 167 ++++++++++++++++ .../navigation/v5/utils/ManeuverUtils.java | 8 +- .../navigation}/v5/utils/MapImageUtils.java | 2 +- .../android/navigation/v5/utils/MapUtils.java | 2 +- .../navigation/v5/utils/MathUtils.java | 2 +- .../navigation/v5/utils/MeasurementUtils.java | 4 +- .../navigation/v5/utils/RingBuffer.java | 2 +- .../navigation/v5/utils/RouteUtils.java | 31 ++- .../navigation/v5/utils/TextUtils.java | 2 +- .../navigation/v5/utils/ToleranceUtils.java | 8 +- .../navigation/v5/utils/ValidationUtils.java | 6 +- .../utils/abbreviation/AbbreviationArray.java | 2 +- .../utils/abbreviation/StringAbbreviator.java | 2 +- .../navigation/v5/utils/package-info.java | 2 +- .../navigation/v5/utils/span/SpanItem.java | 6 + .../navigation/v5/utils/span/SpanUtils.java | 2 +- .../v5/utils/span/TextSpanItem.java | 2 +- .../utils/time/NoneSpecifiedTimeFormat.java | 7 +- .../v5/utils/time/TimeFormatResolver.java | 2 +- .../v5/utils/time/TimeFormatter.java | 12 +- .../v5/utils/time/TimeFormattingChain.java | 2 +- .../v5/utils/time/TwelveHoursTimeFormat.java | 2 +- .../utils/time/TwentyFourHoursTimeFormat.java | 2 +- .../android/navigation/v5/BaseTest.java | 6 +- .../navigation/v5/MockLocationBuilder.java | 8 +- .../navigation/v5/TestRouteBuilder.java | 16 +- .../v5/TestRouteProgressBuilder.java | 20 +- .../v5/location/LocationValidatorTest.java | 3 +- .../v5/location/replay/GpxParserTest.java | 3 +- .../ReplayJsonRouteLocationMapperTest.java | 4 +- .../replay/ReplayLocationDispatcherTest.java | 4 +- .../ReplayRouteLocationConverterTest.java | 3 +- .../replay/ReplayRouteParserTest.java | 4 +- .../BannerInstructionMilestoneTest.java | 10 +- .../v5/milestone/StepMilestoneTest.java | 13 +- .../v5/milestone/TriggerPropertyTest.java | 13 +- .../navigation/v5/milestone/TriggerTest.java | 13 +- .../VoiceInstructionMilestoneTest.java | 10 +- .../navigation/FasterRouteDetectorTest.java | 18 +- .../MapboxNavigationNotificationTest.java | 14 +- .../v5/navigation/MapboxNavigationTest.java | 24 +-- .../NavigationEngineFactoryTest.java | 3 +- .../NavigationEventDispatcherTest.java | 27 +-- .../NavigationFasterRouteListenerTest.java | 12 +- .../v5/navigation/NavigationHelperTest.java | 43 ++-- .../NavigationNotificationProviderTest.java | 9 +- .../NavigationRouteProcessorTest.java | 12 +- .../RouteProcessorThreadListenerTest.java | 13 +- .../v5/offroute/OffRouteDetectorTest.java | 12 +- .../routeprogress/RouteLegProgressTest.java | 10 +- .../v5/routeprogress/RouteProgressTest.java | 15 +- .../routeprogress/RouteStepProgressTest.java | 18 +- .../navigation/v5/snap/SnapToRouteTest.java | 14 +- .../v5/utils/DistanceFormatterTest.java | 9 +- .../v5/utils/MeasurementUtilsTest.java | 10 +- .../navigation/v5/utils/RingBufferTest.java | 4 +- .../navigation/v5/utils/RouteUtilsTest.java | 26 +-- .../v5/utils/ToleranceUtilsTest.java | 12 +- .../v5/utils/ValidationUtilsTest.java | 8 +- .../v5/utils/time/TimeFormatterTest.java | 3 +- 420 files changed, 1833 insertions(+), 2108 deletions(-) delete mode 100644 app/src/androidTest/java/testapp/NavigationViewOrientationTest.java delete mode 100644 app/src/androidTest/java/testapp/NavigationViewTest.java delete mode 100644 app/src/androidTest/java/testapp/action/OrientationChangeAction.java delete mode 100644 app/src/androidTest/java/testapp/activity/BaseNavigationActivityTest.java delete mode 100644 app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/CustomNavigationNotification.java (88%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/MainActivity.java (98%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/MockNavigationActivity.kt (81%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/NavigationApplication.java (87%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/NavigationUIActivity.kt (91%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/SampleItem.java (88%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/SnapToRouteNavigationActivity.kt (81%) rename app/src/main/java/{com/mapbox/services/android/navigation/testapp => org/maplibre/navigation/android/example}/Utils.java (96%) delete mode 100644 libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeVerifier.java delete mode 100644 libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java delete mode 100644 libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/NavigationListener.java rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/CancelBtnClickListener.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/ConnectivityStatusProvider.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java (98%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/LocationEngineConductor.java (76%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/MapConnectivityController.java (71%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/MapboxNavigationActivity.java (89%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/MobileNetworkChecker.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/MultiOnClickListener.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationButton.java (89%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationContract.java (86%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationInstructionListListener.java (77%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationLauncher.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationLauncherOptions.java (89%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationPresenter.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationUiOptions.java (72%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationView.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewEventDispatcher.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewInstanceState.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewModel.java (87%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java (67%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewOptions.java (75%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewRouteEngineListener.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewRouter.java (86%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewSubscriber.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewWayNameListener.java (72%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/OnNavigationReadyCallback.java (88%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RecenterBtnClickListener.java (84%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RecenterButton.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RouteCallStatus.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RouteComparator.java (89%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RouteOverviewBtnClickListener.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/SoundButton.java (99%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/SummaryBottomSheetCallback.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/ThemeSwitcher.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/ViewRouteListener.java (61%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/WifiNetworkChecker.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/alert/AlertView.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/CameraAnimationDelegate.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/CameraUpdateMode.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/DynamicCamera.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCamera.java (95%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraUpdate.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java (84%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java (88%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/ResetCancelableCallback.java (86%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/AbbreviationCreator.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/AbbreviationVerifier.java (70%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerComponentNode.java (77%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerComponentTree.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerInstructionModel.java (74%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerShield.java (82%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/ExitSignCreator.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/ExitSignVerifier.java (61%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/ImageCreator.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/ImageVerifier.java (68%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java (87%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionLoader.java (88%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionModel.java (77%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionTarget.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionView.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/NavigationAlertView.java (82%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/NodeCreator.java (88%) create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeVerifier.java rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/TextCreator.java (77%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/TextVerifier.java (58%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/TextViewUtils.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/UrlDensityMap.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java (84%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java (79%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java (73%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java (99%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java (85%) create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java (71%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java (68%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/listeners/BannerInstructionsListener.java (83%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/listeners/InstructionListListener.java (84%) create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/listeners/RouteListener.java (80%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java (76%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/FeatureFilterTask.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java (63%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/LocationFpsDelegate.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapBatteryMonitor.java (95%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapFpsDelegate.java (84%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapLayerInteractor.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapPaddingAdjustor.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapWayName.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapWayNameChangedListener.java (88%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java (64%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationMapSettings.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationMapboxMap.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationSymbolManager.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java (73%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/OnWayNameChangedListener.java (79%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java (75%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/WayNameView.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/WaynameFeatureFilter.java (99%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/WaynameFeatureFinder.java (87%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/package-info.java (64%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/FeatureProcessingTask.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteArrow.java (65%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteClickListener.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteDrawableProvider.java (87%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteLayerProvider.java (82%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteLine.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java (83%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteSourceProvider.java (84%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapboxRouteFetcher.java (93%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/NavigationMapRoute.java (98%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/NavigationRoute.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java (75%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java (71%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java (75%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/RouteConstants.java (97%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/SummaryBottomSheet.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/SummaryModel.java (69%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/list/InstructionListAdapter.java (81%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/list/InstructionListPresenter.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/list/InstructionListView.java (89%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/list/InstructionViewHolder.java (91%) rename {libandroid-navigation/src/main/java/com/mapbox/services/android/navigation => libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui}/v5/utils/MapImageUtils.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/utils/MapUtils.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/utils/ViewUtils.java (96%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java (98%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/Api14UtteranceListener.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/AudioFocusDelegate.java (56%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java (90%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/NavigationSpeechListener.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java (91%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAnnouncement.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java (92%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java (71%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java (88%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java (85%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechListener.java (68%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechPlayer.java (87%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechPlayerProvider.java (94%) rename libandroid-navigation-ui/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/UtteranceListener.java (91%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/BaseTest.java (85%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/ConnectivityStatusProviderTest.java (97%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/LocationEngineConductorTest.java (93%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java (85%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationPresenterTest.java (94%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java (93%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java (82%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewModelTest.java (88%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java (89%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewRouterTest.java (91%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewSubscriberTest.java (91%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java (63%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/RouteCallStatusTest.java (90%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/TestRouteBuilder.java (85%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/TestRouteProgressBuilder.java (80%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java (67%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/DynamicCameraTest.java (94%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraTest.java (95%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java (83%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java (86%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java (76%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java (92%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java (92%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/BannerComponentsFaker.java (76%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/InstructionLoaderTest.java (69%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/UrlDensityMapTest.java (95%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java (73%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/LocationFpsDelegateTest.java (96%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapFpsDelegateTest.java (84%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapLayerInteractorTest.java (97%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java (95%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java (76%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/MapWayNameTest.java (91%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationMapboxMapTest.java (92%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java (93%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java (75%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java (92%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java (81%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteClickListenerTest.java (91%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteLineTest.java (99%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java (82%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/NavigationMapRouteTest.java (96%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/NavigationRouteTest.java (93%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java (86%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java (92%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java (81%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java (79%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java (84%) rename libandroid-navigation-ui/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java (78%) delete mode 100644 libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/MilestoneEventListener.java delete mode 100644 libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/package-info.java delete mode 100644 libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/package-info.java delete mode 100644 libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java delete mode 100644 libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanItem.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/FileUtils.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/connectivity/ConnectivityListener.java (70%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/connectivity/ConnectivityReceiver.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/crashreporter/CrashReport.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/crashreporter/CrashReportBuilder.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/exception/NavigationException.java (88%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/exception/package-info.java (70%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/instruction/Instruction.java (71%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/instruction/package-info.java (57%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/LocationValidator.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/MetricsLocation.java (87%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/engine/LocationEngineProvider.java (90%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/engine/Utils.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/GpxParser.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ParseGpxTask.java (96%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayJsonRouteDto.java (88%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java (96%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayLocationDispatcher.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayLocationDto.java (96%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayLocationListener.java (62%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java (95%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/TimestampAdapter.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/BannerInstructionMilestone.java (82%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/Milestone.java (90%) create mode 100644 libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/MilestoneEventListener.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/Operation.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/RouteMilestone.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/StepMilestone.java (88%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/Trigger.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/TriggerProperty.java (96%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/VoiceInstructionMilestone.java (85%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/package-info.java (67%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/Admin.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/BannerComponents.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/BannerInstructions.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/BannerText.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/BannerView.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/Closure.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/Congestion.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsAdapterFactory.java (91%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsCriteria.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsError.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsJsonObject.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsResponse.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsRoute.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/DirectionsWaypoint.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/Incident.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/IntersectionLanes.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/LegAnnotation.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/LegStep.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/ManeuverModifier.java (96%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/MapboxStreetsV8.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/MaxSpeed.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/RestStop.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/RouteLeg.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/RouteOptions.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/SpeedLimit.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/StepIntersection.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/StepManeuver.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/TollCollection.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/VoiceInstructions.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/WalkingOptions.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/WalkingOptionsAdapterFactory.java (91%) create mode 100644 libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/package-info.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/utils/FormatUtils.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/models/utils/ParseUtils.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/MapboxNavigation.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/MapboxNavigationNotification.java (87%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/MapboxNavigationOptions.java (95%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationConstants.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationEngineFactory.java (66%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationEventDispatcher.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationEventListener.java (55%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationFasterRouteListener.java (69%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationHelper.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationIndices.java (80%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationLifecycleMonitor.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationLocationEngineListener.java (92%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java (92%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationLocationUpdate.java (85%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationMapRoute.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationNotificationProvider.java (81%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationRouteProcessor.java (82%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationService.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationTimeFormat.java (86%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java (87%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/RouteProcessorThreadListener.java (84%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/SdkVersionChecker.java (84%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/camera/Camera.java (81%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/camera/RouteInformation.java (86%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/camera/SimpleCamera.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/notification/NavigationNotification.java (72%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/package-info.java (65%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/offroute/OffRoute.java (50%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/offroute/OffRouteCallback.java (85%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/offroute/OffRouteDetector.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/offroute/OffRouteListener.java (64%) create mode 100644 libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/package-info.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/FasterRoute.java (82%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/FasterRouteDetector.java (79%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/FasterRouteListener.java (74%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/MapRouteProgressChangeListener.java (76%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/OnRouteSelectionChangeListener.java (75%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/RouteFetcher.java (82%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/route/RouteListener.java (56%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/CurrentLegAnnotation.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/MetricsRouteProgress.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/ProgressChangeListener.java (68%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteLegProgress.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteProgress.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteStepProgress.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/package-info.java (64%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/snap/Snap.java (55%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/snap/SnapToRoute.java (92%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/snap/package-info.java (61%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/Constants.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/DistanceFormatter.java (95%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/LocaleUtils.java (95%) create mode 100644 libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverMap.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/ManeuverUtils.java (68%) rename {libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui => libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation}/v5/utils/MapImageUtils.java (91%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/MapUtils.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/MathUtils.java (97%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/MeasurementUtils.java (94%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/RingBuffer.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/RouteUtils.java (92%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/TextUtils.java (99%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/ToleranceUtils.java (84%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/ValidationUtils.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/abbreviation/AbbreviationArray.java (98%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/abbreviation/StringAbbreviator.java (93%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/package-info.java (61%) create mode 100644 libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanItem.java rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/span/SpanUtils.java (92%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/span/TextSpanItem.java (83%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java (61%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TimeFormatResolver.java (71%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TimeFormatter.java (89%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TimeFormattingChain.java (87%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java (90%) rename libandroid-navigation/src/main/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java (90%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/BaseTest.java (93%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/MockLocationBuilder.java (85%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/TestRouteBuilder.java (79%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/TestRouteProgressBuilder.java (79%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/LocationValidatorTest.java (91%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/GpxParserTest.java (96%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java (96%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java (95%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java (82%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/location/replay/ReplayRouteParserTest.java (94%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java (92%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/StepMilestoneTest.java (79%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/TriggerPropertyTest.java (92%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/TriggerTest.java (96%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java (93%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/FasterRouteDetectorTest.java (89%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java (80%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/MapboxNavigationTest.java (91%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationEngineFactoryTest.java (92%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationEventDispatcherTest.java (93%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java (79%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationHelperTest.java (93%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationNotificationProviderTest.java (82%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/NavigationRouteProcessorTest.java (95%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java (86%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/offroute/OffRouteDetectorTest.java (97%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteLegProgressTest.java (95%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteProgressTest.java (95%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/routeprogress/RouteStepProgressTest.java (96%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/snap/SnapToRouteTest.java (93%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/DistanceFormatterTest.java (90%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/MeasurementUtilsTest.java (85%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/RingBufferTest.java (90%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/RouteUtilsTest.java (95%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/ToleranceUtilsTest.java (83%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/ValidationUtilsTest.java (92%) rename libandroid-navigation/src/test/java/{com/mapbox/services => org/maplibre/navigation}/android/navigation/v5/utils/time/TimeFormatterTest.java (95%) diff --git a/app/build.gradle b/app/build.gradle index f16ba96cf..cf05b482c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ kotlin { } android { - namespace 'com.mapbox.services.android.navigation.testapp' + namespace 'org.maplibre.navigation.android.example' compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion diff --git a/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java b/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java deleted file mode 100644 index 9001f67ed..000000000 --- a/app/src/androidTest/java/testapp/NavigationViewOrientationTest.java +++ /dev/null @@ -1,103 +0,0 @@ -package testapp; - -import android.content.res.Configuration; -import androidx.test.espresso.ViewAction; - -import com.mapbox.services.android.navigation.testapp.R; -import com.mapbox.services.android.navigation.testapp.test.TestNavigationActivity; -import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap; - -import org.junit.Test; - -import testapp.activity.BaseNavigationActivityTest; - -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.action.ViewActions.click; -import static androidx.test.espresso.action.ViewActions.swipeUp; -import static androidx.test.espresso.assertion.ViewAssertions.matches; -import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; -import static androidx.test.espresso.matcher.ViewMatchers.isRoot; -import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static junit.framework.Assert.assertFalse; -import static testapp.action.OrientationChangeAction.orientationLandscape; -import static testapp.action.OrientationChangeAction.orientationPortrait; - -public class NavigationViewOrientationTest extends BaseNavigationActivityTest { - - @Override - protected Class getActivityClass() { - return TestNavigationActivity.class; - } - - @Test - public void onOrientationLandscape_navigationContinuesRunning() { - if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) { - return; - } - validateTestSetup(); - - changeOrientation(orientationLandscape()); - } - - @Test - public void onOrientationPortrait_navigationContinuesRunning() { - if (checkOrientation(Configuration.ORIENTATION_PORTRAIT)) { - return; - } - validateTestSetup(); - - changeOrientation(orientationPortrait()); - } - - @Test - public void onOrientationChange_recenterBtnStateIsRestore() { - if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) { - return; - } - validateTestSetup(); - - onView(withId(R.id.routeOverviewBtn)).perform(click()); - changeOrientation(orientationLandscape()); - onView(withId(R.id.recenterBtn)).check(matches(isDisplayed())); - } - - @Test - public void onOrientationChange_cameraTrackingIsRestore() { - if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) { - return; - } - validateTestSetup(); - - onView(withId(R.id.navigationMapView)).perform(swipeUp()); - changeOrientation(orientationLandscape()); - - NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap(); - boolean isTrackingEnabled = navigationMapboxMap.retrieveCamera().isTrackingEnabled(); - assertFalse(isTrackingEnabled); - } - - @Test - public void onOrientationChange_waynameVisibilityIsRestored() { - if (checkOrientation(Configuration.ORIENTATION_LANDSCAPE)) { - return; - } - validateTestSetup(); - - onView(withId(R.id.navigationMapView)).perform(swipeUp()); - changeOrientation(orientationLandscape()); - - NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap(); - boolean isWaynameVisible = navigationMapboxMap.isWaynameVisible(); - assertFalse(isWaynameVisible); - } - - // TODO create test rule for this to conditionally ignore - private boolean checkOrientation(int testedOrientation) { - int orientation = getNavigationView().getContext().getResources().getConfiguration().orientation; - return orientation == testedOrientation; - } - - private void changeOrientation(ViewAction newOrientation) { - onView(isRoot()).perform(newOrientation); - } -} diff --git a/app/src/androidTest/java/testapp/NavigationViewTest.java b/app/src/androidTest/java/testapp/NavigationViewTest.java deleted file mode 100644 index 16465de64..000000000 --- a/app/src/androidTest/java/testapp/NavigationViewTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package testapp; - -import com.mapbox.services.android.navigation.testapp.test.TestNavigationActivity; -import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; - -import org.junit.Test; - -import testapp.activity.BaseNavigationActivityTest; - -import static junit.framework.Assert.assertNotNull; - -public class NavigationViewTest extends BaseNavigationActivityTest { - - @Override - protected Class getActivityClass() { - return TestNavigationActivity.class; - } - - @Test - public void onInitialization_navigationMapboxMapIsNotNull() { - validateTestSetup(); - - NavigationMapboxMap navigationMapboxMap = getNavigationView().retrieveNavigationMapboxMap(); - - assertNotNull(navigationMapboxMap); - } - - @Test - public void onNavigationStart_mapboxNavigationIsNotNull() { - validateTestSetup(); - - MapboxNavigation mapboxNavigation = getNavigationView().retrieveMapboxNavigation(); - - assertNotNull(mapboxNavigation); - } -} diff --git a/app/src/androidTest/java/testapp/action/OrientationChangeAction.java b/app/src/androidTest/java/testapp/action/OrientationChangeAction.java deleted file mode 100644 index e4ed3c6fb..000000000 --- a/app/src/androidTest/java/testapp/action/OrientationChangeAction.java +++ /dev/null @@ -1,65 +0,0 @@ -package testapp.action; - -import android.app.Activity; -import android.content.Context; -import android.content.ContextWrapper; -import android.content.pm.ActivityInfo; -import androidx.test.espresso.UiController; -import androidx.test.espresso.ViewAction; -import android.view.View; -import android.view.ViewGroup; - -import org.hamcrest.Matcher; - -import static androidx.test.espresso.matcher.ViewMatchers.isRoot; - -public class OrientationChangeAction implements ViewAction { - - private final int orientation; - - private OrientationChangeAction(int orientation) { - this.orientation = orientation; - } - - public static ViewAction orientationLandscape() { - return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } - - public static ViewAction orientationPortrait() { - return new OrientationChangeAction(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } - - @Override - public Matcher getConstraints() { - return isRoot(); - } - - @Override - public String getDescription() { - return "change orientation to " + orientation; - } - - @Override - public void perform(UiController uiController, View view) { - uiController.loopMainThreadUntilIdle(); - Activity activity = getActivity(view.getContext()); - if (activity == null && view instanceof ViewGroup) { - ViewGroup viewGroup = (ViewGroup) view; - int childCount = viewGroup.getChildCount(); - for (int i = 0; i < childCount && activity == null; ++i) { - activity = getActivity(viewGroup.getChildAt(i).getContext()); - } - } - activity.setRequestedOrientation(orientation); - } - - private Activity getActivity(Context context) { - while (context instanceof ContextWrapper) { - if (context instanceof Activity) { - return (Activity) context; - } - context = ((ContextWrapper) context).getBaseContext(); - } - return null; - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/testapp/activity/BaseNavigationActivityTest.java b/app/src/androidTest/java/testapp/activity/BaseNavigationActivityTest.java deleted file mode 100644 index 77730dbb8..000000000 --- a/app/src/androidTest/java/testapp/activity/BaseNavigationActivityTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package testapp.activity; - -import android.app.Activity; -import android.content.Context; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import androidx.test.espresso.IdlingRegistry; -import androidx.test.espresso.IdlingResourceTimeoutException; -import androidx.test.rule.ActivityTestRule; - -import com.mapbox.services.android.navigation.testapp.R; -import com.mapbox.services.android.navigation.ui.v5.NavigationView; - -import junit.framework.Assert; - -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; - -import testapp.utils.OnNavigationReadyIdlingResource; -import timber.log.Timber; - -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.assertion.ViewAssertions.matches; -import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; -import static androidx.test.espresso.matcher.ViewMatchers.withId; - -public abstract class BaseNavigationActivityTest { - - @Rule - public ActivityTestRule rule = new ActivityTestRule<>(getActivityClass()); - private NavigationView navigationView; - private OnNavigationReadyIdlingResource idlingResource; - - @Before - public void beforeTest() { - try { - idlingResource = new OnNavigationReadyIdlingResource(rule.getActivity()); - IdlingRegistry.getInstance().register(idlingResource); - checkViewIsDisplayed(R.id.navigationView); - navigationView = idlingResource.getNavigationView(); - } catch (IdlingResourceTimeoutException idlingResourceTimeoutException) { - Timber.e("Idling resource timed out. Could not validate if navigation is ready."); - throw new RuntimeException("Could not start test for " + getActivityClass().getSimpleName() + ".\n" - + "The ViewHierarchy doesn't contain a view with resource id = R.id.navigationView"); - } - } - - protected void validateTestSetup() { - Assert.assertTrue("Device is not connected to the Internet.", isConnected(rule.getActivity())); - checkViewIsDisplayed(R.id.navigationView); - } - - protected NavigationView getNavigationView() { - return navigationView; - } - - protected abstract Class getActivityClass(); - - private void checkViewIsDisplayed(int id) { - onView(withId(id)).check(matches(isDisplayed())); - } - - private boolean isConnected(Context context) { - ConnectivityManager connectivityManager - = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); - return activeNetworkInfo != null && activeNetworkInfo.isConnected(); - } - - @After - public void afterTest() { - IdlingRegistry.getInstance().unregister(idlingResource); - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java b/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java deleted file mode 100644 index 86f3ab72a..000000000 --- a/app/src/androidTest/java/testapp/utils/OnNavigationReadyIdlingResource.java +++ /dev/null @@ -1,120 +0,0 @@ -package testapp.utils; - -import android.app.Activity; -import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import androidx.annotation.NonNull; -import androidx.test.espresso.IdlingResource; - -import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute; - -import com.mapbox.services.android.navigation.testapp.R; -import com.mapbox.services.android.navigation.ui.v5.NavigationView; -import com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions; -import com.mapbox.services.android.navigation.ui.v5.OnNavigationReadyCallback; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; - -import java.lang.reflect.Field; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; - -public class OnNavigationReadyIdlingResource implements IdlingResource, Callback, - OnNavigationReadyCallback { - - private static final String NAVIGATION_VIEW = "navigationView"; - private static final String TEST_ROUTE_JSON = "test_route_json"; - private static final int FIRST_ROUTE = 0; - private boolean isNavigationReady; - private NavigationView navigationView; - private DirectionsRoute testRoute; - private ResourceCallback resourceCallback; - private SharedPreferences preferences; - - public OnNavigationReadyIdlingResource(Activity activity) { - try { - Field field = activity.getClass().getDeclaredField(NAVIGATION_VIEW); - field.setAccessible(true); - navigationView = (NavigationView) field.get(activity); - preferences = PreferenceManager.getDefaultSharedPreferences(activity); - fetchRoute(activity); - } catch (Exception err) { - throw new RuntimeException(err); - } - } - - @Override - public String getName() { - return getClass().getSimpleName(); - } - - @Override - public boolean isIdleNow() { - return isNavigationReady; - } - - @Override - public void registerIdleTransitionCallback(ResourceCallback resourceCallback) { - this.resourceCallback = resourceCallback; - } - - public NavigationView getNavigationView() { - return navigationView; - } - - @Override - public void onResponse(@NonNull Call call, @NonNull Response response) { - testRoute = response.body().routes().get(FIRST_ROUTE); - storeRouteForRotation(testRoute); - navigationView.initialize(this); - } - - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { - throw new RuntimeException(throwable); - } - - @Override - public void onNavigationReady(boolean isRunning) { - navigationView.startNavigation(buildTestNavigationViewOptions()); - transitionToIdle(); - } - - private void fetchRoute(Context context) { - Point origin = Point.fromLngLat(-77.033987, 38.900123); - Point destination = Point.fromLngLat(-77.044818, 38.848942); - NavigationRoute.builder(context) - .accessToken(context.getString(R.string.mapbox_access_token)) - .origin(origin) - .destination(destination) - .build().getRoute(this); - } - - private void storeRouteForRotation(DirectionsRoute route) { - SharedPreferences.Editor editor = preferences.edit(); - String testRouteJson = new GsonBuilder() - .registerTypeAdapterFactory(DirectionsAdapterFactory.create()).create().toJson(route); - editor.putString(TEST_ROUTE_JSON, testRouteJson); - editor.apply(); - } - - private NavigationViewOptions buildTestNavigationViewOptions() { - return NavigationViewOptions.builder() - .directionsRoute(com.mapbox.services.android.navigation.v5.models.DirectionsRoute.fromJson(testRoute.toJson())) - .shouldSimulateRoute(true) - .build(); - } - - private void transitionToIdle() { - isNavigationReady = true; - if (resourceCallback != null) { - resourceCallback.onTransitionToIdle(); - } - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 33374ac44..b7b98a2f1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.maplibre.navigation.android.example"> diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/CustomNavigationNotification.java b/app/src/main/java/org/maplibre/navigation/android/example/CustomNavigationNotification.java similarity index 88% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/CustomNavigationNotification.java rename to app/src/main/java/org/maplibre/navigation/android/example/CustomNavigationNotification.java index 8300ad769..77757418c 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/CustomNavigationNotification.java +++ b/app/src/main/java/org/maplibre/navigation/android/example/CustomNavigationNotification.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp; +package org.maplibre.navigation.android.example; import android.app.Notification; import android.app.NotificationChannel; @@ -14,10 +14,10 @@ import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL; public class CustomNavigationNotification implements NavigationNotification { @@ -34,7 +34,7 @@ public CustomNavigationNotification(Context applicationContext) { notificationManager = (NotificationManager) applicationContext.getSystemService(Context.NOTIFICATION_SERVICE); customNotificationBuilder = new NotificationCompat.Builder(applicationContext, NAVIGATION_NOTIFICATION_CHANNEL) - .setSmallIcon(com.mapbox.services.android.navigation.ui.v5.R.drawable.ic_navigation) + .setSmallIcon(org.maplibre.navigation.android.navigation.ui.v5.R.drawable.ic_navigation) .setContentTitle("Custom Navigation Notification") .setContentText("Display your own content here!") .setContentIntent(createPendingStopIntent(applicationContext)); diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java b/app/src/main/java/org/maplibre/navigation/android/example/MainActivity.java similarity index 98% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java rename to app/src/main/java/org/maplibre/navigation/android/example/MainActivity.java index e51dbd9b0..46431a6df 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MainActivity.java +++ b/app/src/main/java/org/maplibre/navigation/android/example/MainActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp; +package org.maplibre.navigation.android.example; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt similarity index 81% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt rename to app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt index e16adc9d0..da26d83e6 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/MockNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp +package org.maplibre.navigation.android.example import android.annotation.SuppressLint import android.content.BroadcastReceiver @@ -11,7 +11,7 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse import org.maplibre.geojson.Point import org.maplibre.android.annotations.MarkerOptions import org.maplibre.android.camera.CameraUpdateFactory @@ -23,20 +23,27 @@ import org.maplibre.android.location.modes.RenderMode import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.OnMapReadyCallback import org.maplibre.android.maps.Style -import com.mapbox.services.android.navigation.testapp.databinding.ActivityMockNavigationBinding -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute -import com.mapbox.services.android.navigation.v5.instruction.Instruction -import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine -import com.mapbox.services.android.navigation.v5.milestone.* -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute -import com.mapbox.services.android.navigation.v5.navigation.* -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute +import org.maplibre.navigation.android.navigation.v5.instruction.Instruction +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress import org.maplibre.turf.TurfConstants import org.maplibre.turf.TurfMeasurement import okhttp3.Request +import org.maplibre.navigation.android.example.databinding.ActivityMockNavigationBinding +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener +import org.maplibre.navigation.android.navigation.v5.milestone.RouteMilestone +import org.maplibre.navigation.android.navigation.v5.milestone.Trigger +import org.maplibre.navigation.android.navigation.v5.milestone.TriggerProperty +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventListener +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -55,7 +62,8 @@ class MockNavigationActivity : private lateinit var mapboxMap: MapLibreMap // Navigation related variables - private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() + private var locationEngine: ReplayRouteLocationEngine = + ReplayRouteLocationEngine() private lateinit var navigation: MapboxNavigation private var route: DirectionsRoute? = null private var navigationMapRoute: NavigationMapRoute? = null @@ -76,7 +84,10 @@ class MockNavigationActivity : } val context = applicationContext - val customNotification = CustomNavigationNotification(context) + val customNotification = + CustomNavigationNotification( + context + ) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { customNotification.createNotificationChannel(this) } @@ -84,7 +95,11 @@ class MockNavigationActivity : .navigationNotification(customNotification) .build() - navigation = MapboxNavigation(this, options) + navigation = + MapboxNavigation( + this, + options + ) navigation.addMilestone( RouteMilestone.Builder() @@ -92,9 +107,12 @@ class MockNavigationActivity : .setInstruction(BeginRouteInstruction()) .setTrigger( Trigger.all( - Trigger.lt(TriggerProperty.STEP_INDEX, 3), - Trigger.gt(TriggerProperty.STEP_DISTANCE_TOTAL_METERS, 200), - Trigger.gte(TriggerProperty.STEP_DISTANCE_TRAVELED_METERS, 75), + Trigger.lt( + TriggerProperty.STEP_INDEX, 3), + Trigger.gt( + TriggerProperty.STEP_DISTANCE_TOTAL_METERS, 200), + Trigger.gte( + TriggerProperty.STEP_DISTANCE_TRAVELED_METERS, 75), ), ).build(), ) @@ -147,7 +165,12 @@ class MockNavigationActivity : enableLocationComponent(style) } - navigationMapRoute = NavigationMapRoute(navigation, binding.mapView, mapboxMap) + navigationMapRoute = + NavigationMapRoute( + navigation, + binding.mapView, + mapboxMap + ) mapboxMap.addOnMapClickListener(this) Snackbar.make( diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java b/app/src/main/java/org/maplibre/navigation/android/example/NavigationApplication.java similarity index 87% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java rename to app/src/main/java/org/maplibre/navigation/android/example/NavigationApplication.java index 1979e65e2..06362a3de 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationApplication.java +++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationApplication.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp; +package org.maplibre.navigation.android.example; import android.app.Application; diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt similarity index 91% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt rename to app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt index addbb184f..9bef72da5 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/NavigationUIActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp +package org.maplibre.navigation.android.example import android.annotation.SuppressLint import android.os.Bundle @@ -6,7 +6,7 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse import org.maplibre.geojson.Point import org.maplibre.android.annotations.MarkerOptions import org.maplibre.android.camera.CameraPosition @@ -18,16 +18,16 @@ import org.maplibre.android.location.modes.RenderMode import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.OnMapReadyCallback import org.maplibre.android.maps.Style -import com.mapbox.services.android.navigation.testapp.databinding.ActivityNavigationUiBinding -import com.mapbox.services.android.navigation.ui.v5.NavigationLauncher -import com.mapbox.services.android.navigation.ui.v5.NavigationLauncherOptions -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute -import com.mapbox.services.android.navigation.v5.navigation.* +import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncher +import org.maplibre.navigation.android.navigation.ui.v5.NavigationLauncherOptions +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute import org.maplibre.turf.TurfConstants import org.maplibre.turf.TurfMeasurement import okhttp3.Request +import org.maplibre.navigation.android.example.databinding.ActivityNavigationUiBinding +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -106,10 +106,11 @@ class NavigationUIActivity : enableLocationComponent(style) } - navigationMapRoute = NavigationMapRoute( - binding.mapView, - mapboxMap - ) + navigationMapRoute = + NavigationMapRoute( + binding.mapView, + mapboxMap + ) mapboxMap.addOnMapClickListener(this) Snackbar.make( diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SampleItem.java b/app/src/main/java/org/maplibre/navigation/android/example/SampleItem.java similarity index 88% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/SampleItem.java rename to app/src/main/java/org/maplibre/navigation/android/example/SampleItem.java index 5c83efffc..8f0bdc41d 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SampleItem.java +++ b/app/src/main/java/org/maplibre/navigation/android/example/SampleItem.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp; +package org.maplibre.navigation.android.example; public class SampleItem { diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt similarity index 81% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt rename to app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt index 740b37f6d..0c0e1d48f 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/SnapToRouteNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.testapp +package org.maplibre.navigation.android.example import android.location.Location import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse import org.maplibre.geojson.Point import org.maplibre.android.location.LocationComponent import org.maplibre.android.location.LocationComponentActivationOptions @@ -13,15 +13,18 @@ import org.maplibre.android.location.modes.RenderMode import org.maplibre.android.maps.MapLibreMap import org.maplibre.android.maps.OnMapReadyCallback import org.maplibre.android.maps.Style -import com.mapbox.services.android.navigation.testapp.databinding.ActivitySnapToRouteNavigationBinding -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute -import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute -import com.mapbox.services.android.navigation.v5.navigation.* -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress -import com.mapbox.services.android.navigation.v5.snap.SnapToRoute +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress +import org.maplibre.navigation.android.navigation.v5.snap.SnapToRoute import okhttp3.Request +import org.maplibre.navigation.android.example.databinding.ActivitySnapToRouteNavigationBinding +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -42,7 +45,8 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, private lateinit var binding: ActivitySnapToRouteNavigationBinding private lateinit var mapboxMap: MapLibreMap - private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() + private var locationEngine: ReplayRouteLocationEngine = + ReplayRouteLocationEngine() private lateinit var navigation: MapboxNavigation private var route: DirectionsRoute? = null private var navigationMapRoute: NavigationMapRoute? = null @@ -54,7 +58,8 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, setContentView(binding.root) navigation = MapboxNavigation( - this, MapboxNavigationOptions.builder() + this, + MapboxNavigationOptions.builder() .snapToRoute(true) .build() ).apply { @@ -80,7 +85,12 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, enableLocationComponent(style) } - navigationMapRoute = NavigationMapRoute(navigation, binding.mapView, mapboxMap) + navigationMapRoute = + NavigationMapRoute( + navigation, + binding.mapView, + mapboxMap + ) calculateRouteAndStartNavigation() } @@ -127,7 +137,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, this.origin(Point.fromLngLat(9.7536318, 52.3717979)) this.addWaypoint(Point.fromLngLat(9.741052, 52.360496)) this.destination(Point.fromLngLat(9.756259, 52.342620)) - this.voiceUnits(com.mapbox.services.android.navigation.v5.models.DirectionsCriteria.METRIC) + this.voiceUnits(DirectionsCriteria.METRIC) this.alternatives(true) this.baseUrl(getString(R.string.base_url)) } @@ -140,7 +150,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, Timber.d("Url: %s", (call.request() as Request).url.toString()) response.body()?.let { responseBody -> if (responseBody.routes().isNotEmpty()) { - val maplibreResponse = com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(responseBody.toJson()); + val maplibreResponse = DirectionsResponse.fromJson(responseBody.toJson()); val directionsRoute = maplibreResponse.routes().first() this@SnapToRouteNavigationActivity.route = directionsRoute navigationMapRoute?.addRoutes(maplibreResponse.routes()) diff --git a/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java b/app/src/main/java/org/maplibre/navigation/android/example/Utils.java similarity index 96% rename from app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java rename to app/src/main/java/org/maplibre/navigation/android/example/Utils.java index 4f8928569..519defd35 100644 --- a/app/src/main/java/com/mapbox/services/android/navigation/testapp/Utils.java +++ b/app/src/main/java/org/maplibre/navigation/android/example/Utils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.testapp; +package org.maplibre.navigation.android.example; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8c78397e6..1c8a5ca11 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="com.mapbox.services.android.navigation.testapp.MainActivity"> + tools:context="com.mapbox.services.android.navigation.testapp.org.maplibre.navigation.android.example.testapp.MainActivity"> + tools:context="org.maplibre.navigation.android.example.MockNavigationActivity"> + tools:context="org.maplibre.navigation.android.example.MockNavigationActivity"> - + \ No newline at end of file diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeVerifier.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeVerifier.java deleted file mode 100644 index 6ae1475e7..000000000 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeVerifier.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; - -import com.mapbox.services.android.navigation.v5.models.BannerComponents; - -interface NodeVerifier { - boolean isNodeType(BannerComponents bannerComponents); -} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java deleted file mode 100644 index b4eab3f64..000000000 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; - -import com.mapbox.services.android.navigation.ui.v5.R; - -import java.util.HashMap; - -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT_ONLY; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_SLIGHT_RIGHT; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_STRAIGHT; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_STRAIGHT_ONLY; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_UTURN; - -class TurnLaneDrawableMap extends HashMap { - - TurnLaneDrawableMap() { - put(DRAW_LANE_STRAIGHT, R.drawable.ic_lane_straight); - put(DRAW_LANE_UTURN, R.drawable.ic_lane_uturn); - put(DRAW_LANE_RIGHT, R.drawable.ic_lane_right); - put(DRAW_LANE_SLIGHT_RIGHT, R.drawable.ic_lane_slight_right); - put(DRAW_LANE_RIGHT_ONLY, R.drawable.ic_lane_right_only); - put(DRAW_LANE_STRAIGHT_ONLY, R.drawable.ic_lane_straight_only); - } -} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/NavigationListener.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/NavigationListener.java deleted file mode 100644 index 632ceebc9..000000000 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/NavigationListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.mapbox.services.android.navigation.ui.v5.listeners; - -/** - * A listener that can be implemented and - * added to {@link com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions} to - * hook into navigation related events occurring in {@link com.mapbox.services.android.navigation.ui.v5.NavigationView}. - */ -public interface NavigationListener { - - /** - * Will be triggered when the user clicks - * on the cancel "X" icon while navigating. - * - * @since 0.8.0 - */ - void onCancelNavigation(); - - /** - * Will be triggered when {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} - * has finished and the service is completely shut down. - * - * @since 0.8.0 - */ - void onNavigationFinished(); - - /** - * Will be triggered when {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} - * has been initialized and the user is navigating the given route. - * - * @since 0.8.0 - */ - void onNavigationRunning(); -} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/CancelBtnClickListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/CancelBtnClickListener.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/CancelBtnClickListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/CancelBtnClickListener.java index 5dcd5f2b1..cd8b66700 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/CancelBtnClickListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/CancelBtnClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProvider.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProvider.java index 22b726657..7f42b92c5 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.annotation.SuppressLint; import android.content.Context; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java similarity index 98% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java index 92af480c1..5f9ddae92 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/DamerauLevenshteinAlgorithm.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import java.util.HashMap; import java.util.Map; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductor.java similarity index 76% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductor.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductor.java index a31d7584b..d3afbbe31 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductor.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductor.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.Context; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.location.engine.LocationEngineProvider; -import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine; +import org.maplibre.navigation.android.navigation.v5.location.engine.LocationEngineProvider; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine; class LocationEngineConductor { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapConnectivityController.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java similarity index 71% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapConnectivityController.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java index 728453399..2f995b78d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapConnectivityController.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import org.maplibre.android.MapLibre; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java similarity index 89% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java index 223e5ba9f..d21f04e62 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MapboxNavigationActivity.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.SharedPreferences; import android.os.Bundle; @@ -7,11 +7,11 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.camera.CameraPosition; -import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; /** * Serves as a launching point for the custom drop-in UI, {@link NavigationView}. @@ -19,7 +19,7 @@ * Demonstrates the proper setup and usage of the view, including all lifecycle methods. */ public class MapboxNavigationActivity extends AppCompatActivity implements OnNavigationReadyCallback, - NavigationListener { + NavigationListener { private NavigationView navigationView; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MobileNetworkChecker.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MobileNetworkChecker.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MobileNetworkChecker.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MobileNetworkChecker.java index e9030539c..361c5002b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MobileNetworkChecker.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MobileNetworkChecker.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.NonNull; import android.telephony.TelephonyManager; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MultiOnClickListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MultiOnClickListener.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MultiOnClickListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MultiOnClickListener.java index 28699343c..f2281fd92 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/MultiOnClickListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MultiOnClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationButton.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationButton.java similarity index 89% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationButton.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationButton.java index b45b0530a..d3b8e0ccf 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationButton.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationButton.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java similarity index 86% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java index 40d8473cd..35e65057f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationContract.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationContract.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; public interface NavigationContract { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationInstructionListListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationInstructionListListener.java similarity index 77% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationInstructionListListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationInstructionListListener.java index c4b9a4864..806ec56ef 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationInstructionListListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationInstructionListListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.ui.v5.listeners.InstructionListListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener; class NavigationInstructionListListener implements InstructionListListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java index a599883fe..17f00266e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.app.Activity; import android.content.Context; @@ -7,8 +7,9 @@ import android.preference.PreferenceManager; import com.google.gson.Gson; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine; /** * Use this class to launch the navigation UI @@ -17,7 +18,7 @@ * {@link com.mapbox.services.android.navigation.v5.navigation.NavigationRoute}. *

* For testing, you can launch with simulation, in which our - * {@link com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine} will begin + * {@link ReplayRouteLocationEngine} will begin * following the given {@link DirectionsRoute} once the UI is initialized. *

*/ diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncherOptions.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncherOptions.java similarity index 89% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncherOptions.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncherOptions.java index e833bb05b..381be7a65 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncherOptions.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncherOptions.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.camera.CameraPosition; @AutoValue diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java index a6b270760..7466f3abf 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import com.google.android.material.bottomsheet.BottomSheetBehavior; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java index ea2ca01bb..d835871a8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenter.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; import androidx.annotation.NonNull; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import com.mapbox.core.utils.TextUtils; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationUiOptions.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationUiOptions.java similarity index 72% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationUiOptions.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationUiOptions.java index 814bc493f..720d2a7bc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationUiOptions.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationUiOptions.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; public abstract class NavigationUiOptions { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java index 24ec3a7e4..565d5fded 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.app.Activity; import android.content.Context; @@ -21,8 +21,16 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; + +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMapInstanceState; +import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView; +import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import com.mapbox.core.utils.TextUtils; import org.maplibre.geojson.Point; import org.maplibre.android.camera.CameraPosition; @@ -31,20 +39,13 @@ import org.maplibre.android.maps.MapLibreMap; import org.maplibre.android.maps.OnMapReadyCallback; import org.maplibre.android.maps.Style; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; -import com.mapbox.services.android.navigation.ui.v5.instruction.ImageCreator; -import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionView; -import com.mapbox.services.android.navigation.ui.v5.instruction.NavigationAlertView; -import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap; -import com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMapInstanceState; -import com.mapbox.services.android.navigation.ui.v5.map.WayNameView; -import com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet; -import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; /** * View that creates the drop-in UI. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java index 9cf8afebc..ce7695052 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; @@ -6,18 +6,19 @@ import androidx.annotation.Nullable; import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.ui.v5.listeners.BannerInstructionsListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.RouteListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.ui.v5.listeners.BannerInstructionsListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.InstructionListListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.RouteListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechAnnouncement; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; /** * In charge of holding any {@link NavigationView} related listeners {@link NavigationListener}, diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java index 5332cbf5f..42ff7733c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewInstanceState.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewInstanceState.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.os.Parcel; import android.os.Parcelable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java similarity index 87% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java index d643ef3f5..c12437635 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.app.Application; import android.content.Context; @@ -11,35 +11,35 @@ import org.maplibre.geojson.Point; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.ui.v5.camera.DynamicCamera; -import com.mapbox.services.android.navigation.ui.v5.instruction.BannerInstructionModel; -import com.mapbox.services.android.navigation.ui.v5.instruction.InstructionModel; -import com.mapbox.services.android.navigation.ui.v5.summary.SummaryModel; -import com.mapbox.services.android.navigation.ui.v5.voice.NavigationSpeechPlayer; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechAnnouncement; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechPlayer; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechPlayerProvider; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.milestone.VoiceInstructionMilestone; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.navigation.NavigationEventListener; -import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat; -import com.mapbox.services.android.navigation.v5.navigation.camera.Camera; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; -import com.mapbox.services.android.navigation.v5.route.FasterRouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.ui.v5.camera.DynamicCamera; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.BannerInstructionModel; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionModel; +import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryModel; +import org.maplibre.navigation.android.navigation.ui.v5.voice.NavigationSpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayerProvider; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import org.jetbrains.annotations.TestOnly; -import com.mapbox.services.android.navigation.ui.v5.route.MapboxRouteFetcher; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java similarity index 67% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java index 51b769f33..370575883 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListener.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; class NavigationViewModelProgressChangeListener implements ProgressChangeListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewOptions.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java similarity index 75% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewOptions.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java index a97af685e..927870ed9 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewOptions.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java @@ -1,21 +1,22 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.Nullable; import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.ui.v5.listeners.BannerInstructionsListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.RouteListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.ui.v5.listeners.BannerInstructionsListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.InstructionListListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.RouteListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechPlayer; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListener.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListener.java index 5d9de2872..4e18f9646 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java similarity index 86% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java index 9910437db..88fddea16 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java @@ -1,18 +1,18 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.ui.v5.route.MapboxRouteFetcher; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute; -import com.mapbox.services.android.navigation.v5.route.RouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.route.RouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.Date; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriber.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriber.java index 3d81efb14..94bdd66c9 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriber.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriber.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; @@ -9,7 +9,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.OnLifecycleEvent; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; class NavigationViewSubscriber implements LifecycleObserver { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListener.java similarity index 72% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListener.java index e91d757b2..fc24efc90 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListener.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.ui.v5.map.OnWayNameChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; class NavigationViewWayNameListener implements OnWayNameChangedListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java index 5a4a1ce82..d7159361f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/OnNavigationReadyCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/OnNavigationReadyCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; public interface OnNavigationReadyCallback { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterBtnClickListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterBtnClickListener.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterBtnClickListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterBtnClickListener.java index 5f53df67a..34a3e6cb4 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterBtnClickListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterBtnClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterButton.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterButton.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterButton.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterButton.java index 18cd8cad3..bbad93414 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RecenterButton.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RecenterButton.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.Context; import androidx.annotation.Nullable; @@ -8,11 +8,13 @@ import android.view.animation.OvershootInterpolator; import android.view.animation.TranslateAnimation; +import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet; + /** * Button used to re-activate following user location during navigation. *

* If a user scrolls the map while navigating, the - * {@link com.mapbox.services.android.navigation.ui.v5.summary.SummaryBottomSheet} + * {@link SummaryBottomSheet} * is set to hidden and this button is shown. *

* This button uses a custom {@link TranslateAnimation} with {@link OvershootInterpolator} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatus.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatus.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatus.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatus.java index 513e7097b..78187e320 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatus.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatus.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import java.util.Date; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteComparator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteComparator.java similarity index 89% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteComparator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteComparator.java index f7d5d1b6a..c0022a382 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteComparator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteComparator.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteOverviewBtnClickListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteOverviewBtnClickListener.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteOverviewBtnClickListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteOverviewBtnClickListener.java index d910413b6..cad1973b0 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/RouteOverviewBtnClickListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/RouteOverviewBtnClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.view.View; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java similarity index 99% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java index 1c3fbcc4a..670545816 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SoundButton.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SoundButton.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SummaryBottomSheetCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SummaryBottomSheetCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java index d5d059e18..4757a78c8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/SummaryBottomSheetCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/SummaryBottomSheetCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.NonNull; import com.google.android.material.bottomsheet.BottomSheetBehavior; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java index f4c05320e..b2fd24f4e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ThemeSwitcher.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.Context; import android.content.SharedPreferences; @@ -14,7 +14,7 @@ import android.util.TypedValue; import org.maplibre.android.utils.BitmapUtils; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; /** * This class is used to switch theme colors in {@link NavigationView}. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ViewRouteListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ViewRouteListener.java similarity index 61% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ViewRouteListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ViewRouteListener.java index fd766bbcd..b13f36122 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ViewRouteListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/ViewRouteListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; interface ViewRouteListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/WifiNetworkChecker.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/WifiNetworkChecker.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/WifiNetworkChecker.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/WifiNetworkChecker.java index 152ba3551..89fe5c422 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/WifiNetworkChecker.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/WifiNetworkChecker.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertView.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertView.java index a1e9d20f2..f7cc4c46c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.alert; +package org.maplibre.navigation.android.navigation.ui.v5.alert; import android.animation.ObjectAnimator; import android.content.Context; @@ -18,8 +18,8 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; /** * A custom View that can show a quick message to a user. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java index 61c3f6aba..87e3c709c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.alert; +package org.maplibre.navigation.android.navigation.ui.v5.alert; import android.animation.Animator; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraAnimationDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraAnimationDelegate.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraAnimationDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraAnimationDelegate.java index 02649204c..b965ad1c9 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraAnimationDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraAnimationDelegate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.camera.CameraUpdate; import org.maplibre.android.location.modes.CameraMode; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java index 145c6dc67..9841d149c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraOverviewCancelableCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.camera.CameraUpdate; import org.maplibre.android.maps.MapLibreMap; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraUpdateMode.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraUpdateMode.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraUpdateMode.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraUpdateMode.java index 3b176d9df..c0bc8f453 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/CameraUpdateMode.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/CameraUpdateMode.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; /** * This class is passed to {@link NavigationCameraUpdate} to diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java index 28a9ad358..e27ae4d80 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCamera.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCamera.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import android.location.Location; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.android.MapLibre; import org.maplibre.geojson.Point; @@ -11,10 +11,10 @@ import org.maplibre.android.geometry.LatLng; import org.maplibre.android.geometry.LatLngBounds; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; -import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; -import com.mapbox.services.android.navigation.v5.navigation.camera.SimpleCamera; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.SimpleCamera; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java similarity index 95% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java index 2403b6564..f31283804 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCamera.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.maplibre.android.camera.CameraPosition; import org.maplibre.android.camera.CameraUpdate; @@ -22,12 +22,12 @@ import org.maplibre.android.location.OnLocationCameraTransitionListener; import org.maplibre.android.location.modes.CameraMode; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.navigation.camera.Camera; -import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.MathUtils; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.MathUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -37,9 +37,9 @@ import timber.log.Timber; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MAX_CAMERA_ADJUSTMENT_ANIMATION_DURATION; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MIN_CAMERA_TILT_ADJUSTMENT_ANIMATION_DURATION; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MIN_CAMERA_ZOOM_ADJUSTMENT_ANIMATION_DURATION; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MAX_CAMERA_ADJUSTMENT_ANIMATION_DURATION; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MIN_CAMERA_TILT_ADJUSTMENT_ANIMATION_DURATION; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MIN_CAMERA_ZOOM_ADJUSTMENT_ANIMATION_DURATION; /** * Updates the map camera while navigating. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java index 2927dd13f..549aee0df 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.location.OnCameraTrackingChangedListener; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java index 5aa2535a1..544698dcc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.location.OnLocationCameraTransitionListener; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraUpdate.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraUpdate.java index 0e7934b2b..a77fc430d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraUpdate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraUpdate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java index 8bdc0380e..cba7ec4cc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeChangedListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; /** * Use this listener to observe changes in the {@link NavigationCamera} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java index d5f428e7c..ed6152603 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/OnTrackingModeTransitionListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; /** * Listener that gets invoked when the navigation camera finishes a transition diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallback.java similarity index 86% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallback.java index a9b39971c..d16e585df 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.maps.MapLibreMap; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreator.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreator.java index cf6edbfd0..c2cad8ac6 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreator.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; import java.util.ArrayList; import java.util.Collections; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationVerifier.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationVerifier.java similarity index 70% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationVerifier.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationVerifier.java index d19af8a98..237e7efce 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationVerifier.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationVerifier.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; import com.mapbox.core.utils.TextUtils; class AbbreviationVerifier implements NodeVerifier { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentNode.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentNode.java similarity index 77% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentNode.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentNode.java index 3766cb6e1..3adcf2404 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentNode.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentNode.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; /** * Class used to construct a list of BannerComponents to be populated into a TextView diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTree.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTree.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTree.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTree.java index 3a3349132..1d4fd78b1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTree.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTree.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import androidx.annotation.NonNull; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerInstructionModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java similarity index 74% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerInstructionModel.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java index b2a434e69..09415c445 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerInstructionModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerInstructionModel.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.BannerText; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; public class BannerInstructionModel extends InstructionModel { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerShield.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerShield.java similarity index 82% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerShield.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerShield.java index 88c957a2b..313f5a04e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerShield.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerShield.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; class BannerShield { private String url; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignCreator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignCreator.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignCreator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignCreator.java index 0dfd9cbce..86f8330d3 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignCreator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignCreator.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.content.Context; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.ui.v5.R; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignVerifier.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignVerifier.java similarity index 61% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignVerifier.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignVerifier.java index e0e48ec27..13e265288 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ExitSignVerifier.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ExitSignVerifier.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; class ExitSignVerifier implements NodeVerifier { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageCreator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageCreator.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageCreator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageCreator.java index 19a0328b0..753b02859 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageCreator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageCreator.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.content.Context; import android.os.Build; @@ -7,11 +7,11 @@ import android.text.style.ImageSpan; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.BannerText; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.navigation.SdkVersionChecker; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.navigation.SdkVersionChecker; import com.squareup.picasso.Picasso; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageVerifier.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageVerifier.java similarity index 68% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageVerifier.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageVerifier.java index 169438f15..e3877ee16 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/ImageVerifier.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/ImageVerifier.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.text.TextUtils; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; class ImageVerifier implements NodeVerifier { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java similarity index 87% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java index 2bf2b08b5..f8856c48c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionListTransitionListener.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import androidx.annotation.NonNull; import androidx.transition.Transition; import androidx.transition.TransitionListenerAdapter; import androidx.recyclerview.widget.RecyclerView; -import com.mapbox.services.android.navigation.ui.v5.summary.list.InstructionListAdapter; +import org.maplibre.navigation.android.navigation.ui.v5.summary.list.InstructionListAdapter; class InstructionListTransitionListener extends TransitionListenerAdapter { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoader.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoader.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoader.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoader.java index 8004ca2a5..5e06eea8e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoader.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoader.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import androidx.annotation.NonNull; import android.text.Spannable; import android.text.style.ImageSpan; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; import com.squareup.picasso.Picasso; /** diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionModel.java similarity index 77% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionModel.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionModel.java index 44937c1e0..0df16a3fd 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionModel.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.text.SpannableString; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; public class InstructionModel { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionTarget.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionTarget.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionTarget.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionTarget.java index 9539fc8e5..563da7261 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionTarget.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionTarget.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java index d09730cc5..6ed04a85c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.content.Context; import android.content.res.Configuration; @@ -31,28 +31,32 @@ import androidx.transition.AutoTransition; import androidx.transition.TransitionManager; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.BannerText; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.ui.v5.NavigationButton; -import com.mapbox.services.android.navigation.ui.v5.NavigationViewModel; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.SoundButton; -import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; -import com.mapbox.services.android.navigation.ui.v5.instruction.maneuver.ManeuverView; -import com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneAdapter; -import com.mapbox.services.android.navigation.ui.v5.listeners.InstructionListListener; -import com.mapbox.services.android.navigation.ui.v5.summary.list.InstructionListAdapter; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationButton; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.SoundButton; +import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver.ManeuverView; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane.TurnLaneAdapter; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; + +import org.maplibre.navigation.android.navigation.ui.v5.R; + +import org.maplibre.navigation.android.navigation.ui.v5.summary.list.InstructionListAdapter; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import timber.log.Timber; @@ -65,7 +69,7 @@ * as the name of the destination / maneuver name / instruction based on what data is available *

* To automatically have this view update with information from - * {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation}, + * {@link MapboxNavigation}, * add the view as a {@link ProgressChangeListener} and / or {@link OffRouteListener} * * @since 0.6.0 @@ -232,7 +236,7 @@ public void updateDistanceWith(RouteProgress routeProgress) { } /** - * Use this in a {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener} to update + * Use this in a {@link MilestoneEventListener} to update * this view with new banner instructions. *

* This method will look at the type of milestone to determine when diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NavigationAlertView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NavigationAlertView.java similarity index 82% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NavigationAlertView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NavigationAlertView.java index c3f314a4d..68ee0ccf4 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NavigationAlertView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NavigationAlertView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.content.Context; import android.os.Handler; @@ -8,10 +8,11 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; -import com.mapbox.services.android.navigation.ui.v5.NavigationViewModel; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.alert.AlertView; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.alert.AlertView; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; import timber.log.Timber; @@ -66,7 +67,7 @@ public void run() { * events. *

* Note this will only happen automatically in the context of - * the {@link com.mapbox.services.android.navigation.ui.v5.NavigationView} or a {@link NavigationViewModel} + * the {@link NavigationView} or a {@link NavigationViewModel} * has been added to the instruction view with * {@link InstructionView#subscribe(androidx.lifecycle.LifecycleOwner, NavigationViewModel)}. * diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeCreator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeCreator.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeCreator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeCreator.java index 6955c1211..14dd433ad 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/NodeCreator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeCreator.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeVerifier.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeVerifier.java new file mode 100644 index 000000000..0017b51f3 --- /dev/null +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/NodeVerifier.java @@ -0,0 +1,7 @@ +package org.maplibre.navigation.android.navigation.ui.v5.instruction; + +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; + +interface NodeVerifier { + boolean isNodeType(BannerComponents bannerComponents); +} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextCreator.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextCreator.java similarity index 77% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextCreator.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextCreator.java index 826220c68..2d7632603 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextCreator.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextCreator.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; /** * This is the default text coordinator implementation to handle plain text components. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextVerifier.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextVerifier.java similarity index 58% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextVerifier.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextVerifier.java index 20133cd66..e51385800 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextVerifier.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextVerifier.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; class TextVerifier implements NodeVerifier { @Override diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextViewUtils.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextViewUtils.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextViewUtils.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextViewUtils.java index a8ba92b52..a438217cc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/TextViewUtils.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/TextViewUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMap.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMap.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMap.java index 8419ed217..b4139f06d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMap.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.os.Build; import android.util.DisplayMetrics; import android.util.SparseArray; -import com.mapbox.services.android.navigation.v5.navigation.SdkVersionChecker; +import org.maplibre.navigation.android.navigation.v5.navigation.SdkVersionChecker; class UrlDensityMap extends SparseArray { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java index 0e292f47e..fc104dfeb 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java @@ -1,20 +1,20 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.maneuver; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.ManeuverModifier; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.ManeuverType; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROTARY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_FORK; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROTARY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.ManeuverModifier; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.ManeuverType; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROTARY; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_FORK; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROTARY; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN; import android.content.Context; import android.content.res.TypedArray; @@ -31,7 +31,7 @@ import androidx.core.content.ContextCompat; import androidx.core.util.Pair; -import com.mapbox.services.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.R; import java.util.HashSet; import java.util.Map; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java similarity index 79% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java index 798f6121c..ff45af8a6 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewMap.java @@ -1,22 +1,22 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.maneuver; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROTARY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_FORK; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_MERGE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROTARY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROTARY; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_EXIT_ROUNDABOUT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_FORK; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_MERGE; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROTARY; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN; import android.graphics.Canvas; import android.graphics.PointF; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java similarity index 73% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java index ae38309dd..5dca08b57 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuverViewUpdate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.maneuver; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver; import android.graphics.Canvas; import android.graphics.PointF; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java similarity index 99% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java index 08b76cd76..9f70252f7 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/maneuver/ManeuversStyleKit.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.maneuver; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver; import android.graphics.Paint; import android.graphics.Matrix; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java index 1fb530f00..59758f531 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneAdapter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -6,8 +6,8 @@ import android.view.View; import android.view.ViewGroup; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.ui.v5.R; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java new file mode 100644 index 000000000..fdd937835 --- /dev/null +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneDrawableMap.java @@ -0,0 +1,17 @@ +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; + +import org.maplibre.navigation.android.navigation.ui.v5.R; + +import java.util.HashMap; + +class TurnLaneDrawableMap extends HashMap { + + TurnLaneDrawableMap() { + put(TurnLaneViewData.DRAW_LANE_STRAIGHT, R.drawable.ic_lane_straight); + put(TurnLaneViewData.DRAW_LANE_UTURN, R.drawable.ic_lane_uturn); + put(TurnLaneViewData.DRAW_LANE_RIGHT, R.drawable.ic_lane_right); + put(TurnLaneViewData.DRAW_LANE_SLIGHT_RIGHT, R.drawable.ic_lane_slight_right); + put(TurnLaneViewData.DRAW_LANE_RIGHT_ONLY, R.drawable.ic_lane_right_only); + put(TurnLaneViewData.DRAW_LANE_STRAIGHT_ONLY, R.drawable.ic_lane_straight_only); + } +} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java index 49a9cec0f..6494fcd63 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; import android.content.Context; import android.graphics.drawable.Drawable; @@ -8,7 +8,7 @@ import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; /** * Use this view to render turn lane data. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java similarity index 71% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java index 617391c45..c1347b7d4 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewData.java @@ -1,13 +1,13 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_STRAIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_UTURN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_LEFT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_SLIGHT_RIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_STRAIGHT; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.TURN_LANE_INDICATION_UTURN; class TurnLaneViewData { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java similarity index 68% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java index 9975ed9e5..0b7e410bc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewHolder.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; import androidx.recyclerview.widget.RecyclerView; import android.view.View; -import com.mapbox.services.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.R; class TurnLaneViewHolder extends RecyclerView.ViewHolder { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/BannerInstructionsListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/BannerInstructionsListener.java similarity index 83% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/BannerInstructionsListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/BannerInstructionsListener.java index 9153af5e3..3a0a6efb9 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/BannerInstructionsListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/BannerInstructionsListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.listeners; +package org.maplibre.navigation.android.navigation.ui.v5.listeners; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; /** * This listener will be triggered when a {@link BannerInstructions} is about to be displayed. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/InstructionListListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/InstructionListListener.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/InstructionListListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/InstructionListListener.java index 85c2667b7..62c274ec7 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/InstructionListListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/InstructionListListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.listeners; +package org.maplibre.navigation.android.navigation.ui.v5.listeners; /** * A listener that is triggered when the instruction list in InstructionView is shown or hidden. diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java new file mode 100644 index 000000000..916fdfe62 --- /dev/null +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java @@ -0,0 +1,37 @@ +package org.maplibre.navigation.android.navigation.ui.v5.listeners; + +import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; + +/** + * A listener that can be implemented and + * added to {@link NavigationViewOptions} to + * hook into navigation related events occurring in {@link NavigationView}. + */ +public interface NavigationListener { + + /** + * Will be triggered when the user clicks + * on the cancel "X" icon while navigating. + * + * @since 0.8.0 + */ + void onCancelNavigation(); + + /** + * Will be triggered when {@link MapboxNavigation} + * has finished and the service is completely shut down. + * + * @since 0.8.0 + */ + void onNavigationFinished(); + + /** + * Will be triggered when {@link MapboxNavigation} + * has been initialized and the user is navigating the given route. + * + * @since 0.8.0 + */ + void onNavigationRunning(); +} diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/RouteListener.java similarity index 80% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/RouteListener.java index 94293af93..0c4026afe 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/RouteListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/RouteListener.java @@ -1,11 +1,13 @@ -package com.mapbox.services.android.navigation.ui.v5.listeners; +package org.maplibre.navigation.android.navigation.ui.v5.listeners; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; /** - * A listener that can be implemented and added to {@link com.mapbox.services.android.navigation.ui.v5.NavigationViewOptions} to - * hook into route related events occurring in {@link com.mapbox.services.android.navigation.ui.v5.NavigationView}. + * A listener that can be implemented and added to {@link NavigationViewOptions} to + * hook into route related events occurring in {@link NavigationView}. */ public interface RouteListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java similarity index 76% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java index 73da8f71b..1d973d309 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/SpeechAnnouncementListener.java @@ -1,6 +1,7 @@ -package com.mapbox.services.android.navigation.ui.v5.listeners; +package org.maplibre.navigation.android.navigation.ui.v5.listeners; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; /** * This listener will be triggered when a voice announcement is about to be voiced. @@ -19,7 +20,7 @@ public interface SpeechAnnouncementListener { * and it will be ignored. *

* If the {@code SpeechAnnouncement#ssmlAnnouncement} is malformed, - * the {@link com.mapbox.services.android.navigation.ui.v5.voice.SpeechPlayer} will fall back to what is + * the {@link SpeechPlayer} will fall back to what is * included in the {@code SpeechAnnouncement#announcement} with {@link android.speech.tts.TextToSpeech}. * * @param announcement about to be announced diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FeatureFilterTask.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FeatureFilterTask.java index 102f92d4c..1bcb576c1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FeatureFilterTask.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FeatureFilterTask.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.location.Location; import android.os.AsyncTask; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java similarity index 63% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java index 4f05f7994..b411a02b5 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/FpsDelegateProgressChangeListener.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.location.Location; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; class FpsDelegateProgressChangeListener implements ProgressChangeListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegate.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegate.java index 867ba66af..3d1089974 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapBatteryMonitor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapBatteryMonitor.java similarity index 95% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapBatteryMonitor.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapBatteryMonitor.java index dd3e4b175..c4f95ec4a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapBatteryMonitor.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapBatteryMonitor.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.content.Context; import android.content.Intent; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java index c9e65b2fc..f284dee86 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java @@ -1,16 +1,16 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.content.Context; import org.maplibre.android.maps.MapView; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; -import com.mapbox.services.android.navigation.ui.v5.camera.OnTrackingModeChangedListener; -import com.mapbox.services.android.navigation.ui.v5.camera.OnTrackingModeTransitionListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeTransitionListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; class MapFpsDelegate implements OnTrackingModeChangedListener, OnTrackingModeTransitionListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java index c20250e40..a9a905b3b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractor.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.Color; @@ -14,7 +14,7 @@ import static org.maplibre.android.style.layers.PropertyFactory.lineColor; import static org.maplibre.android.style.layers.PropertyFactory.lineWidth; import static org.maplibre.android.style.layers.PropertyFactory.visibility; -import static com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; class MapLayerInteractor { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustor.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustor.java index 41757903a..15cdd140e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustor.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustor.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.content.Context; import android.content.res.Resources; import org.maplibre.android.maps.MapView; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.R; class MapPaddingAdjustor { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java index 9f63d4557..61fa7b162 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayName.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.PointF; import android.location.Location; @@ -7,14 +7,14 @@ import org.maplibre.geojson.Feature; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.mapbox.services.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; class MapWayName { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListener.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListener.java index bada63dc4..8151425d1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java similarity index 64% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java index 73a8e8367..2d53eb1ba 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWaynameProgressChangeListener.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.location.Location; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; class MapWaynameProgressChangeListener implements ProgressChangeListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapSettings.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapSettings.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapSettings.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapSettings.java index 05802b258..cdb6c3f85 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapSettings.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapSettings.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.os.Parcel; import android.os.Parcelable; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; -import static com.mapbox.services.android.navigation.ui.v5.map.MapFpsDelegate.DEFAULT_MAX_FPS_THRESHOLD; +import static org.maplibre.navigation.android.navigation.ui.v5.map.MapFpsDelegate.DEFAULT_MAX_FPS_THRESHOLD; class NavigationMapSettings implements Parcelable { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java index f8d79958f..fd3c4fb12 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.annotation.SuppressLint; import android.content.Context; @@ -12,7 +12,10 @@ import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute; +import org.maplibre.navigation.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.maplibre.android.geometry.LatLng; import org.maplibre.android.location.LocationComponent; @@ -28,18 +31,14 @@ import org.maplibre.android.plugins.annotation.SymbolOptions; import org.maplibre.android.style.sources.Source; import org.maplibre.android.style.sources.VectorSource; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute; -import com.mapbox.services.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import static com.mapbox.services.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MINIMUM_MAP_ZOOM; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MINIMUM_MAP_ZOOM; /** * Wrapper class for {@link MapLibreMap}. @@ -631,7 +630,7 @@ private void initializeMapPaddingAdjustor(MapView mapView, MapLibreMap mapboxMap private void initializeNavigationSymbolManager(MapView mapView, MapLibreMap mapboxMap) { Bitmap markerBitmap = ThemeSwitcher.retrieveThemeMapMarker(mapView.getContext()); - mapboxMap.getStyle().addImage(MAPBOX_NAVIGATION_MARKER_NAME, markerBitmap); + mapboxMap.getStyle().addImage(NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME, markerBitmap); SymbolManager symbolManager = new SymbolManager(mapView, mapboxMap, mapboxMap.getStyle()); navigationSymbolManager = new NavigationSymbolManager(symbolManager); SymbolOnStyleLoadedListener onStyleLoadedListener = new SymbolOnStyleLoadedListener(mapboxMap, markerBitmap); diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java index a0bd96412..6ab561d88 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.os.Parcel; import android.os.Parcelable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java index 59e11090f..81a59b8f1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManager.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManager.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java similarity index 73% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java index ff3757a7a..1e705aed6 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnFeatureFilteredCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnWayNameChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java similarity index 79% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnWayNameChangedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java index cff69222f..809208e85 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/OnWayNameChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java @@ -1,14 +1,16 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import androidx.annotation.NonNull; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; + /** * A listener that can be added to the {@link NavigationMapboxMap} with * {@link NavigationMapboxMap#addOnWayNameChangedListener(OnWayNameChangedListener)}. *

* This listener is triggered when a new way name is found along the route. It will be triggered * regardless of the map way name visibility - * ({@link com.mapbox.services.android.navigation.ui.v5.NavigationView#updateWayNameVisibility(boolean)}). + * ({@link NavigationView#updateWayNameVisibility(boolean)}). * This is so you can hide our implementation of the way name UI and update your own if you'd like. */ public interface OnWayNameChangedListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java similarity index 75% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java index 960be52d3..7bca8a5d8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListener.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.Bitmap; import org.maplibre.android.maps.MapView; import org.maplibre.android.maps.MapLibreMap; -import static com.mapbox.services.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; class SymbolOnStyleLoadedListener implements MapView.OnDidFinishLoadingStyleListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WayNameView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WayNameView.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WayNameView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WayNameView.java index baccc711e..6d81ca1e9 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WayNameView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WayNameView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.content.Context; import android.graphics.drawable.Drawable; @@ -9,8 +9,8 @@ import android.widget.FrameLayout; import android.widget.TextView; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; public class WayNameView extends FrameLayout { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilter.java similarity index 99% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilter.java index dbe163a73..cda298e9b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.location.Location; import androidx.annotation.NonNull; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinder.java similarity index 87% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinder.java index 0a1753750..d5da3cd4a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinder.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinder.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.PointF; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/package-info.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/package-info.java similarity index 64% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/package-info.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/package-info.java index 81b6655b0..12a3fefc8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/package-info.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/package-info.java @@ -3,4 +3,4 @@ * * @since 0.4.0 */ -package com.mapbox.services.android.navigation.ui.v5; \ No newline at end of file +package org.maplibre.navigation.android.navigation.ui.v5; \ No newline at end of file diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/FeatureProcessingTask.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/FeatureProcessingTask.java index f65ddbe76..2c785e0d8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/FeatureProcessingTask.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/FeatureProcessingTask.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.os.Handler; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import com.mapbox.core.constants.Constants; import org.maplibre.geojson.Feature; import org.maplibre.geojson.FeatureCollection; @@ -16,7 +16,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; class FeatureProcessingTask extends Thread { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteArrow.java similarity index 65% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteArrow.java index 389b83d4a..047d9ec8f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteArrow.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteArrow.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; import android.content.res.TypedArray; @@ -25,9 +25,9 @@ import org.maplibre.android.style.sources.GeoJsonOptions; import org.maplibre.android.style.sources.GeoJsonSource; import org.maplibre.android.utils.MathUtils; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.utils.MapImageUtils; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.utils.MapImageUtils; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; @@ -49,34 +49,6 @@ import static org.maplibre.android.style.layers.PropertyFactory.iconAllowOverlap; import static org.maplibre.android.style.layers.PropertyFactory.iconIgnorePlacement; import static org.maplibre.android.style.layers.PropertyFactory.visibility; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_BEARING; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_CASING_OFFSET; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_ICON; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_ICON_CASING; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_OFFSET; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HEAD_SOURCE_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_CASING_LINE_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_LINE_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ARROW_SHAFT_SOURCE_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.LAYER_ABOVE_UPCOMING_MANEUVER_ARROW; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_ARROW_ZOOM; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_DEGREES; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_ZOOM_ARROW_HEAD_CASING_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_ZOOM_ARROW_HEAD_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_ZOOM_ARROW_SHAFT_CASING_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MAX_ZOOM_ARROW_SHAFT_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MIN_ARROW_ZOOM; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MIN_ZOOM_ARROW_HEAD_CASING_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MIN_ZOOM_ARROW_HEAD_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MIN_ZOOM_ARROW_SHAFT_CASING_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MIN_ZOOM_ARROW_SHAFT_SCALE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.OPAQUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.THIRTY; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.TRANSPARENT; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.TWO_POINTS; class MapRouteArrow { @@ -109,8 +81,8 @@ class MapRouteArrow { void addUpcomingManeuverArrow(RouteProgress routeProgress) { boolean invalidUpcomingStepPoints = routeProgress.upcomingStepPoints() == null - || routeProgress.upcomingStepPoints().size() < TWO_POINTS; - boolean invalidCurrentStepPoints = routeProgress.currentStepPoints().size() < TWO_POINTS; + || routeProgress.upcomingStepPoints().size() < RouteConstants.TWO_POINTS; + boolean invalidCurrentStepPoints = routeProgress.currentStepPoints().size() < RouteConstants.TWO_POINTS; if (invalidUpcomingStepPoints || invalidCurrentStepPoints) { updateVisibilityTo(false); return; @@ -144,8 +116,8 @@ private List obtainArrowPointsFrom(RouteProgress routeProgress) { LineString arrowLineCurrent = LineString.fromLngLats(reversedCurrent); LineString arrowLineUpcoming = LineString.fromLngLats(routeProgress.upcomingStepPoints()); - LineString arrowCurrentSliced = TurfMisc.lineSliceAlong(arrowLineCurrent, 0, THIRTY, TurfConstants.UNIT_METERS); - LineString arrowUpcomingSliced = TurfMisc.lineSliceAlong(arrowLineUpcoming, 0, THIRTY, TurfConstants.UNIT_METERS); + LineString arrowCurrentSliced = TurfMisc.lineSliceAlong(arrowLineCurrent, 0, RouteConstants.THIRTY, TurfConstants.UNIT_METERS); + LineString arrowUpcomingSliced = TurfMisc.lineSliceAlong(arrowLineUpcoming, 0, RouteConstants.THIRTY, TurfConstants.UNIT_METERS); Collections.reverse(arrowCurrentSliced.coordinates()); @@ -164,7 +136,7 @@ private void updateArrowShaftWith(List points) { private void updateArrowHeadWith(List points) { double azimuth = TurfMeasurement.bearing(points.get(points.size() - 2), points.get(points.size() - 1)); Feature arrowHeadGeoJsonFeature = Feature.fromGeometry(points.get(points.size() - 1)); - arrowHeadGeoJsonFeature.addNumberProperty(ARROW_BEARING, (float) MathUtils.wrap(azimuth, 0, MAX_DEGREES)); + arrowHeadGeoJsonFeature.addNumberProperty(RouteConstants.ARROW_BEARING, (float) MathUtils.wrap(azimuth, 0, RouteConstants.MAX_DEGREES)); arrowHeadGeoJsonSource.setGeoJson(arrowHeadGeoJsonFeature); } @@ -180,7 +152,7 @@ private void initialize() { SymbolLayer headLayer = createArrowHeadLayer(); SymbolLayer headCasingLayer = createArrowHeadCasingLayer(); - mapboxMap.getStyle().addLayerBelow(shaftCasingLayer, LAYER_ABOVE_UPCOMING_MANEUVER_ARROW); + mapboxMap.getStyle().addLayerBelow(shaftCasingLayer, RouteConstants.LAYER_ABOVE_UPCOMING_MANEUVER_ARROW); mapboxMap.getStyle().addLayerAbove(headCasingLayer, shaftCasingLayer.getId()); mapboxMap.getStyle().addLayerAbove(shaftLayer, headCasingLayer.getId()); @@ -191,7 +163,7 @@ private void initialize() { private void initializeArrowShaft() { arrowShaftGeoJsonSource = new GeoJsonSource( - ARROW_SHAFT_SOURCE_ID, + RouteConstants.ARROW_SHAFT_SOURCE_ID, FeatureCollection.fromFeatures(new Feature[]{}), new GeoJsonOptions().withMaxZoom(16) ); @@ -200,7 +172,7 @@ private void initializeArrowShaft() { private void initializeArrowHead() { arrowHeadGeoJsonSource = new GeoJsonSource( - ARROW_HEAD_SOURCE_ID, + RouteConstants.ARROW_HEAD_SOURCE_ID, FeatureCollection.fromFeatures(new Feature[]{}), new GeoJsonOptions().withMaxZoom(16) ); @@ -216,7 +188,7 @@ private void addArrowHeadIcon() { Drawable head = DrawableCompat.wrap(arrowHead); DrawableCompat.setTint(head.mutate(), arrowColor); Bitmap icon = MapImageUtils.getBitmapFromDrawable(head); - mapboxMap.getStyle().addImage(ARROW_HEAD_ICON, icon); + mapboxMap.getStyle().addImage(RouteConstants.ARROW_HEAD_ICON, icon); } private void addArrowHeadIconCasing() { @@ -228,29 +200,29 @@ private void addArrowHeadIconCasing() { Drawable headCasing = DrawableCompat.wrap(arrowHeadCasing); DrawableCompat.setTint(headCasing.mutate(), arrowBorderColor); Bitmap icon = MapImageUtils.getBitmapFromDrawable(headCasing); - mapboxMap.getStyle().addImage(ARROW_HEAD_ICON_CASING, icon); + mapboxMap.getStyle().addImage(RouteConstants.ARROW_HEAD_ICON_CASING, icon); } private LineLayer createArrowShaftLayer() { - LineLayer shaftLayer = (LineLayer) mapboxMap.getStyle().getLayer(ARROW_SHAFT_LINE_LAYER_ID); + LineLayer shaftLayer = (LineLayer) mapboxMap.getStyle().getLayer(RouteConstants.ARROW_SHAFT_LINE_LAYER_ID); if (shaftLayer != null) { mapboxMap.getStyle().removeLayer(shaftLayer); } - return new LineLayer(ARROW_SHAFT_LINE_LAYER_ID, ARROW_SHAFT_SOURCE_ID).withProperties( + return new LineLayer(RouteConstants.ARROW_SHAFT_LINE_LAYER_ID, RouteConstants.ARROW_SHAFT_SOURCE_ID).withProperties( PropertyFactory.lineColor(color(arrowColor)), PropertyFactory.lineWidth( interpolate(linear(), zoom(), - stop(MIN_ARROW_ZOOM, MIN_ZOOM_ARROW_SHAFT_SCALE), - stop(MAX_ARROW_ZOOM, MAX_ZOOM_ARROW_SHAFT_SCALE) + stop(RouteConstants.MIN_ARROW_ZOOM, RouteConstants.MIN_ZOOM_ARROW_SHAFT_SCALE), + stop(RouteConstants.MAX_ARROW_ZOOM, RouteConstants.MAX_ZOOM_ARROW_SHAFT_SCALE) ) ), PropertyFactory.lineCap(Property.LINE_CAP_ROUND), PropertyFactory.lineJoin(Property.LINE_JOIN_ROUND), PropertyFactory.visibility(NONE), PropertyFactory.lineOpacity( - step(zoom(), OPAQUE, + step(zoom(), RouteConstants.OPAQUE, stop( - ARROW_HIDDEN_ZOOM_LEVEL, TRANSPARENT + RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL, RouteConstants.TRANSPARENT ) ) ) @@ -258,25 +230,25 @@ private LineLayer createArrowShaftLayer() { } private LineLayer createArrowShaftCasingLayer() { - LineLayer shaftCasingLayer = (LineLayer) mapboxMap.getStyle().getLayer(ARROW_SHAFT_CASING_LINE_LAYER_ID); + LineLayer shaftCasingLayer = (LineLayer) mapboxMap.getStyle().getLayer(RouteConstants.ARROW_SHAFT_CASING_LINE_LAYER_ID); if (shaftCasingLayer != null) { mapboxMap.getStyle().removeLayer(shaftCasingLayer); } - return new LineLayer(ARROW_SHAFT_CASING_LINE_LAYER_ID, ARROW_SHAFT_SOURCE_ID).withProperties( + return new LineLayer(RouteConstants.ARROW_SHAFT_CASING_LINE_LAYER_ID, RouteConstants.ARROW_SHAFT_SOURCE_ID).withProperties( PropertyFactory.lineColor(color(arrowBorderColor)), PropertyFactory.lineWidth( interpolate(linear(), zoom(), - stop(MIN_ARROW_ZOOM, MIN_ZOOM_ARROW_SHAFT_CASING_SCALE), - stop(MAX_ARROW_ZOOM, MAX_ZOOM_ARROW_SHAFT_CASING_SCALE) + stop(RouteConstants.MIN_ARROW_ZOOM, RouteConstants.MIN_ZOOM_ARROW_SHAFT_CASING_SCALE), + stop(RouteConstants.MAX_ARROW_ZOOM, RouteConstants.MAX_ZOOM_ARROW_SHAFT_CASING_SCALE) ) ), PropertyFactory.lineCap(Property.LINE_CAP_ROUND), PropertyFactory.lineJoin(Property.LINE_JOIN_ROUND), PropertyFactory.visibility(NONE), PropertyFactory.lineOpacity( - step(zoom(), OPAQUE, + step(zoom(), RouteConstants.OPAQUE, stop( - ARROW_HIDDEN_ZOOM_LEVEL, TRANSPARENT + RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL, RouteConstants.TRANSPARENT ) ) ) @@ -284,28 +256,28 @@ private LineLayer createArrowShaftCasingLayer() { } private SymbolLayer createArrowHeadLayer() { - SymbolLayer headLayer = (SymbolLayer) mapboxMap.getStyle().getLayer(ARROW_HEAD_LAYER_ID); + SymbolLayer headLayer = (SymbolLayer) mapboxMap.getStyle().getLayer(RouteConstants.ARROW_HEAD_LAYER_ID); if (headLayer != null) { mapboxMap.getStyle().removeLayer(headLayer); } - return new SymbolLayer(ARROW_HEAD_LAYER_ID, ARROW_HEAD_SOURCE_ID) + return new SymbolLayer(RouteConstants.ARROW_HEAD_LAYER_ID, RouteConstants.ARROW_HEAD_SOURCE_ID) .withProperties( - PropertyFactory.iconImage(ARROW_HEAD_ICON), + PropertyFactory.iconImage(RouteConstants.ARROW_HEAD_ICON), iconAllowOverlap(true), iconIgnorePlacement(true), PropertyFactory.iconSize(interpolate(linear(), zoom(), - stop(MIN_ARROW_ZOOM, MIN_ZOOM_ARROW_HEAD_SCALE), - stop(MAX_ARROW_ZOOM, MAX_ZOOM_ARROW_HEAD_SCALE) + stop(RouteConstants.MIN_ARROW_ZOOM, RouteConstants.MIN_ZOOM_ARROW_HEAD_SCALE), + stop(RouteConstants.MAX_ARROW_ZOOM, RouteConstants.MAX_ZOOM_ARROW_HEAD_SCALE) ) ), - PropertyFactory.iconOffset(ARROW_HEAD_OFFSET), + PropertyFactory.iconOffset(RouteConstants.ARROW_HEAD_OFFSET), PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP), - PropertyFactory.iconRotate(get(ARROW_BEARING)), + PropertyFactory.iconRotate(get(RouteConstants.ARROW_BEARING)), PropertyFactory.visibility(NONE), PropertyFactory.iconOpacity( - step(zoom(), OPAQUE, + step(zoom(), RouteConstants.OPAQUE, stop( - ARROW_HIDDEN_ZOOM_LEVEL, TRANSPARENT + RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL, RouteConstants.TRANSPARENT ) ) ) @@ -313,27 +285,27 @@ private SymbolLayer createArrowHeadLayer() { } private SymbolLayer createArrowHeadCasingLayer() { - SymbolLayer headCasingLayer = (SymbolLayer) mapboxMap.getStyle().getLayer(ARROW_HEAD_CASING_LAYER_ID); + SymbolLayer headCasingLayer = (SymbolLayer) mapboxMap.getStyle().getLayer(RouteConstants.ARROW_HEAD_CASING_LAYER_ID); if (headCasingLayer != null) { mapboxMap.getStyle().removeLayer(headCasingLayer); } - return new SymbolLayer(ARROW_HEAD_CASING_LAYER_ID, ARROW_HEAD_SOURCE_ID).withProperties( - PropertyFactory.iconImage(ARROW_HEAD_ICON_CASING), + return new SymbolLayer(RouteConstants.ARROW_HEAD_CASING_LAYER_ID, RouteConstants.ARROW_HEAD_SOURCE_ID).withProperties( + PropertyFactory.iconImage(RouteConstants.ARROW_HEAD_ICON_CASING), iconAllowOverlap(true), iconIgnorePlacement(true), PropertyFactory.iconSize(interpolate( linear(), zoom(), - stop(MIN_ARROW_ZOOM, MIN_ZOOM_ARROW_HEAD_CASING_SCALE), - stop(MAX_ARROW_ZOOM, MAX_ZOOM_ARROW_HEAD_CASING_SCALE) + stop(RouteConstants.MIN_ARROW_ZOOM, RouteConstants.MIN_ZOOM_ARROW_HEAD_CASING_SCALE), + stop(RouteConstants.MAX_ARROW_ZOOM, RouteConstants.MAX_ZOOM_ARROW_HEAD_CASING_SCALE) )), - PropertyFactory.iconOffset(ARROW_HEAD_CASING_OFFSET), + PropertyFactory.iconOffset(RouteConstants.ARROW_HEAD_CASING_OFFSET), PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP), - PropertyFactory.iconRotate(get(ARROW_BEARING)), + PropertyFactory.iconRotate(get(RouteConstants.ARROW_BEARING)), PropertyFactory.visibility(NONE), PropertyFactory.iconOpacity( - step(zoom(), OPAQUE, + step(zoom(), RouteConstants.OPAQUE, stop( - ARROW_HIDDEN_ZOOM_LEVEL, TRANSPARENT + RouteConstants.ARROW_HIDDEN_ZOOM_LEVEL, RouteConstants.TRANSPARENT ) ) ) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListener.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListener.java index d0aafa435..d309b0d02 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListener.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Feature; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteDrawableProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteDrawableProvider.java similarity index 87% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteDrawableProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteDrawableProvider.java index a60ee00e6..9f2d54306 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteDrawableProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteDrawableProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLayerProvider.java similarity index 82% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLayerProvider.java index 9e9d0f6fb..f3eb262bd 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLayerProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLayerProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; @@ -7,7 +7,7 @@ import org.maplibre.android.style.layers.LineLayer; import org.maplibre.android.style.layers.Property; import org.maplibre.android.style.layers.SymbolLayer; -import com.mapbox.services.android.navigation.ui.v5.utils.MapImageUtils; +import org.maplibre.navigation.android.navigation.ui.v5.utils.MapImageUtils; import static org.maplibre.android.style.expressions.Expression.color; import static org.maplibre.android.style.expressions.Expression.exponential; @@ -28,20 +28,20 @@ import static org.maplibre.android.style.layers.PropertyFactory.lineColor; import static org.maplibre.android.style.layers.PropertyFactory.lineJoin; import static org.maplibre.android.style.layers.PropertyFactory.lineWidth; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.DESTINATION_MARKER_NAME; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.HEAVY_CONGESTION_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.MODERATE_CONGESTION_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ORIGIN_MARKER_NAME; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.SEVERE_CONGESTION_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.DESTINATION_MARKER_NAME; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.HEAVY_CONGESTION_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.MODERATE_CONGESTION_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ORIGIN_MARKER_NAME; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.SEVERE_CONGESTION_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID; class MapRouteLayerProvider { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java index a0afc1abd..db5ea7d6c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLine.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; import android.content.res.TypedArray; @@ -8,8 +8,10 @@ import androidx.annotation.ColorInt; import androidx.core.content.ContextCompat; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.utils.MapUtils; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.maplibre.geojson.Feature; import org.maplibre.geojson.FeatureCollection; import org.maplibre.geojson.LineString; @@ -21,8 +23,6 @@ import org.maplibre.android.style.layers.SymbolLayer; import org.maplibre.android.style.sources.GeoJsonOptions; import org.maplibre.android.style.sources.GeoJsonSource; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.utils.MapUtils; import java.util.ArrayList; import java.util.HashMap; @@ -33,14 +33,14 @@ import static org.maplibre.android.style.layers.Property.NONE; import static org.maplibre.android.style.layers.Property.VISIBLE; import static org.maplibre.android.style.layers.PropertyFactory.visibility; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SOURCE_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_DESTINATION_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_ORIGIN_VALUE; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_SOURCE_ID; class MapRouteLine { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java similarity index 83% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java index 2d172782c..eb4320b9c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListener.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteSourceProvider.java similarity index 84% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteSourceProvider.java index 3fbbbfb21..523865ecb 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteSourceProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteSourceProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import org.maplibre.geojson.FeatureCollection; import org.maplibre.android.style.sources.GeoJsonOptions; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java index 06f33c846..0bc387493 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapboxRouteFetcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; import android.location.Location; @@ -7,14 +7,14 @@ import androidx.annotation.Nullable; import com.mapbox.geojson.Point; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.route.RouteFetcher; -import com.mapbox.services.android.navigation.v5.route.RouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; -import com.mapbox.services.android.navigation.v5.utils.TextUtils; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.route.RouteFetcher; +import org.maplibre.navigation.android.navigation.v5.route.RouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.utils.TextUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java similarity index 98% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java index 8a9e9795d..e223e90b0 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.app.Activity; import androidx.lifecycle.Lifecycle; @@ -13,12 +13,12 @@ import androidx.fragment.app.Fragment; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.maps.MapView; import org.maplibre.android.maps.MapLibreMap; import org.maplibre.android.maps.Style; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java index f8cb3dfe2..3789dce73 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRoute.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; @@ -7,13 +7,13 @@ import androidx.annotation.Nullable; import com.mapbox.api.directions.v5.MapboxDirections; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; -import com.mapbox.services.android.navigation.v5.utils.TextUtils; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.v5.utils.TextUtils; import com.mapbox.geojson.Point; @@ -23,7 +23,6 @@ import okhttp3.Interceptor; import okhttp3.Request; -import okio.Timeout; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -653,11 +652,11 @@ public NavigationRoute build() { } } - private static com.mapbox.services.android.navigation.v5.models.DirectionsResponse toMapLibreDirectionsResponse(com.mapbox.api.directions.v5.models.DirectionsResponse directionsResponse) { - return com.mapbox.services.android.navigation.v5.models.DirectionsResponse.fromJson(directionsResponse.toJson()); + private static DirectionsResponse toMapLibreDirectionsResponse(com.mapbox.api.directions.v5.models.DirectionsResponse directionsResponse) { + return DirectionsResponse.fromJson(directionsResponse.toJson()); } - private static com.mapbox.api.directions.v5.models.DirectionsResponse toMapboxDirectionsResponse(com.mapbox.services.android.navigation.v5.models.DirectionsResponse directionsResponse) { + private static com.mapbox.api.directions.v5.models.DirectionsResponse toMapboxDirectionsResponse(DirectionsResponse directionsResponse) { return com.mapbox.api.directions.v5.models.DirectionsResponse.fromJson(directionsResponse.toJson()); } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java similarity index 75% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java index e18283432..7c262bd18 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnPrimaryRouteUpdatedCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import org.maplibre.geojson.FeatureCollection; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java similarity index 71% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java index 14e64679b..7f5adf2ae 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteFeaturesProcessedCallback.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.FeatureCollection; import org.maplibre.geojson.LineString; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java similarity index 75% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java index fb8bda7d2..a2a66cb58 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/OnRouteSelectionChangeListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; /** * Listener for determining which current route the user has selected as their primary route for diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java index b8a764a83..44274a100 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTask.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.os.Handler; @@ -10,8 +10,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.FIRST_COLLECTION_INDEX; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.FIRST_COLLECTION_INDEX; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.PRIMARY_ROUTE_PROPERTY_KEY; class PrimaryRouteUpdateTask extends Thread { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java similarity index 97% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java index 2164ae930..8effbaf60 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/RouteConstants.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; class RouteConstants { static final String MAPBOX_LOCATION_ID = "mapbox-location"; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryBottomSheet.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryBottomSheet.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryBottomSheet.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryBottomSheet.java index ebb683c01..efe20199a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryBottomSheet.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryBottomSheet.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.summary; +package org.maplibre.navigation.android.navigation.ui.v5.summary; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -16,15 +16,15 @@ import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.mapbox.services.android.navigation.ui.v5.NavigationViewModel; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.ThemeSwitcher; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; -import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; import java.text.DecimalFormat; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryModel.java similarity index 69% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryModel.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryModel.java index 796f159f7..76c2e87d6 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/SummaryModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/SummaryModel.java @@ -1,17 +1,17 @@ -package com.mapbox.services.android.navigation.ui.v5.summary; +package org.maplibre.navigation.android.navigation.ui.v5.summary; import android.content.Context; import android.text.SpannableStringBuilder; import android.text.format.DateFormat; -import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; import java.util.Calendar; -import static com.mapbox.services.android.navigation.v5.utils.time.TimeFormatter.formatTime; -import static com.mapbox.services.android.navigation.v5.utils.time.TimeFormatter.formatTimeRemaining; +import static org.maplibre.navigation.android.navigation.v5.utils.time.TimeFormatter.formatTime; +import static org.maplibre.navigation.android.navigation.v5.utils.time.TimeFormatter.formatTimeRemaining; public class SummaryModel { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListAdapter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListAdapter.java similarity index 81% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListAdapter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListAdapter.java index db886b7a1..f385da798 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListAdapter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListAdapter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.summary.list; +package org.maplibre.navigation.android.navigation.ui.v5.summary.list; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; @@ -6,10 +6,10 @@ import android.view.View; import android.view.ViewGroup; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; public class InstructionListAdapter extends RecyclerView.Adapter { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenter.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenter.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenter.java index 9c7a78de6..0a76b22c1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenter.java @@ -1,16 +1,16 @@ -package com.mapbox.services.android.navigation.ui.v5.summary.list; +package org.maplibre.navigation.android.navigation.ui.v5.summary.list; import androidx.annotation.NonNull; import android.text.SpannableString; import android.view.View; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListView.java similarity index 89% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListView.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListView.java index a1a6859d5..9569d6379 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.summary.list; +package org.maplibre.navigation.android.navigation.ui.v5.summary.list; import android.text.SpannableString; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionViewHolder.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionViewHolder.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionViewHolder.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionViewHolder.java index 4d6d740dd..73e31338a 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionViewHolder.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionViewHolder.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.summary.list; +package org.maplibre.navigation.android.navigation.ui.v5.summary.list; import android.content.res.Configuration; import androidx.constraintlayout.widget.ConstraintLayout; @@ -7,8 +7,8 @@ import android.view.View; import android.widget.TextView; -import com.mapbox.services.android.navigation.ui.v5.R; -import com.mapbox.services.android.navigation.ui.v5.instruction.maneuver.ManeuverView; +import org.maplibre.navigation.android.navigation.ui.v5.R; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.maneuver.ManeuverView; class InstructionViewHolder extends RecyclerView.ViewHolder implements InstructionListView { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapImageUtils.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapImageUtils.java similarity index 91% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapImageUtils.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapImageUtils.java index 356e431da..b59f2f5b2 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapImageUtils.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapImageUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.ui.v5.utils; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapUtils.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapUtils.java index e9b7523d3..87e7f9cc8 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapUtils.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/MapUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.utils; +package org.maplibre.navigation.android.navigation.ui.v5.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/ViewUtils.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/ViewUtils.java similarity index 96% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/ViewUtils.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/ViewUtils.java index 55d40e1c3..b257e7967 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/ViewUtils.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/utils/ViewUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.utils; +package org.maplibre.navigation.android.navigation.ui.v5.utils; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java similarity index 98% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java index 7bb704123..832d2f61f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AndroidSpeechPlayer.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.content.Context; import android.os.Build; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api14UtteranceListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api14UtteranceListener.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api14UtteranceListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api14UtteranceListener.java index 8ed52a68c..2674bb4da 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api14UtteranceListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api14UtteranceListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.speech.tts.TextToSpeech; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java index d3b9349cc..fb6543065 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/Api26AudioFocusDelegate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.media.AudioFocusRequest; import android.media.AudioManager; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegate.java similarity index 56% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegate.java index 79b701f09..89cf9dba5 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; interface AudioFocusDelegate { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java similarity index 90% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java index 138ad70e9..52300ce03 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/AudioFocusDelegateProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.media.AudioManager; import android.os.Build; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListener.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListener.java index 2692c5f28..a4b4628a1 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import timber.log.Timber; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java index 0164fcccf..25222a83e 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayer.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; + /** * Used to play {@link SpeechAnnouncement}s. *

@@ -61,7 +63,7 @@ public void setMuted(boolean isMuted) { } /** - * Optional method to implement in an {@link com.mapbox.services.android.navigation.v5.offroute.OffRouteListener}. + * Optional method to implement in an {@link OffRouteListener}. *

* During an off-route scenario, you can use this method to cancel existing announcements without * completely muting the player. diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncement.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncement.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncement.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncement.java index 37783a96a..67877e8ab 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncement.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncement.java @@ -1,9 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; /** * Used with {@link NavigationSpeechPlayer#play(SpeechAnnouncement)}. @@ -74,7 +75,7 @@ public abstract static class Builder { public abstract Builder announcement(String announcement); /** - * The {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener} can provide + * The {@link MilestoneEventListener} can provide * voice instructions via {@link VoiceInstructionMilestone}. *

* If you pass the milestone into the builder, {@link SpeechAnnouncement} will extract both the SSML diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java similarity index 92% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java index ca63850ff..67b5fcd1b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementMap.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import androidx.core.util.Pair; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java similarity index 71% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java index 8656216e6..d70dd2d58 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementUpdate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import androidx.core.util.Pair; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java similarity index 88% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java index 50a3f407f..0d527cbed 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusDelegate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.media.AudioManager; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java similarity index 85% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java index c16385d32..9e072f371 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAudioFocusManager.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; class SpeechAudioFocusManager { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechListener.java similarity index 68% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechListener.java index 466a0daa3..46dd15212 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; interface SpeechListener { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayer.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayer.java similarity index 87% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayer.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayer.java index fa1d190eb..81765b59b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayer.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayer.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; + +import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; /** * Defines a contract for speech players - * used in {@link com.mapbox.services.android.navigation.ui.v5.NavigationView}. + * used in {@link NavigationView}. * * @since 0.6.0 */ diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProvider.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProvider.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProvider.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProvider.java index ea8374258..9bb226e44 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProvider.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProvider.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.content.Context; import android.media.AudioManager; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.ui.v5.ConnectivityStatusProvider; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.ConnectivityStatusProvider; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/UtteranceListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/UtteranceListener.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/UtteranceListener.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/UtteranceListener.java index 7a5cad294..340577f05 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/UtteranceListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/voice/UtteranceListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import android.os.Build; import android.speech.tts.UtteranceProgressListener; diff --git a/libandroid-navigation-ui/src/main/res/layout-land/instruction_content_layout.xml b/libandroid-navigation-ui/src/main/res/layout-land/instruction_content_layout.xml index af1e4318e..b0c11b7d8 100644 --- a/libandroid-navigation-ui/src/main/res/layout-land/instruction_content_layout.xml +++ b/libandroid-navigation-ui/src/main/res/layout-land/instruction_content_layout.xml @@ -23,7 +23,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - diff --git a/libandroid-navigation-ui/src/main/res/layout-land/sub_instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout-land/sub_instruction_layout.xml index e45ba9e5d..69bfb1ab1 100644 --- a/libandroid-navigation-ui/src/main/res/layout-land/sub_instruction_layout.xml +++ b/libandroid-navigation-ui/src/main/res/layout-land/sub_instruction_layout.xml @@ -8,7 +8,7 @@ android:background="@drawable/sub_banner_background" android:elevation="2dp"> - - - - - - - - - diff --git a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml index 8322d155f..e3ce03d97 100644 --- a/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml +++ b/libandroid-navigation-ui/src/main/res/layout/sub_instruction_layout.xml @@ -8,7 +8,7 @@ android:background="?attr/navigationViewListBackground" android:elevation="2dp"> - - diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/BaseTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/BaseTest.java similarity index 85% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/BaseTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/BaseTest.java index 2a50a649a..82d9e364e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/BaseTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/BaseTest.java @@ -1,7 +1,7 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.io.IOException; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProviderTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProviderTest.java similarity index 97% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProviderTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProviderTest.java index 028b39746..c5c9f88db 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/ConnectivityStatusProviderTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/ConnectivityStatusProviderTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.content.Context; import android.net.ConnectivityManager; @@ -9,6 +9,7 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.maplibre.navigation.android.navigation.ui.v5.ConnectivityStatusProvider; import org.robolectric.RobolectricTestRunner; import static org.junit.Assert.assertFalse; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductorTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductorTest.java similarity index 93% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductorTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductorTest.java index 68394a8a6..87e8d4f3d 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/LocationEngineConductorTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/LocationEngineConductorTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.location.replay.ReplayRouteLocationEngine; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java similarity index 85% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java index 281a0b911..17fda9dab 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationOnCameraTrackingChangedListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import com.google.android.material.bottomsheet.BottomSheetBehavior; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationOnCameraTrackingChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationPresenter; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java similarity index 94% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java index a80b4309e..d0bb29d4d 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationPresenterTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationPresenterTest.java @@ -1,6 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationContract; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationPresenter; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java similarity index 93% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java index 4304dbd9e..82a4e238e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -10,18 +10,21 @@ import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewEventDispatcher; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.ui.v5.listeners.BannerInstructionsListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.InstructionListListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.NavigationListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.RouteListener; -import com.mapbox.services.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechAnnouncement; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.BannerInstructionsListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.InstructionListListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.RouteListener; +import org.maplibre.navigation.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java similarity index 82% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java index a562521f5..51315e81e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelProgressChangeListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import android.location.Location; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModelProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java similarity index 88% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java index a8492e19f..e8a285bba 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModelTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -9,9 +9,14 @@ import android.app.Application; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.ui.v5.voice.SpeechPlayer; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.ui.v5.LocationEngineConductor; +import org.maplibre.navigation.android.navigation.ui.v5.MapConnectivityController; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewEventDispatcher; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewRouter; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java similarity index 89% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java index bfb7c730b..00bf3e717 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouteEngineListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import androidx.lifecycle.MutableLiveData; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewRouteEngineListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java similarity index 91% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouterTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java index d47a87822..f237917af 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewRouterTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static junit.framework.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -13,18 +13,19 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.DirectionsWaypoint; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; + +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsWaypoint; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import com.mapbox.core.constants.Constants; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; -import com.mapbox.services.android.navigation.ui.v5.route.MapboxRouteFetcher; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationRoute; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute; import java.io.IOException; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriberTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriberTest.java similarity index 91% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriberTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriberTest.java index ad7a4c702..90cc345c5 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewSubscriberTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewSubscriberTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -14,6 +14,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationPresenter; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewSubscriber; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java similarity index 63% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java index dabb618fc..4adb8b8e7 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewWayNameListenerTest.java @@ -1,10 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; -import com.mapbox.services.android.navigation.ui.v5.map.OnWayNameChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationPresenter; +import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewWayNameListener; +import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; import org.junit.Test; -import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatusTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatusTest.java similarity index 90% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatusTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatusTest.java index 96e74cdae..fa421e0d7 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/RouteCallStatusTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/RouteCallStatusTest.java @@ -1,6 +1,7 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.RouteCallStatus; import java.util.Date; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteBuilder.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteBuilder.java similarity index 85% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteBuilder.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteBuilder.java index c772894f3..33fd436da 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteBuilder.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteBuilder.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static com.google.common.base.Charsets.UTF_8; @@ -7,10 +7,10 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import com.mapbox.core.constants.Constants; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteProgressBuilder.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteProgressBuilder.java similarity index 80% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteProgressBuilder.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteProgressBuilder.java index 05203e0e6..6c728a44f 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/TestRouteProgressBuilder.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/TestRouteProgressBuilder.java @@ -1,19 +1,19 @@ -package com.mapbox.services.android.navigation.ui.v5; +package org.maplibre.navigation.android.navigation.ui.v5; import static com.mapbox.core.constants.Constants.PRECISION_6; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; import android.util.Pair; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java similarity index 67% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java index 0fa430519..ef19a3b52 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/alert/AlertViewAnimatorListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.alert; +package org.maplibre.navigation.android.navigation.ui.v5.alert; import android.animation.Animator; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.alert.AlertView; +import org.maplibre.navigation.android.navigation.ui.v5.alert.AlertViewAnimatorListener; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCameraTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCameraTest.java similarity index 94% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCameraTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCameraTest.java index a0bcc87a5..abd226d15 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/DynamicCameraTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/DynamicCameraTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import android.location.Location; import androidx.annotation.NonNull; @@ -6,18 +6,19 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import com.mapbox.core.constants.Constants; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.maplibre.android.camera.CameraPosition; import org.maplibre.android.geometry.LatLngBounds; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java similarity index 95% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java index 58e764960..da7f29c1a 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.camera.CameraPosition; import org.maplibre.android.camera.CameraUpdate; @@ -6,10 +6,11 @@ import org.maplibre.android.location.OnLocationCameraTransitionListener; import org.maplibre.android.location.modes.CameraMode; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.navigation.camera.RouteInformation; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; + +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java similarity index 83% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java index 60fc82926..486c52fae 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTrackingChangedListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.location.modes.CameraMode; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCameraTrackingChangedListener; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java similarity index 86% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java index 00818d068..d44077fe9 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTransitionListenerTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.maplibre.android.location.modes.CameraMode; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCameraTransitionListener; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java similarity index 76% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java index 44334de3d..5ff540bdd 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/ResetCancelableCallbackTest.java @@ -1,6 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.camera; +package org.maplibre.navigation.android.navigation.ui.v5.camera; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.camera.ResetCancelableCallback; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java similarity index 92% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java index 60ac4ffa0..1f11785c7 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java similarity index 92% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java index bb3ea3c5e..3e98b77a9 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.widget.TextView; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; -import com.mapbox.services.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; import org.junit.Test; import org.mockito.InOrder; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentsFaker.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentsFaker.java similarity index 76% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentsFaker.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentsFaker.java index 0946b502c..a7d44a956 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentsFaker.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/BannerComponentsFaker.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import com.mapbox.services.android.navigation.v5.models.BannerComponents; +import org.maplibre.navigation.android.navigation.v5.models.BannerComponents; class BannerComponentsFaker { static BannerComponents bannerComponents() { diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoaderTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoaderTest.java similarity index 69% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoaderTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoaderTest.java index 37afd855c..167783f0d 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionLoaderTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionLoaderTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; import android.widget.TextView; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.BannerComponentTree; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionLoader; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMapTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMapTest.java similarity index 95% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMapTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMapTest.java index 328e0e07e..6925087a1 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/UrlDensityMapTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/UrlDensityMapTest.java @@ -1,18 +1,14 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction; +package org.maplibre.navigation.android.navigation.ui.v5.instruction; -import android.content.Context; -import android.util.DisplayMetrics; - -import com.mapbox.services.android.navigation.v5.navigation.SdkVersionChecker; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.UrlDensityMap; +import org.maplibre.navigation.android.navigation.v5.navigation.SdkVersionChecker; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; @RunWith(RobolectricTestRunner.class) public class UrlDensityMapTest { diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java similarity index 73% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java index 99f103cf2..82d5d1633 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/turnlane/TurnLaneViewDataTest.java @@ -1,9 +1,10 @@ -package com.mapbox.services.android.navigation.ui.v5.instruction.turnlane; +package org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT; -import static com.mapbox.services.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT_ONLY; +import static org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT; +import static org.maplibre.navigation.android.navigation.ui.v5.instruction.turnlane.TurnLaneViewData.DRAW_LANE_RIGHT_ONLY; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegateTest.java similarity index 96% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegateTest.java index ba9907482..262b62ec9 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/LocationFpsDelegateTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/LocationFpsDelegateTest.java @@ -1,10 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import org.maplibre.android.camera.CameraPosition; import org.maplibre.android.location.LocationComponent; import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.LocationFpsDelegate; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.eq; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java similarity index 84% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java index b542f2b57..5722651f7 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapFpsDelegateTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java @@ -1,15 +1,18 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.content.Context; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepManeuver; +import org.maplibre.navigation.android.navigation.ui.v5.map.FpsDelegateProgressChangeListener; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapBatteryMonitor; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapFpsDelegate; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; import org.maplibre.android.maps.MapView; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteStepProgress; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteStepProgress; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractorTest.java similarity index 97% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractorTest.java index 9d470fe8d..fe08d2652 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapLayerInteractorTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractorTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import org.maplibre.android.maps.MapLibreMap; import org.maplibre.android.maps.Style; @@ -11,6 +11,7 @@ import org.maplibre.android.style.layers.SymbolLayer; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapLayerInteractor; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java similarity index 95% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java index 7a7fd8b5e..d0f403977 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapPaddingAdjustorTest.java @@ -1,8 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapPaddingAdjustor; import static junit.framework.Assert.assertFalse; import static junit.framework.TestCase.assertTrue; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java similarity index 76% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java index e2f59ea78..2002e901e 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameChangedListenerTest.java @@ -1,6 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapWayNameChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameTest.java similarity index 91% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameTest.java index bc2cae3ca..01a8fbdc8 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayNameTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayNameTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.PointF; import android.location.Location; @@ -11,6 +11,10 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapPaddingAdjustor; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapWayName; +import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; +import org.maplibre.navigation.android.navigation.ui.v5.map.WaynameFeatureFinder; import org.robolectric.RobolectricTestRunner; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java similarity index 92% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java index cbbfb7989..f1e9579c0 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMapTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java @@ -1,6 +1,14 @@ -package com.mapbox.services.android.navigation.ui.v5.map; - -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +package org.maplibre.navigation.android.navigation.ui.v5.map; + +import org.maplibre.navigation.android.navigation.ui.v5.map.LocationFpsDelegate; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapFpsDelegate; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapLayerInteractor; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapPaddingAdjustor; +import org.maplibre.navigation.android.navigation.ui.v5.map.MapWayName; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationSymbolManager; +import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.maplibre.android.location.LocationComponent; import org.maplibre.android.location.modes.RenderMode; @@ -10,9 +18,9 @@ import org.maplibre.android.style.sources.GeoJsonSource; import org.maplibre.android.style.sources.Source; import org.maplibre.android.style.sources.VectorSource; -import com.mapbox.services.android.navigation.ui.v5.camera.NavigationCamera; -import com.mapbox.services.android.navigation.ui.v5.route.NavigationMapRoute; -import com.mapbox.services.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; +import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute; +import org.maplibre.navigation.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java similarity index 93% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java index a4fdeca8e..aaaccbe5a 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationSymbolManagerTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import org.maplibre.geojson.Point; import org.maplibre.android.plugins.annotation.Symbol; @@ -6,6 +6,7 @@ import org.maplibre.android.plugins.annotation.SymbolOptions; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationSymbolManager; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java similarity index 75% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java index 18e534326..6f18b3daa 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/SymbolOnStyleLoadedListenerTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.Bitmap; @@ -6,8 +6,9 @@ import org.maplibre.android.maps.Style; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.SymbolOnStyleLoadedListener; -import static com.mapbox.services.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationSymbolManager.MAPBOX_NAVIGATION_MARKER_NAME; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java similarity index 92% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java index 47afd082e..28bb81db5 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFilterTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import static com.google.common.base.Charsets.UTF_8; import static org.mockito.Mockito.mock; @@ -12,6 +12,7 @@ import org.maplibre.geojson.Point; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.WaynameFeatureFilter; import java.io.InputStream; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java similarity index 81% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java index 56654ae2c..aac110dc0 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/WaynameFeatureFinderTest.java @@ -1,10 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.map; +package org.maplibre.navigation.android.navigation.ui.v5.map; import android.graphics.PointF; import org.maplibre.android.maps.MapLibreMap; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.map.WaynameFeatureFinder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListenerTest.java similarity index 91% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListenerTest.java index e37db3d9e..fa47198f9 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteClickListenerTest.java @@ -1,6 +1,9 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteClickListener; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteLine; +import org.maplibre.navigation.android.navigation.ui.v5.route.OnRouteSelectionChangeListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import com.mapbox.core.constants.Constants; import org.maplibre.geojson.LineString; import org.maplibre.android.geometry.LatLng; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java similarity index 99% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java index 318f21cb4..92b550737 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; -import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.ROUTE_SHIELD_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.route.RouteConstants.WAYPOINT_LAYER_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.FeatureCollection; import org.maplibre.geojson.LineString; import org.maplibre.android.maps.Style; @@ -31,7 +31,7 @@ import org.maplibre.android.style.layers.SymbolLayer; import org.maplibre.android.style.sources.GeoJsonOptions; import org.maplibre.android.style.sources.GeoJsonSource; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; import com.mapbox.services.android.navigation.ui.v5.R; import org.junit.Before; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java similarity index 82% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java index 68133e010..e0fab6ebb 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteProgressChangeListenerTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -8,8 +8,11 @@ import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteArrow; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteLine; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java similarity index 96% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java index 269e324e7..a0927fe7a 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java @@ -1,14 +1,19 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteArrow; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteClickListener; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteLine; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteProgressChangeListener; +import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.maps.MapView; import org.maplibre.android.maps.MapLibreMap; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java similarity index 93% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java index 111a73e32..4a829cb0d 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java @@ -1,13 +1,14 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import android.content.Context; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; + +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; import org.junit.Before; import org.junit.Ignore; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java similarity index 86% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java index e4218673f..62cb161b1 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/PrimaryRouteUpdateTaskTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.route; +package org.maplibre.navigation.android.navigation.ui.v5.route; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -11,6 +11,8 @@ import org.maplibre.geojson.FeatureCollection; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.route.OnPrimaryRouteUpdatedCallback; +import org.maplibre.navigation.android.navigation.ui.v5.route.PrimaryRouteUpdateTask; import org.mockito.ArgumentCaptor; import java.util.ArrayList; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java similarity index 92% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java index 2b61aaf32..2b2dc9cad 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/summary/list/InstructionListPresenterTest.java @@ -1,16 +1,16 @@ -package com.mapbox.services.android.navigation.ui.v5.summary.list; +package org.maplibre.navigation.android.navigation.ui.v5.summary.list; import androidx.annotation.NonNull; import android.text.SpannableString; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.ui.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java similarity index 81% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java index 7d855ef81..9ecba4255 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechListenerTest.java @@ -1,6 +1,11 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.voice.AndroidSpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.NavigationSpeechListener; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAudioFocusManager; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayerProvider; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java similarity index 79% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java index 94db1d8b8..6df949437 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/NavigationSpeechPlayerTest.java @@ -1,10 +1,15 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.voice.AndroidSpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.NavigationSpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayerProvider; public class NavigationSpeechPlayerTest { diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java similarity index 84% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java index c54123d96..6cd3cc858 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechAnnouncementTest.java @@ -1,6 +1,7 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; -import com.mapbox.services.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; +import org.maplibre.navigation.android.navigation.v5.milestone.VoiceInstructionMilestone; import org.junit.Test; diff --git a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java similarity index 78% rename from libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java index 9bccbc74f..da5322baf 100644 --- a/libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/voice/SpeechPlayerProviderTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.voice; +package org.maplibre.navigation.android.navigation.ui.v5.voice; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; @@ -6,9 +6,12 @@ import android.content.Context; -import com.mapbox.services.android.navigation.ui.v5.ConnectivityStatusProvider; +import org.maplibre.navigation.android.navigation.ui.v5.ConnectivityStatusProvider; import org.junit.Test; +import org.maplibre.navigation.android.navigation.ui.v5.voice.AndroidSpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; +import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayerProvider; import java.util.Locale; diff --git a/libandroid-navigation/build.gradle b/libandroid-navigation/build.gradle index e5c87ced2..b3c6246dd 100644 --- a/libandroid-navigation/build.gradle +++ b/libandroid-navigation/build.gradle @@ -13,7 +13,7 @@ kotlin { } android { - namespace 'com.mapbox.services.android.navigation' + namespace 'org.maplibre.navigation.android.navigation' compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion diff --git a/libandroid-navigation/src/main/AndroidManifest.xml b/libandroid-navigation/src/main/AndroidManifest.xml index 31b8d5dbf..955474077 100644 --- a/libandroid-navigation/src/main/AndroidManifest.xml +++ b/libandroid-navigation/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.maplibre.navigation.android.navigation"> @@ -7,7 +7,7 @@ diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/MilestoneEventListener.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/MilestoneEventListener.java deleted file mode 100644 index 929030431..000000000 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/MilestoneEventListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mapbox.services.android.navigation.v5.milestone; - -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; - -public interface MilestoneEventListener { - - void onMilestoneEvent(RouteProgress routeProgress, String instruction, Milestone milestone); - -} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/package-info.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/package-info.java deleted file mode 100644 index caa24b71e..000000000 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains models mapping to Mapbox Directions API. - */ -package com.mapbox.services.android.navigation.v5.models; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/package-info.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/package-info.java deleted file mode 100644 index 0d8d827ba..000000000 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Holds logic specific to detecting if a user goes off-route and invokes the - * {@link com.mapbox.services.android.navigation.v5.offroute.OffRouteListener} when the logic - * evaluates to true. - */ -package com.mapbox.services.android.navigation.v5.offroute; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java deleted file mode 100644 index d17237e0d..000000000 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverMap.java +++ /dev/null @@ -1,188 +0,0 @@ -package com.mapbox.services.android.navigation.v5.utils; - -import com.mapbox.services.android.navigation.R; - -import java.util.HashMap; -import java.util.Map; - -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_CONTINUE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_DEPART; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_END_OF_ROAD; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_FORK; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_MERGE; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_NEW_NAME; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROTARY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_TURN; - -class ManeuverMap { - - private Map maneuverMap; - - ManeuverMap() { - maneuverMap = new HashMap<>(); - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_UTURN, - R.drawable.ic_maneuver_turn_180); - maneuverMap.put(STEP_MANEUVER_TYPE_CONTINUE + STEP_MANEUVER_MODIFIER_UTURN, - R.drawable.ic_maneuver_turn_180); - - maneuverMap.put(STEP_MANEUVER_TYPE_CONTINUE + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_turn_0); - - maneuverMap.put(STEP_MANEUVER_TYPE_ARRIVE + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_arrive_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ARRIVE + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_arrive_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ARRIVE, - R.drawable.ic_maneuver_arrive); - - maneuverMap.put(STEP_MANEUVER_TYPE_DEPART + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_depart_left); - maneuverMap.put(STEP_MANEUVER_TYPE_DEPART + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_depart_right); - maneuverMap.put(STEP_MANEUVER_TYPE_DEPART, R.drawable.ic_maneuver_depart); - - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_SHARP_RIGHT, - R.drawable.ic_maneuver_turn_75); - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_turn_45); - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_turn_30); - - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_SHARP_LEFT, - R.drawable.ic_maneuver_turn_75_left); - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_turn_45_left); - maneuverMap.put(STEP_MANEUVER_TYPE_TURN + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_turn_30_left); - - maneuverMap.put(STEP_MANEUVER_TYPE_MERGE + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_merge_left); - maneuverMap.put(STEP_MANEUVER_TYPE_MERGE + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_merge_left); - maneuverMap.put(STEP_MANEUVER_TYPE_MERGE + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_merge_right); - maneuverMap.put(STEP_MANEUVER_TYPE_MERGE + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_merge_right); - maneuverMap.put(STEP_MANEUVER_TYPE_MERGE + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_turn_0); - - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_SHARP_LEFT, - R.drawable.ic_maneuver_turn_75_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_turn_45_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_turn_30_left); - - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_SHARP_RIGHT, - R.drawable.ic_maneuver_turn_75); - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_turn_45); - maneuverMap.put(STEP_MANEUVER_TYPE_ON_RAMP + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_turn_30); - - maneuverMap.put(STEP_MANEUVER_TYPE_OFF_RAMP + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_off_ramp_left); - maneuverMap.put(STEP_MANEUVER_TYPE_OFF_RAMP + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_off_ramp_slight_left); - - maneuverMap.put(STEP_MANEUVER_TYPE_OFF_RAMP + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_off_ramp_right); - maneuverMap.put(STEP_MANEUVER_TYPE_OFF_RAMP + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_off_ramp_slight_right); - - maneuverMap.put(STEP_MANEUVER_TYPE_FORK + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_fork_left); - maneuverMap.put(STEP_MANEUVER_TYPE_FORK + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_fork_slight_left); - maneuverMap.put(STEP_MANEUVER_TYPE_FORK + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_fork_right); - maneuverMap.put(STEP_MANEUVER_TYPE_FORK + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_fork_slight_right); - maneuverMap.put(STEP_MANEUVER_TYPE_FORK + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_fork_straight); - maneuverMap.put(STEP_MANEUVER_TYPE_FORK, R.drawable.ic_maneuver_fork); - - maneuverMap.put(STEP_MANEUVER_TYPE_END_OF_ROAD + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_end_of_road_left); - maneuverMap.put(STEP_MANEUVER_TYPE_END_OF_ROAD + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_end_of_road_right); - - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_roundabout_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_SHARP_LEFT, - R.drawable.ic_maneuver_roundabout_sharp_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_roundabout_slight_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_roundabout_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_SHARP_RIGHT, - R.drawable.ic_maneuver_roundabout_sharp_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_roundabout_slight_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_roundabout_straight); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT, R.drawable.ic_maneuver_roundabout); - - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_roundabout_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_SHARP_LEFT, - R.drawable.ic_maneuver_roundabout_sharp_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_roundabout_slight_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_roundabout_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_SHARP_RIGHT, - R.drawable.ic_maneuver_roundabout_sharp_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_roundabout_slight_right); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_roundabout_straight); - maneuverMap.put(STEP_MANEUVER_TYPE_ROTARY, R.drawable.ic_maneuver_roundabout); - - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT_TURN + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_turn_45_left); - maneuverMap.put(STEP_MANEUVER_TYPE_ROUNDABOUT_TURN + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_turn_45); - - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_LEFT, - R.drawable.ic_maneuver_turn_45_left); - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_SHARP_LEFT, - R.drawable.ic_maneuver_turn_75_left); - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, - R.drawable.ic_maneuver_turn_30_left); - - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_RIGHT, - R.drawable.ic_maneuver_turn_45); - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_SHARP_RIGHT, - R.drawable.ic_maneuver_turn_75); - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, - R.drawable.ic_maneuver_turn_30); - maneuverMap.put(STEP_MANEUVER_TYPE_NOTIFICATION + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_turn_0); - - maneuverMap.put(STEP_MANEUVER_TYPE_NEW_NAME + STEP_MANEUVER_MODIFIER_STRAIGHT, - R.drawable.ic_maneuver_turn_0); - } - - public int getManeuverResource(String maneuver) { - if (maneuverMap.get(maneuver) != null) { - return maneuverMap.get(maneuver); - } else { - return R.drawable.ic_maneuver_turn_0; - } - } -} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanItem.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanItem.java deleted file mode 100644 index 85182e34e..000000000 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.mapbox.services.android.navigation.v5.utils.span; - -public interface SpanItem { - - Object getSpan(); -} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/FileUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/FileUtils.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/FileUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/FileUtils.java index a91e4be79..ebb853ed7 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/FileUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/FileUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core; +package org.maplibre.navigation.android.core; import android.content.Context; import android.util.Log; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityListener.java similarity index 70% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityListener.java index dcda5cc82..2200d620b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core.connectivity; +package org.maplibre.navigation.android.core.connectivity; /** * Callback to use with the ConnectivityReceiver diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityReceiver.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityReceiver.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityReceiver.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityReceiver.java index 9018ba0aa..dc813aeea 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/connectivity/ConnectivityReceiver.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/connectivity/ConnectivityReceiver.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core.connectivity; +package org.maplibre.navigation.android.core.connectivity; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReport.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReport.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReport.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReport.java index 3b3966892..2a0fdff4f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReport.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReport.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core.crashreporter; +package org.maplibre.navigation.android.core.crashreporter; import android.util.Log; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReportBuilder.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReportBuilder.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReportBuilder.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReportBuilder.java index f5df84067..9f09beea6 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/CrashReportBuilder.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/CrashReportBuilder.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core.crashreporter; +package org.maplibre.navigation.android.core.crashreporter; import android.content.Context; import android.os.Build; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java index 8ea8cb710..bf1034b3b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.core.crashreporter; +package org.maplibre.navigation.android.core.crashreporter; import android.content.Context; import android.content.SharedPreferences; @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.mapbox.services.android.core.FileUtils; +import org.maplibre.navigation.android.core.FileUtils; import java.io.File; import java.util.ArrayList; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/NavigationException.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/NavigationException.java similarity index 88% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/NavigationException.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/NavigationException.java index 8bda9013d..935d99596 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/NavigationException.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/NavigationException.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.exception; +package org.maplibre.navigation.android.navigation.v5.exception; /** * Generic Exception for all things Mapbox Navigation. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/package-info.java similarity index 70% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/package-info.java index b55c55480..43c8a5920 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/exception/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/exception/package-info.java @@ -2,4 +2,4 @@ * This contains a runtime exception to be thrown during the normal operation and does not need to * be declared in a method or constructor. */ -package com.mapbox.services.android.navigation.v5.exception; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.exception; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/Instruction.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/Instruction.java similarity index 71% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/Instruction.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/Instruction.java index 9a0502f96..193e52971 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/Instruction.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/Instruction.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.instruction; +package org.maplibre.navigation.android.navigation.v5.instruction; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Base Instruction. Subclassed to provide concrete instructions. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/package-info.java similarity index 57% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/package-info.java index f3904b84e..3591798b0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/instruction/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/instruction/package-info.java @@ -1,4 +1,4 @@ /** * Contains instruction logic for providing turn by turn navigation instructions. */ -package com.mapbox.services.android.navigation.v5.instruction; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.instruction; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/LocationValidator.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidator.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/LocationValidator.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidator.java index 52d49a929..eb28b8e91 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/LocationValidator.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidator.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location; +package org.maplibre.navigation.android.navigation.v5.location; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/MetricsLocation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/MetricsLocation.java similarity index 87% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/MetricsLocation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/MetricsLocation.java index 95e733bf9..ee746b21b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/MetricsLocation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/MetricsLocation.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location; +package org.maplibre.navigation.android.navigation.v5.location; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java index b5d8ce124..7c1b7717f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/GoogleLocationEngineImpl.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.engine; +package org.maplibre.navigation.android.navigation.v5.location.engine; import android.annotation.SuppressLint; import android.app.PendingIntent; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/LocationEngineProvider.java similarity index 90% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/LocationEngineProvider.java index d5aae4cde..cc44855b5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/LocationEngineProvider.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/LocationEngineProvider.java @@ -1,7 +1,7 @@ -package com.mapbox.services.android.navigation.v5.location.engine; +package org.maplibre.navigation.android.navigation.v5.location.engine; -import static com.mapbox.services.android.navigation.v5.location.engine.Utils.checkNotNull; -import static com.mapbox.services.android.navigation.v5.location.engine.Utils.isOnClasspath; +import static org.maplibre.navigation.android.navigation.v5.location.engine.Utils.checkNotNull; +import static org.maplibre.navigation.android.navigation.v5.location.engine.Utils.isOnClasspath; import android.content.Context; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/Utils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/Utils.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/Utils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/Utils.java index c0ef0b98f..f9126195a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/engine/Utils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/engine/Utils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.engine; +package org.maplibre.navigation.android.navigation.v5.location.engine; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParser.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParser.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParser.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParser.java index 76cabd865..42188ce4d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParser.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParser.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ParseGpxTask.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ParseGpxTask.java similarity index 96% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ParseGpxTask.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ParseGpxTask.java index 60d3a1698..c49197e47 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ParseGpxTask.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ParseGpxTask.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import android.os.AsyncTask; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteDto.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteDto.java similarity index 88% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteDto.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteDto.java index 0cd2dac76..1b028e28e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteDto.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteDto.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import com.google.gson.annotations.SerializedName; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java similarity index 96% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java index a7d98b636..4a85ce5c7 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapper.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import android.os.Build; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcher.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcher.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcher.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcher.java index 26b6e27d6..f0edbd713 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcher.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcher.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import android.os.Handler; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDto.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDto.java similarity index 96% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDto.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDto.java index 1fb9ee9ba..3c52f16d8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDto.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDto.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationListener.java similarity index 62% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationListener.java index 8815132a6..e3970810c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java similarity index 95% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java index ee71d338a..8b305a320 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverter.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java index fc91c304c..cc2f2d19c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationEngine.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.annotation.SuppressLint; import android.app.PendingIntent; @@ -15,7 +15,7 @@ import org.maplibre.android.location.engine.LocationEngineCallback; import org.maplibre.android.location.engine.LocationEngineRequest; import org.maplibre.android.location.engine.LocationEngineResult; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import java.util.ArrayList; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/TimestampAdapter.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/TimestampAdapter.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/TimestampAdapter.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/TimestampAdapter.java index a821c9417..9dd4bd52e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/location/replay/TimestampAdapter.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/location/replay/TimestampAdapter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java similarity index 82% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestone.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java index 68512f9f5..00336b208 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java @@ -1,13 +1,14 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** - * A default milestone that is added to {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} + * A default milestone that is added to {@link MapboxNavigation} * when default milestones are enabled. *

* Please note, this milestone has a custom trigger based on location progress along a route. If you diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java similarity index 90% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java index 98a575c9c..ceda4329e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Milestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java @@ -1,8 +1,9 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.exception.NavigationException; -import com.mapbox.services.android.navigation.v5.instruction.Instruction; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.exception.NavigationException; +import org.maplibre.navigation.android.navigation.v5.instruction.Instruction; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** * Base Milestone statement. Subclassed to provide concrete statements. @@ -43,7 +44,7 @@ public Instruction getInstruction() { /** * A milestone can either be passed in to the - * {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} object + * {@link MapboxNavigation} object * (recommended) or validated directly inside your activity. * * @param previousRouteProgress last locations generated {@link RouteProgress} object used to diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/MilestoneEventListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/MilestoneEventListener.java new file mode 100644 index 000000000..5c9012951 --- /dev/null +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/MilestoneEventListener.java @@ -0,0 +1,9 @@ +package org.maplibre.navigation.android.navigation.v5.milestone; + +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; + +public interface MilestoneEventListener { + + void onMilestoneEvent(RouteProgress routeProgress, String instruction, Milestone milestone); + +} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Operation.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Operation.java index 545befc46..56f0dc398 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Operation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Operation.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; /** * Extracted operation methods are found in this class and are fundamental to how Triggers work. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/RouteMilestone.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/RouteMilestone.java index 115cdd319..77bd4940a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/RouteMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/RouteMilestone.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Using a Route Milestone will result in diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestone.java similarity index 88% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestone.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestone.java index f7d2cb9df..3ab8b9317 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestone.java @@ -1,7 +1,7 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.exception.NavigationException; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.exception.NavigationException; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Using a Step Milestone will result in diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Trigger.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Trigger.java index b53b02198..fe2feaacd 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/Trigger.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Trigger.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; import android.util.SparseArray; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/TriggerProperty.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerProperty.java similarity index 96% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/TriggerProperty.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerProperty.java index 1233f6f06..7939df3b1 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/TriggerProperty.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerProperty.java @@ -1,8 +1,8 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; import android.util.SparseArray; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * The currently support properties used for triggering a milestone. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java similarity index 85% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestone.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java index 52a839f4a..fd4745f96 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java @@ -1,14 +1,15 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.instruction.Instruction; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.instruction.Instruction; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** - * A default milestone that is added to {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} + * A default milestone that is added to {@link MapboxNavigation} * when default milestones are enabled. *

* Please note, this milestone has a custom trigger based on location progress along a route. If you diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/package-info.java similarity index 67% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/package-info.java index 248ac7fbf..d5ee7e777 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/milestone/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/package-info.java @@ -2,4 +2,4 @@ * Contains navigation milestone classes for receiving information when the user reaches a defined * point along the route. */ -package com.mapbox.services.android.navigation.v5.milestone; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.milestone; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Admin.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Admin.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Admin.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Admin.java index b9fd83656..de794aac9 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Admin.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Admin.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerComponents.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerComponents.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerComponents.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerComponents.java index bb888f051..387753782 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerComponents.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerComponents.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerInstructions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerInstructions.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerInstructions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerInstructions.java index c90201444..1baa4925e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerInstructions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerInstructions.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerText.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerText.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerText.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerText.java index 5179cb8c7..918ebef28 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerText.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerText.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerView.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerView.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerView.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerView.java index 01c180602..b004f3499 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/BannerView.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/BannerView.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Closure.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Closure.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Closure.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Closure.java index 6bd432982..ff21703ce 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Closure.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Closure.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Congestion.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Congestion.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Congestion.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Congestion.java index ab6a7d982..b6d8338cf 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Congestion.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Congestion.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import com.google.auto.value.AutoValue; import com.google.gson.Gson; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsAdapterFactory.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsAdapterFactory.java similarity index 91% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsAdapterFactory.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsAdapterFactory.java index d288477b9..90b2a945a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsAdapterFactory.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsAdapterFactory.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import com.google.gson.TypeAdapterFactory; import com.ryanharter.auto.value.gson.GsonTypeAdapterFactory; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsCriteria.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsCriteria.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsCriteria.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsCriteria.java index eb0439895..bbc0feff1 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsCriteria.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsCriteria.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.StringDef; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsError.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsError.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsError.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsError.java index 5f434d6d9..9e1e0a058 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsError.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsError.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsJsonObject.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsJsonObject.java index a361a94ab..411057bc2 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsJsonObject.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsJsonObject.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import com.google.gson.GsonBuilder; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsResponse.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsResponse.java index f956f19a0..a76e77a2b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsResponse.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsResponse.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsRoute.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsRoute.java index 89e265a3e..59d20c0b9 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsRoute.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsWaypoint.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsWaypoint.java index d24a7947e..ad2ef5db5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/DirectionsWaypoint.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/DirectionsWaypoint.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Incident.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Incident.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Incident.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Incident.java index 7dc30071f..6a1aafe43 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/Incident.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/Incident.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/IntersectionLanes.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/IntersectionLanes.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/IntersectionLanes.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/IntersectionLanes.java index eaea02d72..98a024031 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/IntersectionLanes.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/IntersectionLanes.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegAnnotation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegAnnotation.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegAnnotation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegAnnotation.java index 800366897..739b447d6 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegAnnotation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegAnnotation.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegStep.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegStep.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegStep.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegStep.java index 15283d20f..dc7b6faea 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/LegStep.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/LegStep.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/ManeuverModifier.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/ManeuverModifier.java similarity index 96% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/ManeuverModifier.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/ManeuverModifier.java index 96c7c8c57..c4c0a2e0c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/ManeuverModifier.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/ManeuverModifier.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.StringDef; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MapboxStreetsV8.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MapboxStreetsV8.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java index 12abcbb96..250693d70 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MapboxStreetsV8.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MaxSpeed.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MaxSpeed.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MaxSpeed.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MaxSpeed.java index 81fbe63d8..7588bbbe4 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/MaxSpeed.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MaxSpeed.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RestStop.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RestStop.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RestStop.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RestStop.java index 2ca2e69f8..68055e569 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RestStop.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RestStop.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteLeg.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteLeg.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteLeg.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteLeg.java index 45ae627b2..f685ce2f4 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteLeg.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteLeg.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteOptions.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteOptions.java index 8dea7ca51..4444feca6 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/RouteOptions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/RouteOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -9,8 +9,8 @@ import com.google.gson.annotations.SerializedName; import org.maplibre.geojson.Point; import org.maplibre.geojson.PointAsCoordinatesTypeAdapter; -import com.mapbox.services.android.navigation.v5.models.utils.FormatUtils; -import com.mapbox.services.android.navigation.v5.models.utils.ParseUtils; +import org.maplibre.navigation.android.navigation.v5.models.utils.FormatUtils; +import org.maplibre.navigation.android.navigation.v5.models.utils.ParseUtils; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/SpeedLimit.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/SpeedLimit.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/SpeedLimit.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/SpeedLimit.java index bc9e5f57f..0a71c2cb7 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/SpeedLimit.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/SpeedLimit.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.StringDef; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java index f36675b2f..d9f85ed6f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepIntersection.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepManeuver.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepManeuver.java index 0cb264d99..9cbda4b1c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/StepManeuver.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepManeuver.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.FloatRange; import androidx.annotation.NonNull; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/TollCollection.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/TollCollection.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/TollCollection.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/TollCollection.java index e64fa8eed..5f52cfdd9 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/TollCollection.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/TollCollection.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/VoiceInstructions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/VoiceInstructions.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/VoiceInstructions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/VoiceInstructions.java index cbbea6571..ba84354b8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/VoiceInstructions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/VoiceInstructions.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptions.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptions.java index 62026d47f..a569e6bb7 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import androidx.annotation.FloatRange; import androidx.annotation.NonNull; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptionsAdapterFactory.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptionsAdapterFactory.java similarity index 91% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptionsAdapterFactory.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptionsAdapterFactory.java index 582f8b44f..2034c0ee8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/WalkingOptionsAdapterFactory.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/WalkingOptionsAdapterFactory.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models; +package org.maplibre.navigation.android.navigation.v5.models; import com.google.gson.TypeAdapterFactory; import com.ryanharter.auto.value.gson.GsonTypeAdapterFactory; diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/package-info.java new file mode 100644 index 000000000..5e545c183 --- /dev/null +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains models mapping to Mapbox Directions API. + */ +package org.maplibre.navigation.android.navigation.v5.models; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/FormatUtils.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/FormatUtils.java index ba9766fc5..32bcd1fac 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/FormatUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/FormatUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models.utils; +package org.maplibre.navigation.android.navigation.v5.models.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/ParseUtils.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/ParseUtils.java index 6da721b31..a6c8da9c9 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/models/utils/ParseUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/utils/ParseUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.models.utils; +package org.maplibre.navigation.android.navigation.v5.models.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java index 4d9fe5888..44adc38ce 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.ComponentName; import android.content.Context; @@ -11,20 +11,21 @@ import androidx.annotation.Nullable; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.milestone.VoiceInstructionMilestone; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.navigation.camera.Camera; -import com.mapbox.services.android.navigation.v5.navigation.camera.SimpleCamera; -import com.mapbox.services.android.navigation.v5.offroute.OffRoute; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.route.FasterRouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.snap.Snap; -import com.mapbox.services.android.navigation.v5.utils.ValidationUtils; +import org.maplibre.navigation.android.navigation.v5.location.engine.LocationEngineProvider; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.SimpleCamera; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRoute; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteListener; +import org.maplibre.navigation.android.navigation.v5.snap.Snap; +import org.maplibre.navigation.android.navigation.v5.utils.ValidationUtils; import java.util.ArrayList; import java.util.HashSet; @@ -33,10 +34,10 @@ import timber.log.Timber; -import static com.mapbox.services.android.navigation.v5.location.engine.LocationEngineProvider.getBestLocationEngine; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.BANNER_INSTRUCTION_MILESTONE_ID; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NON_NULL_APPLICATION_CONTEXT_REQUIRED; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.VOICE_INSTRUCTION_MILESTONE_ID; +import static org.maplibre.navigation.android.navigation.v5.location.engine.LocationEngineProvider.getBestLocationEngine; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.BANNER_INSTRUCTION_MILESTONE_ID; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.NON_NULL_APPLICATION_CONTEXT_REQUIRED; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.VOICE_INSTRUCTION_MILESTONE_ID; /** * A MapboxNavigation class for interacting with and customizing a navigation session. @@ -161,7 +162,7 @@ private void initializeDefaultLocationEngine() { private LocationEngine obtainLocationEngine() { if (locationEngine == null) { - return getBestLocationEngine(applicationContext); + return LocationEngineProvider.getBestLocationEngine(applicationContext); } return locationEngine; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java similarity index 87% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java index af6c28bf5..4e03bfa72 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java @@ -1,6 +1,5 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; -import android.annotation.SuppressLint; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -17,20 +16,18 @@ import androidx.core.app.NotificationCompat; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.R; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.DistanceFormatter; -import com.mapbox.services.android.navigation.v5.utils.LocaleUtils; -import com.mapbox.services.android.navigation.v5.utils.ManeuverUtils; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.R; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; +import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; +import org.maplibre.navigation.android.navigation.v5.utils.ManeuverUtils; import java.util.Calendar; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_NOTIFICATION_ID; -import static com.mapbox.services.android.navigation.v5.utils.time.TimeFormatter.formatTime; +import org.maplibre.navigation.android.navigation.v5.utils.time.TimeFormatter; /** * This is in charge of creating the persistent navigation session notification and updating it. @@ -72,7 +69,7 @@ public Notification getNotification() { @Override public int getNotificationId() { - return NAVIGATION_NOTIFICATION_ID; + return NavigationConstants.NAVIGATION_NOTIFICATION_ID; } @Override @@ -112,7 +109,7 @@ private void initializeDistanceFormatter(Context context, MapboxNavigation mapbo private void createNotificationChannel(Context context) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel notificationChannel = new NotificationChannel( - NAVIGATION_NOTIFICATION_CHANNEL, context.getString(R.string.channel_name), + NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL, context.getString(R.string.channel_name), NotificationManager.IMPORTANCE_LOW); notificationManager.createNotificationChannel(notificationChannel); } @@ -130,7 +127,7 @@ private void buildNotification(Context context) { expandedNotificationRemoteViews.setOnClickPendingIntent(R.id.endNavigationBtn, pendingCloseIntent); // Sets up the top bar notification - notificationBuilder = new NotificationCompat.Builder(context, NAVIGATION_NOTIFICATION_CHANNEL) + notificationBuilder = new NotificationCompat.Builder(context, NavigationConstants.NAVIGATION_NOTIFICATION_CHANNEL) .setContentIntent(pendingOpenIntent) .setCategory(NotificationCompat.CATEGORY_SERVICE) .setPriority(NotificationCompat.PRIORITY_MAX) @@ -175,7 +172,7 @@ private void updateNotificationViews(RouteProgress routeProgress) { : routeProgress.currentLegProgress().currentStep(); updateManeuverImage(step); - notificationManager.notify(NAVIGATION_NOTIFICATION_ID, notificationBuilder.build()); + notificationManager.notify(NavigationConstants.NAVIGATION_NOTIFICATION_ID, notificationBuilder.build()); } private void unregisterReceiver(Context context) { @@ -183,7 +180,7 @@ private void unregisterReceiver(Context context) { context.unregisterReceiver(endNavigationBtnReceiver); } if (notificationManager != null) { - notificationManager.cancel(NAVIGATION_NOTIFICATION_ID); + notificationManager.cancel(NavigationConstants.NAVIGATION_NOTIFICATION_ID); } } @@ -223,7 +220,7 @@ private void updateArrivalTime(RouteProgress routeProgress) { Calendar time = Calendar.getInstance(); double durationRemaining = routeProgress.durationRemaining(); int timeFormatType = options.timeFormatType(); - String arrivalTime = formatTime(time, durationRemaining, timeFormatType, isTwentyFourHourFormat); + String arrivalTime = TimeFormatter.formatTime(time, durationRemaining, timeFormatType, isTwentyFourHourFormat); String formattedArrivalTime = String.format(etaFormat, arrivalTime); collapsedNotificationRemoteViews.setTextViewText(R.id.notificationArrivalText, formattedArrivalTime); expandedNotificationRemoteViews.setTextViewText(R.id.notificationArrivalText, formattedArrivalTime); diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java similarity index 95% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java index 348a04d52..5dedfc023 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationOptions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java @@ -1,12 +1,10 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; - -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.ROUNDING_INCREMENT_FIFTY; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; /** * Immutable and can't be changed after passing into {@link MapboxNavigation}. @@ -157,7 +155,7 @@ public static Builder builder() { .metersRemainingTillArrival(NavigationConstants.METERS_REMAINING_TILL_ARRIVAL) .isFromNavigationUi(false) .isDebugLoggingEnabled(false) - .roundingIncrement(ROUNDING_INCREMENT_FIFTY) + .roundingIncrement(NavigationConstants.ROUNDING_INCREMENT_FIFTY) .timeFormatType(NavigationTimeFormat.NONE_SPECIFIED) .locationAcceptableAccuracyInMetersThreshold(NavigationConstants.ONE_HUNDRED_METER_ACCEPTABLE_ACCURACY_THRESHOLD); } diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationConstants.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationConstants.java index 02b0569fd..aa32ca471 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationConstants.java @@ -1,9 +1,13 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import androidx.annotation.IntDef; import androidx.annotation.StringDef; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.location.LocationValidator; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteDetector; /** * Navigation constants @@ -19,7 +23,7 @@ private NavigationConstants() { /** * If default voice instructions are enabled, this identifier will be used to differentiate them * from custom milestones in the - * {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener}. + * {@link MilestoneEventListener}. * * @since 0.7.0 */ @@ -37,8 +41,8 @@ private NavigationConstants() { /** * This identifier will be used to - * differentiate the {@link com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone} - * from custom milestones in the {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener}. + * differentiate the {@link BannerInstructionMilestone} + * from custom milestones in the {@link MilestoneEventListener}. * * @since 0.8.0 */ @@ -182,7 +186,7 @@ private NavigationConstants() { public static final long NAVIGATION_MIN_CAMERA_TILT_ADJUSTMENT_ANIMATION_DURATION = 750L; /** - * In seconds, how quickly {@link com.mapbox.services.android.navigation.v5.route.FasterRouteDetector} + * In seconds, how quickly {@link FasterRouteDetector} * will tell {@link RouteProcessorBackgroundThread} to check * for a faster {@link com.mapbox.api.directions.v5.models.DirectionsRoute}. * @@ -216,7 +220,7 @@ private NavigationConstants() { /** * Default location acceptable accuracy threshold - * used in {@link com.mapbox.services.android.navigation.v5.location.LocationValidator}. + * used in {@link LocationValidator}. *

* If a new {@link android.location.Location} update is received from the LocationEngine that has * an accuracy less than this threshold, the update will be considered valid and all other validation diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactory.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactory.java similarity index 66% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactory.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactory.java index f86c0bafd..b9fc05a90 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactory.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactory.java @@ -1,13 +1,13 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; -import com.mapbox.services.android.navigation.v5.navigation.camera.Camera; -import com.mapbox.services.android.navigation.v5.navigation.camera.SimpleCamera; -import com.mapbox.services.android.navigation.v5.offroute.OffRoute; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteDetector; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.route.FasterRouteDetector; -import com.mapbox.services.android.navigation.v5.snap.Snap; -import com.mapbox.services.android.navigation.v5.snap.SnapToRoute; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.SimpleCamera; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRoute; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteDetector; +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteDetector; +import org.maplibre.navigation.android.navigation.v5.snap.Snap; +import org.maplibre.navigation.android.navigation.v5.snap.SnapToRoute; class NavigationEngineFactory { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcher.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcher.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcher.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcher.java index 318bb6661..68bac5cd6 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcher.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcher.java @@ -1,18 +1,18 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; -import com.mapbox.services.android.navigation.v5.route.FasterRouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventListener.java similarity index 55% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventListener.java index 91a9be7b9..ef45c7310 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; public interface NavigationEventListener { void onRunning(boolean running); diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListener.java similarity index 69% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListener.java index 2e16fba8d..34080a9c0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListener.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.route.RouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.route.RouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import timber.log.Timber; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java index 76544f0d1..1d87020d8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelper.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +import static org.maplibre.navigation.android.navigation.v5.utils.Constants.PRECISION_6; import android.location.Location; import android.util.Pair; @@ -8,26 +8,26 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegAnnotation; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.MaxSpeed; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; -import com.mapbox.services.android.navigation.v5.models.StepManeuver; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegAnnotation; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.MaxSpeed; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; import org.maplibre.geojson.Feature; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.offroute.OffRoute; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteCallback; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteDetector; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.CurrentLegAnnotation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.snap.Snap; -import com.mapbox.services.android.navigation.v5.utils.MathUtils; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRoute; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteCallback; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteDetector; +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.CurrentLegAnnotation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.snap.Snap; +import org.maplibre.navigation.android.navigation.v5.utils.MathUtils; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; @@ -408,7 +408,7 @@ public static StepIntersection findUpcomingIntersection(@NonNull List { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java similarity index 92% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java index 02e89294a..608873071 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineUpdater.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.annotation.SuppressLint; import android.location.Location; @@ -6,12 +6,12 @@ import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.location.engine.LocationEngine; import org.maplibre.android.location.engine.LocationEngineCallback; import org.maplibre.android.location.engine.LocationEngineRequest; import org.maplibre.android.location.engine.LocationEngineResult; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import timber.log.Timber; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationUpdate.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationUpdate.java similarity index 85% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationUpdate.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationUpdate.java index 8343739f4..7970cab76 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationLocationUpdate.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationUpdate.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java index cf80c01df..593cf9c32 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationMapRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import static org.maplibre.android.style.expressions.Expression.color; import static org.maplibre.android.style.expressions.Expression.exponential; @@ -35,8 +35,9 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.R; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.maplibre.geojson.Feature; import org.maplibre.geojson.FeatureCollection; import org.maplibre.geojson.LineString; @@ -53,14 +54,13 @@ import org.maplibre.android.style.sources.GeoJsonOptions; import org.maplibre.android.style.sources.GeoJsonSource; import org.maplibre.android.utils.MathUtils; -import com.mapbox.services.android.navigation.R; -import com.mapbox.services.android.navigation.v5.route.MapRouteProgressChangeListener; -import com.mapbox.services.android.navigation.v5.route.OnRouteSelectionChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.Constants; -import com.mapbox.services.android.navigation.v5.utils.MapImageUtils; -import com.mapbox.services.android.navigation.v5.utils.MapUtils; +import org.maplibre.navigation.android.navigation.v5.route.MapRouteProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.route.OnRouteSelectionChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.utils.MapImageUtils; +import org.maplibre.navigation.android.navigation.v5.utils.MapUtils; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProvider.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java similarity index 81% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProvider.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java index 5497f6aba..885551c28 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProvider.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; class NavigationNotificationProvider { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java similarity index 82% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java index 37ed0f164..8a7206995 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessor.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java @@ -1,33 +1,33 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; import android.util.Pair; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.offroute.OffRoute; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteCallback; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteDetector; -import com.mapbox.services.android.navigation.v5.routeprogress.CurrentLegAnnotation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.routeprogress.CurrentLegAnnotation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRoute; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteCallback; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteDetector; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.checkBearingForStepCompletion; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createCurrentAnnotation; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.decodeStepPoints; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findCurrentIntersection; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findUpcomingIntersection; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.increaseIndex; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.legDistanceRemaining; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.routeDistanceRemaining; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.stepDistanceRemaining; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.checkBearingForStepCompletion; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createCurrentAnnotation; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.decodeStepPoints; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.findCurrentIntersection; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.findUpcomingIntersection; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.increaseIndex; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.legDistanceRemaining; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.routeDistanceRemaining; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.stepDistanceRemaining; import androidx.annotation.NonNull; @@ -104,7 +104,7 @@ void setRouteProgress(RouteProgress routeProgress) { /** * If the {@link OffRouteCallback#onShouldIncreaseIndex()} has been called by the - * {@link com.mapbox.services.android.navigation.v5.offroute.OffRouteDetector}, shouldIncreaseIndex + * {@link OffRouteDetector}, shouldIncreaseIndex * will be true and the {@link NavigationIndices} index needs to be increased by one. * * @param navigation to get the next {@link LegStep#geometry()} and off-route engine diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java index c39c8ad12..520501e69 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationService.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.app.Notification; import android.app.Service; @@ -10,9 +10,9 @@ import androidx.annotation.Nullable; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.location.LocationValidator; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.location.LocationValidator; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import java.lang.ref.WeakReference; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationTimeFormat.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationTimeFormat.java similarity index 86% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationTimeFormat.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationTimeFormat.java index 3c2fbf876..9a7633437 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationTimeFormat.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationTimeFormat.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import androidx.annotation.IntDef; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java index 1fe0f02b3..cace98498 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorBackgroundThread.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; import android.os.Handler; import android.os.HandlerThread; import android.os.Process; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java similarity index 87% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java index f4a3ab436..078c39707 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java @@ -1,15 +1,15 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.buildSnappedLocation; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.checkMilestones; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.isUserOffRoute; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.buildSnappedLocation; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.checkMilestones; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.isUserOffRoute; import android.location.Location; import android.os.Handler; import android.os.Message; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListener.java similarity index 84% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListener.java index 8a84b2135..0390c3a47 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListener.java @@ -1,13 +1,13 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.buildInstructionString; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.buildInstructionString; class RouteProcessorThreadListener implements RouteProcessorBackgroundThread.Listener { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/SdkVersionChecker.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/SdkVersionChecker.java similarity index 84% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/SdkVersionChecker.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/SdkVersionChecker.java index 65bad6523..8cceaa547 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/SdkVersionChecker.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/SdkVersionChecker.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; public class SdkVersionChecker { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java similarity index 81% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java index efc66b3dd..ddd554e86 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/Camera.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java @@ -1,15 +1,16 @@ -package com.mapbox.services.android.navigation.v5.navigation.camera; +package org.maplibre.navigation.android.navigation.v5.navigation.camera; import org.maplibre.geojson.Point; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import java.util.List; /** * This class handles calculating all properties necessary to configure the camera position while - * routing. The {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} uses + * routing. The {@link MapboxNavigation} uses * a {@link SimpleCamera} by default. If you would like to customize the camera position, create a * concrete implementation of this class or subclass {@link SimpleCamera} and update - * {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation#setCameraEngine(Camera)}. + * {@link MapboxNavigation#setCameraEngine(Camera)}. * * @since 0.10.0 */ diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/RouteInformation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/RouteInformation.java similarity index 86% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/RouteInformation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/RouteInformation.java index 0f746f528..e4afce5c7 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/RouteInformation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/RouteInformation.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.v5.navigation.camera; +package org.maplibre.navigation.android.navigation.v5.navigation.camera; import android.location.Location; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * This class holds all information related to a route and a user's progress along the route. It diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java index e8ce362a4..4fa41dbe2 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/camera/SimpleCamera.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java @@ -1,9 +1,10 @@ -package com.mapbox.services.android.navigation.v5.navigation.camera; +package org.maplibre.navigation.android.navigation.v5.navigation.camera; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; @@ -11,7 +12,7 @@ import java.util.List; /** - * The default camera used by {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation}. + * The default camera used by {@link MapboxNavigation}. * * @since 0.10.0 */ diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/notification/NavigationNotification.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java similarity index 72% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/notification/NavigationNotification.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java index 2e1b365e2..b39aaf9d4 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/notification/NavigationNotification.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java @@ -1,14 +1,16 @@ -package com.mapbox.services.android.navigation.v5.navigation.notification; +package org.maplibre.navigation.android.navigation.v5.navigation.notification; import android.app.Notification; import android.content.Context; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationService; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Defines a contract in which a custom notification must adhere to when - * given to {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions}. + * given to {@link MapboxNavigationOptions}. */ public interface NavigationNotification { @@ -17,7 +19,7 @@ public interface NavigationNotification { /** * Provides a custom {@link Notification} to launch - * with the {@link com.mapbox.services.android.navigation.v5.navigation.NavigationService}, specifically + * with the {@link NavigationService}, specifically * {@link android.app.Service#startForeground(int, Notification)}. * * @return a custom notification @@ -26,7 +28,7 @@ public interface NavigationNotification { /** * An integer id that will be used to start this notification - * from {@link com.mapbox.services.android.navigation.v5.navigation.NavigationService} with + * from {@link NavigationService} with * {@link android.app.Service#startForeground(int, Notification)}. * * @return an int id specific to the notification diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/package-info.java similarity index 65% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/package-info.java index ba7fc2845..338e7ab31 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/package-info.java @@ -2,4 +2,4 @@ * Package containing the core navigation logic which monitors location updates and delegates task * accordingly. */ -package com.mapbox.services.android.navigation.v5.navigation; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.navigation; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java similarity index 50% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRoute.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java index e4105c8f2..d4f6c7d28 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.offroute; +package org.maplibre.navigation.android.navigation.v5.offroute; import android.location.Location; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; public abstract class OffRoute { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteCallback.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteCallback.java similarity index 85% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteCallback.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteCallback.java index e90ab769a..8c87b0ca5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteCallback.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteCallback.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.offroute; +package org.maplibre.navigation.android.navigation.v5.offroute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; public interface OffRouteCallback { /** diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java index 56108962d..e461be92e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java @@ -1,21 +1,21 @@ -package com.mapbox.services.android.navigation.v5.offroute; +package org.maplibre.navigation.android.navigation.v5.offroute; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RingBuffer; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RingBuffer; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; import java.util.List; -import static com.mapbox.services.android.navigation.v5.utils.MeasurementUtils.userTrueDistanceFromStep; -import static com.mapbox.services.android.navigation.v5.utils.ToleranceUtils.dynamicRerouteDistanceTolerance; +import static org.maplibre.navigation.android.navigation.v5.utils.MeasurementUtils.userTrueDistanceFromStep; +import static org.maplibre.navigation.android.navigation.v5.utils.ToleranceUtils.dynamicRerouteDistanceTolerance; public class OffRouteDetector extends OffRoute { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteListener.java similarity index 64% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteListener.java index 3dc63e868..006129387 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.offroute; +package org.maplibre.navigation.android.navigation.v5.offroute; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/package-info.java new file mode 100644 index 000000000..484881fef --- /dev/null +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/package-info.java @@ -0,0 +1,6 @@ +/** + * Holds logic specific to detecting if a user goes off-route and invokes the + * {@link org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener} when the logic + * evaluates to true. + */ +package org.maplibre.navigation.android.navigation.v5.offroute; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java similarity index 82% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRoute.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java index 7e5273a2e..281b0e91d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java @@ -1,16 +1,17 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** * This class can be subclassed to provide custom logic for checking / determining * new / faster routes while navigating. *

* To provide your implementation, - * use {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation#setFasterRouteEngine(FasterRoute)}. + * use {@link MapboxNavigation#setFasterRouteEngine(FasterRoute)}. *

* {@link FasterRoute#shouldCheckFasterRoute(Location, RouteProgress)} determines how quickly a * new route will be fetched by {@link RouteFetcher}. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteDetector.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteDetector.java similarity index 79% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteDetector.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteDetector.java index 13510549c..8e61bea27 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteDetector.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteDetector.java @@ -1,19 +1,18 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteStepProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteStepProgress; import java.util.Date; import java.util.concurrent.TimeUnit; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_CHECK_FASTER_ROUTE_INTERVAL; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.NAVIGATION_MEDIUM_ALERT_DURATION; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; public class FasterRouteDetector extends FasterRoute { @@ -31,7 +30,7 @@ public boolean shouldCheckFasterRoute(Location location, RouteProgress routeProg lastCheckedLocation = location; } // Check if the faster route time interval has been exceeded - if (secondsSinceLastCheck(location) >= NAVIGATION_CHECK_FASTER_ROUTE_INTERVAL) { + if (secondsSinceLastCheck(location) >= NavigationConstants.NAVIGATION_CHECK_FASTER_ROUTE_INTERVAL) { lastCheckedLocation = location; // Check for both valid route and step durations remaining if (validRouteDurationRemaining(routeProgress) && validStepDurationRemaining(routeProgress)) { @@ -92,13 +91,13 @@ private boolean validSecondStep(LegStep secondStep, RouteProgress routeProgress) /** * First step is valid if it is greater than - * {@link com.mapbox.services.android.navigation.v5.navigation.NavigationConstants#NAVIGATION_MEDIUM_ALERT_DURATION}. + * {@link NavigationConstants#NAVIGATION_MEDIUM_ALERT_DURATION}. * * @param firstStep of the new route * @return true if valid, false if not */ private boolean validFirstStep(LegStep firstStep) { - return firstStep.duration() > NAVIGATION_MEDIUM_ALERT_DURATION; + return firstStep.duration() > NavigationConstants.NAVIGATION_MEDIUM_ALERT_DURATION; } /** @@ -123,7 +122,7 @@ private boolean validStepDurationRemaining(RouteProgress routeProgress) { RouteStepProgress currentStepProgress = routeProgress.currentLegProgress().currentStepProgress(); // Current step duration remaining in seconds int currentStepDurationRemaining = (int) currentStepProgress.durationRemaining(); - return currentStepDurationRemaining > NAVIGATION_MEDIUM_ALERT_DURATION; + return currentStepDurationRemaining > NavigationConstants.NAVIGATION_MEDIUM_ALERT_DURATION; } private long secondsSinceLastCheck(Location location) { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteListener.java similarity index 74% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteListener.java index b939c8d3c..d073bfc69 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/FasterRouteListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRouteListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; /** * Listener that can be added to monitor faster routes retrieved diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/MapRouteProgressChangeListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/MapRouteProgressChangeListener.java similarity index 76% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/MapRouteProgressChangeListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/MapRouteProgressChangeListener.java index b948e4448..fe1fa2ce5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/MapRouteProgressChangeListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/MapRouteProgressChangeListener.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.navigation.NavigationMapRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/OnRouteSelectionChangeListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/OnRouteSelectionChangeListener.java similarity index 75% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/OnRouteSelectionChangeListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/OnRouteSelectionChangeListener.java index 5e695563b..6955049cf 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/OnRouteSelectionChangeListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/OnRouteSelectionChangeListener.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; /** * Listener for determining which current route the user has selected as their primary route for diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteFetcher.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteFetcher.java similarity index 82% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteFetcher.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteFetcher.java index 8643f91b2..6f4ae3dda 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteFetcher.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteFetcher.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteListener.java similarity index 56% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteListener.java index e31ac8822..c462263db 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/route/RouteListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/RouteListener.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.route; +package org.maplibre.navigation.android.navigation.v5.route; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Will fire when either a successful / failed response is received. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/CurrentLegAnnotation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/CurrentLegAnnotation.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/CurrentLegAnnotation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/CurrentLegAnnotation.java index 142d57a8b..a65d5d7d5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/CurrentLegAnnotation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/CurrentLegAnnotation.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.models.MaxSpeed; +import org.maplibre.navigation.android.navigation.v5.models.MaxSpeed; import java.io.Serializable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/MetricsRouteProgress.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/MetricsRouteProgress.java index 5c5ce5be5..316f31e49 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/MetricsRouteProgress.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/MetricsRouteProgress.java @@ -1,13 +1,13 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import android.text.TextUtils; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepManeuver; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; import org.maplibre.geojson.Point; public class MetricsRouteProgress { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/ProgressChangeListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/ProgressChangeListener.java similarity index 68% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/ProgressChangeListener.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/ProgressChangeListener.java index 503fe3e42..4564f3f4e 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/ProgressChangeListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/ProgressChangeListener.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import android.location.Location; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgress.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgress.java index dcd2fc053..ec1f8201c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgress.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgress.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import android.content.Context; import android.util.Pair; @@ -8,11 +8,12 @@ import com.google.auto.value.AutoValue; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import java.util.List; @@ -22,7 +23,7 @@ * {@link RouteProgress}. *

* The latest route leg progress object can be obtained through either the {@link ProgressChangeListener} - * or the {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener} callbacks. + * or the {@link MilestoneEventListener} callbacks. * Note that the route leg progress object's immutable. *

* diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java index 207be918f..e652e697d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgress.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import android.util.Pair; @@ -7,9 +7,11 @@ import com.google.auto.value.AutoValue; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import java.util.List; @@ -20,7 +22,7 @@ * information. *

* The latest route progress object can be obtained through either the {@link ProgressChangeListener} - * or the {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener} callbacks. + * or the {@link MilestoneEventListener} callbacks. * Note that the route progress object's immutable. *

* @@ -33,7 +35,7 @@ public abstract class RouteProgress { * Get the route the navigation session is currently using. When a reroute occurs and a new * directions route gets obtained, with the next location update this directions route should * reflect the new route. All direction route get passed in through - * {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation#startNavigation(DirectionsRoute)}. + * {@link MapboxNavigation#startNavigation(DirectionsRoute)}. * * @return a {@link DirectionsRoute} currently being used for the navigation session * @since 0.1.0 diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgress.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgress.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgress.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgress.java index 9942b215b..c38f0835d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgress.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgress.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import android.util.Pair; @@ -6,8 +6,10 @@ import androidx.annotation.Nullable; import com.google.auto.value.AutoValue; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; + +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; import java.util.List; @@ -16,7 +18,7 @@ * This is a progress object specific to the current step the user is on. *

* The latest route step progress object can be obtained through either the {@link ProgressChangeListener} - * or the {@link com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener} callbacks. + * or the {@link MilestoneEventListener} callbacks. * Note that the route step progress object's immutable. *

* diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/package-info.java similarity index 64% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/package-info.java index 5590326ff..fb8af9853 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/routeprogress/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/package-info.java @@ -2,4 +2,4 @@ * Immutable model class which provides the users current progress along the route such as distance * or duration. */ -package com.mapbox.services.android.navigation.v5.routeprogress; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.routeprogress; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/Snap.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java similarity index 55% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/Snap.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java index 5c805e158..43e228cda 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/Snap.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java @@ -1,17 +1,18 @@ -package com.mapbox.services.android.navigation.v5.snap; +package org.maplibre.navigation.android.navigation.v5.snap; import android.location.Location; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** * This class handles calculating snapped position along the route. Latitude, longitude and bearing * should be provided. *

- * The {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation} uses - * a {@link com.mapbox.services.android.navigation.v5.snap.SnapToRoute} by default. If you would + * The {@link MapboxNavigation} uses + * a {@link SnapToRoute} by default. If you would * like to customize the camera position, create a concrete implementation of this class - * or subclass {@link com.mapbox.services.android.navigation.v5.snap.SnapToRoute} and update {@link com.mapbox.services.android.navigation.v5.navigation.MapboxNavigation#setSnapEngine(Snap)}}. + * or subclass {@link SnapToRoute} and update {@link MapboxNavigation#setSnapEngine(Snap)}}. */ public abstract class Snap { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRoute.java similarity index 92% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRoute.java index 5754ec13c..76051fc8f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/SnapToRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRoute.java @@ -1,19 +1,18 @@ -package com.mapbox.services.android.navigation.v5.snap; - -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +package org.maplibre.navigation.android.navigation.v5.snap; import android.location.Location; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.maplibre.geojson.Feature; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.MathUtils; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.MathUtils; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; @@ -150,7 +149,7 @@ private static Point getCurrentStepPoint(RouteProgress routeProgress, double add return null; } - LineString currentStepLineString = LineString.fromPolyline(legProgress.currentStep().geometry(), PRECISION_6); + LineString currentStepLineString = LineString.fromPolyline(legProgress.currentStep().geometry(), Constants.PRECISION_6); if (currentStepLineString.coordinates().isEmpty()) { return null; } @@ -183,7 +182,7 @@ private static Point getUpcomingLegPoint(RouteProgress routeProgress) { return null; } - LineString currentStepLineString = LineString.fromPolyline(firstStep.geometry(), PRECISION_6); + LineString currentStepLineString = LineString.fromPolyline(firstStep.geometry(), Constants.PRECISION_6); if (currentStepLineString.coordinates().isEmpty()) { return null; } diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/package-info.java similarity index 61% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/package-info.java index ee934129f..95adc20d0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/snap/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/package-info.java @@ -1,4 +1,4 @@ /** * Contains user location manipulation logic to cause it to snap to a biased location. */ -package com.mapbox.services.android.navigation.v5.snap; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.snap; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/Constants.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/Constants.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/Constants.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/Constants.java index 555728164..4a18e5c83 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/Constants.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/Constants.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; /** * Includes common variables used throughout the Mapbox Service modules. diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatter.java similarity index 95% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatter.java index e2d5fbaec..9a26e718a 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatter.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import android.content.Context; import android.graphics.Typeface; @@ -11,10 +11,10 @@ import androidx.annotation.NonNull; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.R; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.navigation.NavigationConstants; -import com.mapbox.services.android.navigation.v5.routeprogress.MetricsRouteProgress; +import org.maplibre.navigation.android.navigation.R; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.routeprogress.MetricsRouteProgress; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfConversion; import org.maplibre.turf.TurfMeasurement; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/LocaleUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/LocaleUtils.java similarity index 95% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/LocaleUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/LocaleUtils.java index bbfa869cd..1e8b78966 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/LocaleUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/LocaleUtils.java @@ -1,11 +1,11 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import android.content.Context; import android.os.Build; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; import java.util.Locale; diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverMap.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverMap.java new file mode 100644 index 000000000..3caa19462 --- /dev/null +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverMap.java @@ -0,0 +1,167 @@ +package org.maplibre.navigation.android.navigation.v5.utils; + +import org.maplibre.navigation.android.navigation.R; + +import java.util.HashMap; +import java.util.Map; + +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; + +class ManeuverMap { + + private Map maneuverMap; + + ManeuverMap() { + maneuverMap = new HashMap<>(); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN, + R.drawable.ic_maneuver_turn_180); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_CONTINUE + NavigationConstants.STEP_MANEUVER_MODIFIER_UTURN, + R.drawable.ic_maneuver_turn_180); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_CONTINUE + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_turn_0); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_arrive_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_arrive_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE, + R.drawable.ic_maneuver_arrive); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_DEPART + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_depart_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_DEPART + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_depart_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_DEPART, R.drawable.ic_maneuver_depart); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT, + R.drawable.ic_maneuver_turn_75); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_turn_45); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_turn_30); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT, + R.drawable.ic_maneuver_turn_75_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_turn_45_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_turn_30_left); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_MERGE + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_merge_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_MERGE + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_merge_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_MERGE + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_merge_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_MERGE + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_merge_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_MERGE + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_turn_0); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT, + R.drawable.ic_maneuver_turn_75_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_turn_45_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_turn_30_left); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT, + R.drawable.ic_maneuver_turn_75); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_turn_45); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ON_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_turn_30); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_off_ramp_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_off_ramp_slight_left); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_off_ramp_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_OFF_RAMP + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_off_ramp_slight_right); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_fork_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_fork_slight_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_fork_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_fork_slight_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_fork_straight); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_FORK, R.drawable.ic_maneuver_fork); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_END_OF_ROAD + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_end_of_road_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_END_OF_ROAD + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_end_of_road_right); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_roundabout_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT, + R.drawable.ic_maneuver_roundabout_sharp_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_roundabout_slight_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_roundabout_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT, + R.drawable.ic_maneuver_roundabout_sharp_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_roundabout_slight_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_roundabout_straight); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT, R.drawable.ic_maneuver_roundabout); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_roundabout_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT, + R.drawable.ic_maneuver_roundabout_sharp_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_roundabout_slight_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_roundabout_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT, + R.drawable.ic_maneuver_roundabout_sharp_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_roundabout_slight_right); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_roundabout_straight); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROTARY, R.drawable.ic_maneuver_roundabout); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_turn_45_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_ROUNDABOUT_TURN + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_turn_45); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_LEFT, + R.drawable.ic_maneuver_turn_45_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_LEFT, + R.drawable.ic_maneuver_turn_75_left); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_LEFT, + R.drawable.ic_maneuver_turn_30_left); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_RIGHT, + R.drawable.ic_maneuver_turn_45); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_SHARP_RIGHT, + R.drawable.ic_maneuver_turn_75); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_SLIGHT_RIGHT, + R.drawable.ic_maneuver_turn_30); + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NOTIFICATION + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_turn_0); + + maneuverMap.put(NavigationConstants.STEP_MANEUVER_TYPE_NEW_NAME + NavigationConstants.STEP_MANEUVER_MODIFIER_STRAIGHT, + R.drawable.ic_maneuver_turn_0); + } + + public int getManeuverResource(String maneuver) { + if (maneuverMap.get(maneuver) != null) { + return maneuverMap.get(maneuver); + } else { + return R.drawable.ic_maneuver_turn_0; + } + } +} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverUtils.java similarity index 68% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverUtils.java index 03e77a61b..cc9023749 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ManeuverUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ManeuverUtils.java @@ -1,10 +1,10 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import android.text.TextUtils; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepManeuver; -import com.mapbox.services.android.navigation.R; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; +import org.maplibre.navigation.android.navigation.R; public class ManeuverUtils { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapImageUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapImageUtils.java similarity index 91% rename from libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapImageUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapImageUtils.java index b68156007..3a7188b4d 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/utils/MapImageUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapImageUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.ui.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapUtils.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapUtils.java index f4cda045d..f4cdf01a0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MapUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MapUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MathUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MathUtils.java similarity index 97% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MathUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MathUtils.java index 4a76cfe53..fd1be6651 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MathUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MathUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; // TODO Check and remove if not necessary diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtils.java similarity index 94% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtils.java index 1832fddef..adc93c3eb 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtils.java @@ -1,6 +1,6 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import com.mapbox.services.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.Feature; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RingBuffer.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RingBuffer.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RingBuffer.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RingBuffer.java index 2167a3924..9c42b4a6b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RingBuffer.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RingBuffer.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import androidx.annotation.IntRange; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtils.java similarity index 92% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtils.java index 053717adb..7087277d8 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/RouteUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtils.java @@ -1,24 +1,23 @@ -package com.mapbox.services.android.navigation.v5.utils; - -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE; +package org.maplibre.navigation.android.navigation.v5.utils; import android.location.Location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.BannerText; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.ArrayList; import java.util.Arrays; @@ -304,11 +303,11 @@ public int compare(VoiceInstructions instructions, VoiceInstructions nextInstruc private boolean upcomingStepIsArrivalManeuverType(@NonNull RouteProgress routeProgress) { return routeProgress.currentLegProgress().upComingStep() != null - && routeProgress.currentLegProgress().upComingStep().maneuver().type().contains(STEP_MANEUVER_TYPE_ARRIVE); + && routeProgress.currentLegProgress().upComingStep().maneuver().type().contains(NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE); } private boolean currentStepIsArrivalManeuverType(@NonNull RouteProgress routeProgress) { - return routeProgress.currentLegProgress().currentStep().maneuver().type().contains(STEP_MANEUVER_TYPE_ARRIVE); + return routeProgress.currentLegProgress().currentStep().maneuver().type().contains(NavigationConstants.STEP_MANEUVER_TYPE_ARRIVE); } private boolean isValidStep(LegStep step) { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/TextUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/TextUtils.java similarity index 99% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/TextUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/TextUtils.java index b99fbaa26..72b0f5140 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/TextUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/TextUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java similarity index 84% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java index 273475279..7785d78f2 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfClassification; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtils.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtils.java index 7647be345..dbf48128f 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtils.java @@ -1,7 +1,7 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import java.util.MissingFormatArgumentException; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/AbbreviationArray.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/AbbreviationArray.java similarity index 98% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/AbbreviationArray.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/AbbreviationArray.java index 86c0e73f4..f86d7b0fd 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/AbbreviationArray.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/AbbreviationArray.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.abbreviation; +package org.maplibre.navigation.android.navigation.v5.utils.abbreviation; import android.util.SparseArray; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/StringAbbreviator.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/StringAbbreviator.java similarity index 93% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/StringAbbreviator.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/StringAbbreviator.java index 91ac03716..6a294ca95 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/abbreviation/StringAbbreviator.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/abbreviation/StringAbbreviator.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.abbreviation; +package org.maplibre.navigation.android.navigation.v5.utils.abbreviation; import android.text.TextUtils; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/package-info.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/package-info.java similarity index 61% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/package-info.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/package-info.java index 6936fda5a..8cdce1b2b 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/package-info.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/package-info.java @@ -1,4 +1,4 @@ /** * This contains common static util methods used throughout the Maplibre Navigation SDK. */ -package com.mapbox.services.android.navigation.v5.utils; \ No newline at end of file +package org.maplibre.navigation.android.navigation.v5.utils; \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanItem.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanItem.java new file mode 100644 index 000000000..439373f12 --- /dev/null +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanItem.java @@ -0,0 +1,6 @@ +package org.maplibre.navigation.android.navigation.v5.utils.span; + +public interface SpanItem { + + Object getSpan(); +} diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanUtils.java similarity index 92% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanUtils.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanUtils.java index 039e0a804..7bde9464d 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/SpanUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/SpanUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.span; +package org.maplibre.navigation.android.navigation.v5.utils.span; import android.os.Build; import android.text.Spannable; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/TextSpanItem.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/TextSpanItem.java similarity index 83% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/TextSpanItem.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/TextSpanItem.java index f901de8c1..45d56f8c0 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/span/TextSpanItem.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/span/TextSpanItem.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.span; +package org.maplibre.navigation.android.navigation.v5.utils.span; public class TextSpanItem implements SpanItem { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java similarity index 61% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java index 09b4dd08a..482278b35 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/NoneSpecifiedTimeFormat.java @@ -1,11 +1,10 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import java.util.Calendar; import java.util.Locale; -import static com.mapbox.services.android.navigation.v5.utils.time.TwelveHoursTimeFormat.TWELVE_HOURS_FORMAT; -import static com.mapbox.services.android.navigation.v5.utils.time.TwentyFourHoursTimeFormat.TWENTY_FOUR_HOURS_FORMAT; +import static org.maplibre.navigation.android.navigation.v5.utils.time.TwelveHoursTimeFormat.TWELVE_HOURS_FORMAT; class NoneSpecifiedTimeFormat implements TimeFormatResolver { private final boolean isDeviceTwentyFourHourFormat; @@ -21,7 +20,7 @@ public void nextChain(TimeFormatResolver chain) { @Override public String obtainTimeFormatted(int type, Calendar time) { if (isDeviceTwentyFourHourFormat) { - return String.format(Locale.getDefault(), TWENTY_FOUR_HOURS_FORMAT, time, time); + return String.format(Locale.getDefault(), TwentyFourHoursTimeFormat.TWENTY_FOUR_HOURS_FORMAT, time, time); } else { return String.format(Locale.getDefault(), TWELVE_HOURS_FORMAT, time, time, time); } diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatResolver.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatResolver.java similarity index 71% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatResolver.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatResolver.java index 719d21935..2d2c7307c 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatResolver.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatResolver.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import java.util.Calendar; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatter.java similarity index 89% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatter.java index edc685bfa..777100a83 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatter.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatter.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import android.content.Context; import android.content.res.Resources; @@ -7,11 +7,11 @@ import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; -import com.mapbox.services.android.navigation.R; -import com.mapbox.services.android.navigation.v5.navigation.NavigationTimeFormat; -import com.mapbox.services.android.navigation.v5.utils.span.SpanItem; -import com.mapbox.services.android.navigation.v5.utils.span.SpanUtils; -import com.mapbox.services.android.navigation.v5.utils.span.TextSpanItem; +import org.maplibre.navigation.android.navigation.R; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; +import org.maplibre.navigation.android.navigation.v5.utils.span.SpanItem; +import org.maplibre.navigation.android.navigation.v5.utils.span.SpanUtils; +import org.maplibre.navigation.android.navigation.v5.utils.span.TextSpanItem; import java.util.ArrayList; import java.util.Calendar; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormattingChain.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormattingChain.java similarity index 87% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormattingChain.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormattingChain.java index f953327e1..0418a1a59 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormattingChain.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormattingChain.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; class TimeFormattingChain { diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java similarity index 90% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java index 6e85a23af..4d302bcfa 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwelveHoursTimeFormat.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import java.util.Calendar; diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java similarity index 90% rename from libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java index 104769cc8..b86b1e2f5 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/time/TwentyFourHoursTimeFormat.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import java.util.Calendar; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/BaseTest.java similarity index 93% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/BaseTest.java index e0955aedd..94365ddf0 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/BaseTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/BaseTest.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.v5; +package org.maplibre.navigation.android.navigation.v5; import android.location.Location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.io.IOException; import java.util.List; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/MockLocationBuilder.java similarity index 85% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/MockLocationBuilder.java index 486705e08..8f8861e84 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/MockLocationBuilder.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/MockLocationBuilder.java @@ -1,14 +1,14 @@ -package com.mapbox.services.android.navigation.v5; +package org.maplibre.navigation.android.navigation.v5; -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +import static org.maplibre.navigation.android.navigation.v5.utils.Constants.PRECISION_6; import android.location.Location; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteBuilder.java similarity index 79% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteBuilder.java index e0e8ab322..d50d5db26 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteBuilder.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteBuilder.java @@ -1,16 +1,16 @@ -package com.mapbox.services.android.navigation.v5; +package org.maplibre.navigation.android.navigation.v5; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import java.io.IOException; import java.io.InputStream; @@ -19,8 +19,6 @@ import java.util.List; import java.util.Scanner; -import static com.mapbox.services.android.navigation.v5.BaseTest.ACCESS_TOKEN; - class TestRouteBuilder { private static final String DIRECTIONS_PRECISION_6 = "directions_v5_precision_6.json"; @@ -47,7 +45,7 @@ private DirectionsRoute buildRouteWithOptions(DirectionsRoute route) throws IOEx .baseUrl(Constants.BASE_API_URL) .user("user") .profile("profile") - .accessToken(ACCESS_TOKEN) + .accessToken(BaseTest.ACCESS_TOKEN) .requestUuid("uuid") .geometries("mocked_geometries") .voiceInstructions(true) diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteProgressBuilder.java similarity index 79% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteProgressBuilder.java index 479a37597..8f94be637 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/TestRouteProgressBuilder.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/TestRouteProgressBuilder.java @@ -1,23 +1,23 @@ -package com.mapbox.services.android.navigation.v5; +package org.maplibre.navigation.android.navigation.v5; import android.util.Pair; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findCurrentIntersection; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.findUpcomingIntersection; -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createDistancesToIntersections; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.createIntersectionsList; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.findCurrentIntersection; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.findUpcomingIntersection; +import static org.maplibre.navigation.android.navigation.v5.utils.Constants.PRECISION_6; class TestRouteProgressBuilder { diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/LocationValidatorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidatorTest.java similarity index 91% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/LocationValidatorTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidatorTest.java index b0c15f426..0bf211c5f 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/LocationValidatorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/LocationValidatorTest.java @@ -1,8 +1,9 @@ -package com.mapbox.services.android.navigation.v5.location; +package org.maplibre.navigation.android.navigation.v5.location; import android.location.Location; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.location.LocationValidator; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParserTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParserTest.java similarity index 96% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParserTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParserTest.java index 6a0abfaae..dfc3302f5 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/GpxParserTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/GpxParserTest.java @@ -1,9 +1,10 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import org.junit.Test; import org.junit.runner.RunWith; +import org.maplibre.navigation.android.navigation.v5.location.replay.GpxParser; import org.robolectric.RobolectricTestRunner; import org.xml.sax.SAXException; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java similarity index 96% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java index 2f29592e7..e701a1d31 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayJsonRouteLocationMapperTest.java @@ -1,9 +1,11 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import org.junit.Test; import org.junit.runner.RunWith; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayJsonRouteLocationMapper; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayLocationDto; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java index 0743b0543..8efbd47b4 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayLocationDispatcherTest.java @@ -1,9 +1,11 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import android.location.Location; import android.os.Handler; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayLocationDispatcher; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayLocationListener; import java.util.ArrayList; import java.util.Collections; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java similarity index 82% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java index e26cacff0..1cedf2b3f 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteLocationConverterTest.java @@ -1,9 +1,10 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationConverter; import java.util.List; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteParserTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteParserTest.java similarity index 94% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteParserTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteParserTest.java index b6c0e7120..e1a070787 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/location/replay/ReplayRouteParserTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/location/replay/ReplayRouteParserTest.java @@ -1,8 +1,10 @@ -package com.mapbox.services.android.navigation.v5.location.replay; +package org.maplibre.navigation.android.navigation.v5.location.replay; import com.google.gson.GsonBuilder; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayJsonRouteDto; +import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayLocationDto; import java.io.InputStream; import java.text.SimpleDateFormat; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java similarity index 92% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java index 6da1b395e..e7f67621e 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestoneTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestoneTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestoneTest.java similarity index 79% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestoneTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestoneTest.java index a33459484..1052a5863 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/StepMilestoneTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/StepMilestoneTest.java @@ -1,12 +1,13 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerPropertyTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerPropertyTest.java similarity index 92% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerPropertyTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerPropertyTest.java index 200796da5..454961364 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerPropertyTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerPropertyTest.java @@ -1,12 +1,13 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import junit.framework.Assert; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerTest.java similarity index 96% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerTest.java index ee7d8f0ac..9efd4c719 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/TriggerTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/TriggerTest.java @@ -1,12 +1,13 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import junit.framework.Assert; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java similarity index 93% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java index 96d892757..e647eda20 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.milestone; +package org.maplibre.navigation.android.navigation.v5.milestone; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java similarity index 89% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java index ff9a3c9ae..33c0201fa 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/FasterRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java @@ -1,18 +1,20 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import android.location.Location; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.route.FasterRouteDetector; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteDetector; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java similarity index 80% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java index 680282a0a..ad2a40c82 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java @@ -1,15 +1,17 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.app.NotificationManager; import android.content.Context; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import junit.framework.Assert; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java similarity index 91% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java index c58759ca7..5feeba883 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java @@ -1,25 +1,25 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.StepMilestone; -import com.mapbox.services.android.navigation.v5.milestone.VoiceInstructionMilestone; -import com.mapbox.services.android.navigation.v5.navigation.camera.SimpleCamera; -import com.mapbox.services.android.navigation.v5.offroute.OffRoute; -import com.mapbox.services.android.navigation.v5.snap.Snap; -import com.mapbox.services.android.navigation.v5.snap.SnapToRoute; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.StepMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.VoiceInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.navigation.camera.SimpleCamera; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRoute; +import org.maplibre.navigation.android.navigation.v5.snap.Snap; +import org.maplibre.navigation.android.navigation.v5.snap.SnapToRoute; import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.BANNER_INSTRUCTION_MILESTONE_ID; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.VOICE_INSTRUCTION_MILESTONE_ID; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.BANNER_INSTRUCTION_MILESTONE_ID; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.VOICE_INSTRUCTION_MILESTONE_ID; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNotSame; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactoryTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactoryTest.java similarity index 92% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactoryTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactoryTest.java index 60bd79699..f2dba2bd8 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEngineFactoryTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEngineFactoryTest.java @@ -1,6 +1,7 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEngineFactory; import static junit.framework.Assert.assertNotNull; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java similarity index 93% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java index 14252b633..a15f79d8c 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationEventDispatcherTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import android.location.Location; @@ -7,19 +7,20 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.MilestoneEventListener; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteListener; -import com.mapbox.services.android.navigation.v5.route.FasterRouteListener; -import com.mapbox.services.android.navigation.v5.routeprogress.ProgressChangeListener; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.RouteUtils; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRouteListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; import org.junit.Before; import org.junit.Ignore; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java similarity index 79% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java index 656c32150..a0d9fd4cf 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationFasterRouteListenerTest.java @@ -1,11 +1,13 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.route.FasterRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventDispatcher; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationFasterRouteListener; +import org.maplibre.navigation.android.navigation.v5.route.FasterRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java similarity index 93% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java index e0b3f8a16..a99b4cbb2 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationHelperTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import android.location.Location; @@ -6,27 +6,28 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegAnnotation; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.StepIntersection; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegAnnotation; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.StepMilestone; -import com.mapbox.services.android.navigation.v5.milestone.Trigger; -import com.mapbox.services.android.navigation.v5.milestone.TriggerProperty; -import com.mapbox.services.android.navigation.v5.offroute.OffRouteCallback; -import com.mapbox.services.android.navigation.v5.routeprogress.CurrentLegAnnotation; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteStepProgress; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.StepMilestone; +import org.maplibre.navigation.android.navigation.v5.milestone.Trigger; +import org.maplibre.navigation.android.navigation.v5.milestone.TriggerProperty; +import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteCallback; +import org.maplibre.navigation.android.navigation.v5.routeprogress.CurrentLegAnnotation; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteStepProgress; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,8 +37,8 @@ import java.util.ArrayList; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.checkMilestones; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.isUserOffRoute; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.checkMilestones; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.isUserOffRoute; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotSame; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProviderTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java similarity index 82% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProviderTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java index 95d8e6712..9644a57c0 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationNotificationProviderTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java @@ -1,10 +1,13 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.navigation.notification.NavigationNotification; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationNotificationProvider; +import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java index a800e6db3..fd12cb696 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/NavigationRouteProcessorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.content.Context; import android.location.Location; @@ -6,10 +6,10 @@ import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; import org.maplibre.android.location.engine.LocationEngine; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.junit.Before; import org.junit.Test; @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.List; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationHelper.buildSnappedLocation; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationHelper.buildSnappedLocation; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java similarity index 86% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java index 981aa5db7..87385196f 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorThreadListenerTest.java @@ -1,12 +1,15 @@ -package com.mapbox.services.android.navigation.v5.navigation; +package org.maplibre.navigation.android.navigation.v5.navigation; import android.location.Location; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.instruction.Instruction; -import com.mapbox.services.android.navigation.v5.milestone.Milestone; -import com.mapbox.services.android.navigation.v5.milestone.StepMilestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.instruction.Instruction; +import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; +import org.maplibre.navigation.android.navigation.v5.milestone.StepMilestone; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventDispatcher; +import org.maplibre.navigation.android.navigation.v5.navigation.NavigationNotificationProvider; +import org.maplibre.navigation.android.navigation.v5.navigation.RouteProcessorThreadListener; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java similarity index 97% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java index 4226e2855..b906b7859 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java @@ -1,14 +1,14 @@ -package com.mapbox.services.android.navigation.v5.offroute; +package org.maplibre.navigation.android.navigation.v5.offroute; import android.location.Location; -import com.mapbox.services.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; -import com.mapbox.services.android.navigation.v5.utils.Constants; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.junit.Before; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgressTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgressTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgressTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgressTest.java index db61f2e74..99f1e7e74 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteLegProgressTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteLegProgressTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgressTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgressTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgressTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgressTest.java index 11b8ad736..75e54692b 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteProgressTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgressTest.java @@ -1,13 +1,14 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.BaseTest; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgressTest.java similarity index 96% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgressTest.java index 2021dbcaa..0b96a06cf 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/routeprogress/RouteStepProgressTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteStepProgressTest.java @@ -1,17 +1,19 @@ -package com.mapbox.services.android.navigation.v5.routeprogress; +package org.maplibre.navigation.android.navigation.v5.routeprogress; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.utils.Constants; + +import org.maplibre.navigation.android.navigation.v5.utils.Constants; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; import org.maplibre.turf.TurfMisc; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/snap/SnapToRouteTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRouteTest.java similarity index 93% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/snap/SnapToRouteTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRouteTest.java index 083c06219..d29efadf4 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/snap/SnapToRouteTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/snap/SnapToRouteTest.java @@ -1,21 +1,21 @@ -package com.mapbox.services.android.navigation.v5.snap; +package org.maplibre.navigation.android.navigation.v5.snap; import android.location.Location; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.mapbox.services.android.navigation.v5.models.DirectionsAdapterFactory; -import com.mapbox.services.android.navigation.v5.models.DirectionsResponse; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; + +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsAdapterFactory; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import static junit.framework.Assert.assertEquals; -import static org.mockito.internal.matchers.text.ValuePrinter.print; @RunWith(RobolectricTestRunner.class) public class SnapToRouteTest extends BaseTest { diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java similarity index 90% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java index 3fdcd18ea..f29823d42 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/DistanceFormatterTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java @@ -1,4 +1,4 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import android.content.Context; import android.content.res.Configuration; @@ -6,21 +6,22 @@ import android.os.LocaleList; import com.mapbox.services.android.navigation.R; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import java.util.Locale; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.ROUNDING_INCREMENT_FIFTY; -import static com.mapbox.services.android.navigation.v5.navigation.NavigationConstants.ROUNDING_INCREMENT_TEN; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.ROUNDING_INCREMENT_FIFTY; +import static org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants.ROUNDING_INCREMENT_TEN; import static org.mockito.Mockito.when; @RunWith(RobolectricTestRunner.class) diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtilsTest.java similarity index 85% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtilsTest.java index 317973182..b37eec8d8 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/MeasurementUtilsTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/MeasurementUtilsTest.java @@ -1,12 +1,12 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +import static org.maplibre.navigation.android.navigation.v5.utils.Constants.PRECISION_6; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.StepManeuver; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.BaseTest; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RingBufferTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RingBufferTest.java similarity index 90% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RingBufferTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RingBufferTest.java index 6e0192abe..cabd4fd83 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RingBufferTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RingBufferTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import static junit.framework.Assert.assertEquals; import com.google.common.collect.Lists; -import com.mapbox.services.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.BaseTest; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtilsTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtilsTest.java index 2d9d2d553..8fe65ac99 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/RouteUtilsTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/RouteUtilsTest.java @@ -1,20 +1,20 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; import androidx.annotation.NonNull; -import com.mapbox.services.android.navigation.v5.models.BannerInstructions; -import com.mapbox.services.android.navigation.v5.models.BannerText; -import com.mapbox.services.android.navigation.v5.models.DirectionsCriteria; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.LegStep; -import com.mapbox.services.android.navigation.v5.models.RouteLeg; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; -import com.mapbox.services.android.navigation.v5.models.VoiceInstructions; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; +import org.maplibre.navigation.android.navigation.v5.models.BannerText; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.milestone.BannerInstructionMilestone; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteLegProgress; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java similarity index 83% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java index ee6291cce..e53afde30 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ToleranceUtilsTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java @@ -1,14 +1,14 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import static com.mapbox.services.android.navigation.v5.utils.Constants.PRECISION_6; +import static org.maplibre.navigation.android.navigation.v5.utils.Constants.PRECISION_6; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import com.mapbox.services.android.navigation.v5.BaseTest; -import com.mapbox.services.android.navigation.v5.navigation.MapboxNavigationOptions; -import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress; +import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtilsTest.java similarity index 92% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtilsTest.java index 25df5274f..ad6ec8afa 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/ValidationUtilsTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ValidationUtilsTest.java @@ -1,9 +1,9 @@ -package com.mapbox.services.android.navigation.v5.utils; +package org.maplibre.navigation.android.navigation.v5.utils; -import com.mapbox.services.android.navigation.v5.models.DirectionsRoute; -import com.mapbox.services.android.navigation.v5.models.RouteOptions; +import org.maplibre.navigation.android.navigation.v5.BaseTest; +import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; +import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; import org.maplibre.geojson.Point; -import com.mapbox.services.android.navigation.v5.BaseTest; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatterTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatterTest.java similarity index 95% rename from libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatterTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatterTest.java index de7989336..bcde671a2 100644 --- a/libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/utils/time/TimeFormatterTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/time/TimeFormatterTest.java @@ -1,6 +1,7 @@ -package com.mapbox.services.android.navigation.v5.utils.time; +package org.maplibre.navigation.android.navigation.v5.utils.time; import org.junit.Test; +import org.maplibre.navigation.android.navigation.v5.utils.time.TimeFormatter; import java.util.Calendar; From 56591d5521d73db794707d8aa81b283c260b15f0 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Sat, 8 Jun 2024 00:14:20 +0200 Subject: [PATCH 08/21] Rename Mapbox names to MapLibre --- .../android/example/MockNavigationActivity.kt | 14 ++-- .../example/SnapToRouteNavigationActivity.kt | 14 ++-- .../src/main/AndroidManifest.xml | 2 +- ...y.java => MapLibreNavigationActivity.java} | 6 +- .../navigation/ui/v5/NavigationLauncher.java | 2 +- .../navigation/ui/v5/NavigationView.java | 32 ++++---- .../ui/v5/NavigationViewEventDispatcher.java | 16 ++-- .../navigation/ui/v5/NavigationViewModel.java | 32 ++++---- .../ui/v5/NavigationViewOptions.java | 8 +- .../ui/v5/NavigationViewRouter.java | 8 +- .../ui/v5/camera/NavigationCamera.java | 16 ++-- .../ui/v5/instruction/InstructionView.java | 4 +- .../ui/v5/listeners/NavigationListener.java | 6 +- .../navigation/ui/v5/map/MapFpsDelegate.java | 6 +- .../ui/v5/map/MapLayerInteractor.java | 2 +- .../navigation/ui/v5/map/MapWayName.java | 8 +- ...boxMap.java => NavigationMapLibreMap.java} | 44 +++++------ .../NavigationMapLibreMapInstanceState.java | 44 +++++++++++ .../map/NavigationMapboxMapInstanceState.java | 44 ----------- .../ui/v5/map/OnWayNameChangedListener.java | 4 +- ...Fetcher.java => MapLibreRouteFetcher.java} | 6 +- .../ui/v5/route/NavigationMapRoute.java | 34 ++++---- .../ui/v5/route/NavigationRoute.java | 4 +- .../v5/NavigationViewEventDispatcherTest.java | 13 ++-- .../ui/v5/NavigationViewModelTest.java | 23 +++--- .../ui/v5/NavigationViewRouterTest.java | 12 +-- .../ui/v5/camera/NavigationCameraTest.java | 18 ++--- .../ui/v5/map/MapFpsDelegateTest.java | 9 +-- ...st.java => NavigationMapLibreMapTest.java} | 56 ++++++------- .../ui/v5/route/NavigationMapRouteTest.java | 41 +++++----- ... => MapLibreUncaughtExceptionHandler.java} | 12 +-- .../milestone/BannerInstructionMilestone.java | 4 +- .../navigation/v5/milestone/Milestone.java | 4 +- .../milestone/VoiceInstructionMilestone.java | 4 +- ...xStreetsV8.java => MapLibreStreetsV8.java} | 26 +++---- .../v5/models/StepIntersection.java | 4 +- ...avigation.java => MapLibreNavigation.java} | 34 ++++---- ...va => MapLibreNavigationNotification.java} | 30 +++---- ...ns.java => MapLibreNavigationOptions.java} | 8 +- .../v5/navigation/NavigationHelper.java | 22 +++--- .../NavigationLocationEngineListener.java | 8 +- .../navigation/NavigationLocationUpdate.java | 6 +- .../v5/navigation/NavigationMapRoute.java | 26 +++---- .../NavigationNotificationProvider.java | 10 +-- .../navigation/NavigationRouteProcessor.java | 40 +++++----- .../v5/navigation/NavigationService.java | 34 ++++---- .../RouteProcessorHandlerCallback.java | 26 +++---- .../v5/navigation/camera/Camera.java | 6 +- .../v5/navigation/camera/SimpleCamera.java | 4 +- .../notification/NavigationNotification.java | 8 +- .../navigation/v5/offroute/OffRoute.java | 4 +- .../v5/offroute/OffRouteDetector.java | 22 +++--- .../navigation/v5/route/FasterRoute.java | 4 +- .../v5/routeprogress/RouteProgress.java | 4 +- .../android/navigation/v5/snap/Snap.java | 6 +- .../navigation/v5/utils/ToleranceUtils.java | 4 +- .../navigation/FasterRouteDetectorTest.java | 18 ++--- ...> MapLibreNavigationNotificationTest.java} | 14 ++-- ...nTest.java => MapLibreNavigationTest.java} | 78 +++++++++---------- .../NavigationEventDispatcherTest.java | 4 +- .../v5/navigation/NavigationHelperTest.java | 16 ++-- .../NavigationNotificationProviderTest.java | 25 +++--- .../NavigationRouteProcessorTest.java | 6 +- .../v5/offroute/OffRouteDetectorTest.java | 8 +- .../v5/utils/ToleranceUtilsTest.java | 8 +- 65 files changed, 519 insertions(+), 546 deletions(-) rename libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/{MapboxNavigationActivity.java => MapLibreNavigationActivity.java} (94%) rename libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/{NavigationMapboxMap.java => NavigationMapLibreMap.java} (93%) create mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapInstanceState.java delete mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java rename libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/{MapboxRouteFetcher.java => MapLibreRouteFetcher.java} (98%) rename libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/{NavigationMapboxMapTest.java => NavigationMapLibreMapTest.java} (80%) rename libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/{MapboxUncaughtExceptionHanlder.java => MapLibreUncaughtExceptionHandler.java} (93%) rename libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/{MapboxStreetsV8.java => MapLibreStreetsV8.java} (76%) rename libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/{MapboxNavigation.java => MapLibreNavigation.java} (95%) rename libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/{MapboxNavigationNotification.java => MapLibreNavigationNotification.java} (90%) rename libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/{MapboxNavigationOptions.java => MapLibreNavigationOptions.java} (96%) rename libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/{MapboxNavigationNotificationTest.java => MapLibreNavigationNotificationTest.java} (76%) rename libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/{MapboxNavigationTest.java => MapLibreNavigationTest.java} (72%) diff --git a/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt index da26d83e6..aae3a3263 100644 --- a/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt @@ -40,8 +40,8 @@ import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventLis import org.maplibre.navigation.android.navigation.v5.milestone.RouteMilestone import org.maplibre.navigation.android.navigation.v5.milestone.Trigger import org.maplibre.navigation.android.navigation.v5.milestone.TriggerProperty -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventListener import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute import retrofit2.Call @@ -64,7 +64,7 @@ class MockNavigationActivity : // Navigation related variables private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() - private lateinit var navigation: MapboxNavigation + private lateinit var navigation: MapLibreNavigation private var route: DirectionsRoute? = null private var navigationMapRoute: NavigationMapRoute? = null private var destination: Point? = null @@ -91,12 +91,12 @@ class MockNavigationActivity : if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { customNotification.createNotificationChannel(this) } - val options = MapboxNavigationOptions.builder() + val options = MapLibreNavigationOptions.builder() .navigationNotification(customNotification) .build() navigation = - MapboxNavigation( + MapLibreNavigation( this, options ) @@ -338,9 +338,9 @@ class MockNavigationActivity : binding.mapView.onSaveInstanceState(outState) } - private class MyBroadcastReceiver internal constructor(navigation: MapboxNavigation) : + private class MyBroadcastReceiver internal constructor(navigation: MapLibreNavigation) : BroadcastReceiver() { - private val weakNavigation: WeakReference = WeakReference(navigation) + private val weakNavigation: WeakReference = WeakReference(navigation) override fun onReceive(context: Context, intent: Intent) { weakNavigation.get()?.stopNavigation() diff --git a/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt index 0c0e1d48f..ddc665b66 100644 --- a/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt @@ -22,8 +22,8 @@ import org.maplibre.navigation.android.navigation.v5.snap.SnapToRoute import okhttp3.Request import org.maplibre.navigation.android.example.databinding.ActivitySnapToRouteNavigationBinding import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions import org.maplibre.navigation.android.navigation.v5.navigation.NavigationMapRoute import retrofit2.Call import retrofit2.Callback @@ -36,9 +36,9 @@ import timber.log.Timber * You need to do the following steps to enable route snapping: * 1. Disable default location engine by set [LocationComponentActivationOptions.useDefaultLocationEngine] to false. * 2. Get snapped location from [ProgressChangeListener] callback and set it to [LocationComponent] by [LocationComponent.forceLocationUpdate] method. - * 3. Activate route snapping by set [MapboxNavigationOptions.snapToRoute] to true. + * 3. Activate route snapping by set [MapLibreNavigationOptions.snapToRoute] to true. * - * By default [SnapToRoute] is used. If you want to use your own snapping logic, you can set with [MapboxNavigation.setSnapEngine] for your own implementation. + * By default [SnapToRoute] is used. If you want to use your own snapping logic, you can set with [MapLibreNavigation.setSnapEngine] for your own implementation. */ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, ProgressChangeListener { @@ -47,7 +47,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, private lateinit var mapboxMap: MapLibreMap private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() - private lateinit var navigation: MapboxNavigation + private lateinit var navigation: MapLibreNavigation private var route: DirectionsRoute? = null private var navigationMapRoute: NavigationMapRoute? = null @@ -57,9 +57,9 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, binding = ActivitySnapToRouteNavigationBinding.inflate(layoutInflater) setContentView(binding.root) - navigation = MapboxNavigation( + navigation = MapLibreNavigation( this, - MapboxNavigationOptions.builder() + MapLibreNavigationOptions.builder() .snapToRoute(true) .build() ).apply { diff --git a/libandroid-navigation-ui/src/main/AndroidManifest.xml b/libandroid-navigation-ui/src/main/AndroidManifest.xml index 87a1eae2e..2c1449fc4 100644 --- a/libandroid-navigation-ui/src/main/AndroidManifest.xml +++ b/libandroid-navigation-ui/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java similarity index 94% rename from libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java index d21f04e62..ac98ab6e1 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapboxNavigationActivity.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapLibreNavigationActivity.java @@ -10,7 +10,7 @@ import org.maplibre.navigation.android.navigation.ui.v5.listeners.NavigationListener; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.camera.CameraPosition; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; /** @@ -18,7 +18,7 @@ *

* Demonstrates the proper setup and usage of the view, including all lifecycle methods. */ -public class MapboxNavigationActivity extends AppCompatActivity implements OnNavigationReadyCallback, +public class MapLibreNavigationActivity extends AppCompatActivity implements OnNavigationReadyCallback, NavigationListener { private NavigationView navigationView; @@ -95,7 +95,7 @@ public void onNavigationReady(boolean isRunning) { options.navigationListener(this); extractRoute(options); extractConfiguration(options); - options.navigationOptions(MapboxNavigationOptions.builder().build()); + options.navigationOptions(MapLibreNavigationOptions.builder().build()); navigationView.startNavigation(options.build()); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java index 17f00266e..ae9542a29 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationLauncher.java @@ -42,7 +42,7 @@ public static void startNavigation(Activity activity, NavigationLauncherOptions editor.apply(); - Intent navigationActivity = new Intent(activity, MapboxNavigationActivity.class); + Intent navigationActivity = new Intent(activity, MapLibreNavigationActivity.class); storeInitialMapPosition(options, navigationActivity); activity.startActivity(navigationActivity); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java index 565d5fded..13e05e4ad 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationView.java @@ -25,8 +25,8 @@ import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; import org.maplibre.navigation.android.navigation.ui.v5.instruction.ImageCreator; import org.maplibre.navigation.android.navigation.ui.v5.instruction.NavigationAlertView; -import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap; -import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMapInstanceState; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap; +import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMapInstanceState; import org.maplibre.navigation.android.navigation.ui.v5.map.WayNameView; import org.maplibre.navigation.android.navigation.ui.v5.summary.SummaryBottomSheet; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; @@ -41,8 +41,8 @@ import org.maplibre.android.maps.Style; import org.maplibre.navigation.android.navigation.ui.v5.instruction.InstructionView; import org.maplibre.navigation.android.navigation.v5.location.replay.ReplayRouteLocationEngine; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; import org.maplibre.navigation.android.navigation.v5.utils.DistanceFormatter; import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; @@ -57,7 +57,7 @@ * In the latter case, a new {@link DirectionsRoute} will be retrieved from {@link NavigationRoute}. *

* Once valid data is obtained, this activity will immediately begin navigation - * with {@link MapboxNavigation}. + * with {@link MapLibreNavigation}. *

* If launched with the simulation boolean set to true, a {@link ReplayRouteLocationEngine} * will be initialized and begin pushing updates. @@ -86,10 +86,10 @@ public class NavigationView extends CoordinatorLayout implements LifecycleOwner, private NavigationPresenter navigationPresenter; private NavigationViewEventDispatcher navigationViewEventDispatcher; private NavigationViewModel navigationViewModel; - private NavigationMapboxMap navigationMap; + private NavigationMapLibreMap navigationMap; private OnNavigationReadyCallback onNavigationReadyCallback; private NavigationOnCameraTrackingChangedListener onTrackingChangedListener; - private NavigationMapboxMapInstanceState mapInstanceState; + private NavigationMapLibreMapInstanceState mapInstanceState; private CameraPosition initialMapCameraPosition; private boolean isMapInitialized; private boolean isSubscribed; @@ -311,7 +311,7 @@ public boolean isWayNameVisible() { *

* If you'd like to use this method without being overridden by the default way names * values we provide, please disabled auto-query with - * {@link NavigationMapboxMap#updateWaynameQueryMap(boolean)}. + * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}. * * @param wayName to update the view */ @@ -326,7 +326,7 @@ public void updateWayNameView(@NonNull String wayName) { *

* If you'd like to use this method without being overridden by the default visibility values * values we provide, please disabled auto-query with - * {@link NavigationMapboxMap#updateWaynameQueryMap(boolean)}. + * {@link NavigationMapLibreMap#updateWaynameQueryMap(boolean)}. * * @param isVisible true to show, false to hide */ @@ -447,24 +447,24 @@ public void initialize(OnNavigationReadyCallback onNavigationReadyCallback, * Gives the ability to manipulate the map directly for anything that might not currently be * supported. This returns null until the view is initialized. *

- * The {@link NavigationMapboxMap} gives direct access to the map UI (location marker, route, etc.). + * The {@link NavigationMapLibreMap} gives direct access to the map UI (location marker, route, etc.). * * @return navigation mapbox map object, or null if view has not been initialized */ @Nullable - public NavigationMapboxMap retrieveNavigationMapboxMap() { + public NavigationMapLibreMap retrieveNavigationMapboxMap() { return navigationMap; } /** - * Returns the instance of {@link MapboxNavigation} powering the {@link NavigationView} + * Returns the instance of {@link MapLibreNavigation} powering the {@link NavigationView} * once navigation has started. Will return null if navigation has not been started with * {@link NavigationView#startNavigation(NavigationViewOptions)}. * * @return mapbox navigation, or null if navigation has not started */ @Nullable - public MapboxNavigation retrieveMapboxNavigation() { + public MapLibreNavigation retrieveMapboxNavigation() { return navigationViewModel.retrieveNavigation(); } @@ -547,7 +547,7 @@ private void initializeNavigationMap(MapView mapView, MapLibreMap map) { if (initialMapCameraPosition != null) { map.setCameraPosition(initialMapCameraPosition); } - navigationMap = new NavigationMapboxMap(mapView, map); + navigationMap = new NavigationMapLibreMap(mapView, map); navigationMap.updateLocationLayerRenderMode(RenderMode.GPS); if (mapInstanceState != null) { navigationMap.restoreFrom(mapInstanceState); @@ -658,8 +658,8 @@ private void establishDistanceFormatter(LocaleUtils localeUtils, NavigationViewO } private int establishRoundingIncrement(NavigationViewOptions navigationViewOptions) { - MapboxNavigationOptions mapboxNavigationOptions = navigationViewOptions.navigationOptions(); - return mapboxNavigationOptions.roundingIncrement(); + MapLibreNavigationOptions mapLibreNavigationOptions = navigationViewOptions.navigationOptions(); + return mapLibreNavigationOptions.roundingIncrement(); } private String establishLanguage(LocaleUtils localeUtils, NavigationViewOptions options) { diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java index ce7695052..95133e298 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcher.java @@ -17,7 +17,7 @@ import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; /** @@ -37,7 +37,7 @@ class NavigationViewEventDispatcher { private BannerInstructionsListener bannerInstructionsListener; /** - * Initializes the listeners in the dispatcher, as well as the listeners in the {@link MapboxNavigation} + * Initializes the listeners in the dispatcher, as well as the listeners in the {@link MapLibreNavigation} * * @param navigationViewOptions that contains all listeners to attach */ @@ -45,7 +45,7 @@ void initializeListeners(NavigationViewOptions navigationViewOptions, Navigation assignNavigationListener(navigationViewOptions.navigationListener(), navigationViewModel); assignRouteListener(navigationViewOptions.routeListener()); assignBottomSheetCallback(navigationViewOptions.bottomSheetCallback()); - MapboxNavigation navigation = navigationViewModel.retrieveNavigation(); + MapLibreNavigation navigation = navigationViewModel.retrieveNavigation(); assignProgressChangeListener(navigationViewOptions, navigation); assignMilestoneEventListener(navigationViewOptions, navigation); assignInstructionListListener(navigationViewOptions.instructionListListener()); @@ -53,7 +53,7 @@ void initializeListeners(NavigationViewOptions navigationViewOptions, Navigation assignBannerInstructionsListener(navigationViewOptions.bannerInstructionsListener()); } - void onDestroy(@Nullable MapboxNavigation navigation) { + void onDestroy(@Nullable MapLibreNavigation navigation) { if (navigation != null) { removeProgressChangeListener(navigation); removeMilestoneEventListener(navigation); @@ -161,27 +161,27 @@ BannerInstructions onBannerDisplay(BannerInstructions instructions) { return instructions; } - private void assignProgressChangeListener(NavigationViewOptions navigationViewOptions, MapboxNavigation navigation) { + private void assignProgressChangeListener(NavigationViewOptions navigationViewOptions, MapLibreNavigation navigation) { this.progressChangeListener = navigationViewOptions.progressChangeListener(); if (progressChangeListener != null) { navigation.addProgressChangeListener(progressChangeListener); } } - private void assignMilestoneEventListener(NavigationViewOptions navigationViewOptions, MapboxNavigation navigation) { + private void assignMilestoneEventListener(NavigationViewOptions navigationViewOptions, MapLibreNavigation navigation) { this.milestoneEventListener = navigationViewOptions.milestoneEventListener(); if (milestoneEventListener != null) { navigation.addMilestoneEventListener(milestoneEventListener); } } - private void removeMilestoneEventListener(MapboxNavigation navigation) { + private void removeMilestoneEventListener(MapLibreNavigation navigation) { if (milestoneEventListener != null) { navigation.removeMilestoneEventListener(milestoneEventListener); } } - private void removeProgressChangeListener(MapboxNavigation navigation) { + private void removeProgressChangeListener(MapLibreNavigation navigation) { if (progressChangeListener != null) { navigation.removeProgressChangeListener(progressChangeListener); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java index c12437635..b46bc9a5c 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java @@ -19,7 +19,7 @@ import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayerProvider; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapLibreRouteFetcher; import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; @@ -27,8 +27,8 @@ import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationEventListener; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationTimeFormat; import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; @@ -58,7 +58,7 @@ public class NavigationViewModel extends AndroidViewModel { private final MutableLiveData shouldRecordScreenshot = new MutableLiveData<>(); private final MutableLiveData destination = new MutableLiveData<>(); - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private NavigationViewRouter router; private LocationEngineConductor locationEngineConductor; private NavigationViewEventDispatcher navigationViewEventDispatcher; @@ -88,7 +88,7 @@ public NavigationViewModel(Application application) { @TestOnly // Package private (no modifier) for testing purposes - NavigationViewModel(Application application, MapboxNavigation navigation, + NavigationViewModel(Application application, MapLibreNavigation navigation, MapConnectivityController connectivityController, NavigationViewRouter router) { super(application); @@ -99,7 +99,7 @@ public NavigationViewModel(Application application) { @TestOnly // Package private (no modifier) for testing purposes - NavigationViewModel(Application application, MapboxNavigation navigation, + NavigationViewModel(Application application, MapLibreNavigation navigation, LocationEngineConductor conductor, NavigationViewEventDispatcher dispatcher, SpeechPlayer speechPlayer) { super(application); this.navigation = navigation; @@ -131,12 +131,12 @@ public void setMuted(boolean isMuted) { /** - * Returns the current instance of {@link MapboxNavigation}. + * Returns the current instance of {@link MapLibreNavigation}. *

* Will be null if navigation has not been initialized. */ @Nullable - public MapboxNavigation retrieveNavigation() { + public MapLibreNavigation retrieveNavigation() { return navigation; } @@ -145,13 +145,13 @@ void initializeEventDispatcher(NavigationViewEventDispatcher navigationViewEvent } /** - * This method will pass {@link MapboxNavigationOptions} from the {@link NavigationViewOptions} - * to this view model to be used to initialize {@link MapboxNavigation}. + * This method will pass {@link MapLibreNavigationOptions} from the {@link NavigationViewOptions} + * to this view model to be used to initialize {@link MapLibreNavigation}. * * @param options to init MapboxNavigation */ void initialize(NavigationViewOptions options) { - MapboxNavigationOptions navigationOptions = options.navigationOptions(); + MapLibreNavigationOptions navigationOptions = options.navigationOptions(); navigationOptions = navigationOptions.toBuilder().isFromNavigationUi(true).build(); initializeLanguage(options); initializeTimeFormat(navigationOptions); @@ -236,7 +236,7 @@ MutableLiveData retrieveShouldRecordScreenshot() { } private void initializeRouter() { - MapboxRouteFetcher onlineRouter = new MapboxRouteFetcher(getApplication()); + MapLibreRouteFetcher onlineRouter = new MapLibreRouteFetcher(getApplication()); Context applicationContext = getApplication().getApplicationContext(); ConnectivityStatusProvider connectivityStatus = new ConnectivityStatusProvider(applicationContext); router = new NavigationViewRouter(onlineRouter, connectivityStatus, routeEngineListener); @@ -263,12 +263,12 @@ private String initializeUnitType(NavigationUiOptions options) { return unitType; } - private void initializeTimeFormat(MapboxNavigationOptions options) { + private void initializeTimeFormat(MapLibreNavigationOptions options) { timeFormatType = options.timeFormatType(); } private int initializeRoundingIncrement(NavigationViewOptions options) { - MapboxNavigationOptions navigationOptions = options.navigationOptions(); + MapLibreNavigationOptions navigationOptions = options.navigationOptions(); return navigationOptions.roundingIncrement(); } @@ -301,8 +301,8 @@ private LocationEngine initializeLocationEngineFrom(NavigationViewOptions option return locationEngineConductor.obtainLocationEngine(); } - private void initializeNavigation(Context context, MapboxNavigationOptions options, LocationEngine locationEngine) { - navigation = new MapboxNavigation(context, options, locationEngine); + private void initializeNavigation(Context context, MapLibreNavigationOptions options, LocationEngine locationEngine) { + navigation = new MapLibreNavigation(context, options, locationEngine); addNavigationListeners(); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java index 927870ed9..2b4de65a5 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewOptions.java @@ -15,7 +15,7 @@ import org.maplibre.android.location.engine.LocationEngine; import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import java.util.List; @@ -23,7 +23,7 @@ @AutoValue public abstract class NavigationViewOptions extends NavigationUiOptions { - public abstract MapboxNavigationOptions navigationOptions(); + public abstract MapLibreNavigationOptions navigationOptions(); @Nullable public abstract RouteListener routeListener(); @@ -71,7 +71,7 @@ public abstract static class Builder { public abstract Builder waynameChipEnabled(boolean waynameChipEnabled); - public abstract Builder navigationOptions(MapboxNavigationOptions navigationOptions); + public abstract Builder navigationOptions(MapLibreNavigationOptions navigationOptions); public abstract Builder routeListener(RouteListener routeListener); @@ -100,7 +100,7 @@ public abstract static class Builder { public static Builder builder() { return new AutoValue_NavigationViewOptions.Builder() - .navigationOptions(MapboxNavigationOptions.builder().build()) + .navigationOptions(MapLibreNavigationOptions.builder().build()) .shouldSimulateRoute(false) .waynameChipEnabled(true); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java index 88fddea16..566e7053d 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouter.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapLibreRouteFetcher; import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute; import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; @@ -19,7 +19,7 @@ class NavigationViewRouter implements RouteListener { - private final MapboxRouteFetcher onlineRouter; + private final MapLibreRouteFetcher onlineRouter; private final ConnectivityStatusProvider connectivityStatus; private final RouteComparator routeComparator; private final ViewRouteListener listener; @@ -29,7 +29,7 @@ class NavigationViewRouter implements RouteListener { private Location location; private RouteCallStatus callStatus; - NavigationViewRouter(MapboxRouteFetcher onlineRouter, ConnectivityStatusProvider connectivityStatus, + NavigationViewRouter(MapLibreRouteFetcher onlineRouter, ConnectivityStatusProvider connectivityStatus, ViewRouteListener listener) { this.onlineRouter = onlineRouter; this.connectivityStatus = connectivityStatus; @@ -39,7 +39,7 @@ class NavigationViewRouter implements RouteListener { } // Extra fields for testing purposes - NavigationViewRouter(MapboxRouteFetcher onlineRouter, + NavigationViewRouter(MapLibreRouteFetcher onlineRouter, ConnectivityStatusProvider connectivityStatus, RouteComparator routeComparator, ViewRouteListener listener, RouteCallStatus callStatus) { this.onlineRouter = onlineRouter; diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java index f31283804..a6f7a9676 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCamera.java @@ -22,7 +22,7 @@ import org.maplibre.android.location.OnLocationCameraTransitionListener; import org.maplibre.android.location.modes.CameraMode; import org.maplibre.android.maps.MapLibreMap; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.navigation.camera.Camera; import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; @@ -44,7 +44,7 @@ /** * Updates the map camera while navigating. *

- * This class listens to the progress of {@link MapboxNavigation} and moves + * This class listens to the progress of {@link MapLibreNavigation} and moves * the {@link MapLibreMap} camera based on the location updates. * * @since 0.6.0 @@ -80,7 +80,7 @@ public class NavigationCamera implements LifecycleObserver { = new NavigationCameraTrackingChangedListener(this); private MapLibreMap mapboxMap; private LocationComponent locationComponent; - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private RouteInformation currentRouteInformation; private RouteProgress currentRouteProgress; @TrackingMode @@ -107,7 +107,7 @@ public void onProgressChange(Location location, RouteProgress routeProgress) { * @param navigation for listening to location updates * @param locationComponent for managing camera mode */ - public NavigationCamera(@NonNull MapLibreMap mapboxMap, @NonNull MapboxNavigation navigation, + public NavigationCamera(@NonNull MapLibreMap mapboxMap, @NonNull MapLibreNavigation navigation, @NonNull LocationComponent locationComponent) { this.mapboxMap = mapboxMap; this.navigation = navigation; @@ -136,7 +136,7 @@ public NavigationCamera(@NonNull MapLibreMap mapboxMap, LocationComponent locati /** * Used for testing only. */ - NavigationCamera(MapLibreMap mapboxMap, MapboxNavigation navigation, ProgressChangeListener progressChangeListener, + NavigationCamera(MapLibreMap mapboxMap, MapLibreNavigation navigation, ProgressChangeListener progressChangeListener, LocationComponent locationComponent, RouteInformation currentRouteInformation) { this.mapboxMap = mapboxMap; this.locationComponent = locationComponent; @@ -295,14 +295,14 @@ public void onStop() { } /** - * This method can be called if you did not pass an instance of {@link MapboxNavigation} + * This method can be called if you did not pass an instance of {@link MapLibreNavigation} * to the constructor. *

* The camera will begin listening to progress updates and update the route accordingly. * * @param navigation to add the camera progress change listener */ - public void addProgressChangeListener(MapboxNavigation navigation) { + public void addProgressChangeListener(MapLibreNavigation navigation) { this.navigation = navigation; navigation.setCameraEngine(new DynamicCamera(mapboxMap)); navigation.addProgressChangeListener(progressChangeListener); @@ -386,7 +386,7 @@ void updateIsResetting(boolean isResetting) { this.isCameraResetting = isResetting; } - private void initializeWith(MapboxNavigation navigation) { + private void initializeWith(MapLibreNavigation navigation) { navigation.setCameraEngine(new DynamicCamera(mapboxMap)); updateCameraTrackingMode(trackingCameraMode); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java index 6ed04a85c..0745116a2 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/instruction/InstructionView.java @@ -49,7 +49,7 @@ import org.maplibre.navigation.android.navigation.v5.milestone.BannerInstructionMilestone; import org.maplibre.navigation.android.navigation.v5.milestone.Milestone; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; import org.maplibre.navigation.android.navigation.v5.offroute.OffRouteListener; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; @@ -69,7 +69,7 @@ * as the name of the destination / maneuver name / instruction based on what data is available *

* To automatically have this view update with information from - * {@link MapboxNavigation}, + * {@link MapLibreNavigation}, * add the view as a {@link ProgressChangeListener} and / or {@link OffRouteListener} * * @since 0.6.0 diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java index 916fdfe62..a804d958f 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/listeners/NavigationListener.java @@ -2,7 +2,7 @@ import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; /** * A listener that can be implemented and @@ -20,7 +20,7 @@ public interface NavigationListener { void onCancelNavigation(); /** - * Will be triggered when {@link MapboxNavigation} + * Will be triggered when {@link MapLibreNavigation} * has finished and the service is completely shut down. * * @since 0.8.0 @@ -28,7 +28,7 @@ public interface NavigationListener { void onNavigationFinished(); /** - * Will be triggered when {@link MapboxNavigation} + * Will be triggered when {@link MapLibreNavigation} * has been initialized and the user is navigating the given route. * * @since 0.8.0 diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java index f284dee86..14bfc15e2 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegate.java @@ -6,7 +6,7 @@ import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeChangedListener; import org.maplibre.navigation.android.navigation.ui.v5.camera.OnTrackingModeTransitionListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationConstants; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; @@ -23,7 +23,7 @@ class MapFpsDelegate implements OnTrackingModeChangedListener, OnTrackingModeTra private final MapView mapView; private final MapBatteryMonitor batteryMonitor; private final ProgressChangeListener fpsProgressListener = new FpsDelegateProgressChangeListener(this); - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private int maxFpsThreshold = DEFAULT_MAX_FPS_THRESHOLD; private boolean isTracking = true; private boolean isEnabled = true; @@ -51,7 +51,7 @@ public void onTransitionCancelled(int trackingMode) { updateCameraTracking(trackingMode); } - void addProgressChangeListener(MapboxNavigation navigation) { + void addProgressChangeListener(MapLibreNavigation navigation) { this.navigation = navigation; navigation.addProgressChangeListener(fpsProgressListener); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java index a9a905b3b..443b9a3e0 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapLayerInteractor.java @@ -14,7 +14,7 @@ import static org.maplibre.android.style.layers.PropertyFactory.lineColor; import static org.maplibre.android.style.layers.PropertyFactory.lineWidth; import static org.maplibre.android.style.layers.PropertyFactory.visibility; -import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap.STREETS_LAYER_ID; class MapLayerInteractor { diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java index 61fa7b162..5bf4bd614 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapWayName.java @@ -7,14 +7,14 @@ import org.maplibre.geojson.Feature; import org.maplibre.geojson.Point; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap.STREETS_LAYER_ID; +import static org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapLibreMap.STREETS_LAYER_ID; class MapWayName { @@ -25,7 +25,7 @@ class MapWayName { private WaynameFeatureFinder featureInteractor; private List currentStepPoints = new ArrayList<>(); private Location currentLocation = null; - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private boolean isAutoQueryEnabled; private FeatureFilterTask filterTask; private String wayName = EMPTY_CURRENT_WAY_NAME; @@ -61,7 +61,7 @@ void updateWayNameQueryMap(boolean isEnabled) { isAutoQueryEnabled = isEnabled; } - void addProgressChangeListener(MapboxNavigation navigation) { + void addProgressChangeListener(MapLibreNavigation navigation) { this.navigation = navigation; navigation.addProgressChangeListener(progressChangeListener); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java similarity index 93% rename from libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java index fd3c4fb12..d2a43fadc 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java @@ -33,7 +33,7 @@ import org.maplibre.android.style.sources.VectorSource; import org.maplibre.navigation.android.navigation.ui.v5.R; import org.maplibre.navigation.android.navigation.ui.v5.ThemeSwitcher; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -48,7 +48,7 @@ *

* These APIs include drawing a route line, camera animations, and more. */ -public class NavigationMapboxMap { +public class NavigationMapLibreMap { static final String STREETS_LAYER_ID = "streetsLayer"; private static final String MAPBOX_STREETS_V7_URL = "mapbox.mapbox-streets-v7"; @@ -86,7 +86,7 @@ public class NavigationMapboxMap { * @param mapView for map size and Context * @param mapboxMap for APIs to interact with the map */ - public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { + public NavigationMapLibreMap(@NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this.mapView = mapView; this.mapboxMap = mapboxMap; initializeLocationComponent(mapView, mapboxMap); @@ -99,35 +99,35 @@ public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapLibreMap mapbox } // Package private (no modifier) for testing purposes - NavigationMapboxMap(MapLayerInteractor layerInteractor) { + NavigationMapLibreMap(MapLayerInteractor layerInteractor) { this.layerInteractor = layerInteractor; } // Package private (no modifier) for testing purposes - NavigationMapboxMap(LocationComponent locationComponent) { + NavigationMapLibreMap(LocationComponent locationComponent) { this.locationComponent = locationComponent; } // Package private (no modifier) for testing purposes - NavigationMapboxMap(NavigationMapRoute mapRoute) { + NavigationMapLibreMap(NavigationMapRoute mapRoute) { this.mapRoute = mapRoute; } // Package private (no modifier) for testing purposes - NavigationMapboxMap(NavigationSymbolManager navigationSymbolManager) { + NavigationMapLibreMap(NavigationSymbolManager navigationSymbolManager) { this.navigationSymbolManager = navigationSymbolManager; } // Package private (no modifier) for testing purposes - NavigationMapboxMap(@NonNull MapWayName mapWayName, @NonNull MapFpsDelegate mapFpsDelegate) { + NavigationMapLibreMap(@NonNull MapWayName mapWayName, @NonNull MapFpsDelegate mapFpsDelegate) { this.mapWayName = mapWayName; this.mapFpsDelegate = mapFpsDelegate; } // Package private (no modifier) for testing purposes - NavigationMapboxMap(@NonNull MapWayName mapWayName, @NonNull MapFpsDelegate mapFpsDelegate, - NavigationMapRoute mapRoute, NavigationCamera mapCamera, - LocationFpsDelegate locationFpsDelegate) { + NavigationMapLibreMap(@NonNull MapWayName mapWayName, @NonNull MapFpsDelegate mapFpsDelegate, + NavigationMapRoute mapRoute, NavigationCamera mapCamera, + LocationFpsDelegate locationFpsDelegate) { this.mapWayName = mapWayName; this.mapFpsDelegate = mapFpsDelegate; this.mapRoute = mapRoute; @@ -136,7 +136,7 @@ public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapLibreMap mapbox } // Package private (no modifier) for testing purposes - NavigationMapboxMap(MapLibreMap mapboxMap, MapLayerInteractor layerInteractor, MapPaddingAdjustor adjustor) { + NavigationMapLibreMap(MapLibreMap mapboxMap, MapLayerInteractor layerInteractor, MapPaddingAdjustor adjustor) { this.layerInteractor = layerInteractor; initializeWayName(mapboxMap, adjustor); } @@ -149,7 +149,7 @@ public NavigationMapboxMap(@NonNull MapView mapView, @NonNull MapLibreMap mapbox * * @param context to retrieve the icon drawable from the theme * @param position the point at which the marker will be placed - * @deprecated Use {@link NavigationMapboxMap#addDestinationMarker(Point)} instead. + * @deprecated Use {@link NavigationMapLibreMap#addDestinationMarker(Point)} instead. * A {@link Context} is no longer needed. */ @Deprecated @@ -172,7 +172,7 @@ public void addDestinationMarker(Point position) { /** * Adds a custom marker to the map based on the options provided. *

- * Please note, the map will manage all markers added. Calling {@link NavigationMapboxMap#clearMarkers()} + * Please note, the map will manage all markers added. Calling {@link NavigationMapLibreMap#clearMarkers()} * will clear all destination / custom markers that have been added to the map. * * @param options for the custom {@link org.maplibre.android.plugins.annotation.Symbol} @@ -267,11 +267,11 @@ public void updateLocationLayerRenderMode(@RenderMode.Mode int renderMode) { * Can be used to automatically drive the map camera / route updates and arrow * once navigation has started. *

- * These will automatically be removed in {@link MapboxNavigation#onDestroy()}. + * These will automatically be removed in {@link MapLibreNavigation#onDestroy()}. * * @param navigation to add the progress listeners */ - public void addProgressChangeListener(@NonNull MapboxNavigation navigation) { + public void addProgressChangeListener(@NonNull MapLibreNavigation navigation) { initializeWayName(mapboxMap, mapPaddingAdjustor); initializeFpsDelegate(mapView); mapRoute.addProgressChangeListener(navigation); @@ -284,8 +284,8 @@ public void addProgressChangeListener(@NonNull MapboxNavigation navigation) { * Can be used to store the current state of the map in * {@link FragmentActivity#onSaveInstanceState(Bundle, PersistableBundle)}. *

- * This method uses {@link NavigationMapboxMapInstanceState}, stored with the provided key. This key - * can also later be used to extract the {@link NavigationMapboxMapInstanceState}. + * This method uses {@link NavigationMapLibreMapInstanceState}, stored with the provided key. This key + * can also later be used to extract the {@link NavigationMapLibreMapInstanceState}. * * @param key used to store the state * @param outState to store state variables @@ -295,22 +295,22 @@ public void saveStateWith(String key, Bundle outState) { settings.updateShouldUseDefaultPadding(mapPaddingAdjustor.isUsingDefault()); settings.updateCameraTrackingMode(mapCamera.getCameraTrackingMode()); settings.updateLocationFpsEnabled(locationFpsDelegate.isEnabled()); - NavigationMapboxMapInstanceState instanceState = new NavigationMapboxMapInstanceState(settings); + NavigationMapLibreMapInstanceState instanceState = new NavigationMapLibreMapInstanceState(settings); outState.putParcelable(key, instanceState); } /** - * Can be used to restore a {@link NavigationMapboxMap} after it has been initialized. + * Can be used to restore a {@link NavigationMapLibreMap} after it has been initialized. *

* This cannot be called in {@link FragmentActivity#onRestoreInstanceState(Bundle)} * because we cannot guarantee the map is re-initialized at that point. *

- * You can extract the {@link NavigationMapboxMapInstanceState} in onRestoreInstanceState and then + * You can extract the {@link NavigationMapLibreMapInstanceState} in onRestoreInstanceState and then * restore the map once it's ready. * * @param instanceState to extract state variables */ - public void restoreFrom(NavigationMapboxMapInstanceState instanceState) { + public void restoreFrom(NavigationMapLibreMapInstanceState instanceState) { settings = instanceState.retrieveSettings(); restoreMapWith(settings); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapInstanceState.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapInstanceState.java new file mode 100644 index 000000000..85fa5abeb --- /dev/null +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapInstanceState.java @@ -0,0 +1,44 @@ +package org.maplibre.navigation.android.navigation.ui.v5.map; + +import android.os.Parcel; +import android.os.Parcelable; + +public class NavigationMapLibreMapInstanceState implements Parcelable { + + private final NavigationMapSettings settings; + + NavigationMapLibreMapInstanceState(NavigationMapSettings settings) { + this.settings = settings; + } + + NavigationMapSettings retrieveSettings() { + return settings; + } + + private NavigationMapLibreMapInstanceState(Parcel in) { + settings = in.readParcelable(NavigationMapSettings.class.getClassLoader()); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeParcelable(settings, flags); + } + + @Override + public int describeContents() { + return 0; + } + + public static final Creator CREATOR = + new Creator() { + @Override + public NavigationMapLibreMapInstanceState createFromParcel(Parcel in) { + return new NavigationMapLibreMapInstanceState(in); + } + + @Override + public NavigationMapLibreMapInstanceState[] newArray(int size) { + return new NavigationMapLibreMapInstanceState[size]; + } + }; +} diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java deleted file mode 100644 index 6ab561d88..000000000 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapInstanceState.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.maplibre.navigation.android.navigation.ui.v5.map; - -import android.os.Parcel; -import android.os.Parcelable; - -public class NavigationMapboxMapInstanceState implements Parcelable { - - private final NavigationMapSettings settings; - - NavigationMapboxMapInstanceState(NavigationMapSettings settings) { - this.settings = settings; - } - - NavigationMapSettings retrieveSettings() { - return settings; - } - - private NavigationMapboxMapInstanceState(Parcel in) { - settings = in.readParcelable(NavigationMapSettings.class.getClassLoader()); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelable(settings, flags); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = - new Creator() { - @Override - public NavigationMapboxMapInstanceState createFromParcel(Parcel in) { - return new NavigationMapboxMapInstanceState(in); - } - - @Override - public NavigationMapboxMapInstanceState[] newArray(int size) { - return new NavigationMapboxMapInstanceState[size]; - } - }; -} diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java index 809208e85..80d885edb 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/OnWayNameChangedListener.java @@ -5,8 +5,8 @@ import org.maplibre.navigation.android.navigation.ui.v5.NavigationView; /** - * A listener that can be added to the {@link NavigationMapboxMap} with - * {@link NavigationMapboxMap#addOnWayNameChangedListener(OnWayNameChangedListener)}. + * A listener that can be added to the {@link NavigationMapLibreMap} with + * {@link NavigationMapLibreMap#addOnWayNameChangedListener(OnWayNameChangedListener)}. *

* This listener is triggered when a new way name is found along the route. It will be triggered * regardless of the map way name visibility diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java similarity index 98% rename from libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java rename to libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java index 0bc387493..083089e96 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapboxRouteFetcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java @@ -30,7 +30,7 @@ * This class can be used to fetch new routes given a {@link Location} origin and * {@link RouteOptions} provided by a {@link RouteProgress}. */ -public class MapboxRouteFetcher extends RouteFetcher { +public class MapLibreRouteFetcher extends RouteFetcher { private static final double BEARING_TOLERANCE = 90d; private static final String SEMICOLON = ";"; @@ -45,7 +45,7 @@ public class MapboxRouteFetcher extends RouteFetcher { private NavigationRoute navigationRoute; - public MapboxRouteFetcher(Context context) { + public MapLibreRouteFetcher(Context context) { contextWeakReference = new WeakReference<>(context); routeUtils = new RouteUtils(); } @@ -153,7 +153,7 @@ public void cancelRouteCall() { /** * Executes the given NavigationRoute builder, eventually triggering - * any {@link RouteListener} that has been added via {@link MapboxRouteFetcher#addRouteListener(RouteListener)}. + * any {@link RouteListener} that has been added via {@link MapLibreRouteFetcher#addRouteListener(RouteListener)}. * * @param builder to be executed */ diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java index e223e90b0..5c828ee0b 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRoute.java @@ -18,7 +18,7 @@ import org.maplibre.android.maps.MapLibreMap; import org.maplibre.android.maps.Style; import org.maplibre.navigation.android.navigation.ui.v5.R; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import java.util.ArrayList; import java.util.List; @@ -51,7 +51,7 @@ public class NavigationMapRoute implements LifecycleObserver { private boolean isMapClickListenerAdded = false; private MapView.OnDidFinishLoadingStyleListener didFinishLoadingStyleListener; private boolean isDidFinishLoadingStyleListenerAdded = false; - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private MapRouteLine routeLine; private MapRouteArrow routeArrow; @@ -82,13 +82,13 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxM /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @since 0.4.0 */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -96,14 +96,14 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param belowLayer optionally pass in a layer id to place the route line below * @since 0.4.0 */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -111,13 +111,13 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param styleRes a style resource with custom route colors, scale, etc. */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes) { this(navigation, mapView, mapboxMap, styleRes, null); } @@ -125,14 +125,14 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param styleRes a style resource with custom route colors, scale, etc. * @param belowLayer optionally pass in a layer id to place the route line below */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer) { this.styleRes = styleRes; @@ -149,7 +149,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie } // For testing only - NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, MapRouteClickListener mapClickListener, MapView.OnDidFinishLoadingStyleListener didFinishLoadingStyleListener, @@ -166,7 +166,7 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie } // For testing only - NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer, MapRouteClickListener mapClickListener, MapView.OnDidFinishLoadingStyleListener didFinishLoadingStyleListener, @@ -273,26 +273,26 @@ public void showAlternativeRoutes(boolean alternativesVisible) { /** * This method will allow this class to listen to new routes based on - * the progress updates from {@link MapboxNavigation}. + * the progress updates from {@link MapLibreNavigation}. *

- * If a new route is given to {@link MapboxNavigation#startNavigation(DirectionsRoute)}, this + * If a new route is given to {@link MapLibreNavigation#startNavigation(DirectionsRoute)}, this * class will automatically draw the new route. * * @param navigation to add the progress change listener */ - public void addProgressChangeListener(MapboxNavigation navigation) { + public void addProgressChangeListener(MapLibreNavigation navigation) { this.navigation = navigation; navigation.addProgressChangeListener(mapRouteProgressChangeListener); } /** - * Should be called if {@link NavigationMapRoute#addProgressChangeListener(MapboxNavigation)} was + * Should be called if {@link NavigationMapRoute#addProgressChangeListener(MapLibreNavigation)} was * called to prevent leaking. * * @param navigation to remove the progress change listener */ - public void removeProgressChangeListener(MapboxNavigation navigation) { + public void removeProgressChangeListener(MapLibreNavigation navigation) { if (navigation != null) { navigation.removeProgressChangeListener(mapRouteProgressChangeListener); } diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java index 3789dce73..7ec370cf0 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java @@ -11,7 +11,7 @@ import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.navigation.android.navigation.v5.models.RouteOptions; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; import org.maplibre.navigation.android.navigation.v5.utils.TextUtils; @@ -32,7 +32,7 @@ * The NavigationRoute class wraps the {@link MapboxDirections} class with parameters which * must be set inorder for a navigation session to successfully begin. While it is possible * to pass in any {@link DirectionsRoute} into - * {@link MapboxNavigation#startNavigation(DirectionsRoute)}, using this class will ensure your + * {@link MapLibreNavigation#startNavigation(DirectionsRoute)}, using this class will ensure your * request includes all the proper information needed for the navigation session to begin. *

*

diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java index 82a4e238e..43843595c 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewEventDispatcherTest.java @@ -10,9 +10,6 @@ import androidx.annotation.NonNull; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewEventDispatcher; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewOptions; import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; @@ -23,7 +20,7 @@ import org.maplibre.navigation.android.navigation.ui.v5.listeners.SpeechAnnouncementListener; import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechAnnouncement; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; import org.junit.Test; @@ -266,7 +263,7 @@ public void onProgressChangeListenerAddedInOptions_isAddedToNavigation() { NavigationViewOptions options = mock(NavigationViewOptions.class); ProgressChangeListener progressChangeListener = setupProgressChangeListener(options); NavigationViewModel navigationViewModel = mock(NavigationViewModel.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); when(navigationViewModel.retrieveNavigation()).thenReturn(navigation); eventDispatcher.initializeListeners(options, navigationViewModel); @@ -280,7 +277,7 @@ public void onProgressChangeListenerAddedInOptions_isRemovedInOnDestroy() { NavigationViewOptions options = mock(NavigationViewOptions.class); ProgressChangeListener progressChangeListener = setupProgressChangeListener(options); NavigationViewModel navigationViewModel = mock(NavigationViewModel.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); when(navigationViewModel.retrieveNavigation()).thenReturn(navigation); eventDispatcher.initializeListeners(options, navigationViewModel); @@ -295,7 +292,7 @@ public void onMilestoneEventListenerAddedInOptions_isAddedToNavigation() { NavigationViewOptions options = mock(NavigationViewOptions.class); MilestoneEventListener milestoneEventListener = setupMilestoneEventListener(options); NavigationViewModel navigationViewModel = mock(NavigationViewModel.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); when(navigationViewModel.retrieveNavigation()).thenReturn(navigation); eventDispatcher.initializeListeners(options, navigationViewModel); @@ -309,7 +306,7 @@ public void onMilestoneEventListenerAddedInOptions_isRemovedInOnDestroy() { NavigationViewOptions options = mock(NavigationViewOptions.class); MilestoneEventListener milestoneEventListener = setupMilestoneEventListener(options); NavigationViewModel navigationViewModel = mock(NavigationViewModel.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); when(navigationViewModel.retrieveNavigation()).thenReturn(navigation); eventDispatcher.initializeListeners(options, navigationViewModel); diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java index e8a285bba..89393552f 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java @@ -9,14 +9,9 @@ import android.app.Application; -import org.maplibre.navigation.android.navigation.ui.v5.LocationEngineConductor; -import org.maplibre.navigation.android.navigation.ui.v5.MapConnectivityController; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewEventDispatcher; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewModel; -import org.maplibre.navigation.android.navigation.ui.v5.NavigationViewRouter; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.navigation.android.navigation.ui.v5.voice.SpeechPlayer; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,7 +23,7 @@ public class NavigationViewModelTest { @Test public void stopNavigation_progressListenersAreRemoved() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); @@ -41,7 +36,7 @@ public void stopNavigation_progressListenersAreRemoved() { @Test public void stopNavigation_milestoneListenersAreRemoved() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); @@ -54,7 +49,7 @@ public void stopNavigation_milestoneListenersAreRemoved() { @Test public void stopNavigation_mapOfflineManagerOnDestroyIsCalledIfNotNull() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); @@ -65,7 +60,7 @@ public void stopNavigation_mapOfflineManagerOnDestroyIsCalledIfNotNull() { @Test public void updateRoute_navigationIsNotUpdatedWhenChangingConfigurations() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); DirectionsRoute route = mock(DirectionsRoute.class); MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); @@ -80,7 +75,7 @@ public void updateRoute_navigationIsNotUpdatedWhenChangingConfigurations() { @Test public void navigationRouter_onDestroyInvokedWhenViewModelIsDestroyed() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter mockedRouter = mock(NavigationViewRouter.class); NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, mockedRouter); @@ -91,7 +86,7 @@ public void navigationRouter_onDestroyInvokedWhenViewModelIsDestroyed() { @Test public void updateRoute_navigationIsUpdated() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); LocationEngineConductor conductor = mock(LocationEngineConductor.class); NavigationViewEventDispatcher dispatcher = mock(NavigationViewEventDispatcher.class); SpeechPlayer speechPlayer = mock(SpeechPlayer.class); @@ -109,7 +104,7 @@ public void updateRoute_navigationIsUpdated() { @Test public void isMuted_falseWithNullSpeechPlayer() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); LocationEngineConductor conductor = mock(LocationEngineConductor.class); NavigationViewEventDispatcher dispatcher = mock(NavigationViewEventDispatcher.class); SpeechPlayer speechPlayer = null; @@ -125,7 +120,7 @@ public void isMuted_falseWithNullSpeechPlayer() { @Test public void isMuted_trueWithMutedSpeechPlayer() { Application application = mock(Application.class); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); LocationEngineConductor conductor = mock(LocationEngineConductor.class); NavigationViewEventDispatcher dispatcher = mock(NavigationViewEventDispatcher.class); SpeechPlayer speechPlayer = mock(SpeechPlayer.class); diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java index f237917af..0cd37ee48 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewRouterTest.java @@ -24,7 +24,7 @@ import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.junit.Test; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapboxRouteFetcher; +import org.maplibre.navigation.android.navigation.ui.v5.route.MapLibreRouteFetcher; import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationRoute; import java.io.IOException; @@ -94,7 +94,7 @@ public void onErrorReceived_errorListenerIsTriggered() { @Test public void findRouteFrom_fastConnectionGoesToOnline() { - MapboxRouteFetcher onlineRouter = mock(MapboxRouteFetcher.class); + MapLibreRouteFetcher onlineRouter = mock(MapLibreRouteFetcher.class); NavigationRoute.Builder builder = mock(NavigationRoute.Builder.class); when(onlineRouter.buildRequest(any(Location.class), any(RouteProgress.class))).thenReturn(builder); ConnectivityStatusProvider status = mock(ConnectivityStatusProvider.class); @@ -116,7 +116,7 @@ public void findRouteFrom_fastConnectionGoesToOnline() { @Test public void findRouteFrom_secondRequestIgnored() { - MapboxRouteFetcher onlineRouter = mock(MapboxRouteFetcher.class); + MapLibreRouteFetcher onlineRouter = mock(MapLibreRouteFetcher.class); NavigationRoute.Builder builder = mock(NavigationRoute.Builder.class); when(onlineRouter.buildRequest(any(Location.class), any(RouteProgress.class))).thenReturn(builder); ConnectivityStatusProvider status = mock(ConnectivityStatusProvider.class); @@ -136,7 +136,7 @@ public void findRouteFrom_secondRequestIgnored() { @Test public void onDestroy_clearsListeners() { - MapboxRouteFetcher onlineRouter = mock(MapboxRouteFetcher.class); + MapLibreRouteFetcher onlineRouter = mock(MapLibreRouteFetcher.class); NavigationViewRouter router = new NavigationViewRouter( onlineRouter, mock(ConnectivityStatusProvider.class), @@ -152,7 +152,7 @@ public void onDestroy_clearsListeners() { @Test public void onDestroy_cancelsOnlineRouteCall() { - MapboxRouteFetcher onlineRouter = mock(MapboxRouteFetcher.class); + MapLibreRouteFetcher onlineRouter = mock(MapLibreRouteFetcher.class); NavigationViewRouter router = new NavigationViewRouter( onlineRouter, mock(ConnectivityStatusProvider.class), @@ -168,7 +168,7 @@ public void onDestroy_cancelsOnlineRouteCall() { @NonNull private NavigationViewRouter buildRouteEngine(ViewRouteListener routeEngineListener) { - return new NavigationViewRouter(mock(MapboxRouteFetcher.class), mock(ConnectivityStatusProvider.class), + return new NavigationViewRouter(mock(MapLibreRouteFetcher.class), mock(ConnectivityStatusProvider.class), routeEngineListener); } diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java index da7f29c1a..d222b551e 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/camera/NavigationCameraTest.java @@ -8,7 +8,7 @@ import org.maplibre.android.maps.MapLibreMap; import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.navigation.camera.RouteInformation; import org.maplibre.navigation.android.navigation.v5.routeprogress.ProgressChangeListener; @@ -89,7 +89,7 @@ public void onResetCamera_trackingIsResumed() { public void onResetCamera_dynamicCameraIsReset() { MapLibreMap mapboxMap = mock(MapLibreMap.class); when(mapboxMap.getCameraPosition()).thenReturn(mock(CameraPosition.class)); - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); DynamicCamera dynamicCamera = mock(DynamicCamera.class); when(navigation.getCameraEngine()).thenReturn(dynamicCamera); RouteInformation currentRouteInformation = mock(RouteInformation.class); @@ -102,7 +102,7 @@ public void onResetCamera_dynamicCameraIsReset() { @Test public void onStartWithNullRoute_progressListenerIsAdded() { - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); ProgressChangeListener listener = mock(ProgressChangeListener.class); NavigationCamera camera = buildCamera(navigation, listener); @@ -113,7 +113,7 @@ public void onStartWithNullRoute_progressListenerIsAdded() { @Test public void onResumeWithNullLocation_progressListenerIsAdded() { - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); ProgressChangeListener listener = mock(ProgressChangeListener.class); NavigationCamera camera = buildCamera(navigation, listener); @@ -189,23 +189,23 @@ public void update_overrideSetsLocationComponentCameraModeNone() { } private NavigationCamera buildCamera() { - return new NavigationCamera(mock(MapLibreMap.class), mock(MapboxNavigation.class), mock(LocationComponent.class)); + return new NavigationCamera(mock(MapLibreMap.class), mock(MapLibreNavigation.class), mock(LocationComponent.class)); } private NavigationCamera buildCamera(MapLibreMap mapboxMap) { - return new NavigationCamera(mapboxMap, mock(MapboxNavigation.class), mock(LocationComponent.class)); + return new NavigationCamera(mapboxMap, mock(MapLibreNavigation.class), mock(LocationComponent.class)); } private NavigationCamera buildCamera(LocationComponent locationComponent) { - return new NavigationCamera(mock(MapLibreMap.class), mock(MapboxNavigation.class), locationComponent); + return new NavigationCamera(mock(MapLibreMap.class), mock(MapLibreNavigation.class), locationComponent); } - private NavigationCamera buildCamera(MapboxNavigation navigation, ProgressChangeListener listener) { + private NavigationCamera buildCamera(MapLibreNavigation navigation, ProgressChangeListener listener) { return new NavigationCamera(mock(MapLibreMap.class), navigation, listener, mock(LocationComponent.class), mock(RouteInformation.class)); } - private NavigationCamera buildCamera(MapLibreMap mapboxMap, MapboxNavigation navigation, + private NavigationCamera buildCamera(MapLibreMap mapboxMap, MapLibreNavigation navigation, RouteInformation routeInformation) { return new NavigationCamera(mapboxMap, navigation, mock(ProgressChangeListener.class), mock(LocationComponent.class), routeInformation); diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java index 5722651f7..770ee434c 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/MapFpsDelegateTest.java @@ -2,14 +2,11 @@ import android.content.Context; -import org.maplibre.navigation.android.navigation.ui.v5.map.FpsDelegateProgressChangeListener; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapBatteryMonitor; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapFpsDelegate; import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.navigation.android.navigation.v5.models.StepManeuver; import org.maplibre.android.maps.MapView; import org.maplibre.navigation.android.navigation.ui.v5.camera.NavigationCamera; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteStepProgress; @@ -26,7 +23,7 @@ public class MapFpsDelegateTest { @Test public void addProgressChangeListener_navigationReceivesListener() { - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapFpsDelegate delegate = new MapFpsDelegate(mock(MapView.class), mock(MapBatteryMonitor.class)); delegate.addProgressChangeListener(navigation); @@ -56,7 +53,7 @@ public void onTransitionCancelled_resetFpsWhenNotTracking() { @Test public void onStop_navigationListenerRemoved() { - MapboxNavigation navigation = mock(MapboxNavigation.class); + MapLibreNavigation navigation = mock(MapLibreNavigation.class); MapFpsDelegate delegate = new MapFpsDelegate(mock(MapView.class), mock(MapBatteryMonitor.class)); delegate.addProgressChangeListener(navigation); diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapTest.java similarity index 80% rename from libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java rename to libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapTest.java index f1e9579c0..16e149ef4 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapboxMapTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMapTest.java @@ -1,13 +1,5 @@ package org.maplibre.navigation.android.navigation.ui.v5.map; -import org.maplibre.navigation.android.navigation.ui.v5.map.LocationFpsDelegate; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapFpsDelegate; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapLayerInteractor; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapPaddingAdjustor; -import org.maplibre.navigation.android.navigation.ui.v5.map.MapWayName; -import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationMapboxMap; -import org.maplibre.navigation.android.navigation.ui.v5.map.NavigationSymbolManager; -import org.maplibre.navigation.android.navigation.ui.v5.map.OnWayNameChangedListener; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.Point; import org.maplibre.android.location.LocationComponent; @@ -33,12 +25,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class NavigationMapboxMapTest { +public class NavigationMapLibreMapTest { @Test public void updateIncidentsVisibility_layerIdentifierIsClosures() { MapLayerInteractor mockedMapLayerInteractor = mock(MapLayerInteractor.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mockedMapLayerInteractor); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mockedMapLayerInteractor); boolean anyVisibility = true; theNavigationMap.updateIncidentsVisibility(anyVisibility); @@ -49,7 +41,7 @@ public void updateIncidentsVisibility_layerIdentifierIsClosures() { @Test public void isIncidentsVisible_layerIdentifierIsClosures() { MapLayerInteractor mockedMapLayerInteractor = mock(MapLayerInteractor.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mockedMapLayerInteractor); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mockedMapLayerInteractor); theNavigationMap.isIncidentsVisible(); @@ -59,7 +51,7 @@ public void isIncidentsVisible_layerIdentifierIsClosures() { @Test public void updateTrafficVisibility_layerIdentifierIsTraffic() { MapLayerInteractor mockedMapLayerInteractor = mock(MapLayerInteractor.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mockedMapLayerInteractor); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mockedMapLayerInteractor); boolean anyVisibility = false; theNavigationMap.updateTrafficVisibility(anyVisibility); @@ -70,7 +62,7 @@ public void updateTrafficVisibility_layerIdentifierIsTraffic() { @Test public void isTrafficVisible_layerIdentifierIsTraffic() { MapLayerInteractor mockedMapLayerInteractor = mock(MapLayerInteractor.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mockedMapLayerInteractor); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mockedMapLayerInteractor); theNavigationMap.isTrafficVisible(); @@ -80,7 +72,7 @@ public void isTrafficVisible_layerIdentifierIsTraffic() { @Test public void updateRenderMode_locationComponentIsUpdatedWithRenderMode() { LocationComponent locationComponent = mock(LocationComponent.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(locationComponent); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(locationComponent); int renderMode = RenderMode.GPS; theNavigationMap.updateLocationLayerRenderMode(renderMode); @@ -91,7 +83,7 @@ public void updateRenderMode_locationComponentIsUpdatedWithRenderMode() { @Test public void drawRoutes_mapRoutesAreAdded() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapRoute); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapRoute); List routes = new ArrayList<>(); theNavigationMap.drawRoutes(routes); @@ -102,7 +94,7 @@ public void drawRoutes_mapRoutesAreAdded() { @Test public void setOnRouteSelectionChangeListener_listenerIsSet() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapRoute); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapRoute); OnRouteSelectionChangeListener listener = mock(OnRouteSelectionChangeListener.class); theNavigationMap.setOnRouteSelectionChangeListener(listener); @@ -113,7 +105,7 @@ public void setOnRouteSelectionChangeListener_listenerIsSet() { @Test public void showAlternativeRoutes_correctVisibilityIsSet() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapRoute); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapRoute); boolean notVisible = false; theNavigationMap.showAlternativeRoutes(notVisible); @@ -125,7 +117,7 @@ public void showAlternativeRoutes_correctVisibilityIsSet() { public void addOnWayNameChangedListener_listenerIsAddedToMapWayname() { MapWayName mapWayName = mock(MapWayName.class); MapFpsDelegate mapFpsDelegate = mock(MapFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate); OnWayNameChangedListener listener = mock(OnWayNameChangedListener.class); boolean isAdded = theNavigationMap.addOnWayNameChangedListener(listener); @@ -137,7 +129,7 @@ public void addOnWayNameChangedListener_listenerIsAddedToMapWayname() { public void removeOnWayNameChangedListener_listenerIsRemovedFromMapWayname() { MapWayName mapWayName = mock(MapWayName.class); MapFpsDelegate mapFpsDelegate = mock(MapFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate); OnWayNameChangedListener listener = mock(OnWayNameChangedListener.class); theNavigationMap.addOnWayNameChangedListener(listener); @@ -150,7 +142,7 @@ public void removeOnWayNameChangedListener_listenerIsRemovedFromMapWayname() { public void updateMapFpsThrottle_mapFpsDelegateIsUpdated() { MapWayName mapWayName = mock(MapWayName.class); MapFpsDelegate mapFpsDelegate = mock(MapFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate); int maxFpsThreshold = 10; theNavigationMap.updateMapFpsThrottle(maxFpsThreshold); @@ -162,7 +154,7 @@ public void updateMapFpsThrottle_mapFpsDelegateIsUpdated() { public void updateMapFpsThrottleEnabled_mapFpsDelegateIsEnabled() { MapWayName mapWayName = mock(MapWayName.class); MapFpsDelegate mapFpsDelegate = mock(MapFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate); + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate); boolean isEnabled = false; theNavigationMap.updateMapFpsThrottleEnabled(isEnabled); @@ -177,7 +169,7 @@ public void onStart_mapFpsOnStartIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStart(); @@ -192,7 +184,7 @@ public void onStop_mapFpsOnStopIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStop(); @@ -207,7 +199,7 @@ public void onStart_mapWayNameOnStartIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStart(); @@ -222,7 +214,7 @@ public void onStop_mapWayNameOnStopIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStop(); @@ -241,7 +233,7 @@ public void onInitializeWayName_existingV7StreetSourceIsUsed() { MapLayerInteractor layerInteractor = mock(MapLayerInteractor.class); MapPaddingAdjustor adjustor = mock(MapPaddingAdjustor.class); - new NavigationMapboxMap(mapboxMap, layerInteractor, adjustor); + new NavigationMapLibreMap(mapboxMap, layerInteractor, adjustor); verify(layerInteractor).addStreetsLayer("composite", "road_label"); } @@ -253,7 +245,7 @@ public void updateLocationFpsThrottleEnabled_locationFpsUpdateEnabledIsSet() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.updateLocationFpsThrottleEnabled(false); @@ -268,7 +260,7 @@ public void onStart_locationFpsUpdateOnStartIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStart(); @@ -283,7 +275,7 @@ public void onStop_locationFpsUpdateOnStopIsCalled() { NavigationMapRoute mapRoute = mock(NavigationMapRoute.class); NavigationCamera mapCamera = mock(NavigationCamera.class); LocationFpsDelegate locationFpsDelegate = mock(LocationFpsDelegate.class); - NavigationMapboxMap theNavigationMap = new NavigationMapboxMap(mapWayName, mapFpsDelegate, + NavigationMapLibreMap theNavigationMap = new NavigationMapLibreMap(mapWayName, mapFpsDelegate, mapRoute, mapCamera, locationFpsDelegate); theNavigationMap.onStop(); @@ -302,7 +294,7 @@ public void onInitializeWayName_exisitingV8StreetSourceIsUsed() { MapLayerInteractor layerInteractor = mock(MapLayerInteractor.class); MapPaddingAdjustor adjustor = mock(MapPaddingAdjustor.class); - new NavigationMapboxMap(mapboxMap, layerInteractor, adjustor); + new NavigationMapLibreMap(mapboxMap, layerInteractor, adjustor); verify(layerInteractor).addStreetsLayer("composite", "road"); } @@ -311,7 +303,7 @@ public void onInitializeWayName_exisitingV8StreetSourceIsUsed() { public void addDestinationMarker_navigationSymbolManagerReceivesPosition() { Point position = mock(Point.class); NavigationSymbolManager navigationSymbolManager = mock(NavigationSymbolManager.class); - NavigationMapboxMap map = new NavigationMapboxMap(navigationSymbolManager); + NavigationMapLibreMap map = new NavigationMapLibreMap(navigationSymbolManager); map.addDestinationMarker(position); @@ -322,7 +314,7 @@ public void addDestinationMarker_navigationSymbolManagerReceivesPosition() { public void addCustomMarker_navigationSymbolManagerReceivesOptions() { SymbolOptions options = mock(SymbolOptions.class); NavigationSymbolManager navigationSymbolManager = mock(NavigationSymbolManager.class); - NavigationMapboxMap map = new NavigationMapboxMap(navigationSymbolManager); + NavigationMapLibreMap map = new NavigationMapLibreMap(navigationSymbolManager); map.addCustomMarker(options); diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java index a0927fe7a..45d30412f 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationMapRouteTest.java @@ -5,15 +5,10 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteArrow; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteClickListener; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteLine; -import org.maplibre.navigation.android.navigation.ui.v5.route.MapRouteProgressChangeListener; -import org.maplibre.navigation.android.navigation.ui.v5.route.NavigationMapRoute; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.android.maps.MapView; import org.maplibre.android.maps.MapLibreMap; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.junit.Test; @@ -24,7 +19,7 @@ public class NavigationMapRouteTest { @Test public void checksMapClickListenerIsAddedAtConstructionTime() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -41,7 +36,7 @@ public void checksMapClickListenerIsAddedAtConstructionTime() { @Test public void checksDidFinishLoadingStyleListenerIsAddedAtConstructionTime() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -59,7 +54,7 @@ public void checksDidFinishLoadingStyleListenerIsAddedAtConstructionTime() { @Test public void checksMapRouteProgressChangeListenerIsAddedAtConstructionTime() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -77,7 +72,7 @@ public void checksMapRouteProgressChangeListenerIsAddedAtConstructionTime() { @Test public void checksMapClickListenerIsNotAddedIfIsMapClickListenerAdded() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -96,7 +91,7 @@ public void checksMapClickListenerIsNotAddedIfIsMapClickListenerAdded() { @Test public void checksDidFinishLoadingStyleListenerIsNotAddedIfIsDidFinishLoadingStyleListenerAdded() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -116,7 +111,7 @@ public void checksDidFinishLoadingStyleListenerIsNotAddedIfIsDidFinishLoadingSty @Test public void checksMapClickListenerIsRemovedInOnStop() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -135,7 +130,7 @@ public void checksMapClickListenerIsRemovedInOnStop() { @Test public void checksDidFinishLoadingStyleListenerIsRemovedInOnStop() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -155,7 +150,7 @@ public void checksDidFinishLoadingStyleListenerIsRemovedInOnStop() { @Test public void checksMapRouteProgressChangeListenerIsRemovedInOnStop() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -175,7 +170,7 @@ public void checksMapRouteProgressChangeListenerIsRemovedInOnStop() { @Test public void addProgressChangeListener_mapRouteProgressChangeListenerIsAdded() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -197,7 +192,7 @@ public void addProgressChangeListener_mapRouteProgressChangeListenerIsAdded() { @Test public void removeProgressChangeListener_mapRouteProgressChangeListenerIsRemoved() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -219,7 +214,7 @@ public void removeProgressChangeListener_mapRouteProgressChangeListenerIsRemoved @Test public void addRoutes_mapRouteProgressChangeListenerIsAdded() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -241,7 +236,7 @@ public void addRoutes_mapRouteProgressChangeListenerIsAdded() { @Test public void updateRouteVisibilityTo_routeLineVisibilityIsUpdated() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -263,7 +258,7 @@ public void updateRouteVisibilityTo_routeLineVisibilityIsUpdated() { @Test public void removeRoute_routeLineVisibilityIsUpdated() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -284,7 +279,7 @@ public void removeRoute_routeLineVisibilityIsUpdated() { @Test public void removeRoute_routeArrowVisibilityIsUpdated() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -305,7 +300,7 @@ public void removeRoute_routeArrowVisibilityIsUpdated() { @Test public void updateRouteVisibilityTo_progressChangeVisibilityIsUpdated() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -327,7 +322,7 @@ public void updateRouteVisibilityTo_progressChangeVisibilityIsUpdated() { @Test public void updateRouteArrowVisibilityTo_routeArrowReceivesNewVisibility() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; @@ -349,7 +344,7 @@ public void updateRouteArrowVisibilityTo_routeArrowReceivesNewVisibility() { @Test public void showAlternativeRoutes_mapRouteProgressChangeListenerIsAdded() { - MapboxNavigation mockedNavigation = mock(MapboxNavigation.class); + MapLibreNavigation mockedNavigation = mock(MapLibreNavigation.class); MapView mockedMapView = mock(MapView.class); MapLibreMap mockedMapboxMap = mock(MapLibreMap.class); int mockedStyleRes = 0; diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapLibreUncaughtExceptionHandler.java similarity index 93% rename from libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapLibreUncaughtExceptionHandler.java index bf1034b3b..d8d16b08f 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapboxUncaughtExceptionHanlder.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/core/crashreporter/MapLibreUncaughtExceptionHandler.java @@ -24,7 +24,7 @@ *

* Note: this handler is not capturing full application's stacktrace! */ -public class MapboxUncaughtExceptionHanlder implements Thread.UncaughtExceptionHandler, +public class MapLibreUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler, SharedPreferences.OnSharedPreferenceChangeListener { public static final String MAPBOX_PREF_ENABLE_CRASH_REPORTER = "mapbox.crash.enable"; public static final String MAPBOX_CRASH_REPORTER_PREFERENCES = "MapboxCrashReporterPrefs"; @@ -43,11 +43,11 @@ public class MapboxUncaughtExceptionHanlder implements Thread.UncaughtExceptionH private int exceptionChainDepth; @VisibleForTesting - MapboxUncaughtExceptionHanlder(@NonNull Context applicationContext, - @NonNull SharedPreferences sharedPreferences, - @NonNull String mapboxPackage, - @NonNull String version, - Thread.UncaughtExceptionHandler defaultExceptionHandler) { + MapLibreUncaughtExceptionHandler(@NonNull Context applicationContext, + @NonNull SharedPreferences sharedPreferences, + @NonNull String mapboxPackage, + @NonNull String version, + Thread.UncaughtExceptionHandler defaultExceptionHandler) { if (TextUtils.isEmpty(mapboxPackage) || TextUtils.isEmpty(version)) { throw new IllegalArgumentException("Invalid package name: " + mapboxPackage + " or version: " + version); } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java index 00336b208..e18698d8c 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/BannerInstructionMilestone.java @@ -2,13 +2,13 @@ import org.maplibre.navigation.android.navigation.v5.models.BannerInstructions; import org.maplibre.navigation.android.navigation.v5.models.LegStep; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteLegProgress; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** - * A default milestone that is added to {@link MapboxNavigation} + * A default milestone that is added to {@link MapLibreNavigation} * when default milestones are enabled. *

* Please note, this milestone has a custom trigger based on location progress along a route. If you diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java index ceda4329e..5adce4f0e 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/Milestone.java @@ -2,8 +2,8 @@ import org.maplibre.navigation.android.navigation.v5.exception.NavigationException; import org.maplibre.navigation.android.navigation.v5.instruction.Instruction; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** * Base Milestone statement. Subclassed to provide concrete statements. @@ -44,7 +44,7 @@ public Instruction getInstruction() { /** * A milestone can either be passed in to the - * {@link MapboxNavigation} object + * {@link MapLibreNavigation} object * (recommended) or validated directly inside your activity. * * @param previousRouteProgress last locations generated {@link RouteProgress} object used to diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java index fd4745f96..e56176f97 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/milestone/VoiceInstructionMilestone.java @@ -6,10 +6,10 @@ import org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.navigation.android.navigation.v5.utils.RouteUtils; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; /** - * A default milestone that is added to {@link MapboxNavigation} + * A default milestone that is added to {@link MapLibreNavigation} * when default milestones are enabled. *

* Please note, this milestone has a custom trigger based on location progress along a route. If you diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapLibreStreetsV8.java similarity index 76% rename from libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapLibreStreetsV8.java index 250693d70..759c4978b 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapboxStreetsV8.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/MapLibreStreetsV8.java @@ -13,7 +13,7 @@ * Only available on the {@link DirectionsCriteria#PROFILE_DRIVING} profile. */ @AutoValue -public abstract class MapboxStreetsV8 extends DirectionsJsonObject { +public abstract class MapLibreStreetsV8 extends DirectionsJsonObject { /** * The road class of the road exiting the intersection as defined by the @@ -35,16 +35,16 @@ public abstract class MapboxStreetsV8 extends DirectionsJsonObject { * @return this classes {@link Builder} for creating a new instance */ public static Builder builder() { - return new AutoValue_MapboxStreetsV8.Builder(); + return new AutoValue_MapLibreStreetsV8.Builder(); } /** - * Convert the current {@link MapboxStreetsV8} to its builder holding the currently assigned + * Convert the current {@link MapLibreStreetsV8} to its builder holding the currently assigned * values. This allows you to modify a single property and then rebuild the object resulting in - * an updated and modified {@link MapboxStreetsV8}. + * an updated and modified {@link MapLibreStreetsV8}. * * @return a {@link Builder} with the same values set to match the ones defined in this {@link - * MapboxStreetsV8} + * MapLibreStreetsV8} */ public abstract Builder toBuilder(); @@ -54,8 +54,8 @@ public static Builder builder() { * @param gson the built {@link Gson} object * @return the type adapter for this class */ - public static TypeAdapter typeAdapter(Gson gson) { - return new AutoValue_MapboxStreetsV8.GsonTypeAdapter(gson); + public static TypeAdapter typeAdapter(Gson gson) { + return new AutoValue_MapLibreStreetsV8.GsonTypeAdapter(gson); } /** @@ -64,14 +64,14 @@ public static TypeAdapter typeAdapter(Gson gson) { * @param json a formatted valid JSON string defining an Incident * @return a new instance of this class defined by the values passed in the method */ - public static MapboxStreetsV8 fromJson(String json) { + public static MapLibreStreetsV8 fromJson(String json) { GsonBuilder gson = new GsonBuilder(); gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create()); - return gson.create().fromJson(json, MapboxStreetsV8.class); + return gson.create().fromJson(json, MapLibreStreetsV8.class); } /** - * This builder can be used to set the values describing the {@link MapboxStreetsV8}. + * This builder can be used to set the values describing the {@link MapLibreStreetsV8}. */ @AutoValue.Builder public abstract static class Builder { @@ -85,10 +85,10 @@ public abstract static class Builder { public abstract Builder roadClass(@Nullable String roadClass); /** - * Build a new {@link MapboxStreetsV8} object. + * Build a new {@link MapLibreStreetsV8} object. * - * @return a new {@link MapboxStreetsV8} using the provided values in this builder + * @return a new {@link MapLibreStreetsV8} using the provided values in this builder */ - public abstract MapboxStreetsV8 build(); + public abstract MapLibreStreetsV8 build(); } } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java index d9f85ed6f..4b85b3345 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/models/StepIntersection.java @@ -192,7 +192,7 @@ public Point location() { */ @Nullable @SerializedName("mapbox_streets_v8") - public abstract MapboxStreetsV8 mapboxStreetsV8(); + public abstract MapLibreStreetsV8 mapboxStreetsV8(); /** * Name of the tunnel. Value may be present if {@link #classes} contains "tunnel". @@ -388,7 +388,7 @@ public abstract static class Builder { * @return this builder for chaining options together */ @Nullable - public abstract Builder mapboxStreetsV8(@Nullable MapboxStreetsV8 street); + public abstract Builder mapboxStreetsV8(@Nullable MapLibreStreetsV8 street); /** * Name of the tunnel. Value is present only if class is tunnel. diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigation.java similarity index 95% rename from libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigation.java index 44adc38ce..1dcbaad3d 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigation.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigation.java @@ -47,13 +47,13 @@ * @see Navigation documentation * @since 0.1.0 */ -public class MapboxNavigation implements ServiceConnection { +public class MapLibreNavigation implements ServiceConnection { private NavigationEventDispatcher navigationEventDispatcher; private NavigationEngineFactory navigationEngineFactory; private NavigationService navigationService; private DirectionsRoute directionsRoute; - private MapboxNavigationOptions options; + private MapLibreNavigationOptions options; private LocationEngine locationEngine = null; private Set milestones; private Context applicationContext; @@ -61,7 +61,7 @@ public class MapboxNavigation implements ServiceConnection { /** * Constructs a new instance of this class using the default options. This should be used over - * {@link #MapboxNavigation(Context, String, MapboxNavigationOptions)} if all the default options + * {@link #MapboxNavigation(Context, String, MapLibreNavigationOptions)} if all the default options * fit your needs. *

* Initialization will also add the default milestones and create a new location engine @@ -72,13 +72,13 @@ public class MapboxNavigation implements ServiceConnection { * @param context required in order to create and bind the navigation service * @since 0.5.0 */ - public MapboxNavigation(@NonNull Context context) { - this(context, MapboxNavigationOptions.builder().build()); + public MapLibreNavigation(@NonNull Context context) { + this(context, MapLibreNavigationOptions.builder().build()); } /** * Constructs a new instance of this class using a custom built options class. Building a custom - * {@link MapboxNavigationOptions} object and passing it in allows you to further customize the + * {@link MapLibreNavigationOptions} object and passing it in allows you to further customize the * user experience. While many of the default values have been tested thoroughly, you might find * that your app requires special tweaking. Once this class is initialized, the options specified * through the options class cannot be modified. @@ -90,10 +90,10 @@ public MapboxNavigation(@NonNull Context context) { * * @param context required in order to create and bind the navigation service * @param options a custom built {@code MapboxNavigationOptions} class - * @see MapboxNavigationOptions + * @see MapLibreNavigationOptions * @since 0.5.0 */ - public MapboxNavigation(@NonNull Context context, @NonNull MapboxNavigationOptions options) { + public MapLibreNavigation(@NonNull Context context, @NonNull MapLibreNavigationOptions options) { initializeContext(context); this.options = options; initialize(); @@ -101,17 +101,17 @@ public MapboxNavigation(@NonNull Context context, @NonNull MapboxNavigationOptio /** * Constructs a new instance of this class using a custom built options class. Building a custom - * {@link MapboxNavigationOptions} object and passing it in allows you to further customize the + * {@link MapLibreNavigationOptions} object and passing it in allows you to further customize the * user experience. Once this class is initialized, the options specified * through the options class cannot be modified. * * @param context required in order to create and bind the navigation service * @param options a custom built {@code MapboxNavigationOptions} class * @param locationEngine a LocationEngine to provide Location updates - * @see MapboxNavigationOptions + * @see MapLibreNavigationOptions * @since 0.19.0 */ - public MapboxNavigation(@NonNull Context context, @NonNull MapboxNavigationOptions options, @NonNull LocationEngine locationEngine) { + public MapLibreNavigation(@NonNull Context context, @NonNull MapLibreNavigationOptions options, @NonNull LocationEngine locationEngine) { initializeContext(context); this.options = options; this.locationEngine = locationEngine; @@ -119,9 +119,9 @@ public MapboxNavigation(@NonNull Context context, @NonNull MapboxNavigationOptio } // Package private (no modifier) for testing purposes - MapboxNavigation(@NonNull Context context, LocationEngine locationEngine) { + MapLibreNavigation(@NonNull Context context, LocationEngine locationEngine) { initializeContext(context); - this.options = MapboxNavigationOptions.builder().build(); + this.options = MapLibreNavigationOptions.builder().build(); this.locationEngine = locationEngine; initialize(); } @@ -186,7 +186,7 @@ public void onDestroy() { /** * Navigation {@link Milestone}s provide a powerful way to give your user instructions at custom * defined locations along their route. Default milestones are automatically added unless - * {@link MapboxNavigationOptions#defaultMilestonesEnabled()} is set to false but they can also + * {@link MapLibreNavigationOptions#defaultMilestonesEnabled()} is set to false but they can also * be individually removed using the {@link #removeMilestone(Milestone)} API. Once a custom * milestone is built, it will need to be passed into the navigation SDK through this method. *

@@ -352,7 +352,7 @@ public void startNavigation(@NonNull DirectionsRoute directionsRoute) { /** * Call this when the navigation session needs to end before the user reaches their final * destination. There isn't a need to manually end the navigation session using this API when the - * user arrives unless you set {@link MapboxNavigationOptions#manuallyEndNavigationUponCompletion()} + * user arrives unless you set {@link MapLibreNavigationOptions#manuallyEndNavigationUponCompletion()} * to true. *

* Ending the navigation session ends and unbinds the navigation service meaning any milestone, @@ -452,7 +452,7 @@ public void removeProgressChangeListener(@Nullable ProgressChangeListener progre /** * This adds a new off route listener which is invoked when the devices location veers off the - * route and the specified criteria's in {@link MapboxNavigationOptions} have been met. + * route and the specified criteria's in {@link MapLibreNavigationOptions} have been met. *

* The behavior that causes this listeners callback to get invoked vary depending on whether a * custom off route engine has been set using {@link #setOffRouteEngine(OffRoute)}. @@ -693,7 +693,7 @@ List getMilestones() { return new ArrayList<>(milestones); } - MapboxNavigationOptions options() { + MapLibreNavigationOptions options() { return options; } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotification.java similarity index 90% rename from libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotification.java index 4e03bfa72..8ec49a2a3 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotification.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotification.java @@ -32,7 +32,7 @@ /** * This is in charge of creating the persistent navigation session notification and updating it. */ -class MapboxNavigationNotification implements NavigationNotification { +class MapLibreNavigationNotification implements NavigationNotification { private static final int INTENT_FLAGS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE : @@ -43,7 +43,7 @@ class MapboxNavigationNotification implements NavigationNotification { private Notification notification; private RemoteViews collapsedNotificationRemoteViews; private RemoteViews expandedNotificationRemoteViews; - private MapboxNavigation mapboxNavigation; + private MapLibreNavigation mapLibreNavigation; private SpannableString currentDistanceText; private DistanceFormatter distanceFormatter; private String instructionText; @@ -54,12 +54,12 @@ class MapboxNavigationNotification implements NavigationNotification { private BroadcastReceiver endNavigationBtnReceiver = new BroadcastReceiver() { @Override public void onReceive(final Context context, final Intent intent) { - MapboxNavigationNotification.this.onEndNavigationBtnClick(); + MapLibreNavigationNotification.this.onEndNavigationBtnClick(); } }; - MapboxNavigationNotification(Context context, MapboxNavigation mapboxNavigation) { - initialize(context, mapboxNavigation); + MapLibreNavigationNotification(Context context, MapLibreNavigation mapLibreNavigation) { + initialize(context, mapLibreNavigation); } @Override @@ -82,10 +82,10 @@ public void onNavigationStopped(Context context) { unregisterReceiver(context); } - private void initialize(Context context, MapboxNavigation mapboxNavigation) { - this.mapboxNavigation = mapboxNavigation; + private void initialize(Context context, MapLibreNavigation mapLibreNavigation) { + this.mapLibreNavigation = mapLibreNavigation; etaFormat = context.getString(R.string.eta_format); - initializeDistanceFormatter(context, mapboxNavigation); + initializeDistanceFormatter(context, mapLibreNavigation); notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); isTwentyFourHourFormat = DateFormat.is24HourFormat(context); createNotificationChannel(context); @@ -93,8 +93,8 @@ private void initialize(Context context, MapboxNavigation mapboxNavigation) { registerReceiver(context); } - private void initializeDistanceFormatter(Context context, MapboxNavigation mapboxNavigation) { - RouteOptions routeOptions = mapboxNavigation.getRoute().routeOptions(); + private void initializeDistanceFormatter(Context context, MapLibreNavigation mapLibreNavigation) { + RouteOptions routeOptions = mapLibreNavigation.getRoute().routeOptions(); LocaleUtils localeUtils = new LocaleUtils(); String language = localeUtils.inferDeviceLanguage(context); String unitType = localeUtils.getUnitTypeForDeviceLocale(context); @@ -102,8 +102,8 @@ private void initializeDistanceFormatter(Context context, MapboxNavigation mapbo language = routeOptions.language(); unitType = routeOptions.voiceUnits(); } - MapboxNavigationOptions mapboxNavigationOptions = mapboxNavigation.options(); - distanceFormatter = new DistanceFormatter(context, language, unitType, mapboxNavigationOptions.roundingIncrement()); + MapLibreNavigationOptions mapLibreNavigationOptions = mapLibreNavigation.options(); + distanceFormatter = new DistanceFormatter(context, language, unitType, mapLibreNavigationOptions.roundingIncrement()); } private void createNotificationChannel(Context context) { @@ -216,7 +216,7 @@ private boolean newDistanceText(RouteProgress routeProgress) { } private void updateArrivalTime(RouteProgress routeProgress) { - MapboxNavigationOptions options = mapboxNavigation.options(); + MapLibreNavigationOptions options = mapLibreNavigation.options(); Calendar time = Calendar.getInstance(); double durationRemaining = routeProgress.durationRemaining(); int timeFormatType = options.timeFormatType(); @@ -245,8 +245,8 @@ private PendingIntent createPendingCloseIntent(Context context) { } private void onEndNavigationBtnClick() { - if (mapboxNavigation != null) { - mapboxNavigation.stopNavigation(); + if (mapLibreNavigation != null) { + mapLibreNavigation.stopNavigation(); } } } \ No newline at end of file diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationOptions.java similarity index 96% rename from libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java rename to libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationOptions.java index 5dedfc023..053045ac5 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationOptions.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationOptions.java @@ -7,10 +7,10 @@ import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; /** - * Immutable and can't be changed after passing into {@link MapboxNavigation}. + * Immutable and can't be changed after passing into {@link MapLibreNavigation}. */ @AutoValue -public abstract class MapboxNavigationOptions { +public abstract class MapLibreNavigationOptions { public abstract double maxTurnCompletionOffset(); @@ -132,11 +132,11 @@ public abstract static class Builder { public abstract Builder locationAcceptableAccuracyInMetersThreshold(int accuracyInMetersThreshold); - public abstract MapboxNavigationOptions build(); + public abstract MapLibreNavigationOptions build(); } public static Builder builder() { - return new AutoValue_MapboxNavigationOptions.Builder() + return new AutoValue_MapLibreNavigationOptions.Builder() .maxTurnCompletionOffset(NavigationConstants.MAXIMUM_ALLOWED_DEGREE_OFFSET_FOR_TURN_COMPLETION) .maneuverZoneRadius(NavigationConstants.MANEUVER_ZONE_RADIUS) .maximumDistanceOffRoute(NavigationConstants.MAXIMUM_DISTANCE_BEFORE_OFF_ROUTE) diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java index 1d87020d8..cbdaec3ea 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelper.java @@ -56,11 +56,11 @@ private NavigationHelper() { // Empty private constructor to prevent users creating an instance of this class. } - static Location buildSnappedLocation(MapboxNavigation mapboxNavigation, boolean snapToRouteEnabled, + static Location buildSnappedLocation(MapLibreNavigation mapLibreNavigation, boolean snapToRouteEnabled, Location rawLocation, RouteProgress routeProgress, boolean userOffRoute) { final Location location; if (!userOffRoute && snapToRouteEnabled) { - location = getSnappedLocation(mapboxNavigation, rawLocation, routeProgress); + location = getSnappedLocation(mapLibreNavigation, rawLocation, routeProgress); } else { location = rawLocation; } @@ -445,19 +445,19 @@ public static CurrentLegAnnotation createCurrentAnnotation(CurrentLegAnnotation } /** - * This method runs through the list of milestones in {@link MapboxNavigation#getMilestones()} + * This method runs through the list of milestones in {@link MapLibreNavigation#getMilestones()} * and returns a list of occurring milestones (if any), based on their individual criteria. * * @param previousRouteProgress for checking if milestone is occurring * @param routeProgress for checking if milestone is occurring - * @param mapboxNavigation for list of milestones + * @param mapLibreNavigation for list of milestones * @return list of occurring milestones */ static List checkMilestones(RouteProgress previousRouteProgress, RouteProgress routeProgress, - MapboxNavigation mapboxNavigation) { + MapLibreNavigation mapLibreNavigation) { List milestones = new ArrayList<>(); - for (Milestone milestone : mapboxNavigation.getMilestones()) { + for (Milestone milestone : mapLibreNavigation.getMilestones()) { if (milestone.isOccurring(previousRouteProgress, routeProgress)) { milestones.add(milestone); } @@ -468,8 +468,8 @@ static List checkMilestones(RouteProgress previousRouteProgress, /** * This method checks if off route detection is enabled or disabled. *

- * If enabled, the off route engine is retrieved from {@link MapboxNavigation} and - * {@link OffRouteDetector#isUserOffRoute(Location, RouteProgress, MapboxNavigationOptions)} is called + * If enabled, the off route engine is retrieved from {@link MapLibreNavigation} and + * {@link OffRouteDetector#isUserOffRoute(Location, RouteProgress, MapLibreNavigationOptions)} is called * to determine if the location is on or off route. * * @param navigationLocationUpdate containing new location and navigation objects @@ -479,7 +479,7 @@ static List checkMilestones(RouteProgress previousRouteProgress, */ static boolean isUserOffRoute(NavigationLocationUpdate navigationLocationUpdate, RouteProgress routeProgress, OffRouteCallback callback) { - MapboxNavigationOptions options = navigationLocationUpdate.mapboxNavigation().options(); + MapLibreNavigationOptions options = navigationLocationUpdate.mapboxNavigation().options(); if (!options.enableOffRouteDetection()) { return false; } @@ -535,9 +535,9 @@ private static int findAnnotationIndex(CurrentLegAnnotation currentLegAnnotation return INDEX_ZERO; } - private static Location getSnappedLocation(MapboxNavigation mapboxNavigation, Location location, + private static Location getSnappedLocation(MapLibreNavigation mapLibreNavigation, Location location, RouteProgress routeProgress) { - Snap snap = mapboxNavigation.getSnapEngine(); + Snap snap = mapLibreNavigation.getSnapEngine(); return snap.getSnappedLocation(location, routeProgress); } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineListener.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineListener.java index e3ea1ee68..64efeea77 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineListener.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationLocationEngineListener.java @@ -14,12 +14,12 @@ class NavigationLocationEngineListener implements LocationEngineCallback routeLineStrings; private final List featureCollections; @@ -203,13 +203,13 @@ public NavigationMapRoute(@NonNull MapView mapView, @NonNull MapLibreMap mapboxM /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @since 0.4.0 */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute); } @@ -217,14 +217,14 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param belowLayer optionally pass in a layer id to place the route line below * @since 0.4.0 */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @Nullable String belowLayer) { this(navigation, mapView, mapboxMap, R.style.NavigationMapRoute, belowLayer); } @@ -232,13 +232,13 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param styleRes a style resource with custom route colors, scale, etc. */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes) { this(navigation, mapView, mapboxMap, styleRes, null); } @@ -246,14 +246,14 @@ public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapVie /** * Construct an instance of {@link NavigationMapRoute}. * - * @param navigation an instance of the {@link MapboxNavigation} object. Passing in null means + * @param navigation an instance of the {@link MapLibreNavigation} object. Passing in null means * your route won't consider rerouting during a navigation session. * @param mapView the MapView to apply the route to * @param mapboxMap the MapboxMap to apply route with * @param styleRes a style resource with custom route colors, scale, etc. * @param belowLayer optionally pass in a layer id to place the route line below */ - public NavigationMapRoute(@Nullable MapboxNavigation navigation, @NonNull MapView mapView, + public NavigationMapRoute(@Nullable MapLibreNavigation navigation, @NonNull MapView mapView, @NonNull MapLibreMap mapboxMap, @StyleRes int styleRes, @Nullable String belowLayer) { this.styleRes = styleRes; @@ -329,12 +329,12 @@ public void showAlternativeRoutes(boolean alternativesVisible) { toggleAlternativeVisibility(alternativesVisible); } - public void addProgressChangeListener(MapboxNavigation navigation) { + public void addProgressChangeListener(MapLibreNavigation navigation) { this.navigation = navigation; navigation.addProgressChangeListener(progressChangeListener); } - public void removeProgressChangeListener(MapboxNavigation navigation) { + public void removeProgressChangeListener(MapLibreNavigation navigation) { if (navigation != null) { navigation.removeProgressChangeListener(progressChangeListener); } @@ -1064,7 +1064,7 @@ public void onDidFinishLoadingStyle() { } /** - * This method should be called only if you have passed {@link MapboxNavigation} + * This method should be called only if you have passed {@link MapLibreNavigation} * into the constructor. *

* This method will add the {@link ProgressChangeListener} that was originally added so updates @@ -1080,7 +1080,7 @@ public void onStart() { } /** - * This method should be called only if you have passed {@link MapboxNavigation} + * This method should be called only if you have passed {@link MapLibreNavigation} * into the constructor. *

* This method will remove the {@link ProgressChangeListener} that was originally added so updates diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java index 885551c28..5e91c3797 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProvider.java @@ -10,8 +10,8 @@ class NavigationNotificationProvider { private NavigationNotification navigationNotification; private boolean shouldUpdate = true; - NavigationNotificationProvider(Context context, MapboxNavigation mapboxNavigation) { - navigationNotification = buildNotificationFrom(context, mapboxNavigation); + NavigationNotificationProvider(Context context, MapLibreNavigation mapLibreNavigation) { + navigationNotification = buildNotificationFrom(context, mapLibreNavigation); } NavigationNotification retrieveNotification() { @@ -30,12 +30,12 @@ void shutdown(Context context) { shouldUpdate = false; } - private NavigationNotification buildNotificationFrom(Context context, MapboxNavigation mapboxNavigation) { - MapboxNavigationOptions options = mapboxNavigation.options(); + private NavigationNotification buildNotificationFrom(Context context, MapLibreNavigation mapLibreNavigation) { + MapLibreNavigationOptions options = mapLibreNavigation.options(); if (options.navigationNotification() != null) { return options.navigationNotification(); } else { - return new MapboxNavigationNotification(context, mapboxNavigation); + return new MapLibreNavigationNotification(context, mapLibreNavigation); } } } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java index 8a7206995..36d2ac65f 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessor.java @@ -73,16 +73,16 @@ public void onShouldUpdateToIndex(int legIndex, int stepIndex) { * based on our calculations of the distances remaining. *

* Also in charge of detecting if a step / leg has finished and incrementing the - * indices if needed ({@link NavigationRouteProcessor#advanceIndices(MapboxNavigation)} handles + * indices if needed ({@link NavigationRouteProcessor#advanceIndices(MapLibreNavigation)} handles * the decoding of the next step point list). * * @param navigation for the current route / options * @param location for step / leg / route distance remaining * @return new route progress along the route */ - RouteProgress buildNewRouteProgress(MapboxNavigation navigation, Location location) { + RouteProgress buildNewRouteProgress(MapLibreNavigation navigation, Location location) { DirectionsRoute directionsRoute = navigation.getRoute(); - MapboxNavigationOptions options = navigation.options(); + MapLibreNavigationOptions options = navigation.options(); double completionOffset = options.maxTurnCompletionOffset(); double maneuverZoneRadius = options.maneuverZoneRadius(); boolean newRoute = checkNewRoute(navigation); @@ -109,7 +109,7 @@ void setRouteProgress(RouteProgress routeProgress) { * * @param navigation to get the next {@link LegStep#geometry()} and off-route engine */ - void checkIncreaseIndex(MapboxNavigation navigation) { + void checkIncreaseIndex(MapLibreNavigation navigation) { if (shouldIncreaseIndex) { advanceIndices(navigation); shouldIncreaseIndex = false; @@ -121,14 +121,14 @@ void checkIncreaseIndex(MapboxNavigation navigation) { * Checks if the route provided is a new route. If it is, all {@link RouteProgress} * data and {@link NavigationIndices} needs to be reset. * - * @param mapboxNavigation to get the current route and off-route engine + * @param mapLibreNavigation to get the current route and off-route engine * @return Whether or not a route progress is already set and {@link RouteUtils} determines this is a new route */ - private boolean checkNewRoute(@NonNull MapboxNavigation mapboxNavigation) { - DirectionsRoute directionsRoute = mapboxNavigation.getRoute(); + private boolean checkNewRoute(@NonNull MapLibreNavigation mapLibreNavigation) { + DirectionsRoute directionsRoute = mapLibreNavigation.getRoute(); boolean newRoute = routeUtils.isNewRoute(routeProgress, directionsRoute); if (newRoute) { - createFirstIndices(mapboxNavigation); + createFirstIndices(mapLibreNavigation); currentLegAnnotation = null; } return newRoute; @@ -147,7 +147,7 @@ private double calculateStepDistanceRemaining(Location location, DirectionsRoute ); } - private void checkManeuverCompletion(MapboxNavigation navigation, Location location, DirectionsRoute directionsRoute, + private void checkManeuverCompletion(MapLibreNavigation navigation, Location location, DirectionsRoute directionsRoute, double completionOffset, double maneuverZoneRadius) { boolean withinManeuverRadius = stepDistanceRemaining < maneuverZoneRadius; boolean bearingMatchesManeuver = checkBearingForStepCompletion( @@ -167,9 +167,9 @@ private void checkManeuverCompletion(MapboxNavigation navigation, Location locat * Decodes the step points for the new step and clears the distances from * maneuver stack, as the maneuver has now changed. * - * @param mapboxNavigation to get the next {@link LegStep#geometry()} and {@link OffRoute} + * @param mapLibreNavigation to get the next {@link LegStep#geometry()} and {@link OffRoute} */ - private void advanceIndices(MapboxNavigation mapboxNavigation) { + private void advanceIndices(MapLibreNavigation mapLibreNavigation) { NavigationIndices newIndices; if (shouldUpdateToIndex != null) { newIndices = shouldUpdateToIndex; @@ -180,17 +180,17 @@ private void advanceIndices(MapboxNavigation mapboxNavigation) { currentLegAnnotation = null; } indices = newIndices; - processNewIndex(mapboxNavigation); + processNewIndex(mapLibreNavigation); } /** * Initializes or resets the {@link NavigationIndices} for a new route received. * - * @param mapboxNavigation to get the next {@link LegStep#geometry()} and {@link OffRoute} + * @param mapLibreNavigation to get the next {@link LegStep#geometry()} and {@link OffRoute} */ - private void createFirstIndices(MapboxNavigation mapboxNavigation) { + private void createFirstIndices(MapLibreNavigation mapLibreNavigation) { indices = NavigationIndices.create(FIRST_LEG_INDEX, FIRST_STEP_INDEX); - processNewIndex(mapboxNavigation); + processNewIndex(mapLibreNavigation); } /** @@ -199,22 +199,22 @@ private void createFirstIndices(MapboxNavigation mapboxNavigation) { * Processes all new index-based data that is * needed for {@link NavigationRouteProcessor#assembleRouteProgress(DirectionsRoute)}. * - * @param mapboxNavigation for the current route + * @param mapLibreNavigation for the current route */ - private void processNewIndex(MapboxNavigation mapboxNavigation) { - DirectionsRoute route = mapboxNavigation.getRoute(); + private void processNewIndex(MapLibreNavigation mapLibreNavigation) { + DirectionsRoute route = mapLibreNavigation.getRoute(); int legIndex = indices.legIndex(); int stepIndex = indices.stepIndex(); int upcomingStepIndex = stepIndex + ONE_INDEX; if(route.legs().size() <= legIndex || route.legs().get(legIndex).steps().size() <= stepIndex){ // This catches a potential race condition when the route is changed, before the new index is processed - createFirstIndices(mapboxNavigation); + createFirstIndices(mapLibreNavigation); return; } updateSteps(route, legIndex, stepIndex, upcomingStepIndex); updateStepPoints(route, legIndex, stepIndex, upcomingStepIndex); updateIntersections(); - clearManeuverDistances(mapboxNavigation.getOffRouteEngine()); + clearManeuverDistances(mapLibreNavigation.getOffRouteEngine()); } private RouteProgress assembleRouteProgress(DirectionsRoute route) { diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java index 520501e69..66f174783 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationService.java @@ -19,10 +19,10 @@ import timber.log.Timber; /** - * Internal usage only, use navigation by initializing a new instance of {@link MapboxNavigation} + * Internal usage only, use navigation by initializing a new instance of {@link MapLibreNavigation} * and customizing the navigation experience through that class. *

- * This class is first created and started when {@link MapboxNavigation#startNavigation(DirectionsRoute)} + * This class is first created and started when {@link MapLibreNavigation#startNavigation(DirectionsRoute)} * get's called and runs in the background until either the navigation sessions ends implicitly or * the hosting activity gets destroyed. Location updates are also tracked and handled inside this * service. Thread creation gets created in this service and maintains the thread until the service @@ -60,13 +60,13 @@ public void onDestroy() { } /** - * This gets called when {@link MapboxNavigation#startNavigation(DirectionsRoute)} is called and + * This gets called when {@link MapLibreNavigation#startNavigation(DirectionsRoute)} is called and * setups variables among other things on the Navigation Service side. */ - void startNavigation(MapboxNavigation mapboxNavigation) { - initialize(mapboxNavigation); + void startNavigation(MapLibreNavigation mapLibreNavigation) { + initialize(mapLibreNavigation); startForegroundNotification(notificationProvider.retrieveNotification()); - locationEngineUpdater.forceLocationUpdate(mapboxNavigation.getRoute()); + locationEngineUpdater.forceLocationUpdate(mapLibreNavigation.getRoute()); } /** @@ -79,7 +79,7 @@ void endNavigation() { } /** - * Called with {@link MapboxNavigation#setLocationEngine(LocationEngine)}. + * Called with {@link MapLibreNavigation#setLocationEngine(LocationEngine)}. * Updates this service with the new {@link LocationEngine}. * * @param locationEngine to update the provider @@ -88,15 +88,15 @@ void updateLocationEngine(LocationEngine locationEngine) { locationEngineUpdater.updateLocationEngine(locationEngine); } - private void initialize(MapboxNavigation mapboxNavigation) { - NavigationEventDispatcher dispatcher = mapboxNavigation.getEventDispatcher(); - initializeNotificationProvider(mapboxNavigation); + private void initialize(MapLibreNavigation mapLibreNavigation) { + NavigationEventDispatcher dispatcher = mapLibreNavigation.getEventDispatcher(); + initializeNotificationProvider(mapLibreNavigation); initializeRouteProcessorThread(dispatcher, notificationProvider); - initializeLocationProvider(mapboxNavigation); + initializeLocationProvider(mapLibreNavigation); } - private void initializeNotificationProvider(MapboxNavigation mapboxNavigation) { - notificationProvider = new NavigationNotificationProvider(getApplication(), mapboxNavigation); + private void initializeNotificationProvider(MapLibreNavigation mapLibreNavigation) { + notificationProvider = new NavigationNotificationProvider(getApplication(), mapLibreNavigation); } private void initializeRouteProcessorThread(NavigationEventDispatcher dispatcher, NavigationNotificationProvider notificationProvider) { @@ -104,12 +104,12 @@ private void initializeRouteProcessorThread(NavigationEventDispatcher dispatcher thread = new RouteProcessorBackgroundThread(new Handler(), listener); } - private void initializeLocationProvider(MapboxNavigation mapboxNavigation) { - LocationEngine locationEngine = mapboxNavigation.getLocationEngine(); - int accuracyThreshold = mapboxNavigation.options().locationAcceptableAccuracyInMetersThreshold(); + private void initializeLocationProvider(MapLibreNavigation mapLibreNavigation) { + LocationEngine locationEngine = mapLibreNavigation.getLocationEngine(); + int accuracyThreshold = mapLibreNavigation.options().locationAcceptableAccuracyInMetersThreshold(); LocationValidator validator = new LocationValidator(accuracyThreshold); NavigationLocationEngineListener listener = new NavigationLocationEngineListener( - thread, mapboxNavigation, locationEngine, validator + thread, mapLibreNavigation, locationEngine, validator ); locationEngineUpdater = new NavigationLocationEngineUpdater(locationEngine, listener); } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java index 078c39707..9328e9dba 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/RouteProcessorHandlerCallback.java @@ -43,34 +43,34 @@ public boolean handleMessage(Message msg) { * @param update hold location, navigation (with options), and distances away from maneuver */ private void handleRequest(final NavigationLocationUpdate update) { - final MapboxNavigation mapboxNavigation = update.mapboxNavigation(); + final MapLibreNavigation mapLibreNavigation = update.mapboxNavigation(); final Location rawLocation = update.location(); - RouteProgress routeProgress = routeProcessor.buildNewRouteProgress(mapboxNavigation, rawLocation); + RouteProgress routeProgress = routeProcessor.buildNewRouteProgress(mapLibreNavigation, rawLocation); - final boolean userOffRoute = determineUserOffRoute(update, mapboxNavigation, routeProgress); - final List milestones = findTriggeredMilestones(mapboxNavigation, routeProgress); - final Location location = findSnappedLocation(mapboxNavigation, rawLocation, routeProgress, userOffRoute); + final boolean userOffRoute = determineUserOffRoute(update, mapLibreNavigation, routeProgress); + final List milestones = findTriggeredMilestones(mapLibreNavigation, routeProgress); + final Location location = findSnappedLocation(mapLibreNavigation, rawLocation, routeProgress, userOffRoute); final RouteProgress finalRouteProgress = updateRouteProcessorWith(routeProgress); sendUpdateToListener(userOffRoute, milestones, location, finalRouteProgress); } - private List findTriggeredMilestones(MapboxNavigation mapboxNavigation, RouteProgress routeProgress) { + private List findTriggeredMilestones(MapLibreNavigation mapLibreNavigation, RouteProgress routeProgress) { RouteProgress previousRouteProgress = routeProcessor.getRouteProgress(); - return checkMilestones(previousRouteProgress, routeProgress, mapboxNavigation); + return checkMilestones(previousRouteProgress, routeProgress, mapLibreNavigation); } - private Location findSnappedLocation(MapboxNavigation mapboxNavigation, Location rawLocation, - RouteProgress routeProgress, boolean userOffRoute) { - boolean snapToRouteEnabled = mapboxNavigation.options().snapToRoute(); - return buildSnappedLocation(mapboxNavigation, snapToRouteEnabled, + private Location findSnappedLocation(MapLibreNavigation mapLibreNavigation, Location rawLocation, + RouteProgress routeProgress, boolean userOffRoute) { + boolean snapToRouteEnabled = mapLibreNavigation.options().snapToRoute(); + return buildSnappedLocation(mapLibreNavigation, snapToRouteEnabled, rawLocation, routeProgress, userOffRoute); } private boolean determineUserOffRoute(NavigationLocationUpdate navigationLocationUpdate, - MapboxNavigation mapboxNavigation, RouteProgress routeProgress) { + MapLibreNavigation mapLibreNavigation, RouteProgress routeProgress) { final boolean userOffRoute = isUserOffRoute(navigationLocationUpdate, routeProgress, routeProcessor); - routeProcessor.checkIncreaseIndex(mapboxNavigation); + routeProcessor.checkIncreaseIndex(mapLibreNavigation); return userOffRoute; } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java index ddd554e86..527cf9853 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/Camera.java @@ -1,16 +1,16 @@ package org.maplibre.navigation.android.navigation.v5.navigation.camera; import org.maplibre.geojson.Point; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import java.util.List; /** * This class handles calculating all properties necessary to configure the camera position while - * routing. The {@link MapboxNavigation} uses + * routing. The {@link MapLibreNavigation} uses * a {@link SimpleCamera} by default. If you would like to customize the camera position, create a * concrete implementation of this class or subclass {@link SimpleCamera} and update - * {@link MapboxNavigation#setCameraEngine(Camera)}. + * {@link MapLibreNavigation#setCameraEngine(Camera)}. * * @since 0.10.0 */ diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java index 4fa41dbe2..01f5790e7 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/camera/SimpleCamera.java @@ -3,8 +3,8 @@ import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.utils.Constants; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; import org.maplibre.turf.TurfMeasurement; import java.util.ArrayList; @@ -12,7 +12,7 @@ import java.util.List; /** - * The default camera used by {@link MapboxNavigation}. + * The default camera used by {@link MapLibreNavigation}. * * @since 0.10.0 */ diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java index b39aaf9d4..6debe0c01 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/notification/NavigationNotification.java @@ -3,14 +3,14 @@ import android.app.Notification; import android.content.Context; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.navigation.NavigationService; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; /** * Defines a contract in which a custom notification must adhere to when - * given to {@link MapboxNavigationOptions}. + * given to {@link MapLibreNavigationOptions}. */ public interface NavigationNotification { @@ -47,7 +47,7 @@ public interface NavigationNotification { void updateNotification(RouteProgress routeProgress); /** - * Callback for when navigation is stopped via {@link MapboxNavigation#stopNavigation()}. + * Callback for when navigation is stopped via {@link MapLibreNavigation#stopNavigation()}. *

* This callback may be used to clean up any listeners or receivers, preventing leaks. * diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java index d4f6c7d28..994e66c3f 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRoute.java @@ -2,11 +2,11 @@ import android.location.Location; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; public abstract class OffRoute { public abstract boolean isUserOffRoute(Location location, RouteProgress routeProgress, - MapboxNavigationOptions options); + MapLibreNavigationOptions options); } diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java index e461be92e..ab95e0007 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetector.java @@ -5,7 +5,7 @@ import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.navigation.android.navigation.v5.utils.RingBuffer; import org.maplibre.turf.TurfConstants; @@ -36,7 +36,7 @@ public class OffRouteDetector extends OffRoute { * Test #2: * Valid or invalid off-route. An off-route check can only continue if the device has received * at least 1 location update (for comparison) and the user has traveled passed - * the {@link MapboxNavigationOptions#minimumDistanceBeforeRerouting()} checked against the last re-route location. + * the {@link MapLibreNavigationOptions#minimumDistanceBeforeRerouting()} checked against the last re-route location. *

* Test #3: * Distance from the step. This test is checked against the max of the dynamic rerouting tolerance or the @@ -45,7 +45,7 @@ public class OffRouteDetector extends OffRoute { *

* Test #4: * Checks if the user is close the upcoming step. At this point, the user is considered off-route. - * But, if the location update is within the {@link MapboxNavigationOptions#maneuverZoneRadius()} of the + * But, if the location update is within the {@link MapLibreNavigationOptions#maneuverZoneRadius()} of the * upcoming step, this method will return false as well as send fire {@link OffRouteCallback#onShouldIncreaseIndex()} * to let the NavigationEngine know that the * step index should be increased on the next location update. @@ -54,7 +54,7 @@ public class OffRouteDetector extends OffRoute { * @since 0.2.0 */ @Override - public boolean isUserOffRoute(Location location, RouteProgress routeProgress, MapboxNavigationOptions options) { + public boolean isUserOffRoute(Location location, RouteProgress routeProgress, MapLibreNavigationOptions options) { if (checkDistanceRemaining(routeProgress)) { return true; @@ -109,7 +109,7 @@ private boolean checkDistanceRemaining(RouteProgress routeProgress) { } /** - * Method to check if the user has passed either the set (in {@link MapboxNavigationOptions}) + * Method to check if the user has passed either the set (in {@link MapLibreNavigationOptions}) * minimum amount of seconds or minimum amount of meters since the last reroute. *

* If the user is above both thresholds, then the off-route can proceed. Otherwise, ignore. @@ -118,7 +118,7 @@ private boolean checkDistanceRemaining(RouteProgress routeProgress) { * @param options for second (default 3) / distance (default 50m) minimums * @return true if valid, false if not */ - private boolean validOffRoute(Location location, MapboxNavigationOptions options) { + private boolean validOffRoute(Location location, MapLibreNavigationOptions options) { // Check if minimum amount of distance has been passed since last reroute Point currentPoint = Point.fromLngLat(location.getLongitude(), location.getLatitude()); double distanceFromLastReroute = 0d; @@ -133,7 +133,7 @@ private boolean validOffRoute(Location location, MapboxNavigationOptions options } private boolean checkOffRouteRadius(Location location, RouteProgress routeProgress, - MapboxNavigationOptions options, Point currentPoint) { + MapLibreNavigationOptions options, Point currentPoint) { LegStep currentStep = routeProgress.currentLegProgress().currentStep(); double distanceFromCurrentStep = userTrueDistanceFromStep(currentPoint, currentStep); double offRouteRadius = createOffRouteRadius(location, routeProgress, options, currentPoint); @@ -141,7 +141,7 @@ private boolean checkOffRouteRadius(Location location, RouteProgress routeProgre } private double createOffRouteRadius(Location location, RouteProgress routeProgress, - MapboxNavigationOptions options, Point currentPoint) { + MapLibreNavigationOptions options, Point currentPoint) { double dynamicTolerance = dynamicRerouteDistanceTolerance(currentPoint, routeProgress, options); double accuracyTolerance = location.getAccuracy() * options.deadReckoningTimeInterval(); return Math.max(dynamicTolerance, accuracyTolerance); @@ -151,7 +151,7 @@ private boolean isMovingAwayFromManeuver(Location location, RouteProgress routeProgress, RingBuffer distancesAwayFromManeuver, Point currentPoint, - MapboxNavigationOptions options) { + MapLibreNavigationOptions options) { List stepPoints = routeProgress.currentStepPoints(); if (movingAwayFromManeuver(routeProgress, distancesAwayFromManeuver, stepPoints, currentPoint, options)) { updateLastReroutePoint(location); @@ -173,7 +173,7 @@ private boolean isMovingAwayFromManeuver(Location location, * @param upComingStep for distance from current point * @return true if close to upcoming step, false if not */ - private static boolean closeToUpcomingStep(MapboxNavigationOptions options, OffRouteCallback callback, + private static boolean closeToUpcomingStep(MapLibreNavigationOptions options, OffRouteCallback callback, Point currentPoint, LegStep upComingStep) { if (callback == null) { return false; @@ -209,7 +209,7 @@ private static boolean movingAwayFromManeuver(RouteProgress routeProgress, RingBuffer distancesAwayFromManeuver, List stepPoints, Point currentPoint, - MapboxNavigationOptions options) { + MapLibreNavigationOptions options) { boolean invalidUpcomingStep = routeProgress.currentLegProgress().upComingStep() == null; boolean invalidStepPointSize = stepPoints.size() < TWO_POINTS; if (invalidUpcomingStep || invalidStepPointSize) { diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java index 281b0e91d..8b631869b 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/route/FasterRoute.java @@ -4,14 +4,14 @@ import org.maplibre.navigation.android.navigation.v5.models.DirectionsResponse; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; /** * This class can be subclassed to provide custom logic for checking / determining * new / faster routes while navigating. *

* To provide your implementation, - * use {@link MapboxNavigation#setFasterRouteEngine(FasterRoute)}. + * use {@link MapLibreNavigation#setFasterRouteEngine(FasterRoute)}. *

* {@link FasterRoute#shouldCheckFasterRoute(Location, RouteProgress)} determines how quickly a * new route will be fetched by {@link RouteFetcher}. diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java index e652e697d..28edba040 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/routeprogress/RouteProgress.java @@ -8,7 +8,7 @@ import com.google.auto.value.AutoValue; import org.maplibre.geojson.Point; import org.maplibre.navigation.android.navigation.v5.milestone.MilestoneEventListener; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.navigation.android.navigation.v5.models.RouteLeg; import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; @@ -35,7 +35,7 @@ public abstract class RouteProgress { * Get the route the navigation session is currently using. When a reroute occurs and a new * directions route gets obtained, with the next location update this directions route should * reflect the new route. All direction route get passed in through - * {@link MapboxNavigation#startNavigation(DirectionsRoute)}. + * {@link MapLibreNavigation#startNavigation(DirectionsRoute)}. * * @return a {@link DirectionsRoute} currently being used for the navigation session * @since 0.1.0 diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java index 43e228cda..e2fc7070a 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/snap/Snap.java @@ -2,17 +2,17 @@ import android.location.Location; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigation; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; /** * This class handles calculating snapped position along the route. Latitude, longitude and bearing * should be provided. *

- * The {@link MapboxNavigation} uses + * The {@link MapLibreNavigation} uses * a {@link SnapToRoute} by default. If you would * like to customize the camera position, create a concrete implementation of this class - * or subclass {@link SnapToRoute} and update {@link MapboxNavigation#setSnapEngine(Snap)}}. + * or subclass {@link SnapToRoute} and update {@link MapLibreNavigation#setSnapEngine(Snap)}}. */ public abstract class Snap { diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java index 7785d78f2..3d717fabc 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtils.java @@ -2,7 +2,7 @@ import org.maplibre.navigation.android.navigation.v5.models.StepIntersection; import org.maplibre.geojson.Point; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfClassification; import org.maplibre.turf.TurfConstants; @@ -23,7 +23,7 @@ private ToleranceUtils() { */ public static double dynamicRerouteDistanceTolerance(Point snappedPoint, RouteProgress routeProgress, - MapboxNavigationOptions navigationOptions) { + MapLibreNavigationOptions navigationOptions) { List intersections = routeProgress.currentLegProgress().currentStepProgress().intersections(); diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java index 33c0201fa..a299586ca 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/FasterRouteDetectorTest.java @@ -40,14 +40,14 @@ public void sanity() throws Exception { @Test public void defaultFasterRouteEngine_didGetAddedOnInitialization() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); assertNotNull(navigation.getFasterRouteEngine()); } @Test public void addFasterRouteEngine_didGetAdded() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); FasterRoute fasterRouteEngine = mock(FasterRoute.class); navigation.setFasterRouteEngine(fasterRouteEngine); @@ -57,7 +57,7 @@ public void addFasterRouteEngine_didGetAdded() throws Exception { @Test public void onFasterRouteResponse_isFasterRouteIsTrue() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); FasterRoute fasterRouteEngine = navigation.getFasterRouteEngine(); RouteProgress currentProgress = obtainDefaultRouteProgress(); DirectionsRoute longerRoute = currentProgress.directionsRoute().toBuilder() @@ -75,7 +75,7 @@ public void onFasterRouteResponse_isFasterRouteIsTrue() throws Exception { @Test public void onSlowerRouteResponse_isFasterRouteIsFalse() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); FasterRoute fasterRouteEngine = navigation.getFasterRouteEngine(); RouteProgress currentProgress = obtainDefaultRouteProgress(); DirectionsRoute longerRoute = currentProgress.directionsRoute().toBuilder() @@ -93,7 +93,7 @@ public void onSlowerRouteResponse_isFasterRouteIsFalse() throws Exception { @Test public void onNullLocationPassed_shouldCheckFasterRouteIsFalse() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); FasterRoute fasterRouteEngine = navigation.getFasterRouteEngine(); boolean checkFasterRoute = fasterRouteEngine.shouldCheckFasterRoute(null, obtainDefaultRouteProgress()); @@ -103,7 +103,7 @@ public void onNullLocationPassed_shouldCheckFasterRouteIsFalse() throws Exceptio @Test public void onNullRouteProgressPassed_shouldCheckFasterRouteIsFalse() throws Exception { - MapboxNavigation navigation = buildNavigationWithFasterRouteEnabled(); + MapLibreNavigation navigation = buildNavigationWithFasterRouteEnabled(); FasterRoute fasterRouteEngine = navigation.getFasterRouteEngine(); boolean checkFasterRoute = fasterRouteEngine.shouldCheckFasterRoute(mock(Location.class), null); @@ -111,13 +111,13 @@ public void onNullRouteProgressPassed_shouldCheckFasterRouteIsFalse() throws Exc assertFalse(checkFasterRoute); } - private MapboxNavigation buildNavigationWithFasterRouteEnabled() { - MapboxNavigationOptions options = MapboxNavigationOptions.builder() + private MapLibreNavigation buildNavigationWithFasterRouteEnabled() { + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder() .enableFasterRouteDetection(true) .build(); Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(mock(Context.class)); - return new MapboxNavigation(context, options, mock(LocationEngine.class)); + return new MapLibreNavigation(context, options, mock(LocationEngine.class)); } private RouteProgress obtainDefaultRouteProgress() throws Exception { diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotificationTest.java similarity index 76% rename from libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotificationTest.java index ad2a40c82..a7d24bc1e 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationNotificationTest.java @@ -21,7 +21,7 @@ import org.mockito.Mock; import org.mockito.Mockito; -public class MapboxNavigationNotificationTest extends BaseTest { +public class MapLibreNavigationNotificationTest extends BaseTest { private static final String DIRECTIONS_ROUTE_FIXTURE = "directions_v5_precision_6.json"; @@ -42,9 +42,9 @@ public void setUp() throws Exception { @Ignore @Test public void sanity() throws Exception { - MapboxNavigationNotification mapboxNavigationNotification = new MapboxNavigationNotification( - Mockito.mock(Context.class), Mockito.mock(MapboxNavigation.class)); - Assert.assertNotNull(mapboxNavigationNotification); + MapLibreNavigationNotification mapLibreNavigationNotification = new MapLibreNavigationNotification( + Mockito.mock(Context.class), Mockito.mock(MapLibreNavigation.class)); + Assert.assertNotNull(mapLibreNavigationNotification); } @Ignore @@ -56,10 +56,10 @@ public void updateDefaultNotification_onlyUpdatesNameWhenNew() throws Exception .legIndex(0) .build(); - MapboxNavigationNotification mapboxNavigationNotification = new MapboxNavigationNotification( - Mockito.mock(Context.class), Mockito.mock(MapboxNavigation.class)); + MapLibreNavigationNotification mapLibreNavigationNotification = new MapLibreNavigationNotification( + Mockito.mock(Context.class), Mockito.mock(MapLibreNavigation.class)); - mapboxNavigationNotification.updateNotification(routeProgress); + mapLibreNavigationNotification.updateNotification(routeProgress); // notificationManager.getActiveNotifications()[0].getNotification().contentView; // verify(notificationManager, times(1)).getActiveNotifications()[0]; } diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java similarity index 72% rename from libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java rename to libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java index 5feeba883..08bff198e 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapboxNavigationTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java @@ -29,26 +29,26 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class MapboxNavigationTest extends BaseTest { +public class MapLibreNavigationTest extends BaseTest { @Test public void sanityTest() { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); assertNotNull(navigation); } @Test public void sanityTestWithOptions() { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); assertNotNull(navigationWithOptions); } @Test public void voiceInstructionMilestone_onInitializationDoesGetAdded() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); int identifier = searchForVoiceInstructionMilestone(navigation); @@ -57,7 +57,7 @@ public void voiceInstructionMilestone_onInitializationDoesGetAdded() throws Exce @Test public void bannerInstructionMilestone_onInitializationDoesGetAdded() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); int identifier = searchForBannerInstructionMilestone(navigation); @@ -66,29 +66,29 @@ public void bannerInstructionMilestone_onInitializationDoesGetAdded() throws Exc @Test public void defaultMilestones_onInitializationDoNotGetAdded() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); assertEquals(0, navigationWithOptions.getMilestones().size()); } @Test public void defaultEngines_offRouteEngineDidGetInitialized() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); assertNotNull(navigation.getOffRouteEngine()); } @Test public void defaultEngines_snapEngineDidGetInitialized() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); assertNotNull(navigation.getSnapEngine()); } @Test public void addMilestone_milestoneDidGetAdded() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); Milestone milestone = new StepMilestone.Builder().build(); navigation.addMilestone(milestone); @@ -98,8 +98,8 @@ public void addMilestone_milestoneDidGetAdded() throws Exception { @Test public void addMilestone_milestoneOnlyGetsAddedOnce() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(milestone); @@ -110,8 +110,8 @@ public void addMilestone_milestoneOnlyGetsAddedOnce() throws Exception { @Test public void removeMilestone_milestoneDidGetRemoved() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(milestone); @@ -122,8 +122,8 @@ public void removeMilestone_milestoneDidGetRemoved() throws Exception { @Test public void removeMilestone_milestoneDoesNotExist() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); @@ -134,8 +134,8 @@ public void removeMilestone_milestoneDoesNotExist() throws Exception { @Test public void removeMilestone_nullRemovesAllMilestones() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); @@ -148,8 +148,8 @@ public void removeMilestone_nullRemovesAllMilestones() throws Exception { @Test public void removeMilestone_correctMilestoneWithIdentifierGetsRemoved() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); int removedMilestoneIdentifier = 5678; Milestone milestone = new StepMilestone.Builder().setIdentifier(removedMilestoneIdentifier).build(); navigationWithOptions.addMilestone(milestone); @@ -161,8 +161,8 @@ public void removeMilestone_correctMilestoneWithIdentifierGetsRemoved() throws E @Test public void removeMilestone_noMilestoneWithIdentifierFound() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); int removedMilestoneIdentifier = 5678; @@ -173,8 +173,8 @@ public void removeMilestone_noMilestoneWithIdentifierFound() throws Exception { @Test public void addMilestoneList_duplicateIdentifiersAreIgnored() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); int milestoneIdentifier = 5678; Milestone milestone = new StepMilestone.Builder().setIdentifier(milestoneIdentifier).build(); navigationWithOptions.addMilestone(milestone); @@ -190,8 +190,8 @@ public void addMilestoneList_duplicateIdentifiersAreIgnored() throws Exception { @Test public void addMilestoneList_allMilestonesAreAdded() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapboxNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); + MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); int firstMilestoneId = 5678; int secondMilestoneId = 5679; Milestone firstMilestone = new StepMilestone.Builder().setIdentifier(firstMilestoneId).build(); @@ -207,7 +207,7 @@ public void addMilestoneList_allMilestonesAreAdded() throws Exception { @Test public void getLocationEngine_returnsCorrectLocationEngine() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); LocationEngine locationEngine = mock(LocationEngine.class); LocationEngine locationEngineInstanceNotUsed = mock(LocationEngine.class); @@ -219,7 +219,7 @@ public void getLocationEngine_returnsCorrectLocationEngine() throws Exception { @Test public void startNavigation_doesSendTrueToNavigationEvent() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); NavigationEventListener navigationEventListener = mock(NavigationEventListener.class); navigation.addNavigationEventListener(navigationEventListener); @@ -230,7 +230,7 @@ public void startNavigation_doesSendTrueToNavigationEvent() throws Exception { @Test public void setSnapEngine_doesReplaceDefaultEngine() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); Snap snap = mock(Snap.class); navigation.setSnapEngine(snap); @@ -240,7 +240,7 @@ public void setSnapEngine_doesReplaceDefaultEngine() throws Exception { @Test public void setOffRouteEngine_doesReplaceDefaultEngine() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); OffRoute offRoute = mock(OffRoute.class); navigation.setOffRouteEngine(offRoute); @@ -250,7 +250,7 @@ public void setOffRouteEngine_doesReplaceDefaultEngine() throws Exception { @Test public void getCameraEngine_returnsNonNullEngine() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); navigation.setOffRouteEngine(null); @@ -259,26 +259,26 @@ public void getCameraEngine_returnsNonNullEngine() throws Exception { @Test public void getCameraEngine_returnsSimpleCameraWhenNull() throws Exception { - MapboxNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapboxNavigation(); navigation.setCameraEngine(null); assertTrue(navigation.getCameraEngine() instanceof SimpleCamera); } - private MapboxNavigation buildMapboxNavigation() { + private MapLibreNavigation buildMapboxNavigation() { Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(context); - return new MapboxNavigation(context, mock(LocationEngine.class)); + return new MapLibreNavigation(context, mock(LocationEngine.class)); } - private MapboxNavigation buildMapboxNavigationWithOptions(MapboxNavigationOptions options) { + private MapLibreNavigation buildMapboxNavigationWithOptions(MapLibreNavigationOptions options) { Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(context); - return new MapboxNavigation(context, options, mock(LocationEngine.class)); + return new MapLibreNavigation(context, options, mock(LocationEngine.class)); } - private int searchForVoiceInstructionMilestone(MapboxNavigation navigation) { + private int searchForVoiceInstructionMilestone(MapLibreNavigation navigation) { int identifier = -1; for (Milestone milestone : navigation.getMilestones()) { if (milestone instanceof VoiceInstructionMilestone) { @@ -288,7 +288,7 @@ private int searchForVoiceInstructionMilestone(MapboxNavigation navigation) { return identifier; } - private int searchForBannerInstructionMilestone(MapboxNavigation navigation) { + private int searchForBannerInstructionMilestone(MapLibreNavigation navigation) { int identifier = -1; for (Milestone milestone : navigation.getMilestones()) { if (milestone instanceof BannerInstructionMilestone) { diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java index a15f79d8c..fc209bce8 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationEventDispatcherTest.java @@ -57,7 +57,7 @@ public class NavigationEventDispatcherTest extends BaseTest { Milestone milestone; private NavigationEventDispatcher navigationEventDispatcher; - private MapboxNavigation navigation; + private MapLibreNavigation navigation; private DirectionsRoute route; private RouteProgress routeProgress; @@ -66,7 +66,7 @@ public void setup() throws Exception { MockitoAnnotations.initMocks(this); Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(mock(Context.class)); - navigation = new MapboxNavigation(context, mock(LocationEngine.class)); + navigation = new MapLibreNavigation(context, mock(LocationEngine.class)); navigationEventDispatcher = navigation.getEventDispatcher(); Gson gson = new GsonBuilder() diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java index a99b4cbb2..5fda3c718 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationHelperTest.java @@ -94,19 +94,19 @@ public void increaseIndex_stepIndexResetsOnLegIndexIncrease() throws Exception { @Test public void checkMilestones_onlyTriggeredMilestonesGetReturned() throws Exception { RouteProgress routeProgress = buildMultiLegRouteProgress(); - MapboxNavigationOptions options = MapboxNavigationOptions.builder() + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder() .defaultMilestonesEnabled(false).build(); Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(mock(Context.class)); - MapboxNavigation mapboxNavigation = new MapboxNavigation(context, options, mock(LocationEngine.class)); - mapboxNavigation.addMilestone(new StepMilestone.Builder() + MapLibreNavigation mapLibreNavigation = new MapLibreNavigation(context, options, mock(LocationEngine.class)); + mapLibreNavigation.addMilestone(new StepMilestone.Builder() .setTrigger(Trigger.eq(TriggerProperty.STEP_INDEX, 0)) .setIdentifier(1001).build()); - mapboxNavigation.addMilestone(new StepMilestone.Builder() + mapLibreNavigation.addMilestone(new StepMilestone.Builder() .setTrigger(Trigger.eq(TriggerProperty.STEP_INDEX, 4)) .setIdentifier(1002).build()); - List triggeredMilestones = checkMilestones(routeProgress, routeProgress, mapboxNavigation); + List triggeredMilestones = checkMilestones(routeProgress, routeProgress, mapLibreNavigation); assertEquals(1, triggeredMilestones.size()); assertEquals(1001, triggeredMilestones.get(0).getIdentifier()); @@ -115,13 +115,13 @@ public void checkMilestones_onlyTriggeredMilestonesGetReturned() throws Exceptio @Test public void offRouteDetectionDisabled_isOffRouteReturnsFalse() throws Exception { - MapboxNavigationOptions options = MapboxNavigationOptions.builder() + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder() .enableOffRouteDetection(false) .build(); Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(mock(Context.class)); - MapboxNavigation mapboxNavigation = new MapboxNavigation(context, options, mock(LocationEngine.class)); - NavigationLocationUpdate model = NavigationLocationUpdate.create(mock(Location.class), mapboxNavigation); + MapLibreNavigation mapLibreNavigation = new MapLibreNavigation(context, options, mock(LocationEngine.class)); + NavigationLocationUpdate model = NavigationLocationUpdate.create(mock(Location.class), mapLibreNavigation); boolean userOffRoute = isUserOffRoute(model, mock(RouteProgress.class), mock(OffRouteCallback.class)); diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java index 9644a57c0..a87ca6f9c 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationNotificationProviderTest.java @@ -3,9 +3,6 @@ import android.content.Context; import androidx.annotation.NonNull; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigation; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; -import org.maplibre.navigation.android.navigation.v5.navigation.NavigationNotificationProvider; import org.maplibre.navigation.android.navigation.v5.navigation.notification.NavigationNotification; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; @@ -22,9 +19,9 @@ public class NavigationNotificationProviderTest { @Test public void updateNavigationNotification() { NavigationNotification notification = mock(NavigationNotification.class); - MapboxNavigation mapboxNavigation = buildNavigationWithNotificationOptions(notification); + MapLibreNavigation mapLibreNavigation = buildNavigationWithNotificationOptions(notification); Context context = mock(Context.class); - NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapboxNavigation); + NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapLibreNavigation); RouteProgress routeProgress = mock(RouteProgress.class); provider.updateNavigationNotification(routeProgress); @@ -35,9 +32,9 @@ public void updateNavigationNotification() { @Test public void updateNavigationNotification_doesNotUpdateAfterShutdown() { NavigationNotification notification = mock(NavigationNotification.class); - MapboxNavigation mapboxNavigation = buildNavigationWithNotificationOptions(notification); + MapLibreNavigation mapLibreNavigation = buildNavigationWithNotificationOptions(notification); Context context = mock(Context.class); - NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapboxNavigation); + NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapLibreNavigation); RouteProgress routeProgress = mock(RouteProgress.class); provider.shutdown(context); @@ -49,9 +46,9 @@ public void updateNavigationNotification_doesNotUpdateAfterShutdown() { @Test public void onShutdown_onNavigationStoppedIsCalled() { NavigationNotification notification = mock(NavigationNotification.class); - MapboxNavigation mapboxNavigation = buildNavigationWithNotificationOptions(notification); + MapLibreNavigation mapLibreNavigation = buildNavigationWithNotificationOptions(notification); Context context = mock(Context.class); - NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapboxNavigation); + NavigationNotificationProvider provider = new NavigationNotificationProvider(context, mapLibreNavigation); provider.shutdown(context); @@ -59,11 +56,11 @@ public void onShutdown_onNavigationStoppedIsCalled() { } @NonNull - private MapboxNavigation buildNavigationWithNotificationOptions(NavigationNotification notification) { - MapboxNavigation mapboxNavigation = mock(MapboxNavigation.class); - MapboxNavigationOptions options = mock(MapboxNavigationOptions.class); + private MapLibreNavigation buildNavigationWithNotificationOptions(NavigationNotification notification) { + MapLibreNavigation mapLibreNavigation = mock(MapLibreNavigation.class); + MapLibreNavigationOptions options = mock(MapLibreNavigationOptions.class); when(options.navigationNotification()).thenReturn(notification); - when(mapboxNavigation.options()).thenReturn(options); - return mapboxNavigation; + when(mapLibreNavigation.options()).thenReturn(options); + return mapLibreNavigation; } } \ No newline at end of file diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java index fd12cb696..049713c18 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationRouteProcessorTest.java @@ -27,15 +27,15 @@ public class NavigationRouteProcessorTest extends BaseTest { private NavigationRouteProcessor routeProcessor; - private MapboxNavigation navigation; + private MapLibreNavigation navigation; @Before public void before() throws Exception { routeProcessor = new NavigationRouteProcessor(); - MapboxNavigationOptions options = MapboxNavigationOptions.builder().build(); + MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().build(); Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(context); - navigation = new MapboxNavigation(context, options, mock(LocationEngine.class)); + navigation = new MapLibreNavigation(context, options, mock(LocationEngine.class)); navigation.startNavigation(buildTestDirectionsRoute()); } diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java index b906b7859..07af6b634 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/offroute/OffRouteDetectorTest.java @@ -6,7 +6,7 @@ import org.maplibre.navigation.android.navigation.v5.models.LegStep; import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.navigation.android.navigation.v5.utils.Constants; @@ -34,13 +34,13 @@ public class OffRouteDetectorTest extends BaseTest { @Mock private OffRouteCallback mockCallback; private OffRouteDetector offRouteDetector; - private MapboxNavigationOptions options; + private MapLibreNavigationOptions options; @Before public void setup() throws Exception { MockitoAnnotations.initMocks(this); - options = MapboxNavigationOptions.builder().build(); + options = MapLibreNavigationOptions.builder().build(); offRouteDetector = new OffRouteDetector(); offRouteDetector.setOffRouteCallback(mockCallback); @@ -311,7 +311,7 @@ public void isUserOffRoute_AssertTrueWhenOnRouteMovingAwayWithRightDirectionTrav @Test public void isUserOffRoute_AssertTrueWhenOnRouteMovingAwayWithNotEnoughRightDirectionTraveling() throws Exception { - MapboxNavigationOptions options = this.options.toBuilder() + MapLibreNavigationOptions options = this.options.toBuilder() .offRouteMinimumDistanceMetersBeforeRightDirection(60) .build(); diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java index e53afde30..4fc6f2680 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/ToleranceUtilsTest.java @@ -7,7 +7,7 @@ import org.maplibre.geojson.LineString; import org.maplibre.geojson.Point; import org.maplibre.geojson.utils.PolylineUtils; -import org.maplibre.navigation.android.navigation.v5.navigation.MapboxNavigationOptions; +import org.maplibre.navigation.android.navigation.v5.navigation.MapLibreNavigationOptions; import org.maplibre.navigation.android.navigation.v5.routeprogress.RouteProgress; import org.maplibre.turf.TurfConstants; import org.maplibre.turf.TurfMeasurement; @@ -27,7 +27,7 @@ public void dynamicRerouteDistanceTolerance_userFarAwayFromIntersection() throws List stepPoints = PolylineUtils.decode(route.geometry(), PRECISION_6); Point midPoint = TurfMeasurement.midpoint(stepPoints.get(0), stepPoints.get(1)); - double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(midPoint, routeProgress, MapboxNavigationOptions.builder().build()); + double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(midPoint, routeProgress, MapLibreNavigationOptions.builder().build()); assertEquals(25.0, tolerance, DELTA); } @@ -41,7 +41,7 @@ public void dynamicRerouteDistanceTolerance_userCloseToIntersection() throws Exc LineString lineString = LineString.fromPolyline(route.geometry(), PRECISION_6); Point closePoint = TurfMeasurement.along(lineString, distanceToIntersection, TurfConstants.UNIT_METERS); - double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(closePoint, routeProgress, MapboxNavigationOptions.builder().build()); + double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(closePoint, routeProgress, MapLibreNavigationOptions.builder().build()); assertEquals(50.0, tolerance, DELTA); } @@ -54,7 +54,7 @@ public void dynamicRerouteDistanceTolerance_userJustPastTheIntersection() throws LineString lineString = LineString.fromPolyline(route.geometry(), PRECISION_6); Point closePoint = TurfMeasurement.along(lineString, distanceToIntersection, TurfConstants.UNIT_METERS); - double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(closePoint, routeProgress, MapboxNavigationOptions.builder().build()); + double tolerance = ToleranceUtils.dynamicRerouteDistanceTolerance(closePoint, routeProgress, MapLibreNavigationOptions.builder().build()); assertEquals(50.0, tolerance, DELTA); } From 24ff62839871a53d2085891c2a04f36ff4c9fca3 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Sat, 8 Jun 2024 00:30:17 +0200 Subject: [PATCH 09/21] Fix wrong imports --- .../android/navigation/ui/v5/route/MapRouteLineTest.java | 2 +- .../android/navigation/v5/utils/DistanceFormatterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java index 92b550737..c42503ec9 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapRouteLineTest.java @@ -23,6 +23,7 @@ import androidx.annotation.NonNull; +import org.maplibre.navigation.android.navigation.ui.v5.R; import org.maplibre.navigation.android.navigation.v5.models.DirectionsRoute; import org.maplibre.geojson.FeatureCollection; import org.maplibre.geojson.LineString; @@ -32,7 +33,6 @@ import org.maplibre.android.style.sources.GeoJsonOptions; import org.maplibre.android.style.sources.GeoJsonSource; import org.maplibre.navigation.android.navigation.ui.v5.BaseTest; -import com.mapbox.services.android.navigation.ui.v5.R; import org.junit.Before; import org.junit.Test; diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java index f29823d42..8e09fa2d2 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/utils/DistanceFormatterTest.java @@ -5,7 +5,7 @@ import android.content.res.Resources; import android.os.LocaleList; -import com.mapbox.services.android.navigation.R; +import org.maplibre.navigation.android.navigation.R; import org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria; import junit.framework.Assert; From 5a24cc7a47da19ec2105b8258e81f8aa268ba866 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Mon, 10 Jun 2024 23:29:49 +0200 Subject: [PATCH 10/21] Update artifact group ID --- gradle/artifact-settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index 5a69af074..39a5c6115 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -1,5 +1,5 @@ ext { - navigationArtifactGroupId = 'com.mapbox.mapboxsdk' + navigationArtifactGroupId = 'org.maplibre.navigation' navigationArtifactId = 'android' navigationArtifactTitle = 'MapLibre Navigation SDK for Android' navigationArtifactDescription = 'MapLibre Navigation SDK for Android' From 93d0b6f8f8f71417879f05ef2530392783cf581c Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Wed, 12 Jun 2024 16:55:42 +0200 Subject: [PATCH 11/21] Rename Mapbox variable & reference names to MapLibre --- .github/ISSUE_TEMPLATE.md | 2 +- .tx/config | 6 +- CONTRIBUTING.md | 26 -- LICENSE | 4 +- Makefile | 62 ----- app/build.gradle | 7 +- .../android/example/MockNavigationActivity.kt | 32 +-- .../android/example/NavigationUIActivity.kt | 30 +-- .../example/SnapToRouteNavigationActivity.kt | 26 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-my/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles.xml | 30 +-- circle.yml | 126 ---------- config/checkstyle/checkstyle.xml | 2 +- gradle/dependencies-graph.gradle | 8 +- libandroid-navigation-ui/.gitignore | 2 +- libandroid-navigation-ui/build.gradle | 9 +- libandroid-navigation-ui/gradle.properties | 4 - libandroid-navigation-ui/javadoc.gradle | 8 +- .../proguard-consumer.pro | 4 +- .../navigation/ui/v5/NavigationLauncher.java | 6 +- .../navigation/ui/v5/NavigationPresenter.java | 2 +- .../navigation/ui/v5/NavigationView.java | 22 +- .../navigation/ui/v5/NavigationViewModel.java | 2 +- .../ui/v5/camera/CameraAnimationDelegate.java | 14 +- .../CameraOverviewCancelableCallback.java | 8 +- .../ui/v5/camera/DynamicCamera.java | 16 +- .../ui/v5/camera/NavigationCamera.java | 38 +-- .../v5/instruction/AbbreviationVerifier.java | 2 +- .../v5/instruction/maneuver/ManeuverView.java | 4 +- .../maneuver/ManeuversStyleKit.java | 1 - .../ui/v5/map/LocationFpsDelegate.java | 14 +- .../ui/v5/map/MapLayerInteractor.java | 12 +- .../ui/v5/map/MapPaddingAdjustor.java | 14 +- .../ui/v5/map/NavigationMapLibreMap.java | 62 ++--- .../ui/v5/map/NavigationSymbolManager.java | 4 +- .../v5/map/SymbolOnStyleLoadedListener.java | 12 +- .../ui/v5/map/WaynameFeatureFinder.java | 8 +- .../ui/v5/route/FeatureProcessingTask.java | 2 +- .../navigation/ui/v5/route/MapRouteArrow.java | 44 ++-- .../navigation/ui/v5/route/MapRouteLine.java | 18 +- .../ui/v5/route/NavigationMapRoute.java | 66 ++--- .../ui/v5/route/RouteConstants.java | 6 +- .../navigation/ui/v5/utils/MapUtils.java | 10 +- .../ui/v5/voice/NavigationSpeechPlayer.java | 4 +- .../src/main/res/drawable/ic_arrow_head.xml | 2 +- .../res/drawable/ic_arrow_head_casing.xml | 2 +- .../src/main/res/values/colors.xml | 76 +++--- .../src/main/res/values/styles.xml | 74 +++--- .../ui/v5/NavigationViewRouterTest.java | 2 +- .../navigation/ui/v5/TestRouteBuilder.java | 2 +- .../ui/v5/TestRouteProgressBuilder.java | 2 +- .../ui/v5/camera/DynamicCameraTest.java | 24 +- .../ui/v5/camera/NavigationCameraTest.java | 44 ++-- .../ui/v5/map/LocationFpsDelegateTest.java | 44 ++-- .../ui/v5/map/MapPaddingAdjustorTest.java | 38 +-- .../ui/v5/map/NavigationMapLibreMapTest.java | 12 +- .../map/SymbolOnStyleLoadedListenerTest.java | 11 +- .../ui/v5/map/WaynameFeatureFinderTest.java | 8 +- .../v5/route/MapRouteClickListenerTest.java | 5 +- .../ui/v5/route/NavigationMapRouteTest.java | 74 +++--- libandroid-navigation/.gitignore | 2 +- libandroid-navigation/build.gradle | 11 +- libandroid-navigation/gradle.properties | 4 - libandroid-navigation/javadoc.gradle | 8 +- .../src/main/AndroidManifest.xml | 2 +- .../core/crashreporter/CrashReport.java | 2 +- .../MapLibreUncaughtExceptionHandler.java | 42 ++-- .../v5/exception/NavigationException.java | 2 +- .../navigation/v5/models/RouteOptions.java | 6 +- .../navigation/v5/models/StepManeuver.java | 2 +- .../v5/navigation/MapLibreNavigation.java | 13 +- .../v5/navigation/NavigationConstants.java | 14 +- .../v5/navigation/NavigationHelper.java | 6 +- .../navigation/NavigationLocationUpdate.java | 2 +- .../v5/navigation/NavigationMapRoute.java | 187 +++++++------- .../RouteProcessorBackgroundThread.java | 4 +- .../RouteProcessorHandlerCallback.java | 2 +- .../notification/NavigationNotification.java | 4 +- .../v5/offroute/OffRouteCallback.java | 4 +- .../routeprogress/CurrentLegAnnotation.java | 8 +- .../navigation/v5/snap/SnapToRoute.java | 2 +- .../navigation/v5/utils/Constants.java | 2 +- .../android/navigation/v5/utils/MapUtils.java | 20 +- .../src/main/res/values/colors.xml | 76 +++--- .../src/main/res/values/styles.xml | 180 +++++++------- .../v5/navigation/MapLibreNavigationTest.java | 48 ++-- localization.md | 48 ---- scripts/release.py | 235 ------------------ 95 files changed, 817 insertions(+), 1336 deletions(-) delete mode 100644 CONTRIBUTING.md delete mode 100644 Makefile delete mode 100644 circle.yml delete mode 100644 libandroid-navigation-ui/gradle.properties delete mode 100644 libandroid-navigation/gradle.properties delete mode 100644 localization.md delete mode 100644 scripts/release.py diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 01863af3f..ecfd50afb 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,7 +3,7 @@ Hello and thanks for contributing! To help us diagnose your problem quickly, ple - Include a minimal demonstration of the bug, including code, logs, and screenshots. - Ensure you can reproduce the bug using the latest release. - - Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/mapbox + - Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/maplibre --> **Android API:** diff --git a/.tx/config b/.tx/config index 8093b6243..6b6f98cb7 100644 --- a/.tx/config +++ b/.tx/config @@ -3,19 +3,19 @@ host = https://www.transifex.com minimum_perc = 20 lang_map = pt_BR: pt-rBR, pt_PT: pt-rPT -[mapbox-navigation-sdk-for-android.test-app-strings-file] +[maplibre-navigation-sdk-for-android.test-app-strings-file] file_filter = app/src/main/res/values-/strings.xml source_file = app/src/main/res/values/strings.xml source_lang = en type = ANDROID -[mapbox-navigation-sdk-for-android.libandroid-navigation-strings-file] +[maplibre-navigation-sdk-for-android.libandroid-navigation-strings-file] file_filter = libandroid-navigation/src/main/res/values-/strings.xml source_file = libandroid-navigation/src/main/res/values/strings.xml source_lang = en type = ANDROID -[mapbox-navigation-sdk-for-android.libandroid-navigation-ui-strings-file] +[maplibre-navigation-sdk-for-android.libandroid-navigation-ui-strings-file] file_filter = libandroid-navigation-ui/src/main/res/values-/strings.xml source_file = libandroid-navigation-ui/src/main/res/values/strings.xml source_lang = en diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 9ce115a66..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,26 +0,0 @@ -# Contributing - -If you have a usage question pertaining to the Maplibre Navigation SDK for Android, or any of our other products, contact us through [our support page](https://www.mapbox.com/contact/). - -If you want to contribute code: - -1. Please familiarize yourself with the [install process](README.md). - -2. Ensure that existing [pull requests](https://github.com/maplibre/maplibre-navigation-android/pulls) and [issues](https://github.com/maplibre/maplibre-navigation-android/issues) don’t already cover your contribution or question. - -3. Pull requests are gladly accepted. If there are any changes that developers should be aware of, please update the [change log](CHANGELOG.md) - -4. ~~We use checkstyle to enforce good coding standards. CI will fail if your PR contains any issues.~~ Lints are currently disabled; PRs welcome to improve the situation. Unit tests still run though! - -## Getting started building - -You can check out the repo and build locally using Android Studio or the gradle wrapper CLI, -just as with any other Kotlin/Java project. -Do note however that currently the lints fail, so you should run build excluding lints. -For example: `./gradlew build -x lint`. - -# Code of conduct - -Everyone is invited to participate in MapLibre’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Mapbox organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/). - -You can learn more about MapLibre at [maplibre.org](https://maplibre.org/). diff --git a/LICENSE b/LICENSE index 384358c99..1ba0c0a6d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Maplibre -Copyright (c) 2019 Flitsmeister -Copyright (c) 2018 Mapbox +Copyright (c) 2024 Maplibre Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile deleted file mode 100644 index 1d5016285..000000000 --- a/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -checkstyle: - ./gradlew checkstyle - -test: - # See libandroid-navigation/build.gradle for details - ./gradlew :libandroid-navigation:test - ./gradlew :libandroid-navigation-ui:test - -build-release: - ./gradlew :libandroid-navigation:assembleRelease - ./gradlew :libandroid-navigation-ui:assembleRelease - -javadoc: - ./gradlew :libandroid-navigation:javadocrelease - ./gradlew :libandroid-navigation-ui:javadocrelease - -publish: - export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation:uploadArchives - export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation-ui:uploadArchives - -publish-local: - # This publishes to ~/.m2/repository/com/mapbox/mapboxsdk - export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation:uploadArchives - export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation-ui:uploadArchives - -graphs: - ./gradlew :libandroid-navigation:generateDependencyGraphMapboxLibraries - ./gradlew :libandroid-navigation-ui:generateDependencyGraphMapboxLibraries - -dependency-updates: - ./gradlew :libandroid-navigation:dependencyUpdates - ./gradlew :libandroid-navigation-ui:dependencyUpdates - ./gradlew :app:dependencyUpdates - -dex-count: - ./gradlew countDebugDexMethods - ./gradlew countReleaseDexMethods - -navigation-fixtures: - # Navigation: Taylor street to Page street - curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.413165,37.795042;-122.433378,37.7727?geometries=polyline6&overview=full&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/navigation.json - - # Directions: polyline geometry with precision 5 - curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.416667,37.783333;-121.900000,37.333333?geometries=polyline&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/directions_v5.json - - # Intersection: - curl "https://api.mapbox.com/directions/v5/mapbox/driving/-101.70939001157072,33.62145406099651;-101.68721910152767,33.6213852194939?geometries=polyline6&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/single_intersection.json - - # Distance Congestion annotation: Mapbox DC to National Mall - curl "https://api.mapbox.com/directions/v5/mapbox/driving-traffic/-77.034042,38.899949;-77.03949,38.888871?geometries=polyline6&overview=full&steps=true&annotations=congestion%2Cdistance&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/directions_distance_congestion_annotation.json - - # Default Directions - curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.416686,37.783425;-121.90034,37.333317?geometries=polyline6&steps=true&banner_instructions=true&voice_instructions=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/directions_v5_precision_6.json - - # No VoiceInstructions - curl "https://api.mapbox.com/directions/v5/mapbox/driving/-77.034013,38.899994;-77.033757,38.903311?geometries=polyline6&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ - -o libandroid-navigation/src/test/resources/directions_v5_no_voice.json \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index cf05b482c..ab92c160b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { } defaultConfig { - applicationId "com.mapbox.services.android.navigation.testapp" + applicationId "org.maplibre.navigation.android.example" minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion versionCode 1 @@ -63,10 +63,7 @@ android { dependencies { implementation project(':libandroid-navigation') implementation project(':libandroid-navigation-ui') - implementation(dependenciesList.mapLibre) { - exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-geojson' - exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-turf' - } + implementation dependenciesList.mapLibre // Support libraries implementation dependenciesList.androidxAppcompat diff --git a/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt index aae3a3263..0189e3f57 100644 --- a/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/MockNavigationActivity.kt @@ -59,7 +59,7 @@ class MockNavigationActivity : MilestoneEventListener, OffRouteListener { private val BEGIN_ROUTE_MILESTONE = 1001 - private lateinit var mapboxMap: MapLibreMap + private lateinit var mapLibreMap: MapLibreMap // Navigation related variables private var locationEngine: ReplayRouteLocationEngine = @@ -134,8 +134,8 @@ class MockNavigationActivity : it.assign(route) navigation.locationEngine = it navigation.startNavigation(route) - if (::mapboxMap.isInitialized) { - mapboxMap.removeOnMapClickListener(this) + if (::mapLibreMap.isInitialized) { + mapLibreMap.removeOnMapClickListener(this) } } } @@ -146,9 +146,9 @@ class MockNavigationActivity : } binding.clearPoints.setOnClickListener { - if (::mapboxMap.isInitialized) { - mapboxMap.markers.forEach { - mapboxMap.removeMarker(it) + if (::mapLibreMap.isInitialized) { + mapLibreMap.markers.forEach { + mapLibreMap.removeMarker(it) } } destination = null @@ -159,9 +159,9 @@ class MockNavigationActivity : } } - override fun onMapReady(mapboxMap: MapLibreMap) { - this.mapboxMap = mapboxMap - mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> + override fun onMapReady(mapLibreMap: MapLibreMap) { + this.mapLibreMap = mapLibreMap + mapLibreMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) } @@ -169,10 +169,10 @@ class MockNavigationActivity : NavigationMapRoute( navigation, binding.mapView, - mapboxMap + mapLibreMap ) - mapboxMap.addOnMapClickListener(this) + mapLibreMap.addOnMapClickListener(this) Snackbar.make( findViewById(R.id.container), "Tap map to place waypoint", @@ -185,7 +185,7 @@ class MockNavigationActivity : @SuppressWarnings("MissingPermission") private fun enableLocationComponent(style: Style) { // Get an instance of the component - locationComponent = mapboxMap.locationComponent + locationComponent = mapLibreMap.locationComponent locationComponent?.let { // Activate with a built LocationComponentActivationOptions object @@ -218,7 +218,7 @@ class MockNavigationActivity : } if (addMarker) { - mapboxMap.addMarker(MarkerOptions().position(point)) + mapLibreMap.addMarker(MarkerOptions().position(point)) } binding.clearPoints.visibility = View.VISIBLE @@ -327,8 +327,8 @@ class MockNavigationActivity : override fun onDestroy() { super.onDestroy() navigation.onDestroy() - if (::mapboxMap.isInitialized) { - mapboxMap.removeOnMapClickListener(this) + if (::mapLibreMap.isInitialized) { + mapLibreMap.removeOnMapClickListener(this) } binding.mapView.onDestroy() } @@ -348,7 +348,7 @@ class MockNavigationActivity : } private fun newOrigin() { - mapboxMap.let { + mapLibreMap.let { val latLng = LatLng(52.039176, 5.550339) locationEngine.assignLastLocation( Point.fromLngLat(latLng.longitude, latLng.latitude), diff --git a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt index 9bef72da5..d4ee04b8b 100644 --- a/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/NavigationUIActivity.kt @@ -37,7 +37,7 @@ class NavigationUIActivity : AppCompatActivity(), OnMapReadyCallback, MapLibreMap.OnMapClickListener { - private lateinit var mapboxMap: MapLibreMap + private lateinit var mapLibreMap: MapLibreMap // Navigation related variables private var route: DirectionsRoute? = null @@ -67,7 +67,7 @@ class NavigationUIActivity : binding.startRouteButton.setOnClickListener { route?.let { route -> - val userLocation = mapboxMap.locationComponent.lastKnownLocation ?: return@let + val userLocation = mapLibreMap.locationComponent.lastKnownLocation ?: return@let val options = NavigationLauncherOptions.builder() .directionsRoute(route) @@ -86,9 +86,9 @@ class NavigationUIActivity : binding.clearPoints.setOnClickListener { - if (::mapboxMap.isInitialized) { - mapboxMap.markers.forEach { - mapboxMap.removeMarker(it) + if (::mapLibreMap.isInitialized) { + mapLibreMap.markers.forEach { + mapLibreMap.removeMarker(it) } } destination = null @@ -100,19 +100,19 @@ class NavigationUIActivity : } } - override fun onMapReady(mapboxMap: MapLibreMap) { - this.mapboxMap = mapboxMap - mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> + override fun onMapReady(mapLibreMap: MapLibreMap) { + this.mapLibreMap = mapLibreMap + mapLibreMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) } navigationMapRoute = NavigationMapRoute( binding.mapView, - mapboxMap + mapLibreMap ) - mapboxMap.addOnMapClickListener(this) + mapLibreMap.addOnMapClickListener(this) Snackbar.make( findViewById(R.id.container), "Tap map to place waypoint", @@ -123,7 +123,7 @@ class NavigationUIActivity : @SuppressWarnings("MissingPermission") private fun enableLocationComponent(style: Style) { // Get an instance of the component - locationComponent = mapboxMap.locationComponent + locationComponent = mapLibreMap.locationComponent locationComponent?.let { // Activate with a built LocationComponentActivationOptions object @@ -154,7 +154,7 @@ class NavigationUIActivity : } if (addMarker) { - mapboxMap.addMarker(MarkerOptions().position(point)) + mapLibreMap.addMarker(MarkerOptions().position(point)) binding.clearPoints.visibility = View.VISIBLE } calculateRoute() @@ -163,7 +163,7 @@ class NavigationUIActivity : private fun calculateRoute() { binding.startRouteLayout.visibility = View.GONE - val userLocation = mapboxMap.locationComponent.lastKnownLocation + val userLocation = mapLibreMap.locationComponent.lastKnownLocation val destination = destination if (userLocation == null) { Timber.d("calculateRoute: User location is null, therefore, origin can't be set.") @@ -242,8 +242,8 @@ class NavigationUIActivity : override fun onDestroy() { super.onDestroy() - if (::mapboxMap.isInitialized) { - mapboxMap.removeOnMapClickListener(this) + if (::mapLibreMap.isInitialized) { + mapLibreMap.removeOnMapClickListener(this) } binding.mapView.onDestroy() } diff --git a/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt index ddc665b66..cf69362ce 100644 --- a/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt +++ b/app/src/main/java/org/maplibre/navigation/android/example/SnapToRouteNavigationActivity.kt @@ -44,7 +44,7 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, ProgressChangeListener { private lateinit var binding: ActivitySnapToRouteNavigationBinding - private lateinit var mapboxMap: MapLibreMap + private lateinit var mapLibreMap: MapLibreMap private var locationEngine: ReplayRouteLocationEngine = ReplayRouteLocationEngine() private lateinit var navigation: MapLibreNavigation @@ -79,9 +79,9 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, private var locationComponent: LocationComponent? = null - override fun onMapReady(mapboxMap: MapLibreMap) { - this.mapboxMap = mapboxMap - mapboxMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> + override fun onMapReady(mapLibreMap: MapLibreMap) { + this.mapLibreMap = mapLibreMap + mapLibreMap.setStyle(Style.Builder().fromUri(getString(R.string.map_style_light))) { style -> enableLocationComponent(style) } @@ -89,15 +89,15 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, NavigationMapRoute( navigation, binding.mapView, - mapboxMap + mapLibreMap ) calculateRouteAndStartNavigation() } @SuppressWarnings("MissingPermission") private fun enableLocationComponent(style: Style) { - locationComponent = mapboxMap.locationComponent - mapboxMap.locationComponent.activateLocationComponent( + locationComponent = mapLibreMap.locationComponent + mapLibreMap.locationComponent.activateLocationComponent( LocationComponentActivationOptions.builder( this, style, @@ -108,22 +108,22 @@ class SnapToRouteNavigationActivity : AppCompatActivity(), OnMapReadyCallback, followLocation() - mapboxMap.locationComponent.isLocationComponentEnabled = true + mapLibreMap.locationComponent.isLocationComponentEnabled = true } private fun followLocation() { - if (!mapboxMap.locationComponent.isLocationComponentActivated) { + if (!mapLibreMap.locationComponent.isLocationComponentActivated) { return } - mapboxMap.locationComponent.renderMode = RenderMode.GPS - mapboxMap.locationComponent.setCameraMode( + mapLibreMap.locationComponent.renderMode = RenderMode.GPS + mapLibreMap.locationComponent.setCameraMode( CameraMode.TRACKING_GPS, object : OnLocationCameraTransitionListener { override fun onLocationCameraTransitionFinished(cameraMode: Int) { - mapboxMap.locationComponent.zoomWhileTracking(17.0) - mapboxMap.locationComponent.tiltWhileTracking(60.0) + mapLibreMap.locationComponent.zoomWhileTracking(17.0) + mapLibreMap.locationComponent.tiltWhileTracking(60.0) } override fun onLocationCameraTransitionCanceled(cameraMode: Int) {} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1c8a5ca11..3daf6edef 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="com.mapbox.services.android.navigation.testapp.org.maplibre.navigation.android.example.testapp.MainActivity"> + tools:context="org.maplibre.navigation.android.example.MainActivity"> - Mapbox Navigációs SDK Androidhoz + MapLibre Navigációs SDK Androidhoz diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index 8fcfd7676..dd25431bb 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -1,5 +1,5 @@ - Mapbox လမ်းညွန်ခြင်း development tookkit + MapLibre လမ်းညွန်ခြင်း development tookkit စမ်းသပ်လမ်းညွှန်ခြင်း စမ်းသပ်လမ်းညွန်မှုအပိုင်းကို စမ်းသပ်တည်နေရာပြengine အသုံးပြုသည် diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 98b8e3a42..f0c01ff33 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,3 +1,3 @@ - SDK de Navegação Mapbox para Android + SDK de Navegação MapLibre para Android diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 2a3e96a0d..00453e314 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,5 +1,5 @@ - Navegação Mapbox SDK para Android + Navegação MapLibre SDK para Android Navegação Simulada Simule uma sessão de navegação usando um serviço de localizações simuladas. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ccf108817..f4aafa69e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,5 +1,5 @@ - Навигация Mapbox для Android + Навигация MapLibre для Android Моделирование маршрута Начать моделирование маршрута c помощью эмулятора местоположения. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1e4cea3b6..7d28ce403 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,5 +1,5 @@ - SDK Điều hướng của Mapbox + SDK Điều hướng của MapLibre Giả bộ Điều hướng Giả bộ phiên điều hướng dùng máy định vị giả. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b73ada3b..7d115db11 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -37,8 +37,8 @@ NavigationView implemented with Fragment NavigationView implemented with Fragment - MapboxNavigation with UI components - MapboxNavigation with UI components + MapLibreNavigation with UI components + MapLibreNavigation with UI components Settings Simulate Route diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fa969a654..7e4f45f92 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,27 +9,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 25dp - 125dp + 25dp + 125dp - diff --git a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java index 08bff198e..a02d0c5bd 100644 --- a/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java +++ b/libandroid-navigation/src/test/java/org/maplibre/navigation/android/navigation/v5/navigation/MapLibreNavigationTest.java @@ -33,7 +33,7 @@ public class MapLibreNavigationTest extends BaseTest { @Test public void sanityTest() { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); assertNotNull(navigation); } @@ -41,14 +41,14 @@ public void sanityTest() { @Test public void sanityTestWithOptions() { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); assertNotNull(navigationWithOptions); } @Test public void voiceInstructionMilestone_onInitializationDoesGetAdded() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); int identifier = searchForVoiceInstructionMilestone(navigation); @@ -57,7 +57,7 @@ public void voiceInstructionMilestone_onInitializationDoesGetAdded() throws Exce @Test public void bannerInstructionMilestone_onInitializationDoesGetAdded() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); int identifier = searchForBannerInstructionMilestone(navigation); @@ -67,28 +67,28 @@ public void bannerInstructionMilestone_onInitializationDoesGetAdded() throws Exc @Test public void defaultMilestones_onInitializationDoNotGetAdded() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); assertEquals(0, navigationWithOptions.getMilestones().size()); } @Test public void defaultEngines_offRouteEngineDidGetInitialized() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); assertNotNull(navigation.getOffRouteEngine()); } @Test public void defaultEngines_snapEngineDidGetInitialized() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); assertNotNull(navigation.getSnapEngine()); } @Test public void addMilestone_milestoneDidGetAdded() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); Milestone milestone = new StepMilestone.Builder().build(); navigation.addMilestone(milestone); @@ -99,7 +99,7 @@ public void addMilestone_milestoneDidGetAdded() throws Exception { @Test public void addMilestone_milestoneOnlyGetsAddedOnce() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(milestone); @@ -111,7 +111,7 @@ public void addMilestone_milestoneOnlyGetsAddedOnce() throws Exception { @Test public void removeMilestone_milestoneDidGetRemoved() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(milestone); @@ -123,7 +123,7 @@ public void removeMilestone_milestoneDidGetRemoved() throws Exception { @Test public void removeMilestone_milestoneDoesNotExist() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); Milestone milestone = new StepMilestone.Builder().build(); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); @@ -135,7 +135,7 @@ public void removeMilestone_milestoneDoesNotExist() throws Exception { @Test public void removeMilestone_nullRemovesAllMilestones() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); @@ -149,7 +149,7 @@ public void removeMilestone_nullRemovesAllMilestones() throws Exception { @Test public void removeMilestone_correctMilestoneWithIdentifierGetsRemoved() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); int removedMilestoneIdentifier = 5678; Milestone milestone = new StepMilestone.Builder().setIdentifier(removedMilestoneIdentifier).build(); navigationWithOptions.addMilestone(milestone); @@ -162,7 +162,7 @@ public void removeMilestone_correctMilestoneWithIdentifierGetsRemoved() throws E @Test public void removeMilestone_noMilestoneWithIdentifierFound() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); navigationWithOptions.addMilestone(new StepMilestone.Builder().build()); int removedMilestoneIdentifier = 5678; @@ -174,7 +174,7 @@ public void removeMilestone_noMilestoneWithIdentifierFound() throws Exception { @Test public void addMilestoneList_duplicateIdentifiersAreIgnored() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); int milestoneIdentifier = 5678; Milestone milestone = new StepMilestone.Builder().setIdentifier(milestoneIdentifier).build(); navigationWithOptions.addMilestone(milestone); @@ -191,7 +191,7 @@ public void addMilestoneList_duplicateIdentifiersAreIgnored() throws Exception { @Test public void addMilestoneList_allMilestonesAreAdded() throws Exception { MapLibreNavigationOptions options = MapLibreNavigationOptions.builder().defaultMilestonesEnabled(false).build(); - MapLibreNavigation navigationWithOptions = buildMapboxNavigationWithOptions(options); + MapLibreNavigation navigationWithOptions = buildMapLibreNavigationWithOptions(options); int firstMilestoneId = 5678; int secondMilestoneId = 5679; Milestone firstMilestone = new StepMilestone.Builder().setIdentifier(firstMilestoneId).build(); @@ -207,7 +207,7 @@ public void addMilestoneList_allMilestonesAreAdded() throws Exception { @Test public void getLocationEngine_returnsCorrectLocationEngine() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); LocationEngine locationEngine = mock(LocationEngine.class); LocationEngine locationEngineInstanceNotUsed = mock(LocationEngine.class); @@ -219,7 +219,7 @@ public void getLocationEngine_returnsCorrectLocationEngine() throws Exception { @Test public void startNavigation_doesSendTrueToNavigationEvent() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); NavigationEventListener navigationEventListener = mock(NavigationEventListener.class); navigation.addNavigationEventListener(navigationEventListener); @@ -230,7 +230,7 @@ public void startNavigation_doesSendTrueToNavigationEvent() throws Exception { @Test public void setSnapEngine_doesReplaceDefaultEngine() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); Snap snap = mock(Snap.class); navigation.setSnapEngine(snap); @@ -240,7 +240,7 @@ public void setSnapEngine_doesReplaceDefaultEngine() throws Exception { @Test public void setOffRouteEngine_doesReplaceDefaultEngine() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); OffRoute offRoute = mock(OffRoute.class); navigation.setOffRouteEngine(offRoute); @@ -250,7 +250,7 @@ public void setOffRouteEngine_doesReplaceDefaultEngine() throws Exception { @Test public void getCameraEngine_returnsNonNullEngine() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); navigation.setOffRouteEngine(null); @@ -259,20 +259,20 @@ public void getCameraEngine_returnsNonNullEngine() throws Exception { @Test public void getCameraEngine_returnsSimpleCameraWhenNull() throws Exception { - MapLibreNavigation navigation = buildMapboxNavigation(); + MapLibreNavigation navigation = buildMapLibreNavigation(); navigation.setCameraEngine(null); assertTrue(navigation.getCameraEngine() instanceof SimpleCamera); } - private MapLibreNavigation buildMapboxNavigation() { + private MapLibreNavigation buildMapLibreNavigation() { Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(context); return new MapLibreNavigation(context, mock(LocationEngine.class)); } - private MapLibreNavigation buildMapboxNavigationWithOptions(MapLibreNavigationOptions options) { + private MapLibreNavigation buildMapLibreNavigationWithOptions(MapLibreNavigationOptions options) { Context context = mock(Context.class); when(context.getApplicationContext()).thenReturn(context); return new MapLibreNavigation(context, options, mock(LocationEngine.class)); diff --git a/localization.md b/localization.md deleted file mode 100644 index be5773c6c..000000000 --- a/localization.md +++ /dev/null @@ -1,48 +0,0 @@ -## Spoken instructions - -Turn instructions are announced in the user interface language when turn instructions are available in that language. Otherwise, if turn instructions are unavailable in that language, they are announced in English instead. To have instructions announced in a language other than the user interface language, set the `NavigationRoute.Builder#language` property when calculating the route with which to start navigation. - -Turn instructions are primarily designed to be announced by either the Mapbox Voice API (powered by [Amazon Polly](https://docs.aws.amazon.com/polly/latest/dg/SupportedLanguage.html)) or [TextToSpeech](https://developer.android.com/reference/android/speech/tts/TextToSpeech). By default, this SDK uses the Mapbox Voice API, which requires an Internet connection at various points along the route. If the Voice API lacks support for the turn instruction language or there is no Internet connection, TextToSpeech announces the instructions instead. - -By default, distances are given in the predominant measurement system of the system region, which may not necessarily be the same region in which the user is traveling. To override the measurement system used in spoken instructions, set the `MapboxNavigationOptions.Builder#unitType` property when calculating the route with which to start navigation. - -The upcoming road or ramp destination is named according to the local or national language. In some regions, the name may be given in multiple languages. - -## Supported languages - -The table below lists the languages that are supported for user interface elements and for spoken instructions. - -| Language | User interface | [Spoken instructions][apidoc] | Remarks -|------------|:--------------:|:-----------------------------:|-------- -| Bengali | ✅ | — -| Burmese | ✅ | ✅ | Depends on the device; may require third-party text-to-speech -| Chinese | - | ✅ Mandarin | Depends on the device; may require third-party text-to-speech -| Czech | ✅ | - -| Danish | ✅ | ✅ -| English | ✅ | ✅ -| Esperanto | — | ✅ -| Finnish | — | ✅ | Depends on the device; may require third-party text-to-speech -| French | ✅ | ✅ -| German | ✅ | ✅ -| Hebrew | ✅ | ✅ | Depends on the device; may require third-party text-to-speech -| Indonesian | — | ✅ | Depends on the device; may require third-party text-to-speech -| Italian | ✅ | ✅ -| Korean | ✅ | ✅ -| Norwegian | — | ✅ -| Polish | — | ✅ -| Portuguese | ✅ | ✅ -| Romanian | — | ✅ -| Russian | ✅ | ✅ -| Spanish | ✅ | ✅ -| Swedish | ✅ | ✅ -| Turkish | — | ✅ -| Ukrainian | ✅ | ✅ | Depends on the device; may require third-party text-to-speech -| Vietnamese | ✅ | ✅ | Depends on the device; may require third-party text-to-speech - -**Please note:** For languages marked with `Depends on the device; may require third-party text-to-speech`, instructions are provided by the SDK, but we cannot guarantee the given device will have the appropriate `TextToSpeech` speech engine installed to pronounce these instructions correctly. - -## Contributing - -See the [contributing guide](https://github.com/mapbox/mapbox-navigation-ios/blob/master/CONTRIBUTING.md#adding-or-updating-a-localization) for instructions on adding a new localization or improving an existing localization. - -[apidoc]: https://www.mapbox.com/api-documentation/#instructions-languages diff --git a/scripts/release.py b/scripts/release.py deleted file mode 100644 index 04afbc34d..000000000 --- a/scripts/release.py +++ /dev/null @@ -1,235 +0,0 @@ -''' -Utility to schedule Navigation SDK builds on CircleCI. - -Examples: - -- Publish a snapshot from master (release.py uses the current branch) - - $ git branch - * master - 1234-fix-crash - $ python release.py --stage snapshot - -- Publish a snapshot from a feature branch (same as before, just switch branchs with git): - - $ git branch - master - * 1234-fix-crash - $ python release.py --stage snapshot - -- Publish a beta from a pre-release branch: - - $ git branch - master - * release-android-420-beta1 - $ python release.py --stage beta --version 2.0.0-beta.1 - -- Publish a beta from a release branch: - - $ git branch - master - * release-android-420 - $ python release.py --stage final --version 2.0.0 - -TODO: - -- Add a flag to wait until the release has been built (CircleCI) and published (Maven). - -''' - -import click -import json -import os -import requests -import subprocess - -# Three stages, from less stable to more stable -ALLOWED_STAGES = ['snapshot', 'beta', 'final'] - -# Get the version from GRADLE_PROPERTIES_PATH below -CURRENT_VERSION_TAG = 'current' - -# You can add your API token onhttps://circleci.com/account/api -CIRCLECI_API_TOKEN_ENV_VAR = 'CIRCLECI_API_TOKEN' - -# In the future we might want to consider alpha, or rc. -ALLOWED_PRE_RELEASE = ['beta'] - -# We get the default version from here -GRADLE_PROPERTIES_PATH = '../gradle.properties' -GRADLE_TOKEN = 'VERSION_NAME=' - -# Circle CI -# Triggers a new build, returns a summary of the build -URL_CIRCLECI = 'https://circleci.com/api/v1.1/project/github/mapbox/mapbox-gl-native/tree/' # + :branch - -# We support three parameters: stage, branch, and version -@click.command() -@click.option('--stage', default=ALLOWED_STAGES[0], type=click.Choice(ALLOWED_STAGES), prompt='Set stage', help='The release stage.') -@click.option('--version', default=CURRENT_VERSION_TAG, prompt='Set version', help='The version you want to publish. E.g: 2.0.0-SNAPSHOT, 2.0.0-beta.1, or 2.0.0. If you set the version to "%s", the script will default to the current SNAPSHOT version.' % CURRENT_VERSION_TAG) -def release(stage, version): - # Validate params - final_stage = validate_stage(stage=stage) - final_branch = validate_branch(stage=final_stage) - final_version = validate_version(stage=final_stage, branch=final_branch, version=version) - - # Get user confirmation - click.echo('\n===== Build information =====') - click.echo('- Stage: %s' % final_stage) - click.echo('- Branch: %s' % final_branch) - click.echo('- Version: %s' % final_version) - click.confirm('\nDoes it look right?', abort=True) - - # Proceed - if (final_stage == 'snapshot'): - publish_snapshot(branch=final_branch, version=final_version) - elif (final_stage == 'beta'): - publish_beta(branch=final_branch, version=final_version) - elif (final_stage == 'final'): - publish_final(branch=final_branch, version=final_version) - -def validate_stage(stage): - if stage not in ALLOWED_STAGES: - abort_with_message('Invalid stage: %s' % stage) - return stage - -def validate_branch(stage): - branch = git_get_current_branch() - if not branch: - abort_with_message('The current folder is not a git repository.') - if branch == 'master' and stage != 'snapshot': - abort_with_message('You need to swtich to a release branch for a beta or a final release.') - return branch - -def validate_version(stage, branch, version): - if stage == 'snapshot' and branch == 'master' and version != CURRENT_VERSION_TAG: - abort_with_message('You cannot specify a custom version if you are building a snapshot from master.') - - if not version or version == CURRENT_VERSION_TAG: - version = get_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN) - - if stage == 'snapshot': - if not 'SNAPSHOT' in version: - abort_with_message('Version should contain the word SNAPSHOT: %s' % version) - elif stage == 'beta': - if not ALLOWED_PRE_RELEASE[0] in version: - abort_with_message('Version should contain the word %s: %s' % (ALLOWED_PRE_RELEASE[0], version)) - elif stage == 'final': - if not version or 'SNAPSHOT' in version or ALLOWED_PRE_RELEASE[0] in version: - abort_with_message('Version cannot be empty, or contain the words SNAPSHOT or %s: %s' % (ALLOWED_PRE_RELEASE[0], version)) - - return version - -def publish_snapshot(branch, version): - click.echo('Publishing snapshot for branch: %s (version: %s).' % (branch, version)) - if branch != 'master': - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -def publish_beta(branch, version): - click.echo('Publishing beta from branch: %s (version: %s).' % (branch, version)) - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -def publish_final(branch, version): - click.echo('Publishing final release from branch: %s (version: %s).' % (branch, version)) - dirty_gradle = update_current_version(file_path=GRADLE_PROPERTIES_PATH, file_var=GRADLE_TOKEN, version=version) - if dirty_gradle: - git_add(path=GRADLE_PROPERTIES_PATH) - git_commit_and_push(branch=branch, version=version) - do_circleci_request(branch=branch) - -# -# Utils -# - -def abort_with_message(message): - click.echo(message) - click.get_current_context().abort() - -def execute_call(command): - click.echo('Executing: %s' % command) - result = subprocess.call(command, shell=True) - if result != 0: - abort_with_message('Command failed: %s' % command) - -# -# CircleCI -# - -def get_circleci_api_token(): - circleci_api_token = os.environ.get(CIRCLECI_API_TOKEN_ENV_VAR) - if not circleci_api_token: - abort_with_message('You need to set the CIRCLECI_API_TOKEN environment variable.') - click.echo('Found CircleCI API token.') - return circleci_api_token - -def do_circleci_request(branch): - url = URL_CIRCLECI + branch - params = {'circle-token': get_circleci_api_token()} - click.echo('CircleCI request to %s (params: %s)' % (url, json.dumps(params))) - click.confirm('\nDo you want to start a build?', abort=True) - - r = requests.post(url, params=params) - click.echo('- CircleCI response code: %s' % r.status_code) - -# -# Git -# - -def git_get_current_branch(): - return subprocess.check_output('git symbolic-ref --short HEAD'.split(' ')).strip() - -def git_add(path): - execute_call(command='git add %s' % path) - -def git_commit_and_push(branch, version): - message = '[android] [auto] Update properties to version %s in preparation for build.' % version - commands = [ - 'git commit -m "%s"' % message, - 'git push -u origin %s' % branch] - for command in commands: - execute_call(command=command) - -# -# Read and update properties files -# - -def get_current_version(file_path, file_var): - click.echo('Getting current version from %s.' % file_path) - with open(file_path, 'r') as f: - for line in f: - if line.startswith(file_var): - version_name = line[len(file_var):].strip() - click.echo('Current version is %s.' % version_name) - return version_name - return None - -def update_current_version(file_path, file_var, version): - dirty = False - click.echo('Updating file to version %s: %s.' % (version, file_path)) - with open(file_path, 'r') as f: - file_lines = f.readlines() - for line_number in range(len(file_lines)): - if file_lines[line_number].startswith(file_var): - content_old = file_lines[line_number] - content_new = '%s%s\n' % (file_var, version) - if (content_old != content_new): - click.echo('%s -> %s' % (content_old.strip(), content_new.strip())) - file_lines[line_number] = content_new - dirty = True - if dirty: - with open(file_path, 'w') as f: - f.writelines(file_lines) - else: - click.echo('File already has the right version.') - return dirty - -if __name__ == '__main__': - release() From 1b325d29f14301b877ed71cbd1f689684ad528b0 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Fri, 14 Jun 2024 14:44:40 +0200 Subject: [PATCH 12/21] Use Mapbox ids to be equal with native project IDs --- .../ui/v5/route/RouteConstants.java | 2 +- .../v5/navigation/NavigationMapRoute.java | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java index e13a54b33..ad20634f7 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/RouteConstants.java @@ -3,7 +3,7 @@ import org.maplibre.android.constants.MapLibreConstants; class RouteConstants { - static final String MAPLIBRE_LOCATION_ID = "maplibre-location"; + static final String MAPLIBRE_LOCATION_ID = "mapbox-location"; static final String CONGESTION_KEY = "congestion"; static final String ROUTE_SOURCE_ID = "mapbox-navigation-route-source"; static final String ROUTE_LAYER_ID = "mapbox-navigation-route-layer"; diff --git a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java index 1b32e5123..1a871f3ba 100644 --- a/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java +++ b/libandroid-navigation/src/main/java/org/maplibre/navigation/android/navigation/v5/navigation/NavigationMapRoute.java @@ -95,25 +95,25 @@ public class NavigationMapRoute implements MapView.OnDidFinishLoadingStyleListen private static final String SOURCE_KEY = "source"; private static final String INDEX_KEY = "index"; - private static final String GENERIC_ROUTE_SOURCE_ID = "maplibre-navigation-route-source"; - private static final String GENERIC_ROUTE_LAYER_ID = "maplibre-navigation-route-layer"; - private static final String WAYPOINT_SOURCE_ID = "maplibre-navigation-waypoint-source"; - private static final String WAYPOINT_LAYER_ID = "maplibre-navigation-waypoint-layer"; + private static final String GENERIC_ROUTE_SOURCE_ID = "mapbox-navigation-route-source"; + private static final String GENERIC_ROUTE_LAYER_ID = "mapbox-navigation-route-layer"; + private static final String WAYPOINT_SOURCE_ID = "mapbox-navigation-waypoint-source"; + private static final String WAYPOINT_LAYER_ID = "mapbox-navigation-waypoint-layer"; private static final String ID_FORMAT = "%s-%d"; - private static final String GENERIC_ROUTE_SHIELD_LAYER_ID = "maplibre-navigation-route-shield-layer"; + private static final String GENERIC_ROUTE_SHIELD_LAYER_ID = "mapbox-navigation-route-shield-layer"; private static final int TWO_POINTS = 2; private static final int THIRTY = 30; - private static final String ARROW_BEARING = "maplibre-navigation-arrow-bearing"; - private static final String ARROW_SHAFT_SOURCE_ID = "maplibre-navigation-arrow-shaft-source"; - private static final String ARROW_HEAD_SOURCE_ID = "maplibre-navigation-arrow-head-source"; - private static final String ARROW_SHAFT_CASING_LINE_LAYER_ID = "maplibre-navigation-arrow-shaft-casing-layer"; - private static final String ARROW_SHAFT_LINE_LAYER_ID = "maplibre-navigation-arrow-shaft-layer"; - private static final String ARROW_HEAD_ICON = "maplibre-navigation-arrow-head-icon"; - private static final String ARROW_HEAD_ICON_CASING = "maplibre-navigation-arrow-head-icon-casing"; + private static final String ARROW_BEARING = "mapbox-navigation-arrow-bearing"; + private static final String ARROW_SHAFT_SOURCE_ID = "mapbox-navigation-arrow-shaft-source"; + private static final String ARROW_HEAD_SOURCE_ID = "mapbox-navigation-arrow-head-source"; + private static final String ARROW_SHAFT_CASING_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-casing-layer"; + private static final String ARROW_SHAFT_LINE_LAYER_ID = "mapbox-navigation-arrow-shaft-layer"; + private static final String ARROW_HEAD_ICON = "mapbox-navigation-arrow-head-icon"; + private static final String ARROW_HEAD_ICON_CASING = "mapbox-navigation-arrow-head-icon-casing"; private static final int MAX_DEGREES = 360; - private static final String ARROW_HEAD_CASING_LAYER_ID = "maplibre-navigation-arrow-head-casing-layer"; + private static final String ARROW_HEAD_CASING_LAYER_ID = "mapbox-navigation-arrow-head-casing-layer"; private static final Float[] ARROW_HEAD_CASING_OFFSET = {0f, -7f}; - private static final String ARROW_HEAD_LAYER_ID = "maplibre-navigation-arrow-head-layer"; + private static final String ARROW_HEAD_LAYER_ID = "mapbox-navigation-arrow-head-layer"; private static final Float[] ARROW_HEAD_OFFSET = {0f, -7f}; private static final int MIN_ARROW_ZOOM = 10; private static final int MAX_ARROW_ZOOM = 22; @@ -883,7 +883,7 @@ private void placeRouteBelow() { for (int i = 0; i < styleLayers.size(); i++) { if (!(styleLayers.get(i) instanceof SymbolLayer) // Avoid placing the route on top of the user location layer - && !styleLayers.get(i).getId().contains("maplibre-location")) { + && !styleLayers.get(i).getId().contains("mapbox-location")) { belowLayer = styleLayers.get(i).getId(); } } From e5c9b85fcd217190de2f224ff184b5bd4651b9f3 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Wed, 18 Sep 2024 16:22:13 +0200 Subject: [PATCH 13/21] Fix missing point converts --- .../ui/v5/route/MapLibreRouteFetcher.java | 2 +- .../ui/v5/route/NavigationRoute.java | 47 +++++++++---------- .../ui/v5/route/NavigationRouteTest.java | 6 +-- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java index 083089e96..21aeda32b 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/MapLibreRouteFetcher.java @@ -78,7 +78,7 @@ public NavigationRoute.Builder buildRequest(Location location, RouteProgress pro Double bearing = location.hasBearing() ? Float.valueOf(location.getBearing()).doubleValue() : null; RouteOptions options = progress.directionsRoute().routeOptions(); NavigationRoute.Builder builder = NavigationRoute.builder(context) - .origin(origin, bearing, BEARING_TOLERANCE) + .origin(toMapLibrePoint(origin), bearing, BEARING_TOLERANCE) .routeOptions(options); List remainingWaypoints = toMapboxPointList(routeUtils.calculateRemainingWaypoints(progress)); diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java index 7ec370cf0..8a73ec3fc 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRoute.java @@ -15,8 +15,6 @@ import org.maplibre.navigation.android.navigation.v5.utils.LocaleUtils; import org.maplibre.navigation.android.navigation.v5.utils.TextUtils; -import com.mapbox.geojson.Point; - import java.io.IOException; import java.util.List; import java.util.Locale; @@ -214,12 +212,12 @@ public Builder profile(@NonNull @DirectionsCriteria.ProfileCriteria String profi * This sets the starting point on the map where the route will begin. It is one of the * required parameters which must be set for a successful directions response. * - * @param origin a GeoJson {@link Point} object representing the starting location for the route + * @param origin a GeoJson {@link org.maplibre.geojson.Point} object representing the starting location for the route * @return this builder for chaining options together * @since 0.5.0 */ public Builder origin(@NonNull org.maplibre.geojson.Point origin) { - origin(toMapboxPoint(origin), null, null); + origin(origin, null, null); return this; } @@ -227,7 +225,7 @@ public Builder origin(@NonNull org.maplibre.geojson.Point origin) { * This sets the starting point on the map where the route will begin. It is one of the * required parameters which must be set for a successful directions response. * - * @param origin a GeoJson {@link Point} object representing the starting location for the + * @param origin a GeoJson {@link org.maplibre.geojson.Point} object representing the starting location for the * route * @param angle double value used for setting the corresponding coordinate's angle of travel * when determining the route @@ -236,9 +234,9 @@ public Builder origin(@NonNull org.maplibre.geojson.Point origin) { * @return this builder for chaining options together * @since 0.5.0 */ - public Builder origin(@NonNull com.mapbox.geojson.Point origin, @Nullable Double angle, + public Builder origin(@NonNull org.maplibre.geojson.Point origin, @Nullable Double angle, @Nullable Double tolerance) { - directionsBuilder.origin(origin); + directionsBuilder.origin(toMapboxPoint(origin)); directionsBuilder.addBearing(angle, tolerance); return this; } @@ -247,13 +245,13 @@ public Builder origin(@NonNull com.mapbox.geojson.Point origin, @Nullable Double * This sets the ending point on the map where the route will end. It is one of the required * parameters which must be set for a successful directions response. * - * @param destination a GeoJson {@link Point} object representing the starting location for the + * @param destination a GeoJson {@link org.maplibre.geojson.Point} object representing the starting location for the * route * @return this builder for chaining options together * @since 0.50 */ public Builder destination(@NonNull org.maplibre.geojson.Point destination) { - destination(toMapboxPoint(destination), null, null); + destination(destination, null, null); return this; } @@ -261,7 +259,7 @@ public Builder destination(@NonNull org.maplibre.geojson.Point destination) { * This sets the ending point on the map where the route will end. It is one of the required * parameters which must be set for a successful directions response. * - * @param destination a GeoJson {@link Point} object representing the starting location for the + * @param destination a GeoJson {@link org.maplibre.geojson.Point} object representing the starting location for the * route * @param angle double value used for setting the corresponding coordinate's angle of travel * when determining the route @@ -270,9 +268,9 @@ public Builder destination(@NonNull org.maplibre.geojson.Point destination) { * @return this builder for chaining options together * @since 0.5.0 */ - public Builder destination(@NonNull Point destination, @Nullable Double angle, + public Builder destination(@NonNull org.maplibre.geojson.Point destination, @Nullable Double angle, @Nullable Double tolerance) { - directionsBuilder.destination(destination); + directionsBuilder.destination(toMapboxPoint(destination)); directionsBuilder.addBearing(angle, tolerance); return this; } @@ -283,8 +281,8 @@ public Builder destination(@NonNull Point destination, @Nullable Double angle, * {@link DirectionsCriteria#PROFILE_DRIVING_TRAFFIC} that the max number of waypoints allowed * in the request is currently limited to 1. * - * @param waypoint a {@link Point} which represents the pit-stop or waypoint where you'd like - * one of the {@link RouteLeg} to + * @param waypoint a {@link org.maplibre.geojson.Point} which represents the pit-stop or waypoint where you'd like + * one of the {@link org.maplibre.navigation.android.navigation.v5.models.RouteLeg} to * navigate the user to * @return this builder for chaining options together * @since 0.5.0 @@ -301,8 +299,8 @@ public Builder addWaypoint(@NonNull org.maplibre.geojson.Point waypoint) { * {@link DirectionsCriteria#PROFILE_DRIVING_TRAFFIC} that the max number of waypoints allowed * in the request is currently limited to 1. * - * @param waypoint a {@link Point} which represents the pit-stop or waypoint where you'd like - * one of the {@link RouteLeg} to + * @param waypoint a {@link org.maplibre.geojson.Point} which represents the pit-stop or waypoint where you'd like + * one of the {@link org.maplibre.navigation.android.navigation.v5.models.RouteLeg} to * navigate the user to * @param angle double value used for setting the corresponding coordinate's angle of travel * when determining the route @@ -311,9 +309,9 @@ public Builder addWaypoint(@NonNull org.maplibre.geojson.Point waypoint) { * @return this builder for chaining options together * @since 0.5.0 */ - public Builder addWaypoint(@NonNull Point waypoint, @Nullable Double angle, + public Builder addWaypoint(@NonNull org.maplibre.geojson.Point waypoint, @Nullable Double angle, @Nullable Double tolerance) { - directionsBuilder.addWaypoint(waypoint); + directionsBuilder.addWaypoint(toMapboxPoint(waypoint)); directionsBuilder.addBearing(angle, tolerance); return this; } @@ -325,7 +323,6 @@ public Builder addWaypoint(@NonNull Point waypoint, @Nullable Double angle, * Most useful in combination with steps=true and requests based on traces * with high sample rates. Can be an index corresponding to any of the input coordinates, * but must contain the first ( 0 ) and last coordinates' indices. - * {@link #steps()} *

* * @param waypointIndices a list of coordinate indices to be used as waypoints @@ -386,7 +383,7 @@ Builder language(Context context, LocaleUtils localeUtils) { *

* * @param annotations string referencing one of the annotation direction criteria's. The strings - * restricted to one or multiple values inside the {@link AnnotationCriteria} + * restricted to one or multiple values inside the {@link org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria.AnnotationCriteria} * or null which will result in no annotations being used * @return this builder for chaining options together * @see RouteLeg object @@ -455,10 +452,10 @@ public Builder radiuses(@FloatRange(from = 0) List radiuses) { /** * Change the units used for voice announcements, this does not change the units provided in - * other fields outside of the {@link VoiceInstructions} + * other fields outside of the {@link org.maplibre.navigation.android.navigation.v5.models.VoiceInstructions} * object. * - * @param voiceUnits one of the values found inside the {@link VoiceUnitCriteria} + * @param voiceUnits one of the values found inside the {@link org.maplibre.navigation.android.navigation.v5.models.DirectionsCriteria.VoiceUnitCriteria} * @return this builder for chaining options together * @since 0.8.0 */ @@ -509,7 +506,7 @@ public Builder interceptor(Interceptor interceptor) { /** * Required to call when this is being built. If no access token provided, - * {@link ServicesException} will be thrown. + * {@link NullPointerException} will be thrown. * * @param accessToken Mapbox access token, You must have a Mapbox account inorder to use * the Optimization API @@ -660,7 +657,7 @@ private static com.mapbox.api.directions.v5.models.DirectionsResponse toMapboxDi return com.mapbox.api.directions.v5.models.DirectionsResponse.fromJson(directionsResponse.toJson()); } - private static Point toMapboxPoint(org.maplibre.geojson.Point point) { - return Point.fromLngLat(point.longitude(), point.latitude()); + private static com.mapbox.geojson.Point toMapboxPoint(org.maplibre.geojson.Point point) { + return com.mapbox.geojson.Point.fromLngLat(point.longitude(), point.latitude()); } } \ No newline at end of file diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java index 4a829cb0d..a85b7f8b7 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/route/NavigationRouteTest.java @@ -94,7 +94,7 @@ public void addWaypointNamesIncludedInRequest() { public void addingPointAndBearingKeepsCorrectOrder() throws Exception { NavigationRoute navigationRoute = NavigationRoute.builder(context, localeUtils) .accessToken(BaseTest.ACCESS_TOKEN) - .origin(com.mapbox.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) + .origin(org.maplibre.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) .addBearing(2.0, 3.0) .destination(Point.fromLngLat(1.0, 5.0)) .build(); @@ -108,8 +108,8 @@ public void addingPointAndBearingKeepsCorrectOrder() throws Exception { public void reverseOriginDestinationDoesntMessUpBearings() throws Exception { NavigationRoute navigationRoute = NavigationRoute.builder(context, localeUtils) .accessToken(BaseTest.ACCESS_TOKEN) - .destination(com.mapbox.geojson.Point.fromLngLat(1.0, 5.0), 1d, 5d) - .origin(com.mapbox.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) + .destination(org.maplibre.geojson.Point.fromLngLat(1.0, 5.0), 1d, 5d) + .origin(org.maplibre.geojson.Point.fromLngLat(1.0, 2.0), 90d, 90d) .build(); assertThat(navigationRoute.getCall().request().url().toString(), From 61923c1e64186e878a0b68d32cccb3fcbb8f5a58 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Wed, 18 Sep 2024 18:28:47 +0200 Subject: [PATCH 14/21] Update MapLibre version --- gradle/dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 84da97cbd..6c315b47b 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,9 +9,9 @@ ext { ] version = [ - mapLibreVersion : '11.0.0', + mapLibreVersion : '11.4.0', mapLibreTurf : '6.0.1', - mapLibreAnnotations : '3.0.0', + mapLibreAnnotations : '3.0.1', mapboxGeoJson : '5.8.0', annotation : '1.8.0', autoValue : '1.11.0', From 9e0c9c5bfe1f23c4f97e698b21c42555db0771bd Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Wed, 18 Sep 2024 19:12:07 +0200 Subject: [PATCH 15/21] Remove not working street source part --- .../android/navigation/ui/v5/map/NavigationMapLibreMap.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java index a26b0d3fb..75e1c5aae 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/map/NavigationMapLibreMap.java @@ -690,10 +690,6 @@ private void initializeStreetsSource(MapLibreMap mapLibreMap) { layerInteractor.addStreetsLayer(sourceV7.getId(), STREETS_V7_ROAD_LABEL); } else if (sourceV8 != null) { layerInteractor.addStreetsLayer(sourceV8.getId(), STREETS_V8_ROAD_LABEL); - } else { - VectorSource streetSource = new VectorSource(STREETS_SOURCE_ID, MAPBOX_STREETS_V8_URL); - mapLibreMap.getStyle().addSource(streetSource); - layerInteractor.addStreetsLayer(STREETS_SOURCE_ID, STREETS_V8_ROAD_LABEL); } } From 3c0640f7626585bcc1bec8464f5ae841b626eecc Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Fri, 27 Sep 2024 12:16:25 +0200 Subject: [PATCH 16/21] =?UTF-8?q?Add=20FLOSS=20tile=20server=20as=20defaul?= =?UTF-8?q?t=20configuration=20=F0=9F=92=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/developer-config.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/developer-config.gradle b/gradle/developer-config.gradle index 64186bd42..0bb7e7acc 100644 --- a/gradle/developer-config.gradle +++ b/gradle/developer-config.gradle @@ -17,9 +17,9 @@ task accessToken { " \n" + " " + mapboxAccessToken + "\n" + " \n" + - " \n" + + " https://tiles.versatiles.org/assets/styles/colorful.json\n" + " \n" + - " \n" + + " https://tiles.versatiles.org/assets/styles/eclipse.json\n" + "" tokenFile.write(tokenFileContents) } From 90b50c2d849fd54e546d77339c09fe5b1ada08f5 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Fri, 27 Sep 2024 13:11:38 +0200 Subject: [PATCH 17/21] Update to latest MapLibre version --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6c315b47b..dd4ea33ce 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,7 +9,7 @@ ext { ] version = [ - mapLibreVersion : '11.4.0', + mapLibreVersion : '11.5.0', mapLibreTurf : '6.0.1', mapLibreAnnotations : '3.0.1', mapboxGeoJson : '5.8.0', From f1433b577ac8c862e8fb5e6caaa8f4c455b3ceac Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Thu, 31 Oct 2024 11:03:00 +0100 Subject: [PATCH 18/21] Rollback license copyright change --- LICENSE | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1ba0c0a6d..384358c99 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2024 Maplibre +Copyright (c) 2021 Maplibre +Copyright (c) 2019 Flitsmeister +Copyright (c) 2018 Mapbox Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 3204bbbbc4e66286c5a1d3a57b5da19dafcbc243 Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Thu, 7 Nov 2024 15:20:42 +0100 Subject: [PATCH 19/21] Update to latest MapLibre version --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index dd4ea33ce..62cf5c796 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,7 +9,7 @@ ext { ] version = [ - mapLibreVersion : '11.5.0', + mapLibreVersion : '11.6.1', mapLibreTurf : '6.0.1', mapLibreAnnotations : '3.0.1', mapboxGeoJson : '5.8.0', From b94ea90e61e8e775b7b6db6845d8ff7770084fbe Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Thu, 7 Nov 2024 18:00:02 +0100 Subject: [PATCH 20/21] Remove duplicated classpath line --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index e26f7721a..41b9b7746 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ buildscript { classpath pluginDependencies.errorprone classpath pluginDependencies.dependencyUpdates classpath pluginDependencies.kotlinGradle - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0' } } From 5f9472fdb575e5a3e3a2e6dbcd230b966047a42e Mon Sep 17 00:00:00 2001 From: Fabian Keunecke Date: Thu, 7 Nov 2024 18:06:31 +0100 Subject: [PATCH 21/21] Remove unused class MapConnectivityController --- .../ui/v5/MapConnectivityController.java | 10 ---------- .../navigation/ui/v5/NavigationViewModel.java | 4 ---- .../navigation/ui/v5/NavigationViewModelTest.java | 15 +++++---------- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java deleted file mode 100644 index 2f995b78d..000000000 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.maplibre.navigation.android.navigation.ui.v5; - -import org.maplibre.android.MapLibre; - -class MapConnectivityController { - - void assign(Boolean state) { - MapLibre.setConnected(state); - } -} diff --git a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java index 9b5a90bbf..aede9e3b1 100644 --- a/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java +++ b/libandroid-navigation-ui/src/main/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModel.java @@ -75,7 +75,6 @@ public class NavigationViewModel extends AndroidViewModel { private int timeFormatType; private boolean isRunning; private boolean isChangingConfigurations; - private MapConnectivityController connectivityController; public NavigationViewModel(Application application) { super(application); @@ -83,18 +82,15 @@ public NavigationViewModel(Application application) { initializeRouter(); this.routeUtils = new RouteUtils(); this.localeUtils = new LocaleUtils(); - this.connectivityController = new MapConnectivityController(); } @TestOnly // Package private (no modifier) for testing purposes NavigationViewModel(Application application, MapLibreNavigation navigation, - MapConnectivityController connectivityController, NavigationViewRouter router) { super(application); this.navigation = navigation; this.router = router; - this.connectivityController = connectivityController; } @TestOnly diff --git a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java index 89393552f..f0b8e7cc2 100644 --- a/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java +++ b/libandroid-navigation-ui/src/test/java/org/maplibre/navigation/android/navigation/ui/v5/NavigationViewModelTest.java @@ -24,9 +24,8 @@ public class NavigationViewModelTest { public void stopNavigation_progressListenersAreRemoved() { Application application = mock(Application.class); MapLibreNavigation navigation = mock(MapLibreNavigation.class); - MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); - NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); + NavigationViewModel viewModel = new NavigationViewModel(application, navigation, router); viewModel.stopNavigation(); @@ -37,9 +36,8 @@ public void stopNavigation_progressListenersAreRemoved() { public void stopNavigation_milestoneListenersAreRemoved() { Application application = mock(Application.class); MapLibreNavigation navigation = mock(MapLibreNavigation.class); - MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); - NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); + NavigationViewModel viewModel = new NavigationViewModel(application, navigation, router); viewModel.stopNavigation(); @@ -50,9 +48,8 @@ public void stopNavigation_milestoneListenersAreRemoved() { public void stopNavigation_mapOfflineManagerOnDestroyIsCalledIfNotNull() { Application application = mock(Application.class); MapLibreNavigation navigation = mock(MapLibreNavigation.class); - MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); - NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, router); + NavigationViewModel viewModel = new NavigationViewModel(application, navigation, router); viewModel.onDestroy(false); } @@ -62,9 +59,8 @@ public void updateRoute_navigationIsNotUpdatedWhenChangingConfigurations() { Application application = mock(Application.class); MapLibreNavigation navigation = mock(MapLibreNavigation.class); DirectionsRoute route = mock(DirectionsRoute.class); - MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter router = mock(NavigationViewRouter.class); - NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController,router); + NavigationViewModel viewModel = new NavigationViewModel(application, navigation,router); viewModel.onDestroy(true); viewModel.updateRoute(route); @@ -76,9 +72,8 @@ public void updateRoute_navigationIsNotUpdatedWhenChangingConfigurations() { public void navigationRouter_onDestroyInvokedWhenViewModelIsDestroyed() { Application application = mock(Application.class); MapLibreNavigation navigation = mock(MapLibreNavigation.class); - MapConnectivityController mockedConnectivityController = mock(MapConnectivityController.class); NavigationViewRouter mockedRouter = mock(NavigationViewRouter.class); - NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedConnectivityController, mockedRouter); + NavigationViewModel viewModel = new NavigationViewModel(application, navigation, mockedRouter); viewModel.onCleared(); verify(mockedRouter).onDestroy(); }