This repository has been archived by the owner on Nov 29, 2023. It is now read-only.
Fix: preserve geopicker zoom, center map on user location on load, no error clicking pin #905
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was a regression in the original `setgeopoint` work, when abstracting the geolocation code into `getCurrentPosition`
Also fixes the pin's width so it's no longer distorted
eyelidlessness
commented
Jun 7, 2022
| @@ -40,15 +40,15 @@ let searchSource = | |||
| 'https://maps.googleapis.com/maps/api/geocode/json?address={address}&sensor=true&key={api_key}'; | |||
| const googleApiKey = config.googleApiKey || config.google_api_key; | |||
| const iconSingle = L.divIcon({ | |||
| iconSize: 24, | |||
| iconSize: [16, 24], | |||
There was a problem hiding this comment.
This does two things:
- Correct the width of map pins
- Prevent an error when clicking on the pin, where Leaflet's internal state calculating the pin's offset has
NaNfor the left side.
| @@ -773,7 +773,6 @@ class Geopicker extends Widget { | |||
| // update last requested map coordinates to be used to initialize map in mobile fullscreen view | |||
| if (latLng) { | |||
| this.lastLatLng = latLng; | |||
| this.lastZoom = zoom; | |||
There was a problem hiding this comment.
I'm not certain this isn't guarded here for a reason, but it seems like the event handler more likely is the expected behavior.
| @@ -841,6 +840,16 @@ class Geopicker extends Widget { | |||
| } | |||
| }); | |||
|
|
|||
| this.map.on('load', () => { | |||
| this.map.on('zoomend', (event) => { | |||
There was a problem hiding this comment.
Note that this is wrapped in the load event to ensure the initial zoom isn't treated as a user-initiated state change.
lognaturel
approved these changes
Jun 14, 2022
Seems ok to continue with this being untested for now. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #902. Grouping these together, initially for visibility/feedback because they all affect the Leaflet UI and would be challenging to test and I want to get a sense of how much interest there is in adding those tests anyway.