@kq_npm/client3d_webgl_vue 3.1.0-beta → 3.1.2-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 +110 -58
  2. package/index.js +110 -58
  3. package/package.json +1 -1
  4. package/scenceview/index.js +110 -58
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,10 @@ 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,
806
+ layerName: name
784
807
  };
785
808
 
786
809
  this._layerManager.addTempLayerNode(node);
@@ -841,12 +864,13 @@ class AddDataViewModel {
841
864
  });
842
865
  }
843
866
 
867
+ setChildrenAddType(mapServerInfo.layerTreeData, type);
844
868
  mapServerInfo.layerTreeData.forEach(node => {
845
869
  node.lsType = "ls";
846
- node.serverType = "imagerylayer";
847
870
 
848
871
  this._layerManager.addTempLayerNode(node, 1);
849
872
 
873
+ console.log(node);
850
874
  cb && cb(node);
851
875
  }, this);
852
876
  });
@@ -863,7 +887,9 @@ class AddDataViewModel {
863
887
  name: name,
864
888
  visible: true,
865
889
  serverType: "imagerylayer",
866
- lsType: "ls"
890
+ lsType: "ls",
891
+ url: url,
892
+ addType: type
867
893
  };
868
894
 
869
895
  this._layerManager.addTempLayerNode(node);
@@ -891,7 +917,10 @@ class AddDataViewModel {
891
917
  guid: layers[i].guid,
892
918
  name: layers[i].name,
893
919
  visible: true,
894
- serverType: "imagerylayer"
920
+ serverType: "imagerylayer",
921
+ url: url,
922
+ addType: type,
923
+ id: layers[i]._imageryProvider.layers
895
924
  });
896
925
  }
897
926
  }
@@ -923,7 +952,10 @@ class AddDataViewModel {
923
952
  guid: layers[i].guid,
924
953
  name: layers[i].name,
925
954
  visible: true,
926
- serverType: "imagerylayer"
955
+ serverType: "imagerylayer",
956
+ url: url,
957
+ addType: type,
958
+ id: layers[i]._imageryProvider._layer
927
959
  });
928
960
  }
929
961
  }
@@ -955,7 +987,9 @@ class AddDataViewModel {
955
987
  name: name,
956
988
  visible: true,
957
989
  serverType: "datasource",
958
- lsType: "ls"
990
+ lsType: "ls",
991
+ url: url,
992
+ addType: type
959
993
  };
960
994
 
961
995
  that._layerManager.addTempLayerNode(node);
@@ -989,7 +1023,9 @@ class AddDataViewModel {
989
1023
  name: name,
990
1024
  visible: true,
991
1025
  serverType: "datasource",
992
- lsType: "ls"
1026
+ lsType: "ls",
1027
+ url: url,
1028
+ addType: type
993
1029
  };
994
1030
 
995
1031
  this._layerManager.addTempLayerNode(node);
@@ -1014,7 +1050,9 @@ class AddDataViewModel {
1014
1050
  name: name,
1015
1051
  visible: true,
1016
1052
  serverType: "datasource",
1017
- lsType: "ls"
1053
+ lsType: "ls",
1054
+ url: url,
1055
+ addType: type
1018
1056
  };
1019
1057
 
1020
1058
  this._layerManager.addTempLayerNode(node);
@@ -1035,7 +1073,9 @@ class AddDataViewModel {
1035
1073
  name: name,
1036
1074
  visible: true,
1037
1075
  serverType: "datasource",
1038
- lsType: "ls"
1076
+ lsType: "ls",
1077
+ url: url,
1078
+ addType: type
1039
1079
  };
1040
1080
 
1041
1081
  this._layerManager.addTempLayerNode(node);
@@ -1078,6 +1118,18 @@ class AddDataViewModel {
1078
1118
  }
1079
1119
  }
1080
1120
 
1121
+ } // 设置子节点addType属性
1122
+
1123
+ function setChildrenAddType(nodeList, addType) {
1124
+ for (let i = 0; i < nodeList.length; i++) {
1125
+ const node = nodeList[i];
1126
+
1127
+ if (node.children) {
1128
+ setChildrenAddType(node.children, addType);
1129
+ } else {
1130
+ node.addType = addType;
1131
+ }
1132
+ }
1081
1133
  }
