【fix】修复当style里有indexbounds又同时传入tilegrid时，应该优先tilegrid

Author: songyumeng

build/webpack.config.openlayers.js

@@ -1,15 +1,17 @@
 var configBase = require('./webpack.config.base');
 var fs = require('fs');
 const chalk = require('chalk');
+const minimist = require('minimist');
 //端名
 var libName = 'openlayers';
 //产品包名
 var productName = 'iclient-openlayers';
 
-var argv = JSON.parse(process.env['npm_config_argv']);
-var origin = argv.original;
-
-if (origin && origin.includes('deploy-ol')) {
+const args = minimist(process.argv.slice(2));
+if (
+    args._.includes('deploy-ol') || 
+    (process.env.npm_lifecycle_event?.includes('deploy-ol'))
+) {
     libName = 'ol';
     productName = 'iclient-ol';
 }

package.json

@@ -115,6 +115,7 @@
     "karma-sonarqube-unit-reporter": "0.0.23",
     "karma-teamcity-reporter": "^1.1.0",
     "mini-css-extract-plugin": "^2.6.1",
+    "minimist": "^1.2.8",
     "mock-socket": "^9.0.3",
     "nightwatch": "^2.3.0",
     "open": "^8.4.0",

src/leaflet/overlay/dataflow/NormalRenderer.js

@@ -23,7 +23,7 @@ export var NormalRenderer = L.GeoJSON.extend({
         options = options || {};
         if (options.style && !options.pointToLayer) {
             options.pointToLayer = function (geojson, latlng) {
-                return L.circleMarker(latlng, options.style());
+                return L.circleMarker(latlng, options.style(geojson));
             }
         }
         L.Util.setOptions(this, options);

src/openlayers/overlay/VectorTileSuperMapRest.js

@@ -82,6 +82,9 @@ export class VectorTileSuperMapRest extends VectorTile {
         me.headers = options.headers || {};
         me._tileType = options.tileType || 'ScaleXY';
         me.baseUrl = options.baseUrl;
+        if(options.tileGrid){
+            this.hasTileGrid = true;
+        }
         this.vectorTileStyles = new VectorTileStyles();
         this._initialized(options);
 
@@ -366,7 +369,7 @@ export class VectorTileSuperMapRest extends VectorTile {
             }
             this._tileUrl = SecurityManager.appendCredential(newUrl);
         }
-        if (style.metadata && style.metadata.indexbounds) {
+        if (!this.hasTileGrid && style.metadata && style.metadata.indexbounds) {
             const indexbounds = style.metadata.indexbounds;
             var max = Math.max(indexbounds[2] - indexbounds[0], indexbounds[3] - indexbounds[1]);
             const defaultResolutions = [];

test/openlayers/overlay/VectorTileSuperMapRestSpec.js

@@ -7,6 +7,7 @@ import View from 'ol/View';
 import MVT from 'ol/format/MVT';
 import Feature from 'ol/Feature';
 import VectorTileLayer from 'ol/layer/VectorTile';
+import TileGrid from 'ol/tilegrid/TileGrid';
 
 var url = GlobeParameter.ChinaURL;
 const mapObject = {
@@ -105,7 +106,7 @@ describe('openlayers_VectorTileSuperMapRest', () => {
       map.removeLayer(vectorLayer);
     }
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
-    spyGet.calls.reset();
+    spyGet && spyGet.calls.reset();
     spyPost.calls.reset();
     spyCommit.calls.reset();
   });
@@ -294,4 +295,93 @@ describe('openlayers_VectorTileSuperMapRest', () => {
       });
     });
   });
+  const style = {
+    "version": 8,
+    "name": "",
+    "center": [0, 0],
+    "zoom": 2,
+    "metadata": {
+      "indexbounds": [-400000, -400000, 400000,400000]
+    },
+    "sources": {
+      "aaa": {
+        "tiles": ["http://127.0.0.1:5566/tiles/{z}/{x}/{y}.mvt"],
+        "type": "vector"
+      }
+    },
+    "layers": [{
+      "id": "区级政面0_24",
+      "source": "矢量切片",
+      "source-layer": "区级政面@矢量",
+      "minzoom": 0.0,
+      "maxzoom": 24.0,
+      "type": "fill",
+      "layout": {
+        "visibility": "visible"
+      }
+    }]
+  };
+  it('initialize_with_tilegrid_and_metadata_indexbounds', (done) => {
+      map = new Map({
+        target: 'map',
+        view: new View({
+          center: [0, 0],
+          zoom: 2
+        })
+      });
+      vectorTileOptions = {
+        style: style,
+        tileGrid: new TileGrid({
+        resolutions: [100000,50000],
+        origin: [-4823200, 6183000],
+        tileSize: 512,
+        }),
+        format: new ol.format.MVT(),
+      }
+      vectorTileOptions.tileLoadFunction = (tile) => {
+        tile.setLoader(() => {
+          tile.setFeatures([]);
+        });
+      };
+      vectorTileSource = new VectorTileSuperMapRest(vectorTileOptions);
+      vectorTileSource.once('tileloadstart', () => {
+        expect(vectorTileSource).not.toBeNull();
+        expect(vectorTileSource.getTileGrid().getResolutions()[0]).toBe(100000)
+        done();
+      });
+      vectorLayer = new VectorTileLayer({
+        source: vectorTileSource
+      });
+      map.addLayer(vectorLayer);
+  });
+
+  
+  it('initialize_without_tilegrid_but_metadata_indexbounds', (done) => {
+      map = new Map({
+        target: 'map',
+        view: new View({
+          center: [0, 0],
+          zoom: 2
+        })
+      });
+      vectorTileOptions = {
+        style: style,
+        format: new ol.format.MVT(),
+      }
+      vectorTileOptions.tileLoadFunction = (tile) => {
+        tile.setLoader(() => {
+          tile.setFeatures([]);
+        });
+      };
+      vectorTileSource = new VectorTileSuperMapRest(vectorTileOptions);
+      vectorTileSource.once('tileloadstart', () => {
+        expect(vectorTileSource).not.toBeNull();
+        expect(vectorTileSource.getTileGrid().getResolutions()[0]).toBe((400000-(-400000))/512)
+        done();
+      });
+      vectorLayer = new VectorTileLayer({
+        source: vectorTileSource
+      });
+      map.addLayer(vectorLayer);
+  });
 });