Skip to content

Commit 5c544f8

Browse files
committed
【feature】L7依赖 commit by luoxiao
1 parent becbde2 commit 5c544f8

10 files changed

Lines changed: 115 additions & 10 deletions

File tree

‎.eslintignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ src/classic/theme/*
55
src/common/style/CartoCSS.js
66
src/common/thirdparty/ai/*
77
src/common/util/UGCWasmAll.js
8+
src/maplibregl/overlay/L7/l7-render.js
9+
src/mapboxgl/overlay/L7/l7-render.js
10+
L7/l7-render
811
test

‎build/webpack.config.mapboxgl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3232
'@turf/turf': "function(){try{return turf}catch(e){return {}}}()",
3333
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
34-
'@supermap/mapboxgl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
34+
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()'
3535
})
3636
],
3737

‎build/webpack.config.maplibregl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module.exports = {
3030
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3131
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
3232
'xml-js': 'function(){try{return convert}catch(e){return {}}}()',
33-
'@supermap/maplibregl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
33+
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()'
3434
}),
3535

3636
module: {

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@
135135
"@sinonjs/text-encoding": "^0.7.2",
136136
"@supermap/iclient-common": "file:src/common",
137137
"@supermap/tile-decryptor": "^0.0.2",
138-
"@supermap/mapboxgl-l7-render": "^0.0.1",
139-
"@supermap/maplibregl-l7-render": "^0.0.1",
140138
"@tensorflow/tfjs": "^3.9.0",
141139
"@turf/turf": "6.5.0",
142140
"canvg": "3.0.10",

‎src/mapboxgl/overlay/L7/l7-render.js‎

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/mapboxgl/overlay/L7Layer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import '../core/Base';
22
import { Util as CommonUtil } from '@supermap/iclient-common/commontypes/Util';
33
import { getL7Scene } from '@supermap/iclient-common/overlay/l7/util';
44
import mapboxgl from 'mapbox-gl';
5-
import * as L7 from '@supermap/mapboxgl-l7-render';
6-
import { Scene, Mapbox } from '@supermap/mapboxgl-l7-render';
5+
import * as L7 from './L7/l7-render';
6+
import { Scene, Mapbox } from './L7/l7-render';
77

88
/**
99
* @class L7Layer

‎src/mapboxgl/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"mapbox-gl": "1.13.2",
2121
"three": "0.150.1",
2222
"@supermap/iclient-common": "11.2.0-dev",
23-
"@supermap/mapboxgl-l7-render": "^0.0.1",
2423
"canvg": "3.0.10",
2524
"fast-xml-parser": "^4.2.7",
2625
"flatgeobuf": "3.23.1",

‎src/maplibregl/overlay/L7/l7-render.js‎

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/maplibregl/overlay/L7Layer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '../core/Base';
22
import { Util as CommonUtil } from '@supermap/iclient-common/commontypes/Util';
3-
import * as L7 from '@supermap/maplibregl-l7-render';
4-
import { Scene, Maplibre } from '@supermap/maplibregl-l7-render';
3+
import * as L7 from './L7/l7-render';
4+
import { Scene, Maplibre } from './L7/l7-render';
55
import { getL7Scene } from '@supermap/iclient-common/overlay/l7/util';
66
import maplibregl from 'maplibre-gl';
77

‎src/maplibregl/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"canvg": "3.0.10",
2222
"proj4": "2.9.0",
2323
"@supermap/iclient-common": "11.2.0-dev",
24-
"@supermap/maplibregl-l7-render": "^0.0.1",
2524
"rbush": "^2.0.2"
2625
}
2726
}

0 commit comments

Comments
 (0)