【feature】1) 移除setSymbolProperty方法

Yuki-Zhao · Yuki-Zhao · commit 0b4dc8dfd44d · 2023-05-16T10:31:29.000+08:00
diff --git a/dist/mapboxgl/iclient-mapboxgl-es6.js b/dist/mapboxgl/iclient-mapboxgl-es6.js
@@ -64907,48 +64907,11 @@ const LayerType = {
 }
 // EXTERNAL MODULE: ./node_modules/lodash/lodash.js
 var lodash = __webpack_require__(96486);
-;// CONCATENATED MODULE: ./src/symbol/SymbolTransformUtil.js
-const isPaintKey = (key) => {
-    return [
-        'icon-color',
-        'icon-opacity',
-        'icon-translate',
-        'line-opacity',
-        'line-blur',
-        'line-translate',
-        'line-color',
-        'line-width',
-        'line-offset',
-        'line-dasharray',
-        'line-pattern',
-        'fill-color',
-        'fill-opacity',
-        'fill-pattern',
-        'fill-outline-color',
-        'text-color',
-        'text-halo-blur',
-        'text-halo-color',
-        'text-halo-width',
-        'text-opacity',
-        'text-translate',
-        'text-translate-anchor',
-        'circle-blur',
-        'circle-color',
-        'circle-opacity',
-        'circle-translate',
-        'circle-radius',
-        'circle-stroke-color',
-        'circle-stroke-opacity',
-        'circle-stroke-width'
-    ].includes(key);
-}
-
 ;// CONCATENATED MODULE: ./src/symbol/MapboxSymbolLayerManager.js
 
 
 
 
