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.

Sign up for GitHub

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

Jump to bottom

Fix reading SLDs with self closing Filter #621

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Fix reading SLDs with self closing Filter #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions data/slds/1.0/empty_filter.sld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<Name>mcd90py2</Name>
<UserStyle>
<Name>mcd90py2</Name>
<Title>mcd90py2</Title>
<FeatureTypeStyle>
<Rule>
<Name>Cities &amp; Towns</Name>
<Filter xmlns="http://www.opengis.net/ogc"/>
<PolygonSymbolizer>
<Fill>
<CssParameter name="fill">#FFE15A</CssParameter>
</Fill>
</PolygonSymbolizer>
</Rule>
</FeatureTypeStyle>
</UserStyle>
</NamedLayer>
</StyledLayerDescriptor>
20 changes: 20 additions & 0 deletions data/slds/1.1/empty_filter.sld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:se="http://www.opengis.net/se">
<NamedLayer>
<se:Name>mcd90py2</se:Name>
<UserStyle>
<se:Name>mcd90py2</se:Name>
<se:FeatureTypeStyle>
<se:Rule>
<se:Name>Cities &amp; Towns</se:Name>
<se:Filter xmlns="http://www.opengis.net/ogc"/>
<se:PolygonSymbolizer uom="http://www.opengeospatial.org/se/units/pixel">
<se:Fill>
<se:SvgParameter name="fill">#FFE15A</se:SvgParameter>
</se:Fill>
</se:PolygonSymbolizer>
</se:Rule>
</se:FeatureTypeStyle>
</UserStyle>
</NamedLayer>
</StyledLayerDescriptor>
14 changes: 14 additions & 0 deletions data/styles/empty_filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Style } from 'geostyler-style';

const lineSimpleLine: Style = {
name: 'mcd90py2',
rules: [{
name: 'Cities & Towns',
symbolizers: [{
kind: 'Fill',
color: '#FFE15A'
}]
}]
};

export default lineSimpleLine;
3 changes: 3 additions & 0 deletions src/SldStyleParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,9 @@ export class SldStyleParser implements StyleParser<string> {
return;
}
const comparison = _get(sldFilters, '[0].$$[0]');
if (!comparison) {
return;
}
const operator = comparison['#name'];
if (!operator) {
return;
Expand Down
8 changes: 8 additions & 0 deletions src/SldStyleParser.v1.0.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import * as fs from 'fs';
import SldStyleParser from './SldStyleParser';

import empty_filter from '../data/styles/empty_filter';
import point_simplepoint from '../data/styles/point_simplepoint';
import line_simpleline from '../data/styles/line_simpleline';
import line_perpendicularOffset from '../data/styles/line_perpendicularOffset';
Expand Down Expand Up @@ -252,6 +253,13 @@ describe('SldStyleParser implements StyleParser', () => {
expect(geoStylerStyle).toEqual(point_styledLabel_elementOrder);
});

it('can read a SLD with an empty filter', async () => {
const sld = fs.readFileSync('./data/slds/1.0/empty_filter.sld', 'utf8');
const readResult = await styleParser.readStyle(sld);
expect(readResult.output).toBeDefined();
expect(readResult.output).toEqual(empty_filter);
});

describe('#getFilterFromOperatorAndComparison', () => {
it('is defined', () => {
expect(styleParser.getFilterFromOperatorAndComparison).toBeDefined();
Expand Down
8 changes: 8 additions & 0 deletions src/SldStyleParser.v1.1.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import * as fs from 'fs';
import SldStyleParser from './SldStyleParser';

import empty_filter from '../data/styles/empty_filter';
import point_simplepoint from '../data/styles/point_simplepoint';
import line_simpleline from '../data/styles/line_simpleline';
import line_perpendicularOffset from '../data/styles/line_perpendicularOffset';
Expand Down Expand Up @@ -241,6 +242,13 @@ describe('SldStyleParser with Symbology Encoding implements StyleParser', () =>
expect(geoStylerStyle).toEqual(point_styledLabel_elementOrder);
});

it('can read a SLD with an empty filter', async () => {
const sld = fs.readFileSync('./data/slds/1.1/empty_filter.sld', 'utf8');
const readResult = await styleParser.readStyle(sld);
expect(readResult.output).toBeDefined();
expect(readResult.output).toEqual(empty_filter);
});

describe('#getFilterFromOperatorAndComparison', () => {
it('is defined', () => {
expect(styleParser.getFilterFromOperatorAndComparison).toBeDefined();
Expand Down