Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to maplibre v10 and jawg.io #880

Merged
merged 4 commits into from
Nov 12, 2023
Merged

Switch to maplibre v10 and jawg.io #880

merged 4 commits into from
Nov 12, 2023

Conversation

ialokim
Copy link
Collaborator

@ialokim ialokim commented Aug 23, 2023

This should enable us to get back into the main F-Droid repo eventually.

I would appreciate some testing by others before this is merged, especially concerning the device's location (GPS).

@cla-bot cla-bot bot added the cla-signed ✔️ The Contributor Licence Agreement was signed by all contributors. label Aug 23, 2023
@Jowat97 Jowat97 mentioned this pull request Sep 18, 2023
@grote
Copy link
Owner

grote commented Oct 6, 2023

I would appreciate some testing by others before this is merged, especially concerning the device's location (GPS).

If anybody gave this a test-run, please comment here.

@rugk
Copy link

rugk commented Oct 6, 2023

If anyone could upload a precompiled APK that would likely ease testing…

@wallalex0
Copy link

I build a apk on commit a9d4ffa:
transportr-debug.zip

@julianfairfax
Copy link

Thanks to @wallalex0's build, I can confirm that Transportr is fully functional with this PR, including the device's location over GPS (I do not have Google Play Services installed anyway, so this is all GNSS).

The biggest difference you notice between this version and the latest release, is that this version's map is fully greyscale. I'm not sure if this is in an intentional change or rather a technical limitation.

Personally I think the colour map is prettier, but a greyscale map is more useful, since it shows only the important details (i.e. the trip and stations), with other details fading into the background.

I know one test report won't seal the deal for you, but, if this were my project, I would definitely merge this as soon as possible, and get Transportr back in F-Droid as soon as possible.

It's a great app, with some unique features on Android (neither the DB or SBB apps have any map of the trip for example), and it's only going to get better. But, this PR, and the subsequent return to F-Droid, is a necessary first step.

(Maybe then @ialokim's SBB support can also be merged. Seems like schildbach/public-transport-enabler#481 is the holdup. Once merged, Transportr will be the only open source app in existence to support SBB!)

@rugk
Copy link

rugk commented Oct 7, 2023

Also tested it and I can also agree:

  • everything that worked before, seems to work, too
  • also GPS works fine on the map at least (ref Find an alternative for lost #870 (comment)), though have not tested outdoors; and the address did not resolve for me (though indoors it is hard and GPS generally not accurate where I am, so no problem here IMHO (old Transportr in the same place is different though, it resolves to any street in my case, which is the wrong one/place anyway, but well… this new Transportr-dev just shows "getting GPS")
  • I also see the grayscale map, and I agree, IMHO a colored map similar to before would be more beautiful. It was already quite desaturated, so IMHO enough to see/focus on the actual route).

@ialokim
Copy link
Collaborator Author

ialokim commented Oct 7, 2023

The biggest difference you notice between this version and the latest release, is that this version's map is fully greyscale. I'm not sure if this is in an intentional change or rather a technical limitation.

Personally I think the colour map is prettier, but a greyscale map is more useful, since it shows only the important details (i.e. the trip and stations), with other details fading into the background.

That's a very good point, I had forgotten about this change (dark theme user here).

Here's how the difference looks in practice

Transportr-theme-old
Transportr-theme-new

There are more default map styles available from jawg.io, including jawg-sunny which matches the old style more closely: https://www.jawg.io/docs/apidocs/maps/dynamic-maps/#jawg-default-styles

On the other hand, the used jawg-light theme corresponds better to the dark map style that is used in the dark theme version of the app, which is also grayscale.

@julianfairfax
Copy link

There are more default map styles available from jawg.io, including jawg-sunny which matches the old style more closely: https://www.jawg.io/docs/apidocs/maps/dynamic-maps/#jawg-default-styles

On the other hand, the used jawg-light theme corresponds better to the dark map style that is used in the dark theme version of the app, which is also grayscale.

I would still switch to jawg-sunnay since it's consistent with the old version, and it looks prettier.

@1Maxnet1
Copy link

I build a apk on commit a9d4ffa: transportr-debug.zip

I also gave this a test run in my daily travels the last days and everything seems to work as expected. Thanks for the work!

@bernhardreiter
Copy link

@grote @ialokim now that we had three test reports, all positive, are you confident enough to merge ?

@ialokim
Copy link
Collaborator Author

ialokim commented Nov 12, 2023

I have changed the light theme now to jawg-sunny following the suggestions from above. For reference, it now looks like this:

Transportr-theme-new2

I will proceed to merging when the CI build succeeds.

@ialokim ialokim merged commit 52296d8 into master Nov 12, 2023
4 checks passed
@ialokim ialokim deleted the maplibre branch November 12, 2023 22:18
@Altonss Altonss linked an issue Dec 6, 2023 that may be closed by this pull request
@ialokim ialokim changed the title Switch to maplibre v10 and jawg.io as map data source Switch to maplibre v10 and jawg.io as data source Jan 21, 2024
@ialokim ialokim changed the title Switch to maplibre v10 and jawg.io as data source Switch to maplibre v10 and jawg.io Jan 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed ✔️ The Contributor Licence Agreement was signed by all contributors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch to MapLibre SDK and Jawg.io
7 participants