Merge pull request #73 from geostyler/fix-graphic-fill

fix: missing graphic-fill
geostyler · Nov 14, 2024 · 0ccb932 · 0ccb932
2 parents 30eccc2 + 2b8e5e1
commit 0ccb932
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,13 +1,10 @@
 module.exports = {
-  extends: [
-    '@terrestris/eslint-config-typescript',
-    'prettier'
-  ],
+  extends: ["@terrestris/eslint-config-typescript", "prettier"],
   rules: {
-    'no-shadow': 'off',
-    '@typescript-eslint/no-shadow': ['error'],
+    "no-shadow": "off",
+    "@typescript-eslint/no-shadow": ["error"],
     camelcase: [
-      'off',
+      "off",
       {
         ignoreImports: true,
       },

diff --git a/src/processSymbolReference.ts b/src/processSymbolReference.ts
@@ -46,19 +46,30 @@ export const processSymbolReference = (
     if (!symbolizer) {
       return;
     }
+    const layerSymbolizers = [symbolizer];
     if (
       ["CIMVectorMarker", "CIMPictureFill", "CIMCharacterMarker"].includes(
         layer.type,
       )
     ) {
-      processSymbolLayerIfCharacterMarker(symbol, layer, symbolizer, options);
+      const symbolizerWithSubSymbolizer = processSymbolLayerWithSubSymbol(
+        symbol,
+        layer,
+        symbolizer,
+        options,
+      );
+      if (symbolizerWithSubSymbolizer.length) {
+        // Replace symbolizer by a more complete one.
+        layerSymbolizers.length = 0;
+        layerSymbolizers.push(...symbolizerWithSubSymbolizer);
+      }
     }
-    symbolizers.push(symbolizer);
+    symbolizers.push(...layerSymbolizers);
   });
   return symbolizers;
 };
 
-const processSymbolLayerIfCharacterMarker = (
+const processSymbolLayerWithSubSymbol = (
   symbol: CIMSymbol,
   layer: SymbolLayer,
   symbolizer: Symbolizer,