Merge pull request #4267 from camptocamp/GSGMF-658-Kml-print

Missing layer param in style function call
camptocamp · Sep 26, 2018 · ec186c6 · ec186c6
2 parents 71e5d19 + a176846
commit ec186c6
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/print/VectorEncoder.js b/src/print/VectorEncoder.js
@@ -67,14 +67,9 @@ exports.prototype.encodeVectorLayer = function(arr, layer, resolution) {
     const originalFeature = features[i];
 
     let styleData = null;
-    let styleFunction = originalFeature.getStyleFunction();
+    const styleFunction = originalFeature.getStyleFunction() || layer.getStyleFunction();
     if (styleFunction !== undefined) {
-      styleData = styleFunction.call(originalFeature, resolution);
-    } else {
-      styleFunction = layer.getStyleFunction();
-      if (styleFunction !== undefined) {
-        styleData = styleFunction.call(layer, originalFeature, resolution);
-      }
+      styleData = styleFunction.call(layer, originalFeature, resolution);
     }
     const origGeojsonFeature = this.geojsonFormat.writeFeatureObject(originalFeature);
     /**