Geomap: DX improvements (#107588)

chore(geomap): dev experience improvements

public/app/plugins/panel/geomap/layers/data/markersLayer.tsx

@@ -87,8 +87,7 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
     let hasVector = hasText;
 
     const layers = new LayerGroup({
-      // If text and no symbol, only show text - fall back on default symbol
-      layers: hasVector && symbol ? [symbolLayer, vectorLayer] : hasVector && !symbol ? [vectorLayer] : [symbolLayer],
+      layers: hasVector ? (symbol ? [symbolLayer, vectorLayer] : [vectorLayer]) : [symbolLayer],
     });
 
     const legendProps = new ReplaySubject<MarkersLegendProps>(1);
@@ -176,7 +175,11 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
               processedMarkers.add(markerKey);
             }
 
-            if (!isLineString) {
+            // Set style to be used by LineString
+            if (isLineString) {
+              const lineStringStyle = style.maker(values);
+              feature.setStyle(lineStringStyle);
+            } else {
               const colorString = tinycolor(theme.visualization.getColorByName(values.color)).toString();
               const colorValues = getRGBValues(colorString);
 
@@ -199,12 +202,6 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
               const textStyle = textMarker(values);
               feature.setStyle(textStyle);
             }
-
-            // Set style to be used by LineString
-            if (isLineString) {
-              const lineStringStyle = style.maker(values);
-              feature.setStyle(lineStringStyle);
-            }
           });
 
           // Update hasVector state after processing all features
@@ -213,10 +210,8 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
           // Update layer visibility based on current hasVector state
           const layersArray = layers.getLayers();
           layersArray.clear();
-          if (hasVector && symbol) {
-            layersArray.extend([symbolLayer, vectorLayer]);
-          } else if (hasVector && !symbol) {
-            layersArray.extend([vectorLayer]);
+          if (hasVector) {
+            layersArray.extend(symbol ? [symbolLayer, vectorLayer] : [vectorLayer]);
           } else {
             layersArray.extend([symbolLayer]);
           }