fixed color / removed logging

This commit is contained in:
Anton Tranelis 2024-07-16 14:16:41 +02:00
parent 4c6cfa6587
commit f310bb7033

View File

@ -27,7 +27,7 @@ export const Layer = ({
markerIcon = 'circle-solid', markerIcon = 'circle-solid',
markerShape = 'circle', markerShape = 'circle',
markerDefaultColor = '#777', markerDefaultColor = '#777',
markerDefaultColor2, markerDefaultColor2 = "RGBA(35, 31, 32, 0.2)",
api, api,
itemType, itemType,
itemNameField = 'name', itemNameField = 'name',
@ -149,7 +149,7 @@ export const Layer = ({
filter(item => filter(item =>
filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?. filterTags.length == 0 ? item : filterTags.every(tag => getItemTags(item).some(filterTag => filterTag.name.toLocaleLowerCase() === tag.name.toLocaleLowerCase())))?.
filter(item => item.layer && isLayerVisible(item.layer)). filter(item => item.layer && isLayerVisible(item.layer)).
filter(item => item.group_type && isGroupTypeVisible(item.group_type)). filter(item => item.group_type && isGroupTypeVisible(item.group_type)||item.group_type==null).
map((item: Item) => { map((item: Item) => {
if (getValue(item, itemLongitudeField) && getValue(item, itemLatitudeField)) { if (getValue(item, itemLongitudeField) && getValue(item, itemLatitudeField)) {
@ -184,7 +184,7 @@ export const Layer = ({
const longitude = itemLongitudeField && item ? getValue(item, itemLongitudeField) : undefined; const longitude = itemLongitudeField && item ? getValue(item, itemLongitudeField) : undefined;
let color1 = markerDefaultColor; let color1 = markerDefaultColor;
let color2 = markerDefaultColor2; let color2 = markerDefaultColor2;
if (itemColorField && getValue(item, itemColorField) != null) color1 = getValue(item, itemColorField); if (itemColorField && getValue(item, itemColorField) != null) color1 = getValue(item, itemColorField);
else if (itemTags && itemTags[0]) { else if (itemTags && itemTags[0]) {
color1 = itemTags[0].color; color1 = itemTags[0].color;