@kq_npm/client3d_webgl_vue 3.1.0-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.
Files changed (4) hide show
  1. package/adddata/index.js +96 -57
  2. package/index.js +96 -57
  3. package/package.json +1 -1
  4. package/scenceview/index.js +96 -57
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
- var length = layers.length;
715
-
716
- if (length > 1) {
717
- node = {
718
- guid: group.guid,
719
- name: name,
720
- children: []
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
- type = "3dtiles";
745
+ serverType = "3dtiles";
746
+ addType = "3dtiles";
747
+ url = layers[i].url;
733
748
  } else if (layers[i] instanceof Cesium.ImageryLayer) {
734
- type = "imagerylayer";
735
- } else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider || layers[i] instanceof Cesium.CesiumTerrainProvider) {
736
- type = "terrainprovider";
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
- type = "datasource";
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
- if (length > 1) {
746
- node.children.push({
747
- guid: layers[i].guid,
748
- name: layers[i].name,
749
- visible: true,
750
- serverType: type
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);
@@ -989,7 +1022,9 @@ class AddDataViewModel {
989
1022
  name: name,
990
1023
  visible: true,
991
1024
  serverType: "datasource",
992
- lsType: "ls"
1025
+ lsType: "ls",
1026
+ url: url,
1027
+ addType: type
993
1028
  };
994
1029
 
995
1030
  this._layerManager.addTempLayerNode(node);
@@ -1014,7 +1049,9 @@ class AddDataViewModel {
1014
1049
  name: name,
1015
1050
  visible: true,
1016
1051
  serverType: "datasource",
1017
- lsType: "ls"
1052
+ lsType: "ls",
1053
+ url: url,
1054
+ addType: type
1018
1055
  };
1019
1056
 
1020
1057
  this._layerManager.addTempLayerNode(node);
@@ -1035,7 +1072,9 @@ class AddDataViewModel {
1035
1072
  name: name,
1036
1073
  visible: true,
1037
1074
  serverType: "datasource",
1038
- lsType: "ls"
1075
+ lsType: "ls",
1076
+ url: url,
1077
+ addType: type
1039
1078
  };
1040
1079
 
1041
1080
  this._layerManager.addTempLayerNode(node);
package/index.js CHANGED
@@ -19483,7 +19483,9 @@ class AddDataViewModel {
19483
19483
  name: name,
19484
19484
  visible: true,
19485
19485
  serverType: "datasource",
19486
- lsType: "ls"
19486
+ lsType: "ls",
19487
+ url: res,
19488
+ addType: "geojson"
19487
19489
  };
19488
19490
 
19489
19491
  that._layerManager.addTempLayerNode(layer);
@@ -19523,7 +19525,9 @@ class AddDataViewModel {
19523
19525
  name: name,
19524
19526
  visible: true,
19525
19527
  serverType: "datasource",
19526
- lsType: "ls"
19528
+ lsType: "ls",
19529
+ url: res,
19530
+ addType: "geojson"
19527
19531
  };
19528
19532
 
19529
19533
  that._layerManager.addTempLayerNode(layer);
@@ -19584,7 +19588,9 @@ class AddDataViewModel {
19584
19588
  name: name,
19585
19589
  visible: true,
19586
19590
  serverType: "datasource",
19587
- lsType: "ls"
19591
+ lsType: "ls",
19592
+ url: ret,
19593
+ addType: "geojson"
19588
19594
  };
19589
19595
 
19590
19596
  that._layerManager.addTempLayerNode(layer);
@@ -19615,7 +19621,9 @@ class AddDataViewModel {
19615
19621
  name: name,
19616
19622
  visible: true,
19617
19623
  serverType: "datasource",
19618
- lsType: "ls"
19624
+ lsType: "ls",
19625
+ url: data,
19626
+ addType: "kml"
19619
19627
  };
19620
19628
 
19621
19629
  that._layerManager.addTempLayerNode(layer);
@@ -19642,7 +19650,9 @@ class AddDataViewModel {
19642
19650
  name: name,
19643
19651
  visible: true,
19644
19652
  serverType: "datasource",
19645
- lsType: "ls"
19653
+ lsType: "ls",
19654
+ url: file,
19655
+ addType: "kml"
19646
19656
  };
19647
19657
 
19648
19658
  that._layerManager.addTempLayerNode(layer);
@@ -19673,7 +19683,9 @@ class AddDataViewModel {
19673
19683
  name: name,
19674
19684
  visible: true,
19675
19685
  serverType: "datasource",
19676
- lsType: "ls"
19686
+ lsType: "ls",
19687
+ url: ret,
19688
+ addType: "czml"
19677
19689
  };
19678
19690
 
19679
19691
  that._layerManager.addTempLayerNode(layer);
@@ -19803,7 +19815,9 @@ class AddDataViewModel {
19803
19815
  name: name,
19804
19816
  visible: true,
19805
19817
  serverType: "imagerylayer",
19806
- lsType: "ls"
19818
+ lsType: "ls",
19819
+ url: url,
19820
+ addType: type
19807
19821
  };
19808
19822
 
19809
19823
  this._layerManager.addTempLayerNode(node);
@@ -19827,7 +19841,9 @@ class AddDataViewModel {
19827
19841
  name: name,
19828
19842
  visible: true,
19829
19843
  serverType: "terrainprovider",
19830
- lsType: "ls"
19844
+ lsType: "ls",
19845
+ url: url,
19846
+ addType: type
19831
19847
  };
19832
19848
 
19833
19849
  this._layerManager.addTempLayerNode(node);
@@ -19855,7 +19871,9 @@ class AddDataViewModel {
19855
19871
  name: name,
19856
19872
  visible: true,
19857
19873
  serverType: "terrainprovider",
19858
- lsType: "ls"
19874
+ lsType: "ls",
19875
+ url: url,
19876
+ addType: type
19859
19877
  };
19860
19878
 
19861
19879
  this._layerManager.addTempLayerNode(node);
@@ -19877,7 +19895,9 @@ class AddDataViewModel {
19877
19895
  name: name,
19878
19896
  visible: true,
19879
19897
  serverType: "3dtiles",
19880
- lsType: "ls"
19898
+ lsType: "ls",
19899
+ url: url,
19900
+ addType: type
19881
19901
  };
19882
19902
 
19883
19903
  this._layerManager.addTempLayerNode(node);
@@ -19889,56 +19909,56 @@ class AddDataViewModel {
19889
19909
  this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
19890
19910
  var layers = group._addedLayers || group._layers;
19891
19911
 
19892
- if (layers) {
19893
- var length = layers.length;
19894
-
19895
- if (length > 1) {
19896
- node = {
19897
- guid: group.guid,
19898
- name: name,
19899
- children: []
19900
- };
19901
- }
19902
-
19903
- for (var i = 0; i < length; i++) {
19904
- if (i === 0) {
19905
- this.flyToLayer(layers[i]);
19906
- }
19907
-
19908
- 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 = "";
19909
19921
 
19922
+ for (var i = 0; i < layers.length; i++) {
19910
19923
  if (layers[i] instanceof Cesium.Cesium3DTileset) {
19911
- type = "3dtiles";
19924
+ serverType = "3dtiles";
19925
+ addType = "3dtiles";
19926
+ url = layers[i].url;
19912
19927
  } else if (layers[i] instanceof Cesium.ImageryLayer) {
19913
- type = "imagerylayer";
19914
- } else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider || layers[i] instanceof Cesium.CesiumTerrainProvider) {
19915
- type = "terrainprovider";
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;
19916
19941
 
19917
19942
  this._layerManager._terrainProviders.push(layers[i]);
19918
19943
  } else if (layers[i] instanceof Cesium.Kq3dGeoJsonDataSource) {
19919
- type = "datasource";
19944
+ serverType = "datasource";
19945
+ addType = "geojson";
19946
+ url = layers[i]._baseUri + layers[i]._name;
19920
19947
  }
19921
19948
 
19922
19949
  if (!layers[i].guid) layers[i].guid = Cesium.createGuid();
19923
-
19924
- if (length > 1) {
19925
- node.children.push({
19926
- guid: layers[i].guid,
19927
- name: layers[i].name,
19928
- visible: true,
19929
- serverType: type
19930
- });
19931
- } else {
19932
- node = {
19933
- guid: layers[i].guid,
19934
- name: name || layers[i].name,
19935
- visible: true,
19936
- serverType: type,
19937
- lsType: "ls"
19938
- };
19939
- }
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
+ });
19940
19958
  }
19941
19959
 
19960
+ this.flyToLayer(layers[0]);
19961
+
19942
19962
  this._layerManager.addTempLayerNode(node);
19943
19963
 
19944
19964
  cb && cb(node);
@@ -19959,7 +19979,9 @@ class AddDataViewModel {
19959
19979
  name: name,
19960
19980
  visible: true,
19961
19981
  serverType: "imagerylayer",
19962
- lsType: "ls"
19982
+ lsType: "ls",
19983
+ url: url,
19984
+ addType: type
19963
19985
  };
19964
19986
 
19965
19987
  this._layerManager.addTempLayerNode(node);
@@ -20023,6 +20045,7 @@ class AddDataViewModel {
20023
20045
  mapServerInfo.layerTreeData.forEach(node => {
20024
20046
  node.lsType = "ls";
20025
20047
  node.serverType = "imagerylayer";
20048
+ node.addType = type;
20026
20049
 
20027
20050
  this._layerManager.addTempLayerNode(node, 1);
20028
20051
 
@@ -20042,7 +20065,9 @@ class AddDataViewModel {
20042
20065
  name: name,
20043
20066
  visible: true,
20044
20067
  serverType: "imagerylayer",
20045
- lsType: "ls"
20068
+ lsType: "ls",
20069
+ url: url,
20070
+ addType: type
20046
20071
  };
20047
20072
 
20048
20073
  this._layerManager.addTempLayerNode(node);
@@ -20070,7 +20095,10 @@ class AddDataViewModel {
20070
20095
  guid: layers[i].guid,
20071
20096
  name: layers[i].name,
20072
20097
  visible: true,
20073
- serverType: "imagerylayer"
20098
+ serverType: "imagerylayer",
20099
+ url: url,
20100
+ addType: type,
20101
+ id: layers[i].layers
20074
20102
  });
20075
20103
  }
20076
20104
  }
@@ -20102,7 +20130,10 @@ class AddDataViewModel {
20102
20130
  guid: layers[i].guid,
20103
20131
  name: layers[i].name,
20104
20132
  visible: true,
20105
- serverType: "imagerylayer"
20133
+ serverType: "imagerylayer",
20134
+ url: url,
20135
+ addType: type,
20136
+ id: layers[i]._layer
20106
20137
  });
20107
20138
  }
20108
20139
  }
