Skip to content

Commit 0ebc128

Browse files
committed
【fix】替换 Mapbox GL Style Spec 依赖
AI-GEN: 100% gpt-6
1 parent 0e061cc commit 0ebc128

7 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@
143143
"dependencies": {
144144
"@antv/g2": "^4.2.11",
145145
"@antv/g6": "^4.8.14",
146-
"@mapbox/mapbox-gl-style-spec": "14.23.0",
147146
"@mapbox/vector-tile": "1.3.1",
148147
"@maplibre/maplibre-gl-style-spec": "^23.3.0",
149148
"@supermapgis/iclient-common": "file:src/common",

‎src/mapboxgl/mapping/WebMap.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { createMapClassExtending } from '@supermapgis/iclient-common/mapping/Map
66
import { createMapStyleExtending } from '@supermapgis/iclient-common/mapping/MapStyle';
77
import { createWebMapV2BaseExtending } from '@supermapgis/iclient-common/mapping/WebMapV2Base';
88
import { L7LayerUtil } from '@supermapgis/iclient-common/mapping/utils/L7LayerUtil';
9-
import { featureFilter, expression } from '@mapbox/mapbox-gl-style-spec';
10-
import spec from '@mapbox/mapbox-gl-style-spec/reference/v8';
9+
import { featureFilter, expression } from '@maplibre/maplibre-gl-style-spec';
10+
import spec from '@maplibre/maplibre-gl-style-spec/src/reference/v8';
1111
import { L7Layer, L7 } from '../overlay/L7Layer';
1212
import MapManager from './webmap/MapManager';
1313
import { CRSManager } from './webmap/CRSManager';

‎src/mapboxgl/overlay/L7Layer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mapboxgl from 'mapbox-gl';
55
import * as L7 from './L7/l7-render';
66
import { Scene, Mapbox } from './L7/l7-render';
77
import { getL7Filter } from '@supermapgis/iclient-common/mapping/utils/L7LayerUtil';
8-
import { featureFilter } from '@mapbox/mapbox-gl-style-spec';
8+
import { featureFilter } from '@maplibre/maplibre-gl-style-spec';
99

1010

1111
/**

‎src/mapboxgl/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"author": "SuperMap",
1616
"license": "Apache-2.0",
1717
"dependencies": {
18-
"@mapbox/mapbox-gl-style-spec": "14.23.0",
18+
"@maplibre/maplibre-gl-style-spec": "^23.3.0",
1919
"@turf/turf": "7.2.0",
2020
"@turf/meta": "^7.2.0",
2121
"mapv": "2.0.62",

‎test/common/mapping/utils/L7LayerUtilSpec.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { L7LayerUtil, getL7Filter } from '../../../../src/common/mapping/utils/L7LayerUtil';
22
import { FetchRequest } from '../../../../src/common/util/FetchRequest';
33
import * as mockL7 from '../../../tool/mock_l7';
4-
import { featureFilter, expression } from '@mapbox/mapbox-gl-style-spec';
5-
import spec from '@mapbox/mapbox-gl-style-spec/reference/v8';
4+
import { featureFilter, expression } from '@maplibre/maplibre-gl-style-spec';
5+
import spec from '@maplibre/maplibre-gl-style-spec/src/reference/v8';
66

77
describe('L7LayerUtil', () => {
88
const L7 = {
@@ -724,7 +724,8 @@ describe('L7LayerUtil', () => {
724724
const expr = ['any', ['all', ['==', ['get', 'smpid'], 5], ['==', ['get', '新建字段'], '']]];
725725
const result = getL7Filter(expr, featureFilter);
726726
expect(result.field).toEqual(['smpid', '新建字段']);
727-
expect(result.values).not.toBeUndefined();
727+
expect(result.values(5, '')).toBe(true);
728+
expect(result.values(6, '')).toBe(false);
728729
});
729730

730731
it('add mvt source and requestParameters', (done) => {

‎test/karma.conf.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ module.exports = function (config) {
4747
'../src/mapboxgl/overlay/L7/l7-render.js',
4848
'../src/maplibregl/overlay/L7/l7-render.js',
4949
'../node_modules/video.js/dist/video.cjs.js',
50-
'../src/common/util/UGCWasmAll.js',
51-
'../node_modules/@mapbox/mapbox-gl-style-spec'
50+
'../src/common/util/UGCWasmAll.js'
5251

5352
],
5453
plugins: ['istanbul', '@babel/plugin-transform-runtime']

‎test/mapboxgl/mapping/WebMapV3Spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { WebMap } from '../../../src/mapboxgl/mapping/WebMap';
88
import { createSpriteLoadHandler } from '../../../src/mapboxgl';
99
import * as MapManagerUtil from '../../../src/mapboxgl/mapping/webmap/MapManager';
1010
import { CRSManager } from '../../../src/mapboxgl/mapping/webmap/CRSManager';
11-
import { featureFilter, expression } from '@mapbox/mapbox-gl-style-spec';
12-
import spec from '@mapbox/mapbox-gl-style-spec/reference/v8';
11+
import { featureFilter, expression } from '@maplibre/maplibre-gl-style-spec';
12+
import spec from '@maplibre/maplibre-gl-style-spec/src/reference/v8';
1313
import { L7, L7Layer } from '../../../src/mapboxgl/overlay/L7Layer';
1414
import * as mockL7 from '../../tool/mock_l7';
1515
import mbglmap, { CRS, proj4, revertCRS } from '../../tool/mock_mapboxgl_map';

0 commit comments

Comments
 (0)