[update] symbol为表达式时，设置paint、layout生效

review by zhaoq

Author: MyShallowTime

src/mapboxgl/overlay/symbol/SingleSymbolRender.js

@@ -13,13 +13,11 @@ class SingleSymbolRender {
 
     /**
      * 符号转换成图层
-     * @param {*} layer
-     * @param {*} before
+     * @param {object} layer
+     * @param {object} symbol
+     * @param {string | undefined} before
      */
     addLayer(layer, symbol, before) {
-        if(layer.layout && layer.layout.visibility === 'none') {
-            Object.assign(layer.layout, {visibility: 'visible'});
-        }
         layer.paint && Object.assign(symbol.paint || {}, layer.paint);
         layer.layout && Object.assign(symbol.layout || {}, layer.layout);
         this.map.addLayerBySymbolBak({ ...layer, ...symbol }, before);

src/mapboxgl/overlay/symbol/SymbolHandler.js

@@ -152,9 +152,6 @@ class SymbolHandler {
      * @param {string} before
      */
     addExpressionLayer(layer, before) {
-        // symbol支持表达式的话，paint、layout不生效
-        delete layer.paint;
-        delete layer.layout;
         const rules = {
             match: this.getMatchLayers,
             case: this.getCaseLayers

src/mapboxgl/overlay/symbol/SymbolManager.js

@@ -9,6 +9,7 @@ class SymbolManager {
     }
 
     addSymbol(id, symbol) {
+        symbol.layout && delete symbol.layout.visibility;
         this.symbols[id] = symbol;
     }
 

src/maplibregl/overlay/symbol/SingleSymbolRender.js

@@ -13,13 +13,11 @@ class SingleSymbolRender {
 
     /**
      * 符号转换成图层
-     * @param {*} layer
-     * @param {*} before
+     * @param {object} layer
+     * @param {object} symbol
+     * @param {string | undefined} before
      */
     addLayer(layer, symbol, before) {
-        if(layer.layout && layer.layout.visibility === 'none') {
-            Object.assign(layer.layout, {visibility: 'visible'});
-        }
         layer.paint && Object.assign(symbol.paint || {}, layer.paint);
         layer.layout && Object.assign(symbol.layout || {}, layer.layout);
         this.map.addLayerBySymbolBak({ ...layer, ...symbol }, before);

src/maplibregl/overlay/symbol/SymbolHandler.js

@@ -152,9 +152,6 @@ class SymbolHandler {
      * @param {string} before
      */
     addExpressionLayer(layer, before) {
-        // symbol支持表达式的话，paint、layout不生效
-        delete layer.paint;
-        delete layer.layout;
         const rules = {
             match: this.getMatchLayers,
             case: this.getCaseLayers

src/maplibregl/overlay/symbol/SymbolManager.js

@@ -9,6 +9,7 @@ class SymbolManager {
     }
 
     addSymbol(id, symbol) {
+        symbol.layout && delete symbol.layout.visibility;
         this.symbols[id] = symbol;
     }