Revert "feat：升级flatgeobuf到4.6.0，支持含M值的fgb解析"

This reverts commit 075c7b1.

Author: chenxianhuii

build/webpack.config.base.js

@@ -1,5 +1,4 @@
 const webpack = require('webpack');
-const path = require('path');
 const MiniCssExtractPlugin  = require('mini-css-extract-plugin');
 const ESLintPlugin = require('eslint-webpack-plugin');
 const LintExportWebpackPlugin = require('./lint-export-webpack-plugin');
@@ -83,11 +82,7 @@ module.exports = {
 
     //其它解决方案配置
     resolve: {
-        extensions: ['.js', '.json', '.css'],
-        // flatgeobuf 依赖的 @bokuweb/zstd-wasm 默认入口是 node 构建（依赖 fs/path），浏览器包需指向 web 构建
-        alias: {
-            '@bokuweb/zstd-wasm$': path.resolve(__dirname, '../node_modules/@bokuweb/zstd-wasm/dist/web/index.web.js')
-        }
+        extensions: ['.js', '.json', '.css']
     },
 
     externals: {

package.json

@@ -157,7 +157,7 @@
     "fast-xml-parser": "5.5.9",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
-    "flatgeobuf": "4.6.0",
+    "flatgeobuf": "3.31.1",
     "flv.js": "^1.6.2",
     "insert-css": "^2.0.0",
     "jsonsql": "0.2.5",

src/common/overlay/fgb/FGBLayerRenderer.js

@@ -85,12 +85,9 @@ export class FGBLayerRenderer {
       rect.value = { extent: bounds.slice() };
       this.loadedExtentsRtree_.insert(rect);
     }
-
-    return await deserialize((fgbStream && fgbStream.body) || this.url, {
-      rect,
-      headerMetaFn: (headerMeta) => {
-        this.layerType = GEOMETRY_TYPE_MAP[headerMeta.geometryType];
-      }
+   
+    return await deserialize((fgbStream && fgbStream.body) || this.url, rect, (headerMeta) => {
+      this.layerType = GEOMETRY_TYPE_MAP[headerMeta.geometryType];
     });
   }
 

src/common/package.json

@@ -25,7 +25,7 @@
     "fast-xml-parser": "5.5.9",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
-    "flatgeobuf": "4.6.0",
+    "flatgeobuf": "3.31.1",
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
     "lodash.difference": "^4.5.0",

src/leaflet/overlay/FGBLayer.js

@@ -114,7 +114,7 @@ export var FGBLayer = L.FeatureGroup.extend({
       this.loadedExtentsRtree_.insert(rect);
     }
 
-    const fgb = deserialize((fgbStream && fgbStream.body) || this.url, { rect });
+    const fgb = deserialize((fgbStream && fgbStream.body) || this.url, rect);
     if (!this._validatedId) {
       this.curLayer = L.geoJSON(null, this.options);
       this.previousLayer && this.removeLayer(this.previousLayer);

src/leaflet/package.json

@@ -23,7 +23,7 @@
     "@mapbox/vector-tile": "1.3.1",
     "jsonsql": "0.2.5",
     "pbf": "3.2.1",
-    "flatgeobuf": "4.6.0",
+    "flatgeobuf": "3.31.1",
     "proj4": "2.17.0",
     "rbush": "^2.0.2"
   }

src/openlayers/overlay/FGB.js

@@ -116,7 +116,7 @@ export class FGB extends VectorSource {
         maxY: extent[3]
       };
     }
-    const fgb = deserialize(url, Object.keys(rect).length ? { rect } : {});
+    const fgb = deserialize(url, rect);
     let featureList = [];
     const throttleFn = throttle(() => {
       this.addFeatures(featureList);

src/openlayers/package.json

@@ -24,7 +24,7 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.remove": "^4.7.0",
     "lodash.difference": "^4.5.0",
-    "flatgeobuf": "4.6.0",
+    "flatgeobuf": "3.31.1",
     "proj4": "2.17.0"
   }
 }