[fix]mapboxgl.convertFilter

Author: luoxiao-supermap

src/common/mapping/WebMapV2.js

@@ -1387,8 +1387,8 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, crsMa
       const labelStyle = layerInfo.labelStyle;
       const properties = features[0] && features[0].properties;
       const textField = labelStyle.labelField.replace(/{(.+)}/g, '$1');
-      if (!properties || !properties[textField]) {
-        return;
+      if (!properties || !Object.prototype.hasOwnProperty.call(properties, textField)) {
+          return;
       }
       let { backgroundFill = [255, 255, 255, 0] } = labelStyle;
       const fontFamily = labelStyle.fontFamily;

src/common/mapping/WebMapV3.js

@@ -336,31 +336,6 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
     }
     return epsgCode;
   }
-  _getFilterByCatalog(catalog, res = {}) {
-    const { catalogType, children } = catalog;
-    if(catalogType === 'group' && children) {
-      children.forEach(child => {
-        this._getFiltersByCatalog(child, res);
-      })
-    }
-    if (catalogType === 'layer') {
-      const { filter, layersContent = [] } = catalog;
-      if (filter) {
-        layersContent.forEach(layerId => {
-          res[layerId] = filter;
-        })
-      }
-    }
-  }
-  _getFiltersByCatalog(_mapResourceInfo = this._mapResourceInfo) {
-    const { catalogs = [] } = _mapResourceInfo;
-    const res = [];
-    catalogs.forEach((item) => {
-      this._getFilterByCatalog(item, res);
-    })
-    return res;
-  }
-
   /**
    * @private
    * @function WebMapV3.prototype._initLayers
@@ -375,8 +350,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
       };
       if (this._relatedInfo.projectInfo) {
         this._mapResourceInfo = JSON.parse(this._relatedInfo.projectInfo);
-        const catalogFilters =  this._getFiltersByCatalog();
-        this._changeMapInfoFilter(catalogFilters);
+        this._changeMapInfoFilter();
       }
       this._createMapRelatedInfo();
       this._addLayersToMap();
@@ -389,8 +363,7 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
           description: relatedInfo.description
         };
         this._mapResourceInfo = JSON.parse(relatedInfo.projectInfo);
-        const catalogFilters =  this._getFiltersByCatalog();
-        this._changeMapInfoFilter(catalogFilters);
+        this._changeMapInfoFilter();
         this._createMapRelatedInfo();
         this._addLayersToMap();
       })
@@ -404,73 +377,19 @@ export function createWebMapV3Extending(SuperClass, { MapManager, mapRepo, crsMa
    * @function WebMapV3.prototype._changeMapInfoFilter
    * @description 更新地图图层的过滤器， 将filter的内容 ['==', 'Ctype', '']转换为['==', ['get', 'Ctype'], 'label']
    */
