fix: Extract SLD version from SLD #696 and #925 #926
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
pprev94
force-pushed
the
extract_sld_version
branch
from
cbbece1 to
0d33e10
Compare
jansule
reviewed
Jun 19, 2024
There was a problem hiding this comment.
Great idea! Thanks.
I would propose following slightly different approach:
- when reading an SLD always derive the version from the SLD itself (and ignore
this._sldVersion) - when writing always use
this._sldVersion - keep the default version for
this._sldVersion, so passing the version to the constructor will remain optional
src/SldStyleParser.ts
Outdated
| @@ -56,11 +56,14 @@ import { | |||
| numberExpression | |||
| } from './Util/SldUtil'; | |||
|
|
|||
| export type SldVersion = '1.0.0' | '1.1.0'; | |||
| const SLD_VERSIONS = ['1.0.0','1.1.0'] as const; | |||
There was a problem hiding this comment.
Suggested change
| const SLD_VERSIONS = ['1.0.0','1.1.0'] as const; | |
| const SLD_VERSIONS = ['1.0.0', '1.1.0'] as const; |
src/SldStyleParser.ts
Outdated
|
|
||
| if (this._sldVersion === undefined) { | ||
| const version = getAttribute(sldObject[0], 'version'); | ||
| if (! SLD_VERSIONS.includes(version)) { |
There was a problem hiding this comment.
Suggested change
| if (! SLD_VERSIONS.includes(version)) { | |
| if (!SLD_VERSIONS.includes(version)) { |
… sld string (xml)
jansule
approved these changes
Jun 19, 2024
src/SldStyleParser.v1.0.spec.ts
Outdated
| @@ -924,6 +932,7 @@ describe('SldStyleParser implements StyleParser', () => { | |||
|
|
|||
| it('creates the correct order in a text symbolizer', async () => { | |||
| const styleParserOrder = new SldStyleParser({ | |||
| sldVersion: '1.0.0', | |||
There was a problem hiding this comment.
this can probably be omitted, as version 1.0.0 is set as default.
src/SldStyleParser.v1.0.spec.ts
Outdated
| @@ -935,6 +944,7 @@ describe('SldStyleParser implements StyleParser', () => { | |||
| }); | |||
| it('adds unsupportedProperties to the write output', async () => { | |||
| const styleParserOrder = new SldStyleParser({ | |||
| sldVersion: '1.0.0', | |||
This was referenced Jun 19, 2024
github-actions bot
pushed a commit
that referenced
this pull request
Jun 21, 2024
## [5.4.0](v5.3.1...v5.4.0) (2024-06-21) ### Features * Extract SLD version from SLD ([#926](#926)) ([56f231b](56f231b)) * implement i18n for error messages [#923](#923) [#924](#924) ([#928](#928)) ([e01c8c8](e01c8c8)) ### Bug Fixes * offset Y for Textsymbolizer ([#932](#932)) ([398ce0c](398ce0c)), closes [#566](#566)
|
🎉 This PR is included in version 5.4.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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.
For reading you can force sldVersion in option but it's not mandatory, it will be guessed, but for writing style, sldVersion is mandatory