Upgrade to MapLibre 11.0.0 #110

Fabi755 · 2024-06-07T22:16:43Z

Upgrade MapLibre to major version 11.x.x.

Closes #104

Following things have done for this:

Upgrade MapLibre
a. Update maplibre-native to version 11.0.0
b. Update maplibre-java modules to version 6.0.1
c. Rename affected imports
d. Replace MapLibre hosted mapbox-sdk-services (5.9.0) by Mapbox hosted mapbox-sdk-services (5.8.0) to solve package conflicts. This step was required because the project is currently using some classes from the services module. But the module was removed from the MapLibre project, and therefore not upgraded to the new package name.
Rename Mapbox classes to MapLibre

Things we should thinking about, before release the new major version:

Change package naming/structure. For example remove v5 from path.
Rename the Gradle modules. For example in core & ui.

Please note that the GL drawing is crashing (on emulator ?!) when roating the map. See: maplibre/maplibre-native#2371.

Fabi755 · 2024-06-10T21:37:42Z

I see always existing Mapbox names on resources that could changed. I will updates this near time.

Fabi755 · 2024-06-14T12:51:00Z

In favor of maplibre/maplibre-native#2505 I noticed that the layer IDs of the native project always on mapbox naming. We need a follow up update, if the changes are released on their site.

Fabi755 · 2024-06-14T13:42:04Z

I tried to rename all Mapbox names to MapLibre. But while we use at the moment Mapbox requests as our default API, it was not very easy to differentiate the components and which names should renamed and which not.

Feel free to have an own look, and give some hints to missing parts. Alternative we can create a follow up PR when we detect missing things.

From my side this PR is ready to merge. A test usage has worked for me.

To force Jitpack to rebuild I create a tag. I added the library with

implementation 'com.github.fabi755:maplibre-navigation-android:jitpack-test1

nitrag · 2024-06-28T15:15:05Z

@boldtrn Can you review this?

boldtrn · 2024-06-28T15:40:22Z

@nitrag this PR is still on my review list. Please note, this PR is huge, while a lot of the changes are simple renames, I still have to take a look. If you like to help with the review, we are grateful for any feedback you have, so please feel free to also review the code and let us know if you spot an issue. Feel free to run the sample code an integrate this in your project so we catch possible issues early on.

rubenmx · 2024-07-01T12:19:12Z

@Fabi755 Thanks for taking the time to do this! While implementing your changes into our Flitsmeister app we noticed two things in NavigationRoute:

The origin(Point, Double, Double) function on line 239 still uses com.mapbox.geojson.Point instead of org.maplibre.geojson.Point. I see you did change it in the other variant, so the toMapboxPoint() needs to be moved to this one.
The addWayPoint(Point, Double, Double) function on line 314 also uses com.mapbox.geojson.Point instead of org.maplibre.geojson.Point (this also requires the MapLibreRouteFetcher to change to org.maplibre.geojson.Point).

After editing this, and changing all MapBox references to MapLibre, ~~our app ran perfectly fine 👍~~. Edit; when calculating a route using the NavigationRoute.builder, the app crashes on java.lang.NoClassDefFoundError: Failed resolution of: Lcom/mapbox/api/directions/v5/MapboxDirections;. Could also have something to do with adding this sdk as a local aar file to test. I also needed to add retrofit2 dependencies.

frankkienl · 2024-07-26T09:10:57Z

Can this PR be merged, or are additional changes needed?

Fabi755 · 2024-07-26T09:17:07Z

There are still issues, that I need to fix. I'm currently on holiday until august. I will continue working after this.

nitrag · 2024-08-29T16:02:07Z

I'll be happy to test this when it's finished.

frankkienl · 2024-09-18T13:29:23Z

Oh dear, there are merge conflicts :/

Fabi755 · 2024-09-19T14:04:32Z

@Fabi755 Thanks for taking the time to do this! While implementing your changes into our Flitsmeister app we noticed two things in NavigationRoute:

The origin(Point, Double, Double) function on line 239 still uses com.mapbox.geojson.Point instead of org.maplibre.geojson.Point. I see you did change it in the other variant, so the toMapboxPoint() needs to be moved to this one.
The addWayPoint(Point, Double, Double) function on line 314 also uses com.mapbox.geojson.Point instead of org.maplibre.geojson.Point (this also requires the MapLibreRouteFetcher to change to org.maplibre.geojson.Point).

Fixed!

when calculating a route using the NavigationRoute.builder, the app crashes on java.lang.NoClassDefFoundError: Failed resolution of: Lcom/mapbox/api/directions/v5/MapboxDirections;. Could also have something to do with adding this sdk as a local aar file to test. I also needed to add retrofit2 dependencies.

In the example project it works fine. Do you use the NavigationRoute from the right package org.maplibre.navigation.android.navigation.ui.v5.route)?

Feel free to test the recent changes again and let me know if something is broken. But I noticed some issue with the location puck (since v11.0.1). I'm not sure yet, whats causing this.

