Skip to content

Commit 075c7b1

Browse files
chenxianhuiichenxianhuii
committed
feat：升级flatgeobuf到4.6.0，支持含M值的fgb解析
AI-GEN: gpt-6.1-sol
1 parent cce40e3 commit 075c7b1

16 files changed

Lines changed: 116 additions & 45 deletions

File tree

‎build/webpack.config.base.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const webpack = require('webpack');
2+
const path = require('path');
23
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
34
const ESLintPlugin = require('eslint-webpack-plugin');
45
const LintExportWebpackPlugin = require('./lint-export-webpack-plugin');
@@ -82,7 +83,11 @@ module.exports = {
8283

8384
//其它解决方案配置
8485
resolve: {
85-
extensions: ['.js', '.json', '.css']
86+
extensions: ['.js', '.json', '.css'],
87+
// flatgeobuf 依赖的 @bokuweb/zstd-wasm 默认入口是 node 构建（依赖 fs/path），浏览器包需指向 web 构建
88+
alias: {
89+
'@bokuweb/zstd-wasm$': path.resolve(__dirname, '../node_modules/@bokuweb/zstd-wasm/dist/web/index.web.js')
90+
}
8691
},
8792

8893
externals: {

‎examples/leaflet/config.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ var exampleConfig = {
2323
name_en: "3857 coordinate system",
2424
thumbnail: "l_tiledMapLayer3857.png",
2525
fileName: "01_tiledMapLayer3857"
26-
}, {
27-
name: "图层过滤",
28-
name_en: "displayFilters",
29-
thumbnail: "l_tiledMapLayer_displayFilters.png",
30-
fileName: "01_tiledMapLayer_displayFilters"
3126
}, {
3227
name: "4326底图(image)",
3328
name_en: "4326 coordinate system(image)",
@@ -133,6 +128,12 @@ var exampleConfig = {
133128
version: '11.3.0',
134129
thumbnail: "createTempLayer.png",
135130
fileName: "createTempLayer"
131+
},
132+
{
133+
name: "图层过滤",
134+
name_en: "displayFilters",
135+
thumbnail: "l_tiledMapLayer_displayFilters.png",
136+
fileName: "01_tiledMapLayer_displayFilters"
136137
}
137138
]
138139
},

‎examples/mapboxgl/config.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ var exampleConfig = {
2121
thumbnail: 'mb_TileLayer.png',
2222
fileName: '01_tiledMapLayer'
2323
},
24-
{
25-
name: '图层过滤',
26-
name_en: 'displayFilters',
27-
thumbnail: 'mb_tiledMapLayer_displayFilters.png',
28-
fileName: '01_tiledMapLayer_displayFilters'
29-
},
3024
// {
3125
// name: '地图-栅格分析',
3226
// name_en: 'map rasterFunction',
@@ -103,6 +97,12 @@ var exampleConfig = {
10397
version: '11.3.0',
10498
thumbnail: "createTempLayer.png",
10599
fileName: "createTempLayer"
100+
},
101+
{
102+
name: '图层过滤',
103+
name_en: 'displayFilters',
104+
thumbnail: 'mb_tiledMapLayer_displayFilters.png',
105+
fileName: '01_tiledMapLayer_displayFilters'
106106
}
107107
]
108108
},
@@ -1979,12 +1979,6 @@ var exampleConfig = {
19791979
thumbnail: '01_tiledMapLayer_4326.png',
19801980
fileName: '01_tiledMapLayer_4326'
19811981
},
1982-
{
1983-
name: '地图_WGS84_图层过滤',
1984-
name_en: 'Map WGS84 displayFilters',
1985-
thumbnail: 'mb_tiledMapLayer_displayFilters_4326.png',
1986-
fileName: '01_tiledMapLayer_displayFilters_4326'
1987-
},
19881982
{
19891983
name: '地图_China2000',
19901984
name_en: 'Map China2000',
@@ -2043,6 +2037,12 @@ var exampleConfig = {
20432037
version: '10.1.1',
20442038
thumbnail: 'graticule.png',
20452039
fileName: 'graticuleLayer_4326'
2040+
},
2041+
{
2042+
name: '地图_WGS84_图层过滤',
2043+
name_en: 'Map WGS84 displayFilters',
2044+
thumbnail: 'mb_tiledMapLayer_displayFilters_4326.png',
2045+
fileName: '01_tiledMapLayer_displayFilters_4326'
20462046
}
20472047
]
20482048
},

