@kq_npm/client3d_webgl_vue 3.9.3-beta → 3.9.8-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/adddata/index.js +74 -7
- package/index.js +110 -10
- package/package.json +1 -1
- package/scenceview/index.js +110 -10
package/adddata/index.js
CHANGED
|
@@ -394,14 +394,24 @@ class AddDataViewModel {
|
|
|
394
394
|
}
|
|
395
395
|
} catch (e) {}
|
|
396
396
|
|
|
397
|
+
var style = { ...that._geojsonStyle
|
|
398
|
+
};
|
|
397
399
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
398
|
-
|
|
400
|
+
var addType = "geojson"; // 判断是否是arcgis格式的json数据
|
|
401
|
+
|
|
402
|
+
if (ret.geometryType) {
|
|
403
|
+
ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
404
|
+
style.label.express = "NAME";
|
|
405
|
+
addType = "arcjson";
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
ds.load(ret, style).then(ds => {
|
|
399
409
|
ds.entities.values.forEach(entity => {
|
|
400
410
|
if (entity.polygon) {
|
|
401
411
|
entity.polyline = {
|
|
402
412
|
positions: entity.polygon.hierarchy._value.positions,
|
|
403
|
-
width:
|
|
404
|
-
material:
|
|
413
|
+
width: style.polygon.outlineWidth,
|
|
414
|
+
material: style.polygon.outlineColor
|
|
405
415
|
};
|
|
406
416
|
}
|
|
407
417
|
});
|
|
@@ -420,7 +430,7 @@ class AddDataViewModel {
|
|
|
420
430
|
serverType: "datasource",
|
|
421
431
|
lsType: "ls",
|
|
422
432
|
url: ret,
|
|
423
|
-
addType:
|
|
433
|
+
addType: addType,
|
|
424
434
|
shapeType: that._layerManager.getShapeType(ds)
|
|
425
435
|
};
|
|
426
436
|
|
|
@@ -871,9 +881,15 @@ class AddDataViewModel {
|
|
|
871
881
|
}, this);
|
|
872
882
|
|
|
873
883
|
if (mapInfo.rect84) {
|
|
874
|
-
|
|
875
|
-
|
|
876
|
-
|
|
884
|
+
if (mapInfo.rect84 instanceof Array) {
|
|
885
|
+
this._viewer.camera.flyTo({
|
|
886
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
|
|
887
|
+
});
|
|
888
|
+
} else {
|
|
889
|
+
this._viewer.camera.flyTo({
|
|
890
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
|
|
891
|
+
});
|
|
892
|
+
}
|
|
877
893
|
}
|
|
878
894
|
|
|
879
895
|
setChildrenAddType(mapServerInfo.layerTreeData, type);
|
|
@@ -1000,9 +1016,11 @@ class AddDataViewModel {
|
|
|
1000
1016
|
|
|
1001
1017
|
case "wmts":
|
|
1002
1018
|
case "kqgistileserver":
|
|
1019
|
+
case "kqgisaggregationserver":
|
|
1003
1020
|
this._viewer.addWMTSLayerGroup(url).then(group => {
|
|
1004
1021
|
var defaultName = 'wmts';
|
|
1005
1022
|
if (type === "kqgistileserver") defaultName = 'tile';
|
|
1023
|
+
if (type === "kqgisaggregationserver") defaultName = 'aggregation';
|
|
1006
1024
|
node = {
|
|
1007
1025
|
guid: group.guid,
|
|
1008
1026
|
name: name || defaultName,
|
|
@@ -1110,6 +1128,43 @@ class AddDataViewModel {
|
|
|
1110
1128
|
});
|
|
1111
1129
|
break;
|
|
1112
1130
|
|
|
1131
|
+
case "arcjson":
|
|
1132
|
+
var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
1133
|
+
var geojsonStyle = { ...this._geojsonStyle
|
|
1134
|
+
};
|
|
1135
|
+
geojsonStyle.label.express = 'NAME';
|
|
1136
|
+
ds.load(url, geojsonStyle).then(ds => {
|
|
1137
|
+
ds.entities.values.forEach(entity => {
|
|
1138
|
+
if (entity.polygon) {
|
|
1139
|
+
entity.polyline = {
|
|
1140
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
1141
|
+
width: geojsonStyle.polygon.outlineWidth,
|
|
1142
|
+
material: geojsonStyle.polygon.outlineColor
|
|
1143
|
+
};
|
|
1144
|
+
}
|
|
1145
|
+
}, this);
|
|
1146
|
+
|
|
1147
|
+
this._viewer.dataSources.add(ds);
|
|
1148
|
+
|
|
1149
|
+
this._viewer.flyTo(ds);
|
|
1150
|
+
|
|
1151
|
+
node = {
|
|
1152
|
+
guid: ds.guid,
|
|
1153
|
+
name: name,
|
|
1154
|
+
visible: true,
|
|
1155
|
+
serverType: "datasource",
|
|
1156
|
+
lsType: "ls",
|
|
1157
|
+
url: url,
|
|
1158
|
+
addType: type,
|
|
1159
|
+
shapeType: this._layerManager.getShapeType(ds)
|
|
1160
|
+
};
|
|
1161
|
+
|
|
1162
|
+
this._layerManager.addTempLayerNode(node);
|
|
1163
|
+
|
|
1164
|
+
cb && cb(node);
|
|
1165
|
+
});
|
|
1166
|
+
break;
|
|
1167
|
+
|
|
1113
1168
|
case "kml":
|
|
1114
1169
|
var ds = new Cesium.KmlDataSource({
|
|
1115
1170
|
name: name,
|
|
@@ -1416,6 +1471,12 @@ const __default__ = {
|
|
|
1416
1471
|
namePlaceholder: language.value.unnamedLayer,
|
|
1417
1472
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
|
|
1418
1473
|
description: language.value.imagertyTileServerdescription
|
|
1474
|
+
}, {
|
|
1475
|
+
type: "kqgisaggregationserver",
|
|
1476
|
+
name: language.value.KQGISAggregationServer,
|
|
1477
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
1478
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
|
|
1479
|
+
description: language.value.imagertyAggregationServerdescription
|
|
1419
1480
|
}, {
|
|
1420
1481
|
type: "arcgismapserver",
|
|
1421
1482
|
name: language.value.ArcGISMapServer,
|
|
@@ -1452,6 +1513,12 @@ const __default__ = {
|
|
|
1452
1513
|
namePlaceholder: language.value.unnamedLayer,
|
|
1453
1514
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
|
|
1454
1515
|
description: language.value.imagertyGeoJsondescription
|
|
1516
|
+
}, {
|
|
1517
|
+
type: "arcjson",
|
|
1518
|
+
name: language.value.ArcJson,
|
|
1519
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
1520
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
|
|
1521
|
+
description: language.value.imagertyArcJsondescription
|
|
1455
1522
|
}, {
|
|
1456
1523
|
type: "mvt",
|
|
1457
1524
|
name: language.value.MVT,
|
package/index.js
CHANGED
|
@@ -2181,6 +2181,33 @@ class LayerManager {
|
|
|
2181
2181
|
|
|
2182
2182
|
break;
|
|
2183
2183
|
|
|
2184
|
+
case "arcjson":
|
|
2185
|
+
layerData.visible = isAdd;
|
|
2186
|
+
layerData.serverType = "datasource";
|
|
2187
|
+
|
|
2188
|
+
if (isAdd) {
|
|
2189
|
+
var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
2190
|
+
var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
|
|
2191
|
+
promise = ds.load(url, geojsonStyle).then(ds => {
|
|
2192
|
+
ds.entities.values.forEach(entity => {
|
|
2193
|
+
if (entity.polygon) {
|
|
2194
|
+
entity.polyline = {
|
|
2195
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
2196
|
+
width: geojsonStyle.polygon.outlineWidth,
|
|
2197
|
+
material: geojsonStyle.polygon.outlineColor
|
|
2198
|
+
};
|
|
2199
|
+
}
|
|
2200
|
+
}, this);
|
|
2201
|
+
|
|
2202
|
+
this._viewer.dataSources.add(ds);
|
|
2203
|
+
|
|
2204
|
+
ds._guid = layerData.guid;
|
|
2205
|
+
layerData.shapeType = this.getShapeType(ds);
|
|
2206
|
+
});
|
|
2207
|
+
}
|
|
2208
|
+
|
|
2209
|
+
break;
|
|
2210
|
+
|
|
2184
2211
|
case "kml":
|
|
2185
2212
|
layerData.visible = isAdd;
|
|
2186
2213
|
layerData.serverType = "datasource";
|
|
@@ -2381,9 +2408,15 @@ class LayerManager {
|
|
|
2381
2408
|
});
|
|
2382
2409
|
|
|
2383
2410
|
if (rect) {
|
|
2384
|
-
|
|
2385
|
-
|
|
2386
|
-
|
|
2411
|
+
if (rect instanceof Array) {
|
|
2412
|
+
that._viewer.camera.flyTo({
|
|
2413
|
+
destination: Cesium.Rectangle.fromDegrees(rect[0], rect[1], rect[2], rect[3])
|
|
2414
|
+
});
|
|
2415
|
+
} else {
|
|
2416
|
+
that._viewer.camera.flyTo({
|
|
2417
|
+
destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
|
|
2418
|
+
});
|
|
2419
|
+
}
|
|
2387
2420
|
}
|
|
2388
2421
|
|
|
2389
2422
|
that._scenceView.fire("resetLayerDatas");
|
|
@@ -22799,14 +22832,24 @@ class AddDataViewModel {
|
|
|
22799
22832
|
}
|
|
22800
22833
|
} catch (e) {}
|
|
22801
22834
|
|
|
22835
|
+
var style = { ...that._geojsonStyle
|
|
22836
|
+
};
|
|
22802
22837
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
22803
|
-
|
|
22838
|
+
var addType = "geojson"; // 判断是否是arcgis格式的json数据
|
|
22839
|
+
|
|
22840
|
+
if (ret.geometryType) {
|
|
22841
|
+
ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
22842
|
+
style.label.express = "NAME";
|
|
22843
|
+
addType = "arcjson";
|
|
22844
|
+
}
|
|
22845
|
+
|
|
22846
|
+
ds.load(ret, style).then(ds => {
|
|
22804
22847
|
ds.entities.values.forEach(entity => {
|
|
22805
22848
|
if (entity.polygon) {
|
|
22806
22849
|
entity.polyline = {
|
|
22807
22850
|
positions: entity.polygon.hierarchy._value.positions,
|
|
22808
|
-
width:
|
|
22809
|
-
material:
|
|
22851
|
+
width: style.polygon.outlineWidth,
|
|
22852
|
+
material: style.polygon.outlineColor
|
|
22810
22853
|
};
|
|
22811
22854
|
}
|
|
22812
22855
|
});
|
|
@@ -22825,7 +22868,7 @@ class AddDataViewModel {
|
|
|
22825
22868
|
serverType: "datasource",
|
|
22826
22869
|
lsType: "ls",
|
|
22827
22870
|
url: ret,
|
|
22828
|
-
addType:
|
|
22871
|
+
addType: addType,
|
|
22829
22872
|
shapeType: that._layerManager.getShapeType(ds)
|
|
22830
22873
|
};
|
|
22831
22874
|
|
|
@@ -23276,9 +23319,15 @@ class AddDataViewModel {
|
|
|
23276
23319
|
}, this);
|
|
23277
23320
|
|
|
23278
23321
|
if (mapInfo.rect84) {
|
|
23279
|
-
|
|
23280
|
-
|
|
23281
|
-
|
|
23322
|
+
if (mapInfo.rect84 instanceof Array) {
|
|
23323
|
+
this._viewer.camera.flyTo({
|
|
23324
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
|
|
23325
|
+
});
|
|
23326
|
+
} else {
|
|
23327
|
+
this._viewer.camera.flyTo({
|
|
23328
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
|
|
23329
|
+
});
|
|
23330
|
+
}
|
|
23282
23331
|
}
|
|
23283
23332
|
|
|
23284
23333
|
setChildrenAddType(mapServerInfo.layerTreeData, type);
|
|
@@ -23405,9 +23454,11 @@ class AddDataViewModel {
|
|
|
23405
23454
|
|
|
23406
23455
|
case "wmts":
|
|
23407
23456
|
case "kqgistileserver":
|
|
23457
|
+
case "kqgisaggregationserver":
|
|
23408
23458
|
this._viewer.addWMTSLayerGroup(url).then(group => {
|
|
23409
23459
|
var defaultName = 'wmts';
|
|
23410
23460
|
if (type === "kqgistileserver") defaultName = 'tile';
|
|
23461
|
+
if (type === "kqgisaggregationserver") defaultName = 'aggregation';
|
|
23411
23462
|
node = {
|
|
23412
23463
|
guid: group.guid,
|
|
23413
23464
|
name: name || defaultName,
|
|
@@ -23515,6 +23566,43 @@ class AddDataViewModel {
|
|
|
23515
23566
|
});
|
|
23516
23567
|
break;
|
|
23517
23568
|
|
|
23569
|
+
case "arcjson":
|
|
23570
|
+
var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
23571
|
+
var geojsonStyle = { ...this._geojsonStyle
|
|
23572
|
+
};
|
|
23573
|
+
geojsonStyle.label.express = 'NAME';
|
|
23574
|
+
ds.load(url, geojsonStyle).then(ds => {
|
|
23575
|
+
ds.entities.values.forEach(entity => {
|
|
23576
|
+
if (entity.polygon) {
|
|
23577
|
+
entity.polyline = {
|
|
23578
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
23579
|
+
width: geojsonStyle.polygon.outlineWidth,
|
|
23580
|
+
material: geojsonStyle.polygon.outlineColor
|
|
23581
|
+
};
|
|
23582
|
+
}
|
|
23583
|
+
}, this);
|
|
23584
|
+
|
|
23585
|
+
this._viewer.dataSources.add(ds);
|
|
23586
|
+
|
|
23587
|
+
this._viewer.flyTo(ds);
|
|
23588
|
+
|
|
23589
|
+
node = {
|
|
23590
|
+
guid: ds.guid,
|
|
23591
|
+
name: name,
|
|
23592
|
+
visible: true,
|
|
23593
|
+
serverType: "datasource",
|
|
23594
|
+
lsType: "ls",
|
|
23595
|
+
url: url,
|
|
23596
|
+
addType: type,
|
|
23597
|
+
shapeType: this._layerManager.getShapeType(ds)
|
|
23598
|
+
};
|
|
23599
|
+
|
|
23600
|
+
this._layerManager.addTempLayerNode(node);
|
|
23601
|
+
|
|
23602
|
+
cb && cb(node);
|
|
23603
|
+
});
|
|
23604
|
+
break;
|
|
23605
|
+
|
|
23518
23606
|
case "kml":
|
|
23519
23607
|
var ds = new Cesium.KmlDataSource({
|
|
23520
23608
|
name: name,
|
|
@@ -23819,6 +23907,12 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
|
|
|
23819
23907
|
namePlaceholder: language.value.unnamedLayer,
|
|
23820
23908
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
|
|
23821
23909
|
description: language.value.imagertyTileServerdescription
|
|
23910
|
+
}, {
|
|
23911
|
+
type: "kqgisaggregationserver",
|
|
23912
|
+
name: language.value.KQGISAggregationServer,
|
|
23913
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
23914
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
|
|
23915
|
+
description: language.value.imagertyAggregationServerdescription
|
|
23822
23916
|
}, {
|
|
23823
23917
|
type: "arcgismapserver",
|
|
23824
23918
|
name: language.value.ArcGISMapServer,
|
|
@@ -23855,6 +23949,12 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
|
|
|
23855
23949
|
namePlaceholder: language.value.unnamedLayer,
|
|
23856
23950
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
|
|
23857
23951
|
description: language.value.imagertyGeoJsondescription
|
|
23952
|
+
}, {
|
|
23953
|
+
type: "arcjson",
|
|
23954
|
+
name: language.value.ArcJson,
|
|
23955
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
23956
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
|
|
23957
|
+
description: language.value.imagertyArcJsondescription
|
|
23858
23958
|
}, {
|
|
23859
23959
|
type: "mvt",
|
|
23860
23960
|
name: language.value.MVT,
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.9.
|
|
1
|
+
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.9.8-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}
|
package/scenceview/index.js
CHANGED
|
@@ -311,14 +311,24 @@ class AddDataViewModel {
|
|
|
311
311
|
}
|
|
312
312
|
} catch (e) {}
|
|
313
313
|
|
|
314
|
+
var style = { ...that._geojsonStyle
|
|
315
|
+
};
|
|
314
316
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
315
|
-
|
|
317
|
+
var addType = "geojson"; // 判断是否是arcgis格式的json数据
|
|
318
|
+
|
|
319
|
+
if (ret.geometryType) {
|
|
320
|
+
ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
321
|
+
style.label.express = "NAME";
|
|
322
|
+
addType = "arcjson";
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
ds.load(ret, style).then(ds => {
|
|
316
326
|
ds.entities.values.forEach(entity => {
|
|
317
327
|
if (entity.polygon) {
|
|
318
328
|
entity.polyline = {
|
|
319
329
|
positions: entity.polygon.hierarchy._value.positions,
|
|
320
|
-
width:
|
|
321
|
-
material:
|
|
330
|
+
width: style.polygon.outlineWidth,
|
|
331
|
+
material: style.polygon.outlineColor
|
|
322
332
|
};
|
|
323
333
|
}
|
|
324
334
|
});
|
|
@@ -337,7 +347,7 @@ class AddDataViewModel {
|
|
|
337
347
|
serverType: "datasource",
|
|
338
348
|
lsType: "ls",
|
|
339
349
|
url: ret,
|
|
340
|
-
addType:
|
|
350
|
+
addType: addType,
|
|
341
351
|
shapeType: that._layerManager.getShapeType(ds)
|
|
342
352
|
};
|
|
343
353
|
|
|
@@ -788,9 +798,15 @@ class AddDataViewModel {
|
|
|
788
798
|
}, this);
|
|
789
799
|
|
|
790
800
|
if (mapInfo.rect84) {
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
801
|
+
if (mapInfo.rect84 instanceof Array) {
|
|
802
|
+
this._viewer.camera.flyTo({
|
|
803
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84[0], mapInfo.rect84[1], mapInfo.rect84[2], mapInfo.rect84[3])
|
|
804
|
+
});
|
|
805
|
+
} else {
|
|
806
|
+
this._viewer.camera.flyTo({
|
|
807
|
+
destination: Cesium.Rectangle.fromDegrees(mapInfo.rect84.minx, mapInfo.rect84.miny, mapInfo.rect84.maxx, mapInfo.rect84.maxy)
|
|
808
|
+
});
|
|
809
|
+
}
|
|
794
810
|
}
|
|
795
811
|
|
|
796
812
|
setChildrenAddType(mapServerInfo.layerTreeData, type);
|
|
@@ -917,9 +933,11 @@ class AddDataViewModel {
|
|
|
917
933
|
|
|
918
934
|
case "wmts":
|
|
919
935
|
case "kqgistileserver":
|
|
936
|
+
case "kqgisaggregationserver":
|
|
920
937
|
this._viewer.addWMTSLayerGroup(url).then(group => {
|
|
921
938
|
var defaultName = 'wmts';
|
|
922
939
|
if (type === "kqgistileserver") defaultName = 'tile';
|
|
940
|
+
if (type === "kqgisaggregationserver") defaultName = 'aggregation';
|
|
923
941
|
node = {
|
|
924
942
|
guid: group.guid,
|
|
925
943
|
name: name || defaultName,
|
|
@@ -1027,6 +1045,43 @@ class AddDataViewModel {
|
|
|
1027
1045
|
});
|
|
1028
1046
|
break;
|
|
1029
1047
|
|
|
1048
|
+
case "arcjson":
|
|
1049
|
+
var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
1050
|
+
var geojsonStyle = { ...this._geojsonStyle
|
|
1051
|
+
};
|
|
1052
|
+
geojsonStyle.label.express = 'NAME';
|
|
1053
|
+
ds.load(url, geojsonStyle).then(ds => {
|
|
1054
|
+
ds.entities.values.forEach(entity => {
|
|
1055
|
+
if (entity.polygon) {
|
|
1056
|
+
entity.polyline = {
|
|
1057
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
1058
|
+
width: geojsonStyle.polygon.outlineWidth,
|
|
1059
|
+
material: geojsonStyle.polygon.outlineColor
|
|
1060
|
+
};
|
|
1061
|
+
}
|
|
1062
|
+
}, this);
|
|
1063
|
+
|
|
1064
|
+
this._viewer.dataSources.add(ds);
|
|
1065
|
+
|
|
1066
|
+
this._viewer.flyTo(ds);
|
|
1067
|
+
|
|
1068
|
+
node = {
|
|
1069
|
+
guid: ds.guid,
|
|
1070
|
+
name: name,
|
|
1071
|
+
visible: true,
|
|
1072
|
+
serverType: "datasource",
|
|
1073
|
+
lsType: "ls",
|
|
1074
|
+
url: url,
|
|
1075
|
+
addType: type,
|
|
1076
|
+
shapeType: this._layerManager.getShapeType(ds)
|
|
1077
|
+
};
|
|
1078
|
+
|
|
1079
|
+
this._layerManager.addTempLayerNode(node);
|
|
1080
|
+
|
|
1081
|
+
cb && cb(node);
|
|
1082
|
+
});
|
|
1083
|
+
break;
|
|
1084
|
+
|
|
1030
1085
|
case "kml":
|
|
1031
1086
|
var ds = new Cesium.KmlDataSource({
|
|
1032
1087
|
name: name,
|
|
@@ -1333,6 +1388,12 @@ const __default__ = {
|
|
|
1333
1388
|
namePlaceholder: language.value.unnamedLayer,
|
|
1334
1389
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
|
|
1335
1390
|
description: language.value.imagertyTileServerdescription
|
|
1391
|
+
}, {
|
|
1392
|
+
type: "kqgisaggregationserver",
|
|
1393
|
+
name: language.value.KQGISAggregationServer,
|
|
1394
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
1395
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
|
|
1396
|
+
description: language.value.imagertyAggregationServerdescription
|
|
1336
1397
|
}, {
|
|
1337
1398
|
type: "arcgismapserver",
|
|
1338
1399
|
name: language.value.ArcGISMapServer,
|
|
@@ -1369,6 +1430,12 @@ const __default__ = {
|
|
|
1369
1430
|
namePlaceholder: language.value.unnamedLayer,
|
|
1370
1431
|
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
|
|
1371
1432
|
description: language.value.imagertyGeoJsondescription
|
|
1433
|
+
}, {
|
|
1434
|
+
type: "arcjson",
|
|
1435
|
+
name: language.value.ArcJson,
|
|
1436
|
+
namePlaceholder: language.value.unnamedLayer,
|
|
1437
|
+
urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
|
|
1438
|
+
description: language.value.imagertyArcJsondescription
|
|
1372
1439
|
}, {
|
|
1373
1440
|
type: "mvt",
|
|
1374
1441
|
name: language.value.MVT,
|
|
@@ -28064,6 +28131,33 @@ class LayerManager {
|
|
|
28064
28131
|
|
|
28065
28132
|
break;
|
|
28066
28133
|
|
|
28134
|
+
case "arcjson":
|
|
28135
|
+
layerData.visible = isAdd;
|
|
28136
|
+
layerData.serverType = "datasource";
|
|
28137
|
+
|
|
28138
|
+
if (isAdd) {
|
|
28139
|
+
var ds = new Cesium.Kq3dEsriGeoJsonDataSource(name);
|
|
28140
|
+
var geojsonStyle = layerData.geojsonStyle || this._geojsonStyle;
|
|
28141
|
+
promise = ds.load(url, geojsonStyle).then(ds => {
|
|
28142
|
+
ds.entities.values.forEach(entity => {
|
|
28143
|
+
if (entity.polygon) {
|
|
28144
|
+
entity.polyline = {
|
|
28145
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
28146
|
+
width: geojsonStyle.polygon.outlineWidth,
|
|
28147
|
+
material: geojsonStyle.polygon.outlineColor
|
|
28148
|
+
};
|
|
28149
|
+
}
|
|
28150
|
+
}, this);
|
|
28151
|
+
|
|
28152
|
+
this._viewer.dataSources.add(ds);
|
|
28153
|
+
|
|
28154
|
+
ds._guid = layerData.guid;
|
|
28155
|
+
layerData.shapeType = this.getShapeType(ds);
|
|
28156
|
+
});
|
|
28157
|
+
}
|
|
28158
|
+
|
|
28159
|
+
break;
|
|
28160
|
+
|
|
28067
28161
|
case "kml":
|
|
28068
28162
|
layerData.visible = isAdd;
|
|
28069
28163
|
layerData.serverType = "datasource";
|
|
@@ -28264,9 +28358,15 @@ class LayerManager {
|
|
|
28264
28358
|
});
|
|
28265
28359
|
|
|
28266
28360
|
if (rect) {
|
|
28267
|
-
|
|
28268
|
-
|
|
28269
|
-
|
|
28361
|
+
if (rect instanceof Array) {
|
|
28362
|
+
that._viewer.camera.flyTo({
|
|
28363
|
+
destination: Cesium.Rectangle.fromDegrees(rect[0], rect[1], rect[2], rect[3])
|
|
28364
|
+
});
|
|
28365
|
+
} else {
|
|
28366
|
+
that._viewer.camera.flyTo({
|
|
28367
|
+
destination: Cesium.Rectangle.fromDegrees(rect.minx, rect.miny, rect.maxx, rect.maxy)
|
|
28368
|
+
});
|
|
28369
|
+
}
|
|
28270
28370
|
}
|
|
28271
28371
|
|
|
28272
28372
|
that._scenceView.fire("resetLayerDatas");
|