@@ -20134,7 +20165,9 @@ class AddDataViewModel {
20134
20165
  name: name,
20135
20166
  visible: true,
20136
20167
  serverType: "datasource",
20137
- lsType: "ls"
20168
+ lsType: "ls",
20169
+ url: url,
20170
+ addType: type
20138
20171
  };
20139
20172
 
20140
20173
  that._layerManager.addTempLayerNode(node);
@@ -20168,7 +20201,9 @@ class AddDataViewModel {
20168
20201
  name: name,
20169
20202
  visible: true,
20170
20203
  serverType: "datasource",
20171
- lsType: "ls"
20204
+ lsType: "ls",
20205
+ url: url,
20206
+ addType: type
20172
20207
  };
20173
20208
 
20174
20209
  this._layerManager.addTempLayerNode(node);
@@ -20193,7 +20228,9 @@ class AddDataViewModel {
20193
20228
  name: name,
20194
20229
  visible: true,
20195
20230
  serverType: "datasource",
20196
- lsType: "ls"
20231
+ lsType: "ls",
20232
+ url: url,
20233
+ addType: type
20197
20234
  };
20198
20235
 
20199
20236
  this._layerManager.addTempLayerNode(node);
@@ -20214,7 +20251,9 @@ class AddDataViewModel {
20214
20251
  name: name,
20215
20252
  visible: true,
20216
20253
  serverType: "datasource",
20217
- lsType: "ls"
20254
+ lsType: "ls",
20255
+ url: url,
20256
+ addType: type
20218
20257
  };