rubenmx · 2024-09-20T12:29:27Z

@Fabi755 Thanks, everything seems to work so far! The last time I tested it everything worked on emulator as well, but now the map seems to crash on emulator. I guess I should report that to the native team.

Fabi755 · 2024-09-20T12:36:07Z

Crashes on the emulator are known issues at the native project. There already exist issues on native project:

But sure, that is more an issue of the native project, and not part of the navigation 👍

Seems like it's fixed in 1.5.x:

Enable crash mitigation when running OpenGL in the Android emulator maplibre-native#2858 (review)
Android x86_64 emulator crashes (11.2.0) maplibre-native#2791 (comment)

rubenmx · 2024-09-20T12:47:05Z

Thanks, I'm subscribing to that issue. Hopefully it can be fixed 🤞

ravenfeld · 2024-10-26T12:23:15Z

As it's a big refacto, I think it should be merged before other PRs come into conflict with it.

Fabi755 · 2024-10-26T13:45:17Z

When other things come up, and a conflict will created, it's easy to solve, while this changes are only renamings :-)

But this will merged soon. Review is already in progress.

boldtrn · 2024-10-29T11:54:03Z

LICENSE

@@ -1,8 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2021 Maplibre
-Copyright (c) 2019 Flitsmeister
-Copyright (c) 2018 Mapbox


Can we remove previous copyrights? I think we have to keep them

Do we have an legal expert at MapLibre?

But yes, I can roll this also back.

Maybe @ramyaragupathy knows more? My understanding is that we can't just remove copyrights.

I rolled back this for now. We can change this later if necessary.

frankkienl · 2024-11-01T10:40:38Z

libandroid-navigation-ui/javadoc.gradle

-    options.windowTitle("Mapbox Android Navigation UI SDK $VERSION_NAME Reference")
-    options.docTitle("Mapbox Android Navigation UI SDK $VERSION_NAME")
-    options.header("Mapbox Android Navigation UI SDK $VERSION_NAME Reference")
-    options.bottom("&copy; 2019 Mapbox. All rights reserved.")


Should this copyright notice also be deleted/kept?
( I am not a lawyer )

It might be silly to delay this PR, just because of some copyright notices;
So maybe it's better to check that in a separate issue/PR.

Also not a lawyer, but the copyright seems to be wrong anyway, as the repo is under MIT, so I think it should be alright to do this, but maybe link to the license file or something like that (if it would be hosted on some webpage, which I don't think it is right now?). Either way, we are currently testing and reviewing this PR on our end, so it's not blocked due to that, sorry if there isn't a lot of feedback right now I hope we have some by the end of next week.

That said, please feel free to also review the code @frankkienl - my plan would be to merge this ASAP (which is more like 1-2 weeks or so).

frankkienl · 2024-11-01T12:08:26Z

libandroid-navigation/javadoc.gradle

-    options.windowTitle("Mapbox Android Navigation SDK $VERSION_NAME Reference")
-    options.docTitle("Mapbox Android Navigation SDK $VERSION_NAME")
-    options.header("Mapbox Android Navigation SDK $VERSION_NAME Reference")
-    options.bottom("&copy; 2017 Mapbox. All rights reserved.")


Same here ;-) (see comment above)

sotomski

