assign default style before theme style

GEOLYTIX · Mar 26, 2024 · 19ee81d · 19ee81d
1 parent 2ef2e98
commit 19ee81d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/layer/featureStyle.mjs b/lib/layer/featureStyle.mjs
@@ -63,17 +63,13 @@ export default layer => {
       return null
     }
 
-    // Assign geometryType from geometry.
-    //feature.geometryType ??= feature.getGeometry().getType();
+    // Set style.default as feature.style.
+    feature.style = layer.style.default
 
     if (Object.hasOwn(mapp.layer.themes, layer.style.theme?.type)) {
 
       // Apply theme style to style object.
       mapp.layer.themes[layer.style.theme?.type]?.(layer.style.theme, feature)
-    } else {
-
-      // Set style.default as feature.style.
-      feature.style = layer.style.default
     }
 
     // Style cluster point features.

diff --git a/lib/layer/themes/distributed.mjs b/lib/layer/themes/distributed.mjs
@@ -31,10 +31,7 @@ export default function(theme, feature) {
   const val = feature.properties[field]
 
   // Assign theme.style if val is falsy.
-  if (!val) {
-    feature.style = theme.style
-    return;
-  }
+  if (!val) return;
 
   // The feature field property value already has a style assigned.
   if (theme.lookup[val]) {