1082
1134
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/adddata/AddData.vue?vue&type=script&setup=true&lang=js
1083
1135
 
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,10 @@ 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,
19985
+ layerName: name
19963
19986
  };
19964
19987
 
19965
19988
  this._layerManager.addTempLayerNode(node);
@@ -20020,12 +20043,13 @@ class AddDataViewModel {
20020
20043
  });
20021
20044
  }
20022
20045
 
20046
+ setChildrenAddType(mapServerInfo.layerTreeData, type);
20023
20047
  mapServerInfo.layerTreeData.forEach(node => {
20024
20048
  node.lsType = "ls";
20025
- node.serverType = "imagerylayer";
20026
20049
 
20027
20050
  this._layerManager.addTempLayerNode(node, 1);
20028
20051
 
20052
+ console.log(node);
20029
20053
  cb && cb(node);
20030
20054
  }, this);
20031
20055
  });
@@ -20042,7 +20066,9 @@ class AddDataViewModel {
20042
20066
  name: name,
20043
20067
  visible: true,
20044
20068
  serverType: "imagerylayer",
20045
- lsType: "ls"
20069
+ lsType: "ls",
20070
+ url: url,
20071
+ addType: type
20046
20072
  };
20047
20073
 
20048
20074
  this._layerManager.addTempLayerNode(node);
@@ -20070,7 +20096,10 @@ class AddDataViewModel {
20070
20096
  guid: layers[i].guid,
20071
20097
  name: layers[i].name,
20072
20098
  visible: true,
20073
- serverType: "imagerylayer"
20099
+ serverType: "imagerylayer",
20100
+ url: url,
20101
+ addType: type,
20102
+ id: layers[i]._imageryProvider.layers
20074
20103
  });
20075
20104
  }
20076
20105
  }
@@ -20102,7 +20131,10 @@ class AddDataViewModel {
20102
20131
  guid: layers[i].guid,
20103
20132
  name: layers[i].name,
20104
20133
  visible: true,
20105
- serverType: "imagerylayer"
20134
+ serverType: "imagerylayer",
20135
+ url: url,
20136
+ addType: type,
20137
+ id: layers[i]._imageryProvider._layer
20106
20138
  });
20107
20139
  }
20108
20140
  }
@@ -20134,7 +20166,9 @@ class AddDataViewModel {
20134
20166
  name: name,
20135
20167
  visible: true,
20136
20168
  serverType: "datasource",
20137
- lsType: "ls"
20169
+ lsType: "ls",
20170
+ url: url,
20171
+ addType: type
20138
20172
  };
20139
20173
 
20140
20174
  that._layerManager.addTempLayerNode(node);
@@ -20168,7 +20202,9 @@ class AddDataViewModel {
20168
20202
  name: name,
20169
20203
  visible: true,
20170
20204
  serverType: "datasource",
20171
- lsType: "ls"
20205
+ lsType: "ls",
20206
+ url: url,
20207
+ addType: type
20172
20208
  };
20173
20209
 
20174
20210
  this._layerManager.addTempLayerNode(node);
@@ -20193,7 +20229,9 @@ class AddDataViewModel {
20193
20229
  name: name,
20194
20230
  visible: true,
20195
20231
  serverType: "datasource",
20196
- lsType: "ls"
20232
+ lsType: "ls",
20233
+ url: url,
20234
+ addType: type
20197
20235
  };
20198
20236
 
20199
20237
  this._layerManager.addTempLayerNode(node);
@@ -20214,7 +20252,9 @@ class AddDataViewModel {
20214
20252
  name: name,
20215
20253
  visible: true,
20216
20254
  serverType: "datasource",
20217
- lsType: "ls"
20255
+ lsType: "ls",
20256
+ url: url,
20257
+ addType: type
20218
20258
  };
20219
20259
 
20220
20260
  this._layerManager.addTempLayerNode(node);
@@ -20257,6 +20297,18 @@ class AddDataViewModel {
20257
20297
  }
20258
20298
  }
20259
20299
 
20300
+ } // 设置子节点addType属性
20301
+
20302
+ function setChildrenAddType(nodeList, addType) {
20303
+ for (let i = 0; i < nodeList.length; i++) {
20304
+ const node = nodeList[i];
20305
+
20306
+ if (node.children) {
20307
+ setChildrenAddType(node.children, addType);
20308
+ } else {
20309
+ node.addType = addType;
20310
+ }
20311
+ }
20260
20312
  }
