Skip to content
Snippets Groups Projects
Merged Florent Lavelle requested to merge redmine-issues/12499-bis into develop
1 file
+ 12
13
Compare changes
  • Side-by-side
  • Inline
+ 12
13
@@ -387,19 +387,18 @@ const mapUtil = {
customField = Object.keys(feature.properties).filter(el => featureType.customfield_set.map(e => e.name).includes(el));
customFieldOption = feature.properties[customField[0]];
}
const color = this.retrieveFeatureColor(featureType, feature.properties) || feature.properties.color;
let color;
if (customFieldOption && featureType.colors_style) {
color =
featureType.colors_style.value ?
featureType.colors_style.value.colors[customFieldOption].value ?
featureType.colors_style.value.colors[customFieldOption].value :
featureType.colors_style.value.colors[customFieldOption] :
featureType.colors_style.colors[customFieldOption]
} else {
color = feature.properties.color;
}
let color = this.retrieveFeatureColor(featureType, feature.properties) || feature.properties.color;
// if (!color && customFieldOption && featureType.colors_style) {
// color =
// featureType.colors_style.value ?
// featureType.colors_style.value.colors[customFieldOption].value ?
// featureType.colors_style.value.colors[customFieldOption].value :
// featureType.colors_style.value.colors[customFieldOption] :
// featureType.colors_style.colors[customFieldOption]
// } else {
// color = feature.properties.color;
// }
if (color == undefined){
color = featureType.color;
}
Loading