GeoSuite Export Tool: fix layer config priority #958
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
Also merge SBK-38 updates and prep for SBK-40/separate WFS selection and link state for all documents download links.
Fix regression on projects WFS search introduced by SBK-87/SBK-89
* Avoid require of active search layer, since SBK does not want to search boreholes or projects via HAJK search tool. * Fix admin error handling on persistence errors. * Remove unused local model variable
Solves a regression from SBK-102 where tool settings and defaults got higher priority than layer settings in the model config. This is incorrect for WFS vector layer sources. After the fix it is again possible to override WFS service URL etc. via layers.json as expected, e.g. using HAJK admin GUI for layer administration.
|
PR commit history looks a little dodgy... But Sweco's fork has been updated with HAJK's latest code for master + develop and HAJK's upstream develop [de113f0] was also merged into the feature branch used as this PR's source. The last commit is the significant change, all others are already in HAJK develop (see e.g. files changed). We will create a new feature branch next time to spare you this administrative weirdness! |
Hallbergs
approved these changes
Dec 15, 2021
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.
Fix regression in layer config prio introduced in previous switch of GeoSuite export plug-in from search layers to vector layers as WFS sources.
Revert Object.assign priority to let all vector layer properties override any plug-in or default settings.
Closes [#957]