Cleaner way to define styles.

This commit is contained in:
vdv committed 2022-11-29 19:49:05 +01:00
1 parent 4d1b1c9a06
commit d5be1b8672
3 files changed
+231 -51

No files matched your search

+99 -51
View File
@@ -1,35 +1,14 @@
import { Circle, Fill, Text, Icon, Stroke, Style } from 'ol/style';
import { Fill, Text, Icon, Stroke, Style } from 'ol/style';
import startIcon from '../../icons/flag-start-b-svgrepo-com-green.svg';
import finishIcon from '../../icons/flag-finish-b-o-svgrepo-com-red.svg';
import wptIcon from '../../icons/location-pin-svgrepo-com-red.svg';
import { Feature } from 'ol';
import memoize from 'memoizee';
const trackStrokeStyle = new Stroke({
color: 'blue',
width: 3,
});
const trtksegStartImageStyle = new Icon({
src: startIcon,
scale: 0.2,
opacity: 0.6,
anchor: [0.5, 1],
});
const trtksegFinishImageStyle = new Icon({
src: finishIcon,
scale: 0.2,
opacity: 0.6,
anchor: [0.5, 1],
});
const wptImageStyle = new Icon({
src: wptIcon,
scale: 0.1,
opacity: 0.9,
anchor: [0.5, 1],
});
interface StyleParameters {
type: string;
isSelected: boolean;
}
const textStroke = new Stroke({
color: '#fff',
@@ -39,36 +18,105 @@ const textFill = new Fill({
color: '#000',
});
const wptTextStyle = (feature: Feature) =>
new Text({
font: '16px Calibri,sans-serif',
text: feature.get('name'),
fill: textFill,
stroke: textStroke,
offsetY: -40,
});
const styles = {
default: {
trkseg: {
stroke: new Stroke({
color: 'blue',
width: 3,
}),
},
'trkseg-start': {
image: new Icon({
src: startIcon,
scale: 0.2,
opacity: 0.6,
anchor: [0.5, 1],
}),
},
'trkseg-finish': {
image: new Icon({
src: finishIcon,
scale: 0.2,
opacity: 0.6,
anchor: [0.5, 1],
}),
},
wpt: {
image: new Icon({
src: wptIcon,
scale: 0.1,
opacity: 0.9,
anchor: [0.5, 1],
}),
text: (feature: Feature) =>
new Text({
font: '16px Calibri,sans-serif',
text: feature.get('name'),
fill: textFill,
stroke: textStroke,
offsetY: -40,
}),
},
},
selected: {
trkseg: {
stroke: new Stroke({
color: 'red',
width: 3,
}),
},
},
};
const trtksegStyle = new Style({ stroke: trackStrokeStyle });
const trtksegStartStyle = new Style({ image: trtksegStartImageStyle });
const trtksegFinishStyle = new Style({ image: trtksegFinishImageStyle });
const styleRequiresFeature = memoize((type: keyof typeof styles.default) => {
const defaults = styles.default[type];
const selected = styles.selected[type];
const all = { ...defaults, ...selected };
for (const key of Object.keys(all)) {
if (all[key] instanceof Function) {
return true;
}
}
return false;
});
const wptStyle = (feature: Feature) =>
new Style({ image: wptImageStyle, text: wptTextStyle(feature) });
const getStyle = memoize(
(
type: keyof typeof styles.default,
isSelected: boolean = false,
params: any
) => {
const defaults = styles.default[type];
const selected = styles.selected[type];
const all = isSelected ? { ...defaults, ...selected } : { ...defaults };
console.log({
caller: 'style / getStyle',
type,
isSelected,
params,
defaults,
selected,
all,
});
for (const key of Object.keys(all)) {
if (all[key] instanceof Function) {
all[key] = all[key](params);
}
}
return new Style(all);
},
{ length: 3, max: 1024 }
);
export const style = (feature: Feature, resolution: number) => {
const type = feature.get('type');
if (type === 'trkseg') {
return trtksegStyle;
}
if (type === 'trkseg-start') {
return trtksegStartStyle;
}
if (type === 'trkseg-finish') {
return trtksegFinishStyle;
}
if (type === 'wpt') {
return wptStyle(feature);
const isSelected = feature.get('isSelected') === true;
console.log({ caller: 'style', type, isSelected });
if (styleRequiresFeature(type)) {
return getStyle(type, isSelected, feature);
}
return getStyle(type, isSelected, null);
};
export default style;