@kq_npm/client3d_webgl_vue 3.0.9-beta → 3.1.1-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 +106 -57
- package/index.js +146 -77
- package/package.json +1 -1
- package/scenceview/index.js +146 -77
package/adddata/index.js
CHANGED
|
@@ -304,7 +304,9 @@ class AddDataViewModel {
|
|
|
304
304
|
name: name,
|
|
305
305
|
visible: true,
|
|
306
306
|
serverType: "datasource",
|
|
307
|
-
lsType: "ls"
|
|
307
|
+
lsType: "ls",
|
|
308
|
+
url: res,
|
|
309
|
+
addType: "geojson"
|
|
308
310
|
};
|
|
309
311
|
|
|
310
312
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -344,7 +346,9 @@ class AddDataViewModel {
|
|
|
344
346
|
name: name,
|
|
345
347
|
visible: true,
|
|
346
348
|
serverType: "datasource",
|
|
347
|
-
lsType: "ls"
|
|
349
|
+
lsType: "ls",
|
|
350
|
+
url: res,
|
|
351
|
+
addType: "geojson"
|
|
348
352
|
};
|
|
349
353
|
|
|
350
354
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -405,7 +409,9 @@ class AddDataViewModel {
|
|
|
405
409
|
name: name,
|
|
406
410
|
visible: true,
|
|
407
411
|
serverType: "datasource",
|
|
408
|
-
lsType: "ls"
|
|
412
|
+
lsType: "ls",
|
|
413
|
+
url: ret,
|
|
414
|
+
addType: "geojson"
|
|
409
415
|
};
|
|
410
416
|
|
|
411
417
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -436,7 +442,9 @@ class AddDataViewModel {
|
|
|
436
442
|
name: name,
|
|
437
443
|
visible: true,
|
|
438
444
|
serverType: "datasource",
|
|
439
|
-
lsType: "ls"
|
|
445
|
+
lsType: "ls",
|
|
446
|
+
url: data,
|
|
447
|
+
addType: "kml"
|
|
440
448
|
};
|
|
441
449
|
|
|
442
450
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -463,7 +471,9 @@ class AddDataViewModel {
|
|
|
463
471
|
name: name,
|
|
464
472
|
visible: true,
|
|
465
473
|
serverType: "datasource",
|
|
466
|
-
lsType: "ls"
|
|
474
|
+
lsType: "ls",
|
|
475
|
+
url: file,
|
|
476
|
+
addType: "kml"
|
|
467
477
|
};
|
|
468
478
|
|
|
469
479
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -494,7 +504,9 @@ class AddDataViewModel {
|
|
|
494
504
|
name: name,
|
|
495
505
|
visible: true,
|
|
496
506
|
serverType: "datasource",
|
|
497
|
-
lsType: "ls"
|
|
507
|
+
lsType: "ls",
|
|
508
|
+
url: ret,
|
|
509
|
+
addType: "czml"
|
|
498
510
|
};
|
|
499
511
|
|
|
500
512
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -624,7 +636,9 @@ class AddDataViewModel {
|
|
|
624
636
|
name: name,
|
|
625
637
|
visible: true,
|
|
626
638
|
serverType: "imagerylayer",
|
|
627
|
-
lsType: "ls"
|
|
639
|
+
lsType: "ls",
|
|
640
|
+
url: url,
|
|
641
|
+
addType: type
|
|
628
642
|
};
|
|
629
643
|
|
|
630
644
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -648,7 +662,9 @@ class AddDataViewModel {
|
|
|
648
662
|
name: name,
|
|
649
663
|
visible: true,
|
|
650
664
|
serverType: "terrainprovider",
|
|
651
|
-
lsType: "ls"
|
|
665
|
+
lsType: "ls",
|
|
666
|
+
url: url,
|
|
667
|
+
addType: type
|
|
652
668
|
};
|
|
653
669
|
|
|
654
670
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -676,7 +692,9 @@ class AddDataViewModel {
|
|
|
676
692
|
name: name,
|
|
677
693
|
visible: true,
|
|
678
694
|
serverType: "terrainprovider",
|
|
679
|
-
lsType: "ls"
|
|
695
|
+
lsType: "ls",
|
|
696
|
+
url: url,
|
|
697
|
+
addType: type
|
|
680
698
|
};
|
|
681
699
|
|
|
682
700
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -698,7 +716,9 @@ class AddDataViewModel {
|
|
|
698
716
|
name: name,
|
|
699
717
|
visible: true,
|
|
700
718
|
serverType: "3dtiles",
|
|
701
|
-
lsType: "ls"
|
|
719
|
+
lsType: "ls",
|
|
720
|
+
url: url,
|
|
721
|
+
addType: type
|
|
702
722
|
};
|
|
703
723
|
|
|
704
724
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -710,56 +730,56 @@ class AddDataViewModel {
|
|
|
710
730
|
this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
|
|
711
731
|
var layers = group._addedLayers || group._layers;
|
|
712
732
|
|
|
713
|
-
if (layers) {
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
}
|
|
723
|
-
|
|
724
|
-
for (var i = 0; i < length; i++) {
|
|
725
|
-
if (i === 0) {
|
|
726
|
-
this.flyToLayer(layers[i]);
|
|
727
|
-
}
|
|
728
|
-
|
|
729
|
-
var type = "";
|
|
733
|
+
if (layers && layers.length > 0) {
|
|
734
|
+
node = {
|
|
735
|
+
guid: group.guid,
|
|
736
|
+
name: name,
|
|
737
|
+
children: [],
|
|
738
|
+
lsType: "ls"
|
|
739
|
+
};
|
|
740
|
+
var serverType = "";
|
|
741
|
+
var addType = "";
|
|
730
742
|
|
|
743
|
+
for (var i = 0; i < layers.length; i++) {
|
|
731
744
|
if (layers[i] instanceof Cesium.Cesium3DTileset) {
|
|
732
|
-
|
|
745
|
+
serverType = "3dtiles";
|
|
746
|
+
addType = "3dtiles";
|
|
747
|
+
url = layers[i].url;
|
|
733
748
|
} else if (layers[i] instanceof Cesium.ImageryLayer) {
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
749
|
+
serverType = "imagerylayer";
|
|
750
|
+
addType = "kq3dimageryfile";
|
|
751
|
+
url = layers[i]._imageryProvider._originUrl;
|
|
752
|
+
} else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider) {
|
|
753
|
+
serverType = "terrainprovider";
|
|
754
|
+
addType = "obterrain";
|
|
755
|
+
url = layers[i].url;
|
|
756
|
+
|
|
757
|
+
this._layerManager._terrainProviders.push(layers[i]);
|
|
758
|
+
} else if (layers[i] instanceof Cesium.CesiumTerrainProvider) {
|
|
759
|
+
serverType = "terrainprovider";
|
|
760
|
+
addType = "stkterrain";
|
|
761
|
+
url = layers[i].url;
|
|
737
762
|
|
|
738
763
|
this._layerManager._terrainProviders.push(layers[i]);
|
|
739
764
|
} else if (layers[i] instanceof Cesium.Kq3dGeoJsonDataSource) {
|
|
740
|
-
|
|
765
|
+
serverType = "datasource";
|
|
766
|
+
addType = "geojson";
|
|
767
|
+
url = layers[i]._baseUri + layers[i]._name;
|
|
741
768
|
}
|
|
742
769
|
|
|
743
770
|
if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
} else {
|
|
753
|
-
node = {
|
|
754
|
-
guid: layers[i].guid,
|
|
755
|
-
name: name || layers[i].name,
|
|
756
|
-
visible: true,
|
|
757
|
-
serverType: type,
|
|
758
|
-
lsType: "ls"
|
|
759
|
-
};
|
|
760
|
-
}
|
|
771
|
+
node.children.push({
|
|
772
|
+
guid: layers[i].guid,
|
|
773
|
+
name: layers[i].name,
|
|
774
|
+
visible: true,
|
|
775
|
+
serverType: serverType,
|
|
776
|
+
url: url,
|
|
777
|
+
addType: addType
|
|
778
|
+
});
|
|
761
779
|
}
|
|
762
780
|
|
|
781
|
+
this.flyToLayer(layers[0]);
|
|
782
|
+
|
|
763
783
|
this._layerManager.addTempLayerNode(node);
|
|
764
784
|
|
|
765
785
|
cb && cb(node);
|
|
@@ -780,7 +800,9 @@ class AddDataViewModel {
|
|
|
780
800
|
name: name,
|
|
781
801
|
visible: true,
|
|
782
802
|
serverType: "imagerylayer",
|
|
783
|
-
lsType: "ls"
|
|
803
|
+
lsType: "ls",
|
|
804
|
+
url: url,
|
|
805
|
+
addType: type
|
|
784
806
|
};
|
|
785
807
|
|
|
786
808
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -844,6 +866,7 @@ class AddDataViewModel {
|
|
|
844
866
|
mapServerInfo.layerTreeData.forEach(node => {
|
|
845
867
|
node.lsType = "ls";
|
|
846
868
|
node.serverType = "imagerylayer";
|
|
869
|
+
node.addType = type;
|
|
847
870
|
|
|
848
871
|
this._layerManager.addTempLayerNode(node, 1);
|
|
849
872
|
|
|
@@ -863,7 +886,9 @@ class AddDataViewModel {
|
|
|
863
886
|
name: name,
|
|
864
887
|
visible: true,
|
|
865
888
|
serverType: "imagerylayer",
|
|
866
|
-
lsType: "ls"
|
|
889
|
+
lsType: "ls",
|
|
890
|
+
url: url,
|
|
891
|
+
addType: type
|
|
867
892
|
};
|
|
868
893
|
|
|
869
894
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -891,7 +916,10 @@ class AddDataViewModel {
|
|
|
891
916
|
guid: layers[i].guid,
|
|
892
917
|
name: layers[i].name,
|
|
893
918
|
visible: true,
|
|
894
|
-
serverType: "imagerylayer"
|
|
919
|
+
serverType: "imagerylayer",
|
|
920
|
+
url: url,
|
|
921
|
+
addType: type,
|
|
922
|
+
id: layers[i].layers
|
|
895
923
|
});
|
|
896
924
|
}
|
|
897
925
|
}
|
|
@@ -923,7 +951,10 @@ class AddDataViewModel {
|
|
|
923
951
|
guid: layers[i].guid,
|
|
924
952
|
name: layers[i].name,
|
|
925
953
|
visible: true,
|
|
926
|
-
serverType: "imagerylayer"
|
|
954
|
+
serverType: "imagerylayer",
|
|
955
|
+
url: url,
|
|
956
|
+
addType: type,
|
|
957
|
+
id: layers[i]._layer
|
|
927
958
|
});
|
|
928
959
|
}
|
|
929
960
|
}
|
|
@@ -955,7 +986,9 @@ class AddDataViewModel {
|
|
|
955
986
|
name: name,
|
|
956
987
|
visible: true,
|
|
957
988
|
serverType: "datasource",
|
|
958
|
-
lsType: "ls"
|
|
989
|
+
lsType: "ls",
|
|
990
|
+
url: url,
|
|
991
|
+
addType: type
|
|
959
992
|
};
|
|
960
993
|
|
|
961
994
|
that._layerManager.addTempLayerNode(node);
|
|
@@ -968,6 +1001,16 @@ class AddDataViewModel {
|
|
|
968
1001
|
case "geojson":
|
|
969
1002
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
970
1003
|
ds.load(url, this._geojsonStyle).then(ds => {
|
|
1004
|
+
ds.entities.values.forEach(entity => {
|
|
1005
|
+
if (entity.polygon) {
|
|
1006
|
+
entity.polyline = {
|
|
1007
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
1008
|
+
width: this._geojsonStyle.polygon.outlineWidth,
|
|
1009
|
+
material: this._geojsonStyle.polygon.outlineColor
|
|
1010
|
+
};
|
|
1011
|
+
}
|
|
1012
|
+
}, this);
|
|
1013
|
+
|
|
971
1014
|
this._viewer.dataSources.add(ds);
|
|
972
1015
|
|
|
973
1016
|
ds.autoAvoid(this._viewer);
|
|
@@ -979,7 +1022,9 @@ class AddDataViewModel {
|
|
|
979
1022
|
name: name,
|
|
980
1023
|
visible: true,
|
|
981
1024
|
serverType: "datasource",
|
|
982
|
-
lsType: "ls"
|
|
1025
|
+
lsType: "ls",
|
|
1026
|
+
url: url,
|
|
1027
|
+
addType: type
|
|
983
1028
|
};
|
|
984
1029
|
|
|
985
1030
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -1004,7 +1049,9 @@ class AddDataViewModel {
|
|
|
1004
1049
|
name: name,
|
|
1005
1050
|
visible: true,
|
|
1006
1051
|
serverType: "datasource",
|
|
1007
|
-
lsType: "ls"
|
|
1052
|
+
lsType: "ls",
|
|
1053
|
+
url: url,
|
|
1054
|
+
addType: type
|
|
1008
1055
|
};
|
|
1009
1056
|
|
|
1010
1057
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -1025,7 +1072,9 @@ class AddDataViewModel {
|
|
|
1025
1072
|
name: name,
|
|
1026
1073
|
visible: true,
|
|
1027
1074
|
serverType: "datasource",
|
|
1028
|
-
lsType: "ls"
|
|
1075
|
+
lsType: "ls",
|
|
1076
|
+
url: url,
|
|
1077
|
+
addType: type
|
|
1029
1078
|
};
|
|
1030
1079
|
|
|
1031
1080
|
this._layerManager.addTempLayerNode(node);
|
package/index.js
CHANGED
|
@@ -2186,18 +2186,19 @@ class LayerManager {
|
|
|
2186
2186
|
}
|
|
2187
2187
|
});
|
|
2188
2188
|
}
|
|
2189
|
-
}
|
|
2189
|
+
} //获取底图图层Index
|
|
2190
2190
|
|
|
2191
2191
|
|
|
2192
2192
|
getBaseLayerIndex() {
|
|
2193
|
-
|
|
2194
|
-
|
|
2195
|
-
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
|
|
2200
|
-
|
|
2193
|
+
let index = 1;
|
|
2194
|
+
|
|
2195
|
+
this._viewer.imageryLayers._layers.forEach(layer => {
|
|
2196
|
+
if (layer.target === "online") {
|
|
2197
|
+
index++;
|
|
2198
|
+
}
|
|
2199
|
+
});
|
|
2200
|
+
|
|
2201
|
+
return index;
|
|
2201
2202
|
} //设置图层置顶或取消置顶
|
|
2202
2203
|
|
|
2203
2204
|
|
|
@@ -2782,11 +2783,30 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
2782
2783
|
});
|
|
2783
2784
|
}
|
|
2784
2785
|
}
|
|
2786
|
+
}
|
|
2787
|
+
/**
|
|
2788
|
+
* 获取在线底图index
|
|
2789
|
+
*/
|
|
2790
|
+
|
|
2791
|
+
|
|
2792
|
+
_getOnlineBaseLayerIndex() {
|
|
2793
|
+
let index = 1;
|
|
2794
|
+
|
|
2795
|
+
this._viewer.imageryLayers._layers.forEach(layer => {
|
|
2796
|
+
if (layer.target === "online") {
|
|
2797
|
+
index++;
|
|
2798
|
+
}
|
|
2799
|
+
});
|
|
2800
|
+
|
|
2801
|
+
return index;
|
|
2785
2802
|
} //创建在线底图
|
|
2786
2803
|
|
|
2787
2804
|
|
|
2788
2805
|
_createOnlineLayer(layerConfig) {
|
|
2789
2806
|
let layer = null;
|
|
2807
|
+
|
|
2808
|
+
let index = this._getOnlineBaseLayerIndex();
|
|
2809
|
+
|
|
2790
2810
|
let layerType = layerConfig.renderType;
|
|
2791
2811
|
if (layerType) layerType = layerType.toLowerCase();
|
|
2792
2812
|
|
|
@@ -2795,7 +2815,7 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
2795
2815
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
|
|
2796
2816
|
url: layerConfig.url,
|
|
2797
2817
|
ua_token: layerConfig.accessToken
|
|
2798
|
-
}));
|
|
2818
|
+
}), index);
|
|
2799
2819
|
break;
|
|
2800
2820
|
|
|
2801
2821
|
case "wmts":
|
|
@@ -2811,7 +2831,7 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
2811
2831
|
subdomains: layerConfig.subdomains,
|
|
2812
2832
|
tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
|
|
2813
2833
|
};
|
|
2814
|
-
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
|
|
2834
|
+
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options), index);
|
|
2815
2835
|
break;
|
|
2816
2836
|
|
|
2817
2837
|
case "wms":
|
|
@@ -2822,31 +2842,31 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
2822
2842
|
transparent: "true",
|
|
2823
2843
|
format: "image/png"
|
|
2824
2844
|
}
|
|
2825
|
-
}));
|
|
2845
|
+
}), index);
|
|
2826
2846
|
break;
|
|
2827
2847
|
|
|
2828
2848
|
case "tianditu":
|
|
2829
2849
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
|
|
2830
2850
|
mapStyle: layerConfig.layerType + "_c"
|
|
2831
|
-
}));
|
|
2851
|
+
}), index);
|
|
2832
2852
|
break;
|
|
2833
2853
|
|
|
2834
2854
|
case "baidu":
|
|
2835
2855
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
|
|
2836
2856
|
mapStyle: layerConfig.layerType
|
|
2837
|
-
}));
|
|
2857
|
+
}), index);
|
|
2838
2858
|
break;
|
|
2839
2859
|
|
|
2840
2860
|
case "gaode":
|
|
2841
2861
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
|
|
2842
2862
|
mapStyle: layerConfig.layerType
|
|
2843
|
-
}));
|
|
2863
|
+
}), index);
|
|
2844
2864
|
break;
|
|
2845
2865
|
|
|
2846
2866
|
case "tencent":
|
|
2847
2867
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
|
|
2848
2868
|
mapStyle: layerConfig.layerType
|
|
2849
|
-
}));
|
|
2869
|
+
}), index);
|
|
2850
2870
|
break;
|
|
2851
2871
|
|
|
2852
2872
|
case "bing":
|
|
@@ -2854,26 +2874,26 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
2854
2874
|
url: layerConfig.url || "https://dev.virtualearth.net",
|
|
2855
2875
|
key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
|
|
2856
2876
|
mapStyle: layerConfig.layerType
|
|
2857
|
-
}));
|
|
2877
|
+
}), index);
|
|
2858
2878
|
break;
|
|
2859
2879
|
|
|
2860
2880
|
case "arcgisonline":
|
|
2861
2881
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
|
|
2862
2882
|
url: layerConfig.url
|
|
2863
|
-
}));
|
|
2883
|
+
}), index);
|
|
2864
2884
|
break;
|
|
2865
2885
|
|
|
2866
2886
|
case "mapbox":
|
|
2867
2887
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
|
|
2868
2888
|
mapId: "mapbox." + layerConfig.layerType,
|
|
2869
2889
|
accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
|
|
2870
|
-
}));
|
|
2890
|
+
}), index);
|
|
2871
2891
|
break;
|
|
2872
2892
|
|
|
2873
2893
|
case "osm":
|
|
2874
2894
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
|
|
2875
2895
|
url: layerConfig.url
|
|
2876
|
-
}));
|
|
2896
|
+
}), index);
|
|
2877
2897
|
break;
|
|
2878
2898
|
}
|
|
2879
2899
|
|
|
@@ -19463,7 +19483,9 @@ class AddDataViewModel {
|
|
|
19463
19483
|
name: name,
|
|
19464
19484
|
visible: true,
|
|
19465
19485
|
serverType: "datasource",
|
|
19466
|
-
lsType: "ls"
|
|
19486
|
+
lsType: "ls",
|
|
19487
|
+
url: res,
|
|
19488
|
+
addType: "geojson"
|
|
19467
19489
|
};
|
|
19468
19490
|
|
|
19469
19491
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19503,7 +19525,9 @@ class AddDataViewModel {
|
|
|
19503
19525
|
name: name,
|
|
19504
19526
|
visible: true,
|
|
19505
19527
|
serverType: "datasource",
|
|
19506
|
-
lsType: "ls"
|
|
19528
|
+
lsType: "ls",
|
|
19529
|
+
url: res,
|
|
19530
|
+
addType: "geojson"
|
|
19507
19531
|
};
|
|
19508
19532
|
|
|
19509
19533
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19564,7 +19588,9 @@ class AddDataViewModel {
|
|
|
19564
19588
|
name: name,
|
|
19565
19589
|
visible: true,
|
|
19566
19590
|
serverType: "datasource",
|
|
19567
|
-
lsType: "ls"
|
|
19591
|
+
lsType: "ls",
|
|
19592
|
+
url: ret,
|
|
19593
|
+
addType: "geojson"
|
|
19568
19594
|
};
|
|
19569
19595
|
|
|
19570
19596
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19595,7 +19621,9 @@ class AddDataViewModel {
|
|
|
19595
19621
|
name: name,
|
|
19596
19622
|
visible: true,
|
|
19597
19623
|
serverType: "datasource",
|
|
19598
|
-
lsType: "ls"
|
|
19624
|
+
lsType: "ls",
|
|
19625
|
+
url: data,
|
|
19626
|
+
addType: "kml"
|
|
19599
19627
|
};
|
|
19600
19628
|
|
|
19601
19629
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19622,7 +19650,9 @@ class AddDataViewModel {
|
|
|
19622
19650
|
name: name,
|
|
19623
19651
|
visible: true,
|
|
19624
19652
|
serverType: "datasource",
|
|
19625
|
-
lsType: "ls"
|
|
19653
|
+
lsType: "ls",
|
|
19654
|
+
url: file,
|
|
19655
|
+
addType: "kml"
|
|
19626
19656
|
};
|
|
19627
19657
|
|
|
19628
19658
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19653,7 +19683,9 @@ class AddDataViewModel {
|
|
|
19653
19683
|
name: name,
|
|
19654
19684
|
visible: true,
|
|
19655
19685
|
serverType: "datasource",
|
|
19656
|
-
lsType: "ls"
|
|
19686
|
+
lsType: "ls",
|
|
19687
|
+
url: ret,
|
|
19688
|
+
addType: "czml"
|
|
19657
19689
|
};
|
|
19658
19690
|
|
|
19659
19691
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -19783,7 +19815,9 @@ class AddDataViewModel {
|
|
|
19783
19815
|
name: name,
|
|
19784
19816
|
visible: true,
|
|
19785
19817
|
serverType: "imagerylayer",
|
|
19786
|
-
lsType: "ls"
|
|
19818
|
+
lsType: "ls",
|
|
19819
|
+
url: url,
|
|
19820
|
+
addType: type
|
|
19787
19821
|
};
|
|
19788
19822
|
|
|
19789
19823
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -19807,7 +19841,9 @@ class AddDataViewModel {
|
|
|
19807
19841
|
name: name,
|
|
19808
19842
|
visible: true,
|
|
19809
19843
|
serverType: "terrainprovider",
|
|
19810
|
-
lsType: "ls"
|
|
19844
|
+
lsType: "ls",
|
|
19845
|
+
url: url,
|
|
19846
|
+
addType: type
|
|
19811
19847
|
};
|
|
19812
19848
|
|
|
19813
19849
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -19835,7 +19871,9 @@ class AddDataViewModel {
|
|
|
19835
19871
|
name: name,
|
|
19836
19872
|
visible: true,
|
|
19837
19873
|
serverType: "terrainprovider",
|
|
19838
|
-
lsType: "ls"
|
|
19874
|
+
lsType: "ls",
|
|
19875
|
+
url: url,
|
|
19876
|
+
addType: type
|
|
19839
19877
|
};
|
|
19840
19878
|
|
|
19841
19879
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -19857,7 +19895,9 @@ class AddDataViewModel {
|
|
|
19857
19895
|
name: name,
|
|
19858
19896
|
visible: true,
|
|
19859
19897
|
serverType: "3dtiles",
|
|
19860
|
-
lsType: "ls"
|
|
19898
|
+
lsType: "ls",
|
|
19899
|
+
url: url,
|
|
19900
|
+
addType: type
|
|
19861
19901
|
};
|
|
19862
19902
|
|
|
19863
19903
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -19869,56 +19909,56 @@ class AddDataViewModel {
|
|
|
19869
19909
|
this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
|
|
19870
19910
|
var layers = group._addedLayers || group._layers;
|
|
19871
19911
|
|
|
19872
|
-
if (layers) {
|
|
19873
|
-
|
|
19874
|
-
|
|
19875
|
-
|
|
19876
|
-
|
|
19877
|
-
|
|
19878
|
-
|
|
19879
|
-
|
|
19880
|
-
|
|
19881
|
-
}
|
|
19882
|
-
|
|
19883
|
-
for (var i = 0; i < length; i++) {
|
|
19884
|
-
if (i === 0) {
|
|
19885
|
-
this.flyToLayer(layers[i]);
|
|
19886
|
-
}
|
|
19887
|
-
|
|
19888
|
-
var type = "";
|
|
19912
|
+
if (layers && layers.length > 0) {
|
|
19913
|
+
node = {
|
|
19914
|
+
guid: group.guid,
|
|
19915
|
+
name: name,
|
|
19916
|
+
children: [],
|
|
19917
|
+
lsType: "ls"
|
|
19918
|
+
};
|
|
19919
|
+
var serverType = "";
|
|
19920
|
+
var addType = "";
|
|
19889
19921
|
|
|
19922
|
+
for (var i = 0; i < layers.length; i++) {
|
|
19890
19923
|
if (layers[i] instanceof Cesium.Cesium3DTileset) {
|
|
19891
|
-
|
|
19924
|
+
serverType = "3dtiles";
|
|
19925
|
+
addType = "3dtiles";
|
|
19926
|
+
url = layers[i].url;
|
|
19892
19927
|
} else if (layers[i] instanceof Cesium.ImageryLayer) {
|
|
19893
|
-
|
|
19894
|
-
|
|
19895
|
-
|
|
19928
|
+
serverType = "imagerylayer";
|
|
19929
|
+
addType = "kq3dimageryfile";
|
|
19930
|
+
url = layers[i]._imageryProvider._originUrl;
|
|
19931
|
+
} else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider) {
|
|
19932
|
+
serverType = "terrainprovider";
|
|
19933
|
+
addType = "obterrain";
|
|
19934
|
+
url = layers[i].url;
|
|
19935
|
+
|
|
19936
|
+
this._layerManager._terrainProviders.push(layers[i]);
|
|
19937
|
+
} else if (layers[i] instanceof Cesium.CesiumTerrainProvider) {
|
|
19938
|
+
serverType = "terrainprovider";
|
|
19939
|
+
addType = "stkterrain";
|
|
19940
|
+
url = layers[i].url;
|
|
19896
19941
|
|
|
19897
19942
|
this._layerManager._terrainProviders.push(layers[i]);
|
|
19898
19943
|
} else if (layers[i] instanceof Cesium.Kq3dGeoJsonDataSource) {
|
|
19899
|
-
|
|
19944
|
+
serverType = "datasource";
|
|
19945
|
+
addType = "geojson";
|
|
19946
|
+
url = layers[i]._baseUri + layers[i]._name;
|
|
19900
19947
|
}
|
|
19901
19948
|
|
|
19902
19949
|
if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
|
|
19903
|
-
|
|
19904
|
-
|
|
19905
|
-
|
|
19906
|
-
|
|
19907
|
-
|
|
19908
|
-
|
|
19909
|
-
|
|
19910
|
-
|
|
19911
|
-
} else {
|
|
19912
|
-
node = {
|
|
19913
|
-
guid: layers[i].guid,
|
|
19914
|
-
name: name || layers[i].name,
|
|
19915
|
-
visible: true,
|
|
19916
|
-
serverType: type,
|
|
19917
|
-
lsType: "ls"
|
|
19918
|
-
};
|
|
19919
|
-
}
|
|
19950
|
+
node.children.push({
|
|
19951
|
+
guid: layers[i].guid,
|
|
19952
|
+
name: layers[i].name,
|
|
19953
|
+
visible: true,
|
|
19954
|
+
serverType: serverType,
|
|
19955
|
+
url: url,
|
|
19956
|
+
addType: addType
|
|
19957
|
+
});
|
|
19920
19958
|
}
|
|
19921
19959
|
|
|
19960
|
+
this.flyToLayer(layers[0]);
|
|
19961
|
+
|
|
19922
19962
|
this._layerManager.addTempLayerNode(node);
|
|
19923
19963
|
|
|
19924
19964
|
cb && cb(node);
|
|
@@ -19939,7 +19979,9 @@ class AddDataViewModel {
|
|
|
19939
19979
|
name: name,
|
|
19940
19980
|
visible: true,
|
|
19941
19981
|
serverType: "imagerylayer",
|
|
19942
|
-
lsType: "ls"
|
|
19982
|
+
lsType: "ls",
|
|
19983
|
+
url: url,
|
|
19984
|
+
addType: type
|
|
19943
19985
|
};
|
|
19944
19986
|
|
|
19945
19987
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -20003,6 +20045,7 @@ class AddDataViewModel {
|
|
|
20003
20045
|
mapServerInfo.layerTreeData.forEach(node => {
|
|
20004
20046
|
node.lsType = "ls";
|
|
20005
20047
|
node.serverType = "imagerylayer";
|
|
20048
|
+
node.addType = type;
|
|
20006
20049
|
|
|
20007
20050
|
this._layerManager.addTempLayerNode(node, 1);
|
|
20008
20051
|
|
|
@@ -20022,7 +20065,9 @@ class AddDataViewModel {
|
|
|
20022
20065
|
name: name,
|
|
20023
20066
|
visible: true,
|
|
20024
20067
|
serverType: "imagerylayer",
|
|
20025
|
-
lsType: "ls"
|
|
20068
|
+
lsType: "ls",
|
|
20069
|
+
url: url,
|
|
20070
|
+
addType: type
|
|
20026
20071
|
};
|
|
20027
20072
|
|
|
20028
20073
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -20050,7 +20095,10 @@ class AddDataViewModel {
|
|
|
20050
20095
|
guid: layers[i].guid,
|
|
20051
20096
|
name: layers[i].name,
|
|
20052
20097
|
visible: true,
|
|
20053
|
-
serverType: "imagerylayer"
|
|
20098
|
+
serverType: "imagerylayer",
|
|
20099
|
+
url: url,
|
|
20100
|
+
addType: type,
|
|
20101
|
+
id: layers[i].layers
|
|
20054
20102
|
});
|
|
20055
20103
|
}
|
|
20056
20104
|
}
|
|
@@ -20082,7 +20130,10 @@ class AddDataViewModel {
|
|
|
20082
20130
|
guid: layers[i].guid,
|
|
20083
20131
|
name: layers[i].name,
|
|
20084
20132
|
visible: true,
|
|
20085
|
-
serverType: "imagerylayer"
|
|
20133
|
+
serverType: "imagerylayer",
|
|
20134
|
+
url: url,
|
|
20135
|
+
addType: type,
|
|
20136
|
+
id: layers[i]._layer
|
|
20086
20137
|
});
|
|
20087
20138
|
}
|
|
20088
20139
|
}
|
|
@@ -20114,7 +20165,9 @@ class AddDataViewModel {
|
|
|
20114
20165
|
name: name,
|
|
20115
20166
|
visible: true,
|
|
20116
20167
|
serverType: "datasource",
|
|
20117
|
-
lsType: "ls"
|
|
20168
|
+
lsType: "ls",
|
|
20169
|
+
url: url,
|
|
20170
|
+
addType: type
|
|
20118
20171
|
};
|
|
20119
20172
|
|
|
20120
20173
|
that._layerManager.addTempLayerNode(node);
|
|
@@ -20127,6 +20180,16 @@ class AddDataViewModel {
|
|
|
20127
20180
|
case "geojson":
|
|
20128
20181
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
20129
20182
|
ds.load(url, this._geojsonStyle).then(ds => {
|
|
20183
|
+
ds.entities.values.forEach(entity => {
|
|
20184
|
+
if (entity.polygon) {
|
|
20185
|
+
entity.polyline = {
|
|
20186
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
20187
|
+
width: this._geojsonStyle.polygon.outlineWidth,
|
|
20188
|
+
material: this._geojsonStyle.polygon.outlineColor
|
|
20189
|
+
};
|
|
20190
|
+
}
|
|
20191
|
+
}, this);
|
|
20192
|
+
|
|
20130
20193
|
this._viewer.dataSources.add(ds);
|
|
20131
20194
|
|
|
20132
20195
|
ds.autoAvoid(this._viewer);
|
|
@@ -20138,7 +20201,9 @@ class AddDataViewModel {
|
|
|
20138
20201
|
name: name,
|
|
20139
20202
|
visible: true,
|
|
20140
20203
|
serverType: "datasource",
|
|
20141
|
-
lsType: "ls"
|
|
20204
|
+
lsType: "ls",
|
|
20205
|
+
url: url,
|
|
20206
|
+
addType: type
|
|
20142
20207
|
};
|
|
20143
20208
|
|
|
20144
20209
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -20163,7 +20228,9 @@ class AddDataViewModel {
|
|
|
20163
20228
|
name: name,
|
|
20164
20229
|
visible: true,
|
|
20165
20230
|
serverType: "datasource",
|
|
20166
|
-
lsType: "ls"
|
|
20231
|
+
lsType: "ls",
|
|
20232
|
+
url: url,
|
|
20233
|
+
addType: type
|
|
20167
20234
|
};
|
|
20168
20235
|
|
|
20169
20236
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -20184,7 +20251,9 @@ class AddDataViewModel {
|
|
|
20184
20251
|
name: name,
|
|
20185
20252
|
visible: true,
|
|
20186
20253
|
serverType: "datasource",
|
|
20187
|
-
lsType: "ls"
|
|
20254
|
+
lsType: "ls",
|
|
20255
|
+
url: url,
|
|
20256
|
+
addType: type
|
|
20188
20257
|
};
|
|
20189
20258
|
|
|
20190
20259
|
this._layerManager.addTempLayerNode(node);
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.
|
|
1
|
+
{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.1.1-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
|
@@ -228,7 +228,9 @@ class AddDataViewModel {
|
|
|
228
228
|
name: name,
|
|
229
229
|
visible: true,
|
|
230
230
|
serverType: "datasource",
|
|
231
|
-
lsType: "ls"
|
|
231
|
+
lsType: "ls",
|
|
232
|
+
url: res,
|
|
233
|
+
addType: "geojson"
|
|
232
234
|
};
|
|
233
235
|
|
|
234
236
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -268,7 +270,9 @@ class AddDataViewModel {
|
|
|
268
270
|
name: name,
|
|
269
271
|
visible: true,
|
|
270
272
|
serverType: "datasource",
|
|
271
|
-
lsType: "ls"
|
|
273
|
+
lsType: "ls",
|
|
274
|
+
url: res,
|
|
275
|
+
addType: "geojson"
|
|
272
276
|
};
|
|
273
277
|
|
|
274
278
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -329,7 +333,9 @@ class AddDataViewModel {
|
|
|
329
333
|
name: name,
|
|
330
334
|
visible: true,
|
|
331
335
|
serverType: "datasource",
|
|
332
|
-
lsType: "ls"
|
|
336
|
+
lsType: "ls",
|
|
337
|
+
url: ret,
|
|
338
|
+
addType: "geojson"
|
|
333
339
|
};
|
|
334
340
|
|
|
335
341
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -360,7 +366,9 @@ class AddDataViewModel {
|
|
|
360
366
|
name: name,
|
|
361
367
|
visible: true,
|
|
362
368
|
serverType: "datasource",
|
|
363
|
-
lsType: "ls"
|
|
369
|
+
lsType: "ls",
|
|
370
|
+
url: data,
|
|
371
|
+
addType: "kml"
|
|
364
372
|
};
|
|
365
373
|
|
|
366
374
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -387,7 +395,9 @@ class AddDataViewModel {
|
|
|
387
395
|
name: name,
|
|
388
396
|
visible: true,
|
|
389
397
|
serverType: "datasource",
|
|
390
|
-
lsType: "ls"
|
|
398
|
+
lsType: "ls",
|
|
399
|
+
url: file,
|
|
400
|
+
addType: "kml"
|
|
391
401
|
};
|
|
392
402
|
|
|
393
403
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -418,7 +428,9 @@ class AddDataViewModel {
|
|
|
418
428
|
name: name,
|
|
419
429
|
visible: true,
|
|
420
430
|
serverType: "datasource",
|
|
421
|
-
lsType: "ls"
|
|
431
|
+
lsType: "ls",
|
|
432
|
+
url: ret,
|
|
433
|
+
addType: "czml"
|
|
422
434
|
};
|
|
423
435
|
|
|
424
436
|
that._layerManager.addTempLayerNode(layer);
|
|
@@ -548,7 +560,9 @@ class AddDataViewModel {
|
|
|
548
560
|
name: name,
|
|
549
561
|
visible: true,
|
|
550
562
|
serverType: "imagerylayer",
|
|
551
|
-
lsType: "ls"
|
|
563
|
+
lsType: "ls",
|
|
564
|
+
url: url,
|
|
565
|
+
addType: type
|
|
552
566
|
};
|
|
553
567
|
|
|
554
568
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -572,7 +586,9 @@ class AddDataViewModel {
|
|
|
572
586
|
name: name,
|
|
573
587
|
visible: true,
|
|
574
588
|
serverType: "terrainprovider",
|
|
575
|
-
lsType: "ls"
|
|
589
|
+
lsType: "ls",
|
|
590
|
+
url: url,
|
|
591
|
+
addType: type
|
|
576
592
|
};
|
|
577
593
|
|
|
578
594
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -600,7 +616,9 @@ class AddDataViewModel {
|
|
|
600
616
|
name: name,
|
|
601
617
|
visible: true,
|
|
602
618
|
serverType: "terrainprovider",
|
|
603
|
-
lsType: "ls"
|
|
619
|
+
lsType: "ls",
|
|
620
|
+
url: url,
|
|
621
|
+
addType: type
|
|
604
622
|
};
|
|
605
623
|
|
|
606
624
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -622,7 +640,9 @@ class AddDataViewModel {
|
|
|
622
640
|
name: name,
|
|
623
641
|
visible: true,
|
|
624
642
|
serverType: "3dtiles",
|
|
625
|
-
lsType: "ls"
|
|
643
|
+
lsType: "ls",
|
|
644
|
+
url: url,
|
|
645
|
+
addType: type
|
|
626
646
|
};
|
|
627
647
|
|
|
628
648
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -634,56 +654,56 @@ class AddDataViewModel {
|
|
|
634
654
|
this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
|
|
635
655
|
var layers = group._addedLayers || group._layers;
|
|
636
656
|
|
|
637
|
-
if (layers) {
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
}
|
|
647
|
-
|
|
648
|
-
for (var i = 0; i < length; i++) {
|
|
649
|
-
if (i === 0) {
|
|
650
|
-
this.flyToLayer(layers[i]);
|
|
651
|
-
}
|
|
652
|
-
|
|
653
|
-
var type = "";
|
|
657
|
+
if (layers && layers.length > 0) {
|
|
658
|
+
node = {
|
|
659
|
+
guid: group.guid,
|
|
660
|
+
name: name,
|
|
661
|
+
children: [],
|
|
662
|
+
lsType: "ls"
|
|
663
|
+
};
|
|
664
|
+
var serverType = "";
|
|
665
|
+
var addType = "";
|
|
654
666
|
|
|
667
|
+
for (var i = 0; i < layers.length; i++) {
|
|
655
668
|
if (layers[i] instanceof Cesium.Cesium3DTileset) {
|
|
656
|
-
|
|
669
|
+
serverType = "3dtiles";
|
|
670
|
+
addType = "3dtiles";
|
|
671
|
+
url = layers[i].url;
|
|
657
672
|
} else if (layers[i] instanceof Cesium.ImageryLayer) {
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
673
|
+
serverType = "imagerylayer";
|
|
674
|
+
addType = "kq3dimageryfile";
|
|
675
|
+
url = layers[i]._imageryProvider._originUrl;
|
|
676
|
+
} else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider) {
|
|
677
|
+
serverType = "terrainprovider";
|
|
678
|
+
addType = "obterrain";
|
|
679
|
+
url = layers[i].url;
|
|
680
|
+
|
|
681
|
+
this._layerManager._terrainProviders.push(layers[i]);
|
|
682
|
+
} else if (layers[i] instanceof Cesium.CesiumTerrainProvider) {
|
|
683
|
+
serverType = "terrainprovider";
|
|
684
|
+
addType = "stkterrain";
|
|
685
|
+
url = layers[i].url;
|
|
661
686
|
|
|
662
687
|
this._layerManager._terrainProviders.push(layers[i]);
|
|
663
688
|
} else if (layers[i] instanceof Cesium.Kq3dGeoJsonDataSource) {
|
|
664
|
-
|
|
689
|
+
serverType = "datasource";
|
|
690
|
+
addType = "geojson";
|
|
691
|
+
url = layers[i]._baseUri + layers[i]._name;
|
|
665
692
|
}
|
|
666
693
|
|
|
667
694
|
if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
} else {
|
|
677
|
-
node = {
|
|
678
|
-
guid: layers[i].guid,
|
|
679
|
-
name: name || layers[i].name,
|
|
680
|
-
visible: true,
|
|
681
|
-
serverType: type,
|
|
682
|
-
lsType: "ls"
|
|
683
|
-
};
|
|
684
|
-
}
|
|
695
|
+
node.children.push({
|
|
696
|
+
guid: layers[i].guid,
|
|
697
|
+
name: layers[i].name,
|
|
698
|
+
visible: true,
|
|
699
|
+
serverType: serverType,
|
|
700
|
+
url: url,
|
|
701
|
+
addType: addType
|
|
702
|
+
});
|
|
685
703
|
}
|
|
686
704
|
|
|
705
|
+
this.flyToLayer(layers[0]);
|
|
706
|
+
|
|
687
707
|
this._layerManager.addTempLayerNode(node);
|
|
688
708
|
|
|
689
709
|
cb && cb(node);
|
|
@@ -704,7 +724,9 @@ class AddDataViewModel {
|
|
|
704
724
|
name: name,
|
|
705
725
|
visible: true,
|
|
706
726
|
serverType: "imagerylayer",
|
|
707
|
-
lsType: "ls"
|
|
727
|
+
lsType: "ls",
|
|
728
|
+
url: url,
|
|
729
|
+
addType: type
|
|
708
730
|
};
|
|
709
731
|
|
|
710
732
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -768,6 +790,7 @@ class AddDataViewModel {
|
|
|
768
790
|
mapServerInfo.layerTreeData.forEach(node => {
|
|
769
791
|
node.lsType = "ls";
|
|
770
792
|
node.serverType = "imagerylayer";
|
|
793
|
+
node.addType = type;
|
|
771
794
|
|
|
772
795
|
this._layerManager.addTempLayerNode(node, 1);
|
|
773
796
|
|
|
@@ -787,7 +810,9 @@ class AddDataViewModel {
|
|
|
787
810
|
name: name,
|
|
788
811
|
visible: true,
|
|
789
812
|
serverType: "imagerylayer",
|
|
790
|
-
lsType: "ls"
|
|
813
|
+
lsType: "ls",
|
|
814
|
+
url: url,
|
|
815
|
+
addType: type
|
|
791
816
|
};
|
|
792
817
|
|
|
793
818
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -815,7 +840,10 @@ class AddDataViewModel {
|
|
|
815
840
|
guid: layers[i].guid,
|
|
816
841
|
name: layers[i].name,
|
|
817
842
|
visible: true,
|
|
818
|
-
serverType: "imagerylayer"
|
|
843
|
+
serverType: "imagerylayer",
|
|
844
|
+
url: url,
|
|
845
|
+
addType: type,
|
|
846
|
+
id: layers[i].layers
|
|
819
847
|
});
|
|
820
848
|
}
|
|
821
849
|
}
|
|
@@ -847,7 +875,10 @@ class AddDataViewModel {
|
|
|
847
875
|
guid: layers[i].guid,
|
|
848
876
|
name: layers[i].name,
|
|
849
877
|
visible: true,
|
|
850
|
-
serverType: "imagerylayer"
|
|
878
|
+
serverType: "imagerylayer",
|
|
879
|
+
url: url,
|
|
880
|
+
addType: type,
|
|
881
|
+
id: layers[i]._layer
|
|
851
882
|
});
|
|
852
883
|
}
|
|
853
884
|
}
|
|
@@ -879,7 +910,9 @@ class AddDataViewModel {
|
|
|
879
910
|
name: name,
|
|
880
911
|
visible: true,
|
|
881
912
|
serverType: "datasource",
|
|
882
|
-
lsType: "ls"
|
|
913
|
+
lsType: "ls",
|
|
914
|
+
url: url,
|
|
915
|
+
addType: type
|
|
883
916
|
};
|
|
884
917
|
|
|
885
918
|
that._layerManager.addTempLayerNode(node);
|
|
@@ -892,6 +925,16 @@ class AddDataViewModel {
|
|
|
892
925
|
case "geojson":
|
|
893
926
|
var ds = new Cesium.Kq3dGeoJsonDataSource(name);
|
|
894
927
|
ds.load(url, this._geojsonStyle).then(ds => {
|
|
928
|
+
ds.entities.values.forEach(entity => {
|
|
929
|
+
if (entity.polygon) {
|
|
930
|
+
entity.polyline = {
|
|
931
|
+
positions: entity.polygon.hierarchy._value.positions,
|
|
932
|
+
width: this._geojsonStyle.polygon.outlineWidth,
|
|
933
|
+
material: this._geojsonStyle.polygon.outlineColor
|
|
934
|
+
};
|
|
935
|
+
}
|
|
936
|
+
}, this);
|
|
937
|
+
|
|
895
938
|
this._viewer.dataSources.add(ds);
|
|
896
939
|
|
|
897
940
|
ds.autoAvoid(this._viewer);
|
|
@@ -903,7 +946,9 @@ class AddDataViewModel {
|
|
|
903
946
|
name: name,
|
|
904
947
|
visible: true,
|
|
905
948
|
serverType: "datasource",
|
|
906
|
-
lsType: "ls"
|
|
949
|
+
lsType: "ls",
|
|
950
|
+
url: url,
|
|
951
|
+
addType: type
|
|
907
952
|
};
|
|
908
953
|
|
|
909
954
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -928,7 +973,9 @@ class AddDataViewModel {
|
|
|
928
973
|
name: name,
|
|
929
974
|
visible: true,
|
|
930
975
|
serverType: "datasource",
|
|
931
|
-
lsType: "ls"
|
|
976
|
+
lsType: "ls",
|
|
977
|
+
url: url,
|
|
978
|
+
addType: type
|
|
932
979
|
};
|
|
933
980
|
|
|
934
981
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -949,7 +996,9 @@ class AddDataViewModel {
|
|
|
949
996
|
name: name,
|
|
950
997
|
visible: true,
|
|
951
998
|
serverType: "datasource",
|
|
952
|
-
lsType: "ls"
|
|
999
|
+
lsType: "ls",
|
|
1000
|
+
url: url,
|
|
1001
|
+
addType: type
|
|
953
1002
|
};
|
|
954
1003
|
|
|
955
1004
|
this._layerManager.addTempLayerNode(node);
|
|
@@ -25131,18 +25180,19 @@ class LayerManager {
|
|
|
25131
25180
|
}
|
|
25132
25181
|
});
|
|
25133
25182
|
}
|
|
25134
|
-
}
|
|
25183
|
+
} //获取底图图层Index
|
|
25135
25184
|
|
|
25136
25185
|
|
|
25137
25186
|
getBaseLayerIndex() {
|
|
25138
|
-
|
|
25139
|
-
|
|
25140
|
-
|
|
25141
|
-
|
|
25142
|
-
|
|
25143
|
-
|
|
25144
|
-
|
|
25145
|
-
|
|
25187
|
+
let index = 1;
|
|
25188
|
+
|
|
25189
|
+
this._viewer.imageryLayers._layers.forEach(layer => {
|
|
25190
|
+
if (layer.target === "online") {
|
|
25191
|
+
index++;
|
|
25192
|
+
}
|
|
25193
|
+
});
|
|
25194
|
+
|
|
25195
|
+
return index;
|
|
25146
25196
|
} //设置图层置顶或取消置顶
|
|
25147
25197
|
|
|
25148
25198
|
|
|
@@ -25727,11 +25777,30 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
25727
25777
|
});
|
|
25728
25778
|
}
|
|
25729
25779
|
}
|
|
25780
|
+
}
|
|
25781
|
+
/**
|
|
25782
|
+
* 获取在线底图index
|
|
25783
|
+
*/
|
|
25784
|
+
|
|
25785
|
+
|
|
25786
|
+
_getOnlineBaseLayerIndex() {
|
|
25787
|
+
let index = 1;
|
|
25788
|
+
|
|
25789
|
+
this._viewer.imageryLayers._layers.forEach(layer => {
|
|
25790
|
+
if (layer.target === "online") {
|
|
25791
|
+
index++;
|
|
25792
|
+
}
|
|
25793
|
+
});
|
|
25794
|
+
|
|
25795
|
+
return index;
|
|
25730
25796
|
} //创建在线底图
|
|
25731
25797
|
|
|
25732
25798
|
|
|
25733
25799
|
_createOnlineLayer(layerConfig) {
|
|
25734
25800
|
let layer = null;
|
|
25801
|
+
|
|
25802
|
+
let index = this._getOnlineBaseLayerIndex();
|
|
25803
|
+
|
|
25735
25804
|
let layerType = layerConfig.renderType;
|
|
25736
25805
|
if (layerType) layerType = layerType.toLowerCase();
|
|
25737
25806
|
|
|
@@ -25740,7 +25809,7 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
25740
25809
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dKQGISMapServerImageryProviderExt({
|
|
25741
25810
|
url: layerConfig.url,
|
|
25742
25811
|
ua_token: layerConfig.accessToken
|
|
25743
|
-
}));
|
|
25812
|
+
}), index);
|
|
25744
25813
|
break;
|
|
25745
25814
|
|
|
25746
25815
|
case "wmts":
|
|
@@ -25756,7 +25825,7 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
25756
25825
|
subdomains: layerConfig.subdomains,
|
|
25757
25826
|
tilingScheme: layerConfig.epsg === "4326" ? new Cesium.GeographicTilingScheme() : new Cesium.WebMercatorTilingScheme()
|
|
25758
25827
|
};
|
|
25759
|
-
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options));
|
|
25828
|
+
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider(options), index);
|
|
25760
25829
|
break;
|
|
25761
25830
|
|
|
25762
25831
|
case "wms":
|
|
@@ -25767,31 +25836,31 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
25767
25836
|
transparent: "true",
|
|
25768
25837
|
format: "image/png"
|
|
25769
25838
|
}
|
|
25770
|
-
}));
|
|
25839
|
+
}), index);
|
|
25771
25840
|
break;
|
|
25772
25841
|
|
|
25773
25842
|
case "tianditu":
|
|
25774
25843
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dTiandituImageryProvider({
|
|
25775
25844
|
mapStyle: layerConfig.layerType + "_c"
|
|
25776
|
-
}));
|
|
25845
|
+
}), index);
|
|
25777
25846
|
break;
|
|
25778
25847
|
|
|
25779
25848
|
case "baidu":
|
|
25780
25849
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dBaiduMapsImageryProvider({
|
|
25781
25850
|
mapStyle: layerConfig.layerType
|
|
25782
|
-
}));
|
|
25851
|
+
}), index);
|
|
25783
25852
|
break;
|
|
25784
25853
|
|
|
25785
25854
|
case "gaode":
|
|
25786
25855
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dAMapsImageryProvider({
|
|
25787
25856
|
mapStyle: layerConfig.layerType
|
|
25788
|
-
}));
|
|
25857
|
+
}), index);
|
|
25789
25858
|
break;
|
|
25790
25859
|
|
|
25791
25860
|
case "tencent":
|
|
25792
25861
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dQQMapsImageryProvider({
|
|
25793
25862
|
mapStyle: layerConfig.layerType
|
|
25794
|
-
}));
|
|
25863
|
+
}), index);
|
|
25795
25864
|
break;
|
|
25796
25865
|
|
|
25797
25866
|
case "bing":
|
|
@@ -25799,26 +25868,26 @@ class ScenceViewViewModel extends (mitt_default()) {
|
|
|
25799
25868
|
url: layerConfig.url || "https://dev.virtualearth.net",
|
|
25800
25869
|
key: layerConfig.key || "AmXdbd8UeUJtaRSn7yVwyXgQlBBUqliLbHpgn2c76DfuHwAXfRrgS5qwfHU6Rhm8",
|
|
25801
25870
|
mapStyle: layerConfig.layerType
|
|
25802
|
-
}));
|
|
25871
|
+
}), index);
|
|
25803
25872
|
break;
|
|
25804
25873
|
|
|
25805
25874
|
case "arcgisonline":
|
|
25806
25875
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
|
|
25807
25876
|
url: layerConfig.url
|
|
25808
|
-
}));
|
|
25877
|
+
}), index);
|
|
25809
25878
|
break;
|
|
25810
25879
|
|
|
25811
25880
|
case "mapbox":
|
|
25812
25881
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.MapboxImageryProvider({
|
|
25813
25882
|
mapId: "mapbox." + layerConfig.layerType,
|
|
25814
25883
|
accessToken: layerConfig.key || "pk.eyJ1IjoiZXhhbXBsZXMiLCJhIjoiY2p1dHRybDR5MGJuZjQzcGhrZ2doeGgwNyJ9.a-vxW4UaxOoUMWUTGnEArw"
|
|
25815
|
-
}));
|
|
25884
|
+
}), index);
|
|
25816
25885
|
break;
|
|
25817
25886
|
|
|
25818
25887
|
case "osm":
|
|
25819
25888
|
layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.createOpenStreetMapImageryProvider({
|
|
25820
25889
|
url: layerConfig.url
|
|
25821
|
-
}));
|
|
25890
|
+
}), index);
|
|
25822
25891
|
break;
|
|
25823
25892
|
}
|
|
25824
25893
|
|