Skip to content

Commit bcd76b5

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
Merge branch 'maplibregl-overlays'
2 parents 2fa9e50 + 82fd9e3 commit bcd76b5

File tree

213 files changed

+14661
-4019
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+14661
-4019
lines changed

‎build/jsdocs/mapboxgl/docs.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
"src/common/components/templates/Select",
6565
"src/common/security/KeyServiceParameter",
6666
"src/common/components/templates/TemplateBase",
67-
6867
"src/mapboxgl/core/Util"
6968
]
7069
},

‎build/jsdocs/maplibregl/docs.json‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,52 @@
1818
"source": {
1919
"includePattern": ".+\\.js?$",
2020
"excludePattern": ".+[\\\\/]src[\\\\/]common[\\\\/]iServer[\\\\/].*Service.js?$",
21-
"include": ["src/maplibregl"],
22-
"exclude": ["src/common"]
21+
"include": ["src/common", "src/maplibregl"],
22+
"exclude": [
23+
"src/common/overlay/levelRenderer",
24+
"src/common/thirdparty/ai",
25+
"src/common/lang/locales",
26+
"src/common/iPortal/iPortalQueryResult",
27+
"src/common/online/OnlineServiceBase",
28+
"src/common/online/OnlineData",
29+
"src/common/online/Online",
30+
"src/common/iManager/iManagerServiceBase",
31+
"src/common/iServer/GetFeaturesServiceBase",
32+
"src/common/iServer/NetworkAnalystServiceBase",
33+
"src/common/iServer/SpatialAnalystBase",
34+
"src/common/iServer/ProcessingServiceBase",
35+
"src/common/iServer/PointWithMeasure",
36+
"src/common/iServer/ServerTheme",
37+
"src/common/overlay/RankSymbol",
38+
"src/common/overlay/ThemeVector",
39+
"src/common/overlay/Graph",
40+
"src/common/overlay/feature/ShapeFactory",
41+
"src/common/overlay/feature/ShapeParameters",
42+
"src/common/overlay/feature/Rectangle",
43+
"src/common/overlay/feature/Circle",
44+
"src/common/overlay/feature/Image",
45+
"src/common/overlay/feature/Label",
46+
"src/common/overlay/feature/Line",
47+
"src/common/overlay/feature/Point",
48+
"src/common/overlay/feature/Polygon",
49+
"src/common/overlay/feature/Sector",
50+
"src/common/overlay/feature/Theme",
51+
"src/common/commontypes/Credential",
52+
"src/common/components/chart/ChartViewModel",
53+
"src/common/components/util/Util",
54+
"src/common/components/templates/AttributesPopContainer",
55+
"src/common/components/templates/CityTabsPage",
56+
"src/common/components/templates/CommonContainer",
57+
"src/common/components/templates/DropDownBox",
58+
"src/common/components/templates/NavTabsPage",
59+
"src/common/components/templates/IndexTabsPageContainer",
60+
"src/common/components/templates/PaginationContainer",
61+
"src/common/components/templates/PopContainer",
62+
"src/common/components/templates/Select",
63+
"src/common/security/KeyServiceParameter",
64+
"src/common/components/templates/TemplateBase",
65+
"src/mapboxgl/core/Util"
66+
]
2367
},
2468
"plugins": ["plugins/markdown", "../plugins/usage"],
2569
"markdown": {

‎build/jsdocs/template/publish.js‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,35 @@ var whiteLists = {
572572
'KnowledgeGraphService',
573573
'GraphMap',
574574
'FGBLayer',
575-
'L7Layer',
575+
'AddressMatchService',
576+
'ChartService',
577+
'DataFlowService',
578+
'DatasetService',
579+
'DatasourceService',
580+
'FeatureService',
581+
'FieldService',
582+
'GeoprocessingService',
583+
'GridCellInfosService',
584+
'ImageCollectionService',
585+
'ImageService',
586+
'LayerInfoService',
587+
'MapService',
588+
'MeasureService',
589+
'NetworkAnalyst3DService',
590+
'NetworkAnalystService',
591+
'ProcessingService',
592+
'QueryService',
593+
'SpatialAnalystService',
594+
'ThemeService',
595+
'TrafficTransferAnalystService',
596+
'WebPrintingJobService',
597+
'DeckglLayer',
598+
'FGBLayer',
599+
'GraphicLayer',
600+
'GraticuleLayer',
601+
'HeatMapLayer',
602+
'MapvLayer',
603+
'ThreeLayer'
576604
],
577605
openlayers: [
578606
'KnowledgeGraphService',

‎build/jsdocs/template/typeLinkExt.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ var typeLinks = {
8686
//maplibregl
8787
"maplibregl.Map": mlbglapi + '#map',
8888
"maplibregl.Evented": mlbglapi + '#Evented',
89+
"maplibregl.LngLatBounds": mlbglapi + '#lnglatbounds',
8990

9091
//mapv
9192
"Mapv.DataSet": mapv + 'data/DataSet.md',

‎build/webpack.config.leaflet.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ module.exports = {
2424
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
2525
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
2626
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
27-
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()"
27+
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()",
28+
three: 'function(){try{return THREE}catch(e){return {}}}()'
2829
}),
2930

3031
module: {

‎build/webpack.config.openlayers.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ var externals = [
2121
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
2222
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
2323
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
24-
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
24+
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
25+
three: 'function(){try{return THREE}catch(e){return {}}}()'
2526
}),
2627
function(context, request, callback) {
2728
if (/^ol\//.test(request)) {

‎dist/maplibregl/include-maplibregl.js‎

Lines changed: 116 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,128 @@
5252
function load({ libsurl }) {
5353
var includes = (targetScript.getAttribute('include') || '').split(',');
5454
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
55-
inputCSS('https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css');
56-
inputScript('https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.js');
55+
inputCSS('https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.css');
56+
inputScript('https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.js');
57+
if (inArray(includes, 'turf')) {
58+
inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
59+
}
5760
if (inArray(includes, 'draw')) {
5861
inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css`);
5962
inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js`);
6063
}
64+
6165
if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
6266
inputScript(`${libsurl}/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js`);
67+
}
68+
if (inArray(includes, 'compare')) {
69+
inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css`);
70+
inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js`);
71+
}
72+
if (inArray(includes, 'mapv')) {
73+
inputScript(`${libsurl}/mapv/2.0.62/mapv.min.js`);
74+
}
75+
if (inArray(includes, 'echarts')) {
76+
inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
77+
inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
78+
inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
79+
}
80+
if (inArray(includes, 'echarts-vue')) {
81+
inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
82+
inputScript(`${libsurl}/vue-echarts/4.1.0/vue-echarts.min.js`);
83+
inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
84+
inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
85+
}
86+
if (inArray(includes, 'three')) {
87+
inputScript(`${libsurl}/three/0.150.1/three.min.js`);
88+
}
89+
if (inArray(includes, 'three@0.121.1')) {
90+
inputScript(`${libsurl}/three/0.121.1/build/three.js`);
91+
}
92+
if (inArray(includes, 'xlsx')) {
93+
inputScript(`${libsurl}/xlsx/0.19.3/xlsx.core.min.js`);
94+
}
95+
if (inArray(includes, 'proj4')) {
96+
inputScript(`${libsurl}/proj4/2.9.0/proj4.min.js`);
97+
}
98+
if (inArray(includes, 'shapefile')) {
99+
inputScript(`${libsurl}/shapefile/shapefile.js`);
100+
}
101+
if (inArray(includes, 'ant-design-vue')) {
102+
inputCSS(`${libsurl}/ant-design-vue/1.7.8/antd.min.css`);
103+
inputScript(`${libsurl}/ant-design-vue/1.7.8/antd.min.js`);
104+
}
105+
if (inArray(includes, 'antd')) {
106+
inputCSS(`${libsurl}/antd/3.25.3/antd.min.css`);
107+
inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
108+
inputScript(`${libsurl}/antd/3.25.3/antd.min.js`);
109+
}
110+
if (inArray(includes, 'deck')) {
111+
inputScript(`${libsurl}/deck.gl/5.1.3/deck.gl.min.js`);
112+
}
113+
if (inArray(includes, 'jsonsql')) {
114+
inputScript(`${libsurl}/jsonsql/jsonsql.js`);
115+
}
116+
if (inArray(includes, 'geostats')) {
117+
inputScript(`${libsurl}/geostats/geostats.js`);
118+
}
119+
if (inArray(includes, 'canvg')) {
120+
inputScript(`${libsurl}/canvg/3.0.10/umd.min.js`);
121+
}
122+
if (inArray(includes, 'convert')) {
123+
inputScript(`${libsurl}/xml-js/1.6.8/xml-js.min.js`);
124+
}
125+
if (inArray(includes, 'LegacyJSONLoader')) {
126+
inputScript(`${libsurl}/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js`);
127+
}
128+
if (inArray(includes, 'OBJLoader')) {
129+
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/OBJLoader.js`);
130+
}
131+
132+
if (inArray(includes, 'three92')) {
133+
inputScript(`${libsurl}/three/92/three.min.js`);
134+
}
135+
if (inArray(includes, 'LoaderSupport')) {
136+
inputScript(`${libsurl}/three/plugins/loaders/LoaderCommons.js`);
137+
inputScript(`${libsurl}/three/plugins/loaders/LoaderBuilder.js`);
138+
inputScript(`${libsurl}/three/plugins/loaders/LoaderWorkerSupport.js`);
139+
}
140+
if (inArray(includes, 'OBJLoader2')) {
141+
inputScript(`${libsurl}/three-wtm/1.0.0/three-wtm.js`);
142+
inputScript(`${libsurl}/wwobjloader2/4.0.0/wwobjloader2.js`);
143+
}
144+
if (inArray(includes, 'MTLLoader')) {
145+
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/MTLLoader.js`);
146+
}
147+
if (inArray(includes, 'GLTFLoader')) {
148+
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/GLTFLoader.js`);
149+
}
150+
if (inArray(includes, 'echarts-gl')) {
151+
inputScript(`${libsurl}/echarts-gl/1.1.2-fix/echarts-gl.min.js`);
152+
}
153+
if (inArray(includes, 'mapbox-print-pdf')) {
154+
inputScript(`${libsurl}/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js`);
155+
}
156+
if (inArray(includes, 'moment')) {
157+
inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
158+
}
159+
if (inArray(includes, 'lodash')) {
160+
inputScript(`${libsurl}/lodash/4.17.21/lodash.min.js`);
161+
}
162+
if (inArray(includes, 'tensorflow')) {
163+
inputScript(`${libsurl}/tensorflow/3.9.0/tf.min.js`);
164+
}
165+
if (inArray(includes, 'videojs')) {
166+
inputCSS(`${libsurl}/video-js/7.10.2/video-js.min.css`);
167+
inputScript(`${libsurl}/video-js/7.10.2/video.min.js`);
168+
}
169+
if (inArray(includes, 'FGB')) {
170+
inputScript(`${libsurl}/flatgeobuf-geojson/3.23.1/flatgeobuf-geojson.min.js`);
171+
}
172+
if (inArray(includes, 'g6')) {
173+
inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');
174+
}
175+
if (inArray(includes, 'turf')) {
176+
inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
63177
}
64178
if (!inArray(excludes, 'iclient-maplibregl')) {
65179
if (supportES6()) {
@@ -68,15 +182,9 @@
68182
inputScript('../../dist/maplibregl/iclient-maplibregl.min.js');
69183
}
70184
}
71-
if (inArray(includes, 'turf')) {
72-
inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
73-
}
74185
if (!inArray(excludes, 'iclient-maplibregl-css')) {
75186
inputCSS('../../dist/maplibregl/iclient-maplibregl.min.css');
76187
}
77-
if (inArray(includes, 'g6')) {
78-
inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');
79-
}
80188
}
81189

82190
load({

‎examples/classic/editor.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
$body.append("<script type='text/javascript' src='../openlayers/config.js'><\/script>");
3535
$body.append("<script type='text/javascript' src='../mapboxgl/config.js'><\/script>");
3636
$body.append("<script type='text/javascript' src='../leaflet/config.js'><\/script>");
37+
$body.append("<script type='text/javascript' src='../maplibregl/config.js'><\/script>");
3738
$body.append("<script type='text/javascript' src='../component/config.js'><\/script>");
3839
$body.append("<script type='text/javascript' src='./config.js'><\/script>");
3940
$body.append("<script type='text/javascript' src='../js/localization.js'><\/script>");

‎examples/classic/examples.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
$body.append("<script type='text/javascript' src='../openlayers/config.js'><\/script>");
3838
$body.append("<script type='text/javascript' src='../mapboxgl/config.js'><\/script>");
3939
$body.append("<script type='text/javascript' src='../leaflet/config.js'><\/script>");
40+
$body.append("<script type='text/javascript' src='../maplibregl/config.js'><\/script>");
4041
$body.append("<script type='text/javascript' src='../component/config.js'><\/script>");
4142
$body.append("<script type='text/javascript' src='./config.js'><\/script>");
4243
$body.append("<script type='text/javascript' src='../js/localization.js'><\/script>");

‎examples/component/editor.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
$body.append("<script type='text/javascript' src='../mapboxgl/config.js'><\/script>");
3737
$body.append("<script type='text/javascript' src='../classic/config.js'><\/script>");
3838
$body.append("<script type='text/javascript' src='../openlayers/config.js'><\/script>");
39+
$body.append("<script type='text/javascript' src='../maplibregl/config.js'><\/script>");
3940
$body.append("<script type='text/javascript' src='./config.js'><\/script>");
4041
$body.append("<script type='text/javascript' src='../js/localization.js'><\/script>");
4142
$body.append("<script type='text/javascript' src='../js/common.js'><\/script>");

0 commit comments

Comments
 (0)