20261
20313
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/adddata/AddData.vue?vue&type=script&setup=true&lang=js
20262
20314
 
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.2-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,10 @@ 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,
730
+ layerName: name
708
731
  };
709
732
 
710
733
  this._layerManager.addTempLayerNode(node);
@@ -765,12 +788,13 @@ class AddDataViewModel {
765
788
  });
766
789
  }
767
790
 
791
+ setChildrenAddType(mapServerInfo.layerTreeData, type);
768
792
  mapServerInfo.layerTreeData.forEach(node => {
769
793
  node.lsType = "ls";
770
- node.serverType = "imagerylayer";
771
794
 
772
795
  this._layerManager.addTempLayerNode(node, 1);
773
796
 
797
+ console.log(node);
774
798
  cb && cb(node);
775
799
  }, this);
776
800
  });
@@ -787,7 +811,9 @@ class AddDataViewModel {
787
811
  name: name,
788
812
  visible: true,
789
813
  serverType: "imagerylayer",
790
- lsType: "ls"
814
+ lsType: "ls",
815
+ url: url,
816
+ addType: type
791
817
  };
792
818
 
793
819
  this._layerManager.addTempLayerNode(node);
@@ -815,7 +841,10 @@ class AddDataViewModel {
815
841
  guid: layers[i].guid,
816
842
  name: layers[i].name,
817
843
  visible: true,
818
- serverType: "imagerylayer"
844
+ serverType: "imagerylayer",
845
+ url: url,
846
+ addType: type,
847
+ id: layers[i]._imageryProvider.layers
819
848
  });
820
849
  }
821
850
  }
@@ -847,7 +876,10 @@ class AddDataViewModel {
847
876
  guid: layers[i].guid,
848
877
  name: layers[i].name,
849
878
  visible: true,
850
- serverType: "imagerylayer"
879
+ serverType: "imagerylayer",
880
+ url: url,
881
+ addType: type,
882
+ id: layers[i]._imageryProvider._layer
851
883
  });
852
884
  }
853
885
  }
@@ -879,7 +911,9 @@ class AddDataViewModel {
879
911
  name: name,
880
912
  visible: true,
881
913
  serverType: "datasource",
882
- lsType: "ls"
914
+ lsType: "ls",
915
+ url: url,
916
+ addType: type
883
917
  };
884
918
 
885
919
  that._layerManager.addTempLayerNode(node);
@@ -913,7 +947,9 @@ class AddDataViewModel {
913
947
  name: name,
914
948
  visible: true,
915
949
  serverType: "datasource",
916
- lsType: "ls"
950
+ lsType: "ls",
951
+ url: url,
952
+ addType: type
917
953
  };
918
954
 
919
955
  this._layerManager.addTempLayerNode(node);
@@ -938,7 +974,9 @@ class AddDataViewModel {
938
974
  name: name,
939
975
  visible: true,
940
976
  serverType: "datasource",
941
- lsType: "ls"
977
+ lsType: "ls",
978
+ url: url,
979
+ addType: type
942
980
  };
943
981
 
944
982
  this._layerManager.addTempLayerNode(node);
@@ -959,7 +997,9 @@ class AddDataViewModel {
959
997
  name: name,
960
998
  visible: true,
961
999
  serverType: "datasource",
962
- lsType: "ls"
1000
+ lsType: "ls",
1001
+ url: url,
1002
+ addType: type
963
1003
  };
964
1004
 
965
1005
  this._layerManager.addTempLayerNode(node);
@@ -1002,6 +1042,18 @@ class AddDataViewModel {
1002
1042
  }
1003
1043
  }
1004
1044
 
1045
+ } // 设置子节点addType属性
1046
+
1047
+ function setChildrenAddType(nodeList, addType) {
1048
+ for (let i = 0; i < nodeList.length; i++) {
1049
+ const node = nodeList[i];
1050
+
1051
+ if (node.children) {
1052
+ setChildrenAddType(node.children, addType);
1053
+ } else {
1054
+ node.addType = addType;
1055
+ }
1056
+ }
1005
1057
  }
1006
1058
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/adddata/AddData.vue?vue&type=script&setup=true&lang=js
1007
1059