20219
20258
 
20220
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.0-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"}}
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
- var length = layers.length;
639
-
640
- if (length > 1) {
641
- node = {
642
- guid: group.guid,
643
- name: name,
644
- children: []
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
- type = "3dtiles";
669
+ serverType = "3dtiles";
670
+ addType = "3dtiles";
671
+ url = layers[i].url;
657
672
  } else if (layers[i] instanceof Cesium.ImageryLayer) {
658
- type = "imagerylayer";
659
- } else if (layers[i] instanceof Cesium.Kq3dFileTerrainProvider || layers[i] instanceof Cesium.CesiumTerrainProvider) {
660
- type = "terrainprovider";
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
- type = "datasource";
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
- if (length > 1) {
670
- node.children.push({
671
- guid: layers[i].guid,
672
- name: layers[i].name,
673
- visible: true,
674
- serverType: type
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);
@@ -913,7 +946,9 @@ class AddDataViewModel {
913
946
  name: name,
914
947
  visible: true,
915
948
  serverType: "datasource",
916
- lsType: "ls"
949
+ lsType: "ls",
950
+ url: url,
951
+ addType: type
917
952
  };
918
953
 
919
954
  this._layerManager.addTempLayerNode(node);
@@ -938,7 +973,9 @@ class AddDataViewModel {
938
973
  name: name,
939
974
  visible: true,
940
975
  serverType: "datasource",
941
- lsType: "ls"
976
+ lsType: "ls",
977
+ url: url,
978
+ addType: type
942
979
  };
943
980
 
944
981
  this._layerManager.addTempLayerNode(node);
@@ -959,7 +996,9 @@ class AddDataViewModel {
959
996
  name: name,
960
997
  visible: true,
961
998
  serverType: "datasource",
962
- lsType: "ls"
999
+ lsType: "ls",
1000
+ url: url,
1001
+ addType: type
963
1002
  };
964
1003
 
965
1004
  this._layerManager.addTempLayerNode(node);