-
 // 判断符号类型
 const GET_TYPE_RULE = [{
     prefix: 'line-',
@@ -65175,22 +65138,6 @@ const MapboxSymbolLayerManager = (m) => {
             }
         },
 
-        /**
-         * 更新图层上的symbol属性
-         * @param layerId 
-         * @param name mapbox key
-         * @param value 样式值
-         * @returns {undefined}
-         */
-        setSymbolProperty(layerId, name, value) {
-            const type = isPaintKey(name) ? 'paint' : 'layout';
-            const rule = {
-                paint: 'setPaintProperty',
-                layout: 'setLayoutProperty'
-            }
-            map[rule[type]](layerId, name, value);
-        },
-
         /**
          * 设置单个符号
          * @param layerId 
@@ -65501,10 +65448,6 @@ var MapExtend = (function () {
     this.symbolLayerManager(this).setSymbol(layerId, symbol);
   };
 
-  MapExtend_mapboxgl.Map.prototype.setSymbolProperty = function (layerId, name, value) {
-    this.symbolLayerManager(this).setSymbolProperty(layerId, name, value);
-  };
-
   if(!(MapExtend_mapboxgl.Map.prototype).setStyleBak) {
     (MapExtend_mapboxgl.Map.prototype).setStyleBak = MapExtend_mapboxgl.Map.prototype.setStyle;
     MapExtend_mapboxgl.Map.prototype.setStyle = function (style, options) {
diff --git a/dist/mapboxgl/iclient-mapboxgl-es6.min.js b/dist/mapboxgl/iclient-mapboxgl-es6.min.js
diff --git a/dist/mapboxgl/iclient-mapboxgl.js b/dist/mapboxgl/iclient-mapboxgl.js
@@ -57165,10 +57165,6 @@ var LayerType = {
 };
 // EXTERNAL MODULE: ./node_modules/lodash/lodash.js
 var lodash = __webpack_require__(61824);
-;// CONCATENATED MODULE: ./src/symbol/SymbolTransformUtil.js
-var isPaintKey = function isPaintKey(key) {
-  return ['icon-color', 'icon-opacity', 'icon-translate', 'line-opacity', 'line-blur', 'line-translate', 'line-color', 'line-width', 'line-offset', 'line-dasharray', 'line-pattern', 'fill-color', 'fill-opacity', 'fill-pattern', 'fill-outline-color', 'text-color', 'text-halo-blur', 'text-halo-color', 'text-halo-width', 'text-opacity', 'text-translate', 'text-translate-anchor', 'circle-blur', 'circle-color', 'circle-opacity', 'circle-translate', 'circle-radius', 'circle-stroke-color', 'circle-stroke-opacity', 'circle-stroke-width'].includes(key);
-};
 ;// CONCATENATED MODULE: ./src/symbol/MapboxSymbolLayerManager.js
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function MapboxSymbolLayerManager_ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -57184,7 +57180,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 
 
-
 // 判断符号类型
 var GET_TYPE_RULE = [{
   prefix: 'line-',
@@ -57434,21 +57429,6 @@ var MapboxSymbolLayerManager = function MapboxSymbolLayerManager(m) {
         });
       }
     },
-    /**
-     * 更新图层上的symbol属性
-     * @param layerId 
-     * @param name mapbox key
-     * @param value 样式值
-     * @returns {undefined}
-     */
-    setSymbolProperty: function setSymbolProperty(layerId, name, value) {
-      var type = isPaintKey(name) ? 'paint' : 'layout';
-      var rule = {
-        paint: 'setPaintProperty',
-        layout: 'setLayoutProperty'
-      };
-      map[rule[type]](layerId, name, value);
-    },
     /**
      * 设置单个符号
      * @param layerId 
@@ -57774,9 +57754,6 @@ var MapExtend = function () {
   MapExtend_mapboxgl.Map.prototype.setSymbol = function (layerId, symbol) {
     this.symbolLayerManager(this).setSymbol(layerId, symbol);
   };
-  MapExtend_mapboxgl.Map.prototype.setSymbolProperty = function (layerId, name, value) {
-    this.symbolLayerManager(this).setSymbolProperty(layerId, name, value);
-  };
   if (!MapExtend_mapboxgl.Map.prototype.setStyleBak) {
     MapExtend_mapboxgl.Map.prototype.setStyleBak = MapExtend_mapboxgl.Map.prototype.setStyle;
     MapExtend_mapboxgl.Map.prototype.setStyle = function (style, options) {
diff --git a/dist/mapboxgl/iclient-mapboxgl.min.js b/dist/mapboxgl/iclient-mapboxgl.min.js
diff --git a/examples/mapboxgl-v2/libs/mapboxgl/iclient-mapboxgl.js b/examples/mapboxgl-v2/libs/mapboxgl/iclient-mapboxgl.js
@@ -57165,10 +57165,6 @@ var LayerType = {
 };
 // EXTERNAL MODULE: ./node_modules/lodash/lodash.js
 var lodash = __webpack_require__(61824);
-;// CONCATENATED MODULE: ./src/symbol/SymbolTransformUtil.js
-var isPaintKey = function isPaintKey(key) {
-  return ['icon-color', 'icon-opacity', 'icon-translate', 'line-opacity', 'line-blur', 'line-translate', 'line-color', 'line-width', 'line-offset', 'line-dasharray', 'line-pattern', 'fill-color', 'fill-opacity', 'fill-pattern', 'fill-outline-color', 'text-color', 'text-halo-blur', 'text-halo-color', 'text-halo-width', 'text-opacity', 'text-translate', 'text-translate-anchor', 'circle-blur', 'circle-color', 'circle-opacity', 'circle-translate', 'circle-radius', 'circle-stroke-color', 'circle-stroke-opacity', 'circle-stroke-width'].includes(key);
-};
 ;// CONCATENATED MODULE: ./src/symbol/MapboxSymbolLayerManager.js
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function MapboxSymbolLayerManager_ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -57184,7 +57180,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 
 
-
 // 判断符号类型
 var GET_TYPE_RULE = [{
   prefix: 'line-',
@@ -57434,21 +57429,6 @@ var MapboxSymbolLayerManager = function MapboxSymbolLayerManager(m) {
         });
       }
     },
-    /**
-     * 更新图层上的symbol属性
-     * @param layerId 
-     * @param name mapbox key
-     * @param value 样式值
-     * @returns {undefined}
-     */
-    setSymbolProperty: function setSymbolProperty(layerId, name, value) {
-      var type = isPaintKey(name) ? 'paint' : 'layout';
-      var rule = {
-        paint: 'setPaintProperty',
-        layout: 'setLayoutProperty'
-      };
-      map[rule[type]](layerId, name, value);
-    },
     /**
      * 设置单个符号
      * @param layerId 
@@ -57774,9 +57754,6 @@ var MapExtend = function () {
   MapExtend_mapboxgl.Map.prototype.setSymbol = function (layerId, symbol) {
     this.symbolLayerManager(this).setSymbol(layerId, symbol);
   };
-  MapExtend_mapboxgl.Map.prototype.setSymbolProperty = function (layerId, name, value) {
-    this.symbolLayerManager(this).setSymbolProperty(layerId, name, value);
-  };
   if (!MapExtend_mapboxgl.Map.prototype.setStyleBak) {
     MapExtend_mapboxgl.Map.prototype.setStyleBak = MapExtend_mapboxgl.Map.prototype.setStyle;
     MapExtend_mapboxgl.Map.prototype.setStyle = function (style, options) {
diff --git a/examples/mapboxgl-v2/src/application/App.tsx b/examples/mapboxgl-v2/src/application/App.tsx
@@ -5,6 +5,10 @@ import { cloneDeep, uniqueId } from 'lodash';
 import { getMapboxKey, isPaintKey } from '../utils/StyleSettingUtil';
 // import '../../../../src/mapboxgl/core/MapExtend';
 
+const SET_PROPERTY_RULE = {
+    paint: 'setPaintProperty',
+    layout: 'setLayoutProperty'
+}
 const App = () => {
     const [map, setMap] = useState<any>();
     const [layersInfo, setLayersInfo] = useState<any[]>([]);
@@ -260,23 +264,24 @@ const App = () => {
         const type = getLayerType(compositeLayerId ?? layerId);
         const layer = getLayer(layerId);
         const mapboxKey = type && getMapboxKey[type](key);
+        const paintOrLayout = isPaintKey(mapboxKey) ? 'paint' : 'layout';
 
         if (type === 'point' && key === 'color') {
             const ImageId: string = layer?.layout?.['icon-image'];
             if (ImageId && !ImageId.startsWith('sdf_')) {
                 const sdfImageId = uniqueId('sdf_');
                 const image = map.symbolManager.getImageInfo(ImageId);
                 map.addImage(sdfImageId, image, { sdf: true });
-                map.setSymbolProperty(layerId, 'icon-image', sdfImageId);
+                map.setLayoutProperty(layerId, 'icon-image', sdfImageId);
             }
         } else if (type === 'line' && key === 'visibility') {
             const layerIds = map.compositeLayersManager.getLayers(layerId) ?? [layerId];
             layerIds.forEach((layerId) => {
-                map.setSymbolProperty(layerId, mapboxKey, value);
+                map[SET_PROPERTY_RULE[paintOrLayout]](layerId, mapboxKey, value);
             });
             return;
         }
-        map.setSymbolProperty(layerId, mapboxKey, value);
+        map[SET_PROPERTY_RULE[paintOrLayout]](layerId, mapboxKey, value);
     };
 
     const getCompositeLayersIds = (layerId: string): string[] => {
diff --git a/src/mapboxgl/core/MapExtend.js b/src/mapboxgl/core/MapExtend.js
@@ -134,10 +134,6 @@ export var MapExtend = (function () {
     this.symbolLayerManager(this).setSymbol(layerId, symbol);
   };
 
-  mapboxgl.Map.prototype.setSymbolProperty = function (layerId, name, value) {
-    this.symbolLayerManager(this).setSymbolProperty(layerId, name, value);
-  };
-
   if(!(mapboxgl.Map.prototype).setStyleBak) {
     (mapboxgl.Map.prototype).setStyleBak = mapboxgl.Map.prototype.setStyle;
     mapboxgl.Map.prototype.setStyle = function (style, options) {
diff --git a/src/maplibregl/core/MapExtend.js b/src/maplibregl/core/MapExtend.js
@@ -46,10 +46,6 @@ export var MapExtend = (function () {
         this.symbolLayerManager('mapbox', this).setSymbol(layerId, symbol);
     };
 
-    maplibregl.Map.prototype.setSymbolProperty = function (layerId, name, value) {
-        this.symbolLayerManager('mapbox', this).setSymbolProperty(layerId, name, value);
-    };
-
     if(!(maplibregl.Map.prototype).setStyleBak) {
         (maplibregl.Map.prototype).setStyleBak = maplibregl.Map.prototype.setStyle;
         maplibregl.Map.prototype.setStyle = function (style, options) {
diff --git a/src/symbol/MapboxSymbolLayerManager.js b/src/symbol/MapboxSymbolLayerManager.js
@@ -1,7 +1,6 @@
 import {LayerType} from "./DefaultValue";
 import { Util } from "@supermap/iclient-common/commontypes/Util";
 import {isArray} from "lodash";
-import { isPaintKey } from "./SymbolTransformUtil";
 
 // 判断符号类型
 const GET_TYPE_RULE = [{
@@ -229,22 +228,6 @@ const MapboxSymbolLayerManager = (m) => {
             }
         },
 
-        /**
-         * 更新图层上的symbol属性
-         * @param layerId 
-         * @param name mapbox key
-         * @param value 样式值
-         * @returns {undefined}
-         */
-        setSymbolProperty(layerId, name, value) {
-            const type = isPaintKey(name) ? 'paint' : 'layout';
-            const rule = {
-                paint: 'setPaintProperty',
-                layout: 'setLayoutProperty'
-            }
-            map[rule[type]](layerId, name, value);
-        },
-
         /**
          * 设置单个符号
          * @param layerId 
diff --git a/src/symbol/SymbolTransformUtil.js b/src/symbol/SymbolTransformUtil.js
