Using multiple map interactions #751
Merged
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #751 +/- ##
==========================================
+ Coverage 75.77% 83.36% +7.59%
==========================================
Files 222 239 +17
Lines 4582 4750 +168
Branches 1252 1274 +22
==========================================
+ Hits 3472 3960 +488
+ Misses 1106 755 -351
- Partials 4 35 +31
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Because this feature will be added after 3.0, this PR is moved to draft. This PR is still ready to be reviewed, it just shouldn't be merged just yet |
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
from
95cf149 to
2690059
Compare
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
from
2690059 to
56151ac
Compare
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
4 times, most recently
from
bb93058 to
6a5999f
Compare
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
from
6a5999f to
c206b88
Compare
Bundle ReportChanges will increase total bundle size by 154.58kB (1.64%) ⬆️. This is within the configured threshold ✅ Detailed changes
|
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
from
c206b88 to
0c1c6eb
Compare
sergei-maertens
requested changes
Jan 21, 2025
robinmolen
force-pushed
the
feature/2177-map-interactions
branch
from
fa9fe8b to
e3978d7
Compare
Added leaflet-draw and react-leaflet-draw as dependencies. These allow easy user interactions with the leaflet map
…ead of coordinates The map component now uses and stores geoJson data, instead of coordinates. This means we can display and work with multiple shapes. One important change is that geoJson saves coordinates as lng-lat, instead of lat-lng
…ponent property With the new property `interactions` the component can defined the possible map interactions. Currently supporting 'marker', 'polygon' and 'polyline'
…tories for map component
Due to some formio magic, the `resetValue` flag is needed when performing the `setValue` call. Without this flag it isn't allowed to set a field value to `null` or `undefined`.We also need to use the value `null`, instead of `undefined`. This because setting the value to `undefined` isn't reflected as a value change (what we need, to re-render the component). This is described in node_modules/formiojs/components/_classes/component/Component.js:2524
…eoJson geometry Because we won't support circle shapes (due to geoJson and the backend registrations not supporting this type), we no longer need the geoJson feature `properties`. Because we don't use `properties` for anything else, it doesn't make sense to save it
- moved styling to leaflet specific file - Only apply translations when intl changes - Simplified `updateGeoJsonGeometry` function and removed private API usage
Since we persist the leaflet changes in React state, and have to act on state changes, only the shapes from the React state should be shown. Leaflet adds new shapes to its map before calling `onCreated`. If we then save the new shape to state, and show this using `<GeoJSON ... />`, we have two shapes on the exact same spot. This causes weird behavior when you want to remove them using the delete button. Clearing the leaflet map before saving the new shape does ensure only one shape is present. If we then use `<GeoJSON ... />` to show the new shape, the leaflet soft-delete won't work. (Because `<GeoJSON ... />` can't be temporarily hidden, without some extra work) To ensure only one shape is present and to allow soft-deletion, we have two options: - We clear the map every time a new shape is created, and save the new shape to state. Using `<GeoJSON ... />` we show the newly created shape. For the deletion we keep inventory of the soft-delete actions and change the map display accordingly, and persist the changes when confirmed by the user. - We clear the map every time a new shape is created, and save the new shape to state. Using useEffect we add the newly created shape to the leaflet map (this doesn't trigger `onCreated`). With this we can use the complete deletion functionality from leaflet, and only have to persist on `onDeleted`. To keep this component as simple as we can, I've opted for the second option
sergei-maertens
force-pushed
the
feature/2177-map-interactions
branch
from
e3978d7 to
73607c2
Compare
sergei-maertens
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of open-formulieren/open-forms#2177
This allows users to interact with the map using multiple tools: markers (the interaction that is already being used), polygons and polylines. With the aim to give users more accurately control. Using the new
interactionsproperty every tool can be included or excluded separately. By default, only the marker will be available to users (conform the current functionality)The different tools result in different data. To accommodate this the data of the component has been changed from an array of numbers, to a geoJson object.
All previously existing functionality has been updated to work with this new data format. This includes:
To accommodate the polyline and polygon, the center point of a shape is used as the centering point. This changes nothing for the marker shapes
This currently also works for the polyline and polygon. Because these shapes consist of multiple points/coordinates, the center point of these shapes is used as the
search nearby addresscoordinates