-  _changeMapInfoFilter(catalogFilters = {}) {
-      const { layers =[]} = this._mapInfo;
-      layers.forEach(layer => {
-        if (layer.filter && catalogFilters[layer.id]) {
-          const catalogFilter = catalogFilters[layer.id];
-          const matchKeys = this._collectMatchKeys(catalogFilter);
-          const filter =  this._transformFilterByMatchKeys(layer.filter, matchKeys);
-          layer.filter = filter;
+ _changeMapInfoFilter() {
+    if (mapRepo && mapRepo.convertFilter) {
+      const { layers = [] } = this._mapInfo;
+      layers.forEach((layer) => {
+        if (layer.filter) {
+          layer.filter = mapRepo.convertFilter(layer.filter);
         }
-      })
-      this._mapInfo ={
+      });
+      this._mapInfo = {
         ...this._mapInfo,
         layers
-      }
-  }
-
-  _collectMatchKeys(filter) {
-    const keys = [];
-    const excludeKeys = ['$type', '$id', '$layer'];
-    if (!Array.isArray(filter)) {return keys;}
-    const traverse = (arr) => {
-      for (const item of arr) {
-        if (!Array.isArray(item)) {continue;}
-        if (item.length >= 3 && this._isComparisonOperator(item[0])) {
-          const prop = this._getPropertyKey(item[1]);
-          if (prop && !excludeKeys.includes(prop)) {
-            keys.push(prop);
-            continue;
-          }
-          if (typeof item[1] === 'string' && !excludeKeys.includes(item[1])) {
-            keys.push(item[1]);
-          }
-        } else {
-          traverse(item);
-        }
-      }
-    };
-    traverse(filter);
-    return [...new Set(keys)];
-  }
-
-  _getPropertyKey(item) {
-    if (Array.isArray(item) && item.length === 2 && item[0] === 'get' && typeof item[1] === 'string') {
-      return item[1];
-    }
-    return null;
-  }
-
-  _transformFilterByMatchKeys(filter, matchKeys) {
-    if (!Array.isArray(filter)) {
-      return filter;
-    }
-    if (filter.length >= 3 && typeof filter[1] === 'string' && this._isComparisonOperator(filter[0])) {
-      if (matchKeys.includes(filter[1])) {
-        return [filter[0], ['get', filter[1]], ...filter.slice(2)];
-      }
-      return filter;
-    }
-    if (filter.length >= 2 && typeof filter[1] !== 'string' && this._isComparisonOperator(filter[0])) {
-      const operands = filter.slice(1).map(item => this._transformFilterByMatchKeys(item, matchKeys));
-      return [filter[0], ...operands];
+      };
     }
-    return filter.map(item => this._transformFilterByMatchKeys(item, matchKeys));
-  }
-
-  _isComparisonOperator(op) {
-    return ['==', '!=', '>', '<', '>=', '<=', 'in', '!in', 'all', 'any', 'none'].includes(op);
   }
 
   /**

test/mapboxgl/mapping/WebMapV3Spec.js

@@ -177,24 +177,28 @@ describe('mapboxgl-webmap3.0', () => {
       }
       return Promise.resolve();
     });
+    // const Spy = spyOn(mapboxgl, 'convertFilter').and.callThrough();
+    const Spy = jasmine.createSpy('myMock');
+    Spy.and.callFake((arg) => arg);
+    mapboxgl.convertFilter = Spy
     mapstudioWebmap = new WebMap('932266699', {
       server: server
     });
-
     mapstudioWebmap.on('mapcreatesucceeded', ({ map }) => {
       expect(map).not.toBeUndefined();
       expect(mapstudioWebmap.map).toEqual(map);
-      const webMapV3 = mapstudioWebmap._getWebMapInstance();
-      expect(webMapV3._mapInfo.layers[1].filter).toEqual([
-        'all',
-        ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
-        ['all', ['all', ['all', ['all', ['!=', ['get', 'smpid'], 121]]]]]
-      ]);
-      expect(webMapV3._mapInfo.layers[2].filter).toEqual([
-        'all',
-        ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
-        ['all', ['all', ['all', ['any', ['==', ['get', 'smpid'], 121]]]]]
-      ]);
+      expect(Spy).toHaveBeenCalledTimes(2);
+      // const webMapV3 = mapstudioWebmap._getWebMapInstance();
+      // expect(webMapV3._mapInfo.layers[1].filter).toEqual([
+      //   'all',
+      //   ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
+      //   ['all', ['all', ['all', ['all', ['!=', ['get', 'smpid'], 121]]]]]
+      // ]);
+      // expect(webMapV3._mapInfo.layers[2].filter).toEqual([
+      //   'all',
+      //   ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
+      //   ['all', ['all', ['all', ['any', ['==', ['get', 'smpid'], 121]]]]]
+      // ]);
       done();
     });
   });
@@ -206,27 +210,24 @@ describe('mapboxgl-webmap3.0', () => {
       return Promise.resolve();
     });
     const mapInfo = JSON.parse(mapstudioWebMap_filters);
+    // const Spy = spyOn(mapboxgl, 'convertFilter').and.callThrough();
+    const Spy = jasmine.createSpy('myMock');
+    Spy.and.callFake((arg) => arg);
+    mapboxgl.convertFilter = Spy
+
     mapstudioWebmap = new WebMapV3(mapInfo, {
       server: server,
       target: 'map',
       iportalServiceProxyUrlPrefix: 'mapId is JSON',
       relatedInfo: JSON.parse(msProjectINfo_filters)
     });
     mapstudioWebmap.initializeMap(mapInfo);
-
     mapstudioWebmap.on('mapcreatesucceeded', ({ map }) => {
       expect(map).not.toBeUndefined();
       expect(mapstudioWebmap.map).toEqual(map);
-      expect(mapstudioWebmap._mapInfo.layers[1].filter).toEqual([
-        'all',
-        ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
-        ['all', ['all', ['all', ['all', ['!=', ['get', 'smpid'], 121]]]]]
-      ]);
-      expect(mapstudioWebmap._mapInfo.layers[2].filter).toEqual([
-        'all',
-        ['all', ['==', ['get', 'Ctype'], ''], ['!=', ['get', 'smpid'], '']],
-        ['all', ['all', ['all', ['any', ['==', ['get', 'smpid'], 121]]]]]
-      ]);
+      expect(Spy).toHaveBeenCalledTimes(2);
+      const result2 = mapstudioWebmap._getPopupInfos({});
+      expect(result2).toEqual([]);
       done();
     });
   });