Hi folks, inspired by @boldtrn, I've spent some time looking through the changes and integrating this PR into the Kurviger app.
Apart from a blinking puck icon (presumably fixed in maplibre/maplibre-native#2879), things are looking good on our side 👍 Thanks!

build.gradle

...rc/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java

boldtrn · 2024-11-05T13:52:25Z

Ideally the puck flickering will be fixed with the next release of Maplibre-Native maplibre/maplibre-native#2992

boldtrn · 2024-11-07T14:46:11Z

The flickering issue has been resolved and this PR should be almost ready to be merged, if anyone finds an issue, please report this very soon or this PR will be merged (we can always include fixes later as well).

boldtrn

LGTM, I'd vote to merge this whenever you are ready @Fabi755 👍

Fabi755 added the dependencies Issue or pull request for updating dependencies label Jun 7, 2024

Fabi755 requested a review from boldtrn June 7, 2024 22:16

Fabi755 self-assigned this Jun 7, 2024

Fabi755 changed the title ~~Feature/maplibre 11~~ Upgrade to MapLibre v11 Jun 7, 2024

Fabi755 changed the title ~~Upgrade to MapLibre v11~~ Upgrade to MapLibre 11.0.0 Jun 7, 2024

Fabi755 force-pushed the feature/maplibre-11 branch 3 times, most recently from e695301 to ddc8848 Compare June 10, 2024 21:35

Fabi755 changed the title ~~Upgrade to MapLibre 11.0.0~~ WIP: Upgrade to MapLibre 11.0.0 Jun 10, 2024

Fabi755 mentioned this pull request Jun 12, 2024

Missing com.mapbox replacement on annotation layer ID maplibre/maplibre-native#2498

Closed

Fabi755 added 12 commits June 14, 2024 14:54

Upgrade dependencies, build tools & configurations

2dc9919

Set Java & Kotlin version by toolchain

ff41955

Remove unused butterknife dependency

32972eb

Fix maven (local) publishing, Set MapLibre artifact configuration

a49e0d8

Fix Maven publishing config

5eff287

Upgrade MapLibre to latest major version

d4ecb4b

Change package names to org.maplibre.navigation.android

0079047

Rename Mapbox names to MapLibre

56591d5

Fix wrong imports

24ff628

Update artifact group ID

5a24cc7

Rename Mapbox variable & reference names to MapLibre

93d0b6f

Use Mapbox ids to be equal with native project IDs

1b325d2

Fabi755 force-pushed the feature/maplibre-11 branch from b8bba6c to 1b325d2 Compare June 14, 2024 13:03

Fabi755 changed the title ~~WIP: Upgrade to MapLibre 11.0.0~~ Upgrade to MapLibre 11.0.0 Jun 14, 2024

Fabi755 added 4 commits September 18, 2024 16:22

Fix missing point converts

e5c9b85

Merge branch 'main' into feature/maplibre-11

c51033c

Update MapLibre version

61923c1

Remove not working street source part

9e0c9c5

Fabi755 added 3 commits September 27, 2024 12:17

Add FLOSS tile server as default configuration 💜

3c0640f

Update to latest MapLibre version

90b50c2

Merge branch 'main' into feature/maplibre-11

d0f767f

boldtrn reviewed Oct 29, 2024

View reviewed changes

Rollback license copyright change

f1433b5

frankkienl reviewed Nov 1, 2024

View reviewed changes

sotomski reviewed Nov 5, 2024

View reviewed changes

build.gradle Outdated Show resolved Hide resolved

...rc/main/java/org/maplibre/navigation/android/navigation/ui/v5/MapConnectivityController.java Outdated Show resolved Hide resolved

Update to latest MapLibre version

3204bbb

Fabi755 added 2 commits November 7, 2024 18:00

Remove duplicated classpath line

b94ea90

Remove unused class MapConnectivityController

5f9472f

boldtrn approved these changes Nov 8, 2024

View reviewed changes

Fabi755 merged commit b0d2f57 into maplibre:main Nov 8, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to MapLibre 11.0.0 #110

Upgrade to MapLibre 11.0.0 #110

Fabi755 commented Jun 7, 2024

Fabi755 commented Jun 10, 2024

Fabi755 commented Jun 14, 2024 •

edited

Loading

Fabi755 commented Jun 14, 2024 •

edited

Loading

nitrag commented Jun 28, 2024

boldtrn commented Jun 28, 2024

rubenmx commented Jul 1, 2024 •

edited

Loading

frankkienl commented Jul 26, 2024

Fabi755 commented Jul 26, 2024

nitrag commented Aug 29, 2024

frankkienl commented Sep 18, 2024

Fabi755 commented Sep 19, 2024

rubenmx commented Sep 20, 2024

Fabi755 commented Sep 20, 2024 •

edited

Loading

rubenmx commented Sep 20, 2024

ravenfeld commented Oct 26, 2024

Fabi755 commented Oct 26, 2024

boldtrn Oct 29, 2024

Fabi755 Oct 29, 2024

boldtrn Oct 29, 2024

Fabi755 Oct 31, 2024

frankkienl Nov 1, 2024

boldtrn Nov 1, 2024

boldtrn Nov 1, 2024

frankkienl Nov 1, 2024

sotomski left a comment

boldtrn commented Nov 5, 2024

boldtrn commented Nov 7, 2024

boldtrn left a comment

Upgrade to MapLibre 11.0.0 #110

Upgrade to MapLibre 11.0.0 #110

Conversation

Fabi755 commented Jun 7, 2024

Fabi755 commented Jun 10, 2024

Fabi755 commented Jun 14, 2024 • edited Loading

Fabi755 commented Jun 14, 2024 • edited Loading

nitrag commented Jun 28, 2024

boldtrn commented Jun 28, 2024

rubenmx commented Jul 1, 2024 • edited Loading

frankkienl commented Jul 26, 2024

Fabi755 commented Jul 26, 2024

nitrag commented Aug 29, 2024

frankkienl commented Sep 18, 2024

Fabi755 commented Sep 19, 2024

rubenmx commented Sep 20, 2024

Fabi755 commented Sep 20, 2024 • edited Loading

rubenmx commented Sep 20, 2024

ravenfeld commented Oct 26, 2024

Fabi755 commented Oct 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sotomski left a comment

Choose a reason for hiding this comment

boldtrn commented Nov 5, 2024

boldtrn commented Nov 7, 2024

boldtrn left a comment

Choose a reason for hiding this comment

Fabi755 commented Jun 14, 2024 •

edited

Loading

Fabi755 commented Jun 14, 2024 •

edited

Loading

rubenmx commented Jul 1, 2024 •

edited

Loading

Fabi755 commented Sep 20, 2024 •

edited

Loading