‎examples/maplibregl/config.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ var exampleConfig = {
2222
thumbnail: 'mb_TileLayer.png',
2323
fileName: '01_tiledMapLayer'
2424
},
25-
{
26-
name: '图层过滤',
27-
name_en: 'displayFilters',
28-
thumbnail: 'mb_tiledMapLayer_displayFilters.png',
29-
fileName: '01_tiledMapLayer_displayFilters'
30-
},
3125
// {
3226
// name: '地图-栅格分析',
3327
// name_en: 'map rasterFunction',
@@ -90,6 +84,12 @@ var exampleConfig = {
9084
version: '11.3.0',
9185
thumbnail: "createTempLayer.png",
9286
fileName: "createTempLayer"
87+
},
88+
{
89+
name: '图层过滤',
90+
name_en: 'displayFilters',
91+
thumbnail: 'mb_tiledMapLayer_displayFilters.png',
92+
fileName: '01_tiledMapLayer_displayFilters'
9393
}
9494
]
9595
},
@@ -1755,12 +1755,6 @@ var exampleConfig = {
17551755
thumbnail: '01_tiledMapLayer_4326.png',
17561756
fileName: '01_tiledMapLayer_4326'
17571757
},
1758-
{
1759-
name: '地图_WGS84_图层过滤',
1760-
name_en: 'Map WGS84 displayFilters',
1761-
thumbnail: 'mb_tiledMapLayer_displayFilters_4326.png',
1762-
fileName: '01_tiledMapLayer_displayFilters_4326'
1763-
},
17641758
{
17651759
name: '地图_China2000',
17661760
name_en: 'Map China2000',
@@ -1812,6 +1806,12 @@ var exampleConfig = {
18121806
version: '11.2.0',
18131807
thumbnail: 'graticule.png',
18141808
fileName: 'graticuleLayer_4326'
1809+
},
1810+
{
1811+
name: '地图_WGS84_图层过滤',
1812+
name_en: 'Map WGS84 displayFilters',
1813+
thumbnail: 'mb_tiledMapLayer_displayFilters_4326.png',
1814+
fileName: '01_tiledMapLayer_displayFilters_4326'
18151815
}
18161816
]
18171817
},

‎examples/openlayers/config.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ var exampleConfig = {
2424
name_en: "3857 coordinate system",
2525
thumbnail: "ol_tiledMapLayer3857.png",
2626
fileName: "01_tiledMapLayer3857"
27-
}, {
28-
name: "图层过滤",
29-
name_en: "displayFilters",
30-
thumbnail: "ol_tiledMapLayer_displayFilters.png",
31-
fileName: "01_tiledMapLayer_displayFilters"
3227
}, {
3328
name: "地图叠加",
3429
name_en: "overlay tile layer",
@@ -115,6 +110,12 @@ var exampleConfig = {
115110
version: '11.3.0',
116111
thumbnail: "createTempLayer.png",
117112
fileName: "createTempLayer"
113+
},
114+
{
115+
name: "图层过滤",
116+
name_en: "displayFilters",
117+
thumbnail: "ol_tiledMapLayer_displayFilters.png",
118+
fileName: "01_tiledMapLayer_displayFilters"
118119
}
119120
]
120121
},

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"fast-xml-parser": "5.5.9",
158158
"fetch-ie8": "1.5.0",
159159
"fetch-jsonp": "1.1.3",
160-
"flatgeobuf": "3.31.1",
160+
"flatgeobuf": "4.6.0",
161161
"flv.js": "^1.6.2",
162162
"insert-css": "^2.0.0",
163163
"jsonsql": "0.2.5",

‎src/common/overlay/fgb/FGBLayerRenderer.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,12 @@ export class FGBLayerRenderer {
8585
rect.value = { extent: bounds.slice() };
8686
this.loadedExtentsRtree_.insert(rect);
8787
}
88-
89-
return await deserialize((fgbStream && fgbStream.body) || this.url, rect, (headerMeta) => {
90-
this.layerType = GEOMETRY_TYPE_MAP[headerMeta.geometryType];
88+
89+
return await deserialize((fgbStream && fgbStream.body) || this.url, {
90+
rect,
91+
headerMetaFn: (headerMeta) => {
92+
this.layerType = GEOMETRY_TYPE_MAP[headerMeta.geometryType];
93+
}
9194
});
9295
}
9396

‎src/common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"fast-xml-parser": "5.5.9",
2626
"fetch-ie8": "1.5.0",
2727
"fetch-jsonp": "1.1.3",
28-
"flatgeobuf": "3.31.1",
28+
"flatgeobuf": "4.6.0",
2929
"insert-css": "^2.0.0",
3030
"lodash.debounce": "^4.0.8",
3131
"lodash.difference": "^4.5.0",

‎src/leaflet/overlay/FGBLayer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export var FGBLayer = L.FeatureGroup.extend({
114114
this.loadedExtentsRtree_.insert(rect);
115115
}
116116

117-
const fgb = deserialize((fgbStream && fgbStream.body) || this.url, rect);
117+
const fgb = deserialize((fgbStream && fgbStream.body) || this.url, { rect });
118118
if (!this._validatedId) {
119119
this.curLayer = L.geoJSON(null, this.options);
120120
this.previousLayer && this.removeLayer(this.previousLayer);

‎src/leaflet/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@mapbox/vector-tile": "1.3.1",
2424
"jsonsql": "0.2.5",
2525
"pbf": "3.2.1",
26-
"flatgeobuf": "3.31.1",
26+
"flatgeobuf": "4.6.0",
2727
"proj4": "2.17.0",
2828
"rbush": "^2.0.2"
2929
}

0 commit comments

Comments
 (0)