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

Update null checks for number values #914

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update null checks for number values #914

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/SldStyleParser.ts
View file
Open in desktop
Expand Up @@ -439,7 +439,7 @@ export class SldStyleParser implements StyleParser<string> {
scaleDenominator.max = Number(max);
}

return (scaleDenominator.min || scaleDenominator.max)
return (Number.isFinite(scaleDenominator.min) || Number.isFinite(scaleDenominator.max))
? scaleDenominator
: undefined;
}
Expand Down Expand Up @@ -1586,7 +1586,10 @@ export class SldStyleParser implements StyleParser<string> {
});
}

if (markSymbolizer.strokeColor || markSymbolizer.strokeWidth || markSymbolizer.strokeOpacity) {
if (markSymbolizer.strokeColor ||
Number.isFinite(markSymbolizer.strokeWidth) ||
Number.isFinite(markSymbolizer.strokeOpacity)
) {
const strokeCssParameters = [];
if (markSymbolizer.strokeColor) {
if (isGeoStylerFunction(markSymbolizer.strokeColor)) {
Expand Down Expand Up @@ -1858,7 +1861,7 @@ export class SldStyleParser implements StyleParser<string> {
});
}

if (textSymbolizer.offset || textSymbolizer.rotate !== undefined) {
if (Number.isFinite(textSymbolizer.offset) || textSymbolizer.rotate !== undefined) {
const pointPlacement: any = [];
if (textSymbolizer.offset) {
pointPlacement.push({
Expand Down Expand Up @@ -1887,7 +1890,7 @@ export class SldStyleParser implements StyleParser<string> {
});
}

if (textSymbolizer.haloWidth || textSymbolizer.haloColor) {
if (Number.isFinite(textSymbolizer.haloWidth) || textSymbolizer.haloColor) {
const halo: any = [];
const haloFillCssParameter = [];
if (textSymbolizer.haloWidth) {
Expand Down Expand Up @@ -1926,7 +1929,7 @@ export class SldStyleParser implements StyleParser<string> {
[Halo]: halo
});
}
if (textSymbolizer.color || textSymbolizer.opacity) {
if (textSymbolizer.color || Number.isFinite(textSymbolizer.opacity)) {
const fill = [{
[CssParameter]: [{
'#text': textSymbolizer.color || '#000000',
Expand All @@ -1937,7 +1940,7 @@ export class SldStyleParser implements StyleParser<string> {
},
{
[CssParameter]: [{
'#text': textSymbolizer.opacity || '1',
'#text': Number.isFinite(textSymbolizer.opacity) ? textSymbolizer.opacity : '1',
}],
':@': {
'@_name': 'fill-opacity'
Expand Down