Skip to content

[Backport 2024.01.xx] Fix #10373 Style layer - Property value cause an error on 3D view (#10383) #10388

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

Merged
tdipisa merged 1 commit into from
May 31, 2024
Merged

[Backport 2024.01.xx] Fix #10373 Style layer - Property value cause an error on 3D view (#10383) #10388

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
6 changes: 3 additions & 3 deletions web/client/utils/styleparser/CesiumStyleParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import * as Cesium from 'cesium';
import chroma from 'chroma-js';
import { castArray, isNumber, isEqual, range } from 'lodash';
import { castArray, isNumber, isEqual, range, isNaN } from 'lodash';
import { needProxy, getProxyUrl } from '../ProxyUtils';
import {
resolveAttributeTemplate,
Expand Down Expand Up @@ -613,7 +613,7 @@ const symbolizerToPrimitives = {
const { image, width, height } = images.find(({ id }) => id === getImageIdFromSymbolizer(parsedSymbolizer, symbolizer)) || {};
const side = width > height ? width : height;
const scale = (parsedSymbolizer.radius * 2) / side;
return image ? [
return image && !isNaN(scale) ? [
{
type: 'point',
geometryType: 'point',
Expand Down Expand Up @@ -652,7 +652,7 @@ const symbolizerToPrimitives = {
const { image, width, height } = images.find(({ id }) => id === getImageIdFromSymbolizer(parsedSymbolizer, symbolizer)) || {};
const side = width > height ? width : height;
const scale = parsedSymbolizer.size / side;
return image ? [{
return image && !isNaN(scale) ? [{
type: 'point',
geometryType: 'point',
entity: {
Expand Down
94 changes: 94 additions & 0 deletions web/client/utils/styleparser/__tests__/CesiumStyleParser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,4 +1461,98 @@ describe('CesiumStyleParser', () => {
}).catch(done);
});
});
it('should not draw the marker when using radius property without argument', (done) => {
const style = {
name: '',
rules: [
{
filter: undefined,
name: '',
symbolizers: [
{
kind: 'Mark',
wellKnownName: 'Circle',
color: '#ff0000',
fillOpacity: 0.5,
strokeColor: '#00ff00',
strokeOpacity: 0.25,
strokeWidth: 3,
radius: {
name: 'property',
args: []
},
rotate: 90,
msBringToFront: true,
symbolizerId: 'symbolizer-01'
}
]
}
]
};
const feature = {
type: 'Feature',
id: 'feature-01',
properties: {
radius: 2
},
geometry: {
type: 'Point',
coordinates: [7, 41]
}
};
parser.writeStyle(style)
.then((styleFunc) => styleFunc({
features: [{ ...feature, positions: GeoJSONStyledFeatures.featureToCartesianPositions(feature) }]
}))
.then((styledFeatures) => {
expect(styledFeatures.length).toBe(0);
done();
}).catch(done);
});
it('should not draw the icon when using size property without argument', (done) => {
const style = {
name: '',
rules: [
{
filter: undefined,
name: '',
symbolizers: [
{
kind: 'Icon',
/* png 1px x 1px */
image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQYV2NgAAIAAAUAAarVyFEAAAAASUVORK5CYII=',
opacity: 0.5,
size: {
name: 'property',
args: []
},
rotate: 90,
msBringToFront: true,
anchor: 'bottom-left',
symbolizerId: 'symbolizer-01'
}
]
}
]
};
const feature = {
type: 'Feature',
id: 'feature-01',
properties: {
radius: 2
},
geometry: {
type: 'Point',
coordinates: [7, 41]
}
};
parser.writeStyle(style)
.then((styleFunc) => styleFunc({
features: [{ ...feature, positions: GeoJSONStyledFeatures.featureToCartesianPositions(feature) }]
}))
.then((styledFeatures) => {
expect(styledFeatures.length).toBe(0);
done();
}).catch(done);
});
});