@kq_npm/client3d_webgl_vue 1.0.0-beta → 1.0.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/index.js +47 -50
  2. package/measure/index.js +2 -20
  3. package/package.json +1 -1
  4. package/scenceview/index.js +45 -30
package/index.js CHANGED
@@ -1402,33 +1402,52 @@ class LayerManager {
1402
1402
 
1403
1403
  case "wms":
1404
1404
  //配置id时只能是单个图层
1405
- promise = this._viewer.addWMSLayerGroup(url, {
1406
- layers: layerData.id + ""
1407
- }).then(group => {
1408
- var layers = group._addedLayers || group._layers;
1409
-
1410
- if (layers && layers.length > 0) {
1411
- //如果是kqserver类型，记录服务返回的图层信息
1412
- if (layerData.sourceLayers) {
1413
- var layerInfo = layerData.sourceLayers.find(item => {
1414
- return item.id + "" == layerData.id + "";
1415
- });
1405
+ if (layerData.rect84) {
1406
+ var options = {
1407
+ url: url,
1408
+ layers: layerData.id + "",
1409
+ tilingScheme: layerData.epsg == 3857 ? new Cesium.WebMercatorTilingScheme() : new Cesium.GeographicTilingScheme(),
1410
+ rectangle: Cesium.Rectangle.fromDegrees(layerData.rect84[0], layerData.rect84[1], layerData.rect84[2], layerData.rect84[3]),
1411
+ parameters: {
1412
+ transparent: 'true',
1413
+ format: 'image/png'
1414
+ }
1415
+ };
1416
+ if (layerData.styles) options.parameters.styles = layerData.styles;
1417
+ layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
1418
+ this._guidMapping[layerData.guid] = layer.guid;
1419
+ layerData.visible = true;
1420
+ layerData.serverType = "imagerylayer";
1421
+ } else {
1422
+ promise = this._viewer.addWMSLayerGroup(url, {
1423
+ layers: layerData.id + ""
1424
+ }).then(group => {
1425
+ var layers = group._addedLayers || group._layers;
1426
+
1427
+ if (layers && layers.length > 0) {
1428
+ //如果是kqserver类型，记录服务返回的图层信息
1429
+ if (layerData.sourceLayers) {
1430
+ var layerInfo = layerData.sourceLayers.find(item => {
1431
+ return item.id + "" == layerData.id + "";
1432
+ });
1416
1433
 
1417
- if (layerInfo) {
1418
- for (var key in layerInfo) {
1419
- if (!layerData[key]) {
1420
- layerData[key] = layerInfo[key];
1434
+ if (layerInfo) {
1435
+ for (var key in layerInfo) {
1436
+ if (!layerData[key]) {
1437
+ layerData[key] = layerInfo[key];
1438
+ }
1421
1439
  }
1422
1440
  }
1423
1441
  }
1442
+
1443
+ this._guidMapping[layerData.guid] = layers[0].guid;
1444
+ layerData.name = name || layers[0].name;
1445
+ layerData.visible = true;
1446
+ layerData.serverType = "imagerylayer";
1424
1447
  }
1448
+ });
1449
+ }
1425
1450
 
1426
- this._guidMapping[layerData.guid] = layers[0].guid;
1427
- layerData.name = name || layers[0].name;
1428
- layerData.visible = true;
1429
- layerData.serverType = "imagerylayer";
1430
- }
1431
- });
1432
1451
  break;
1433
1452
 
1434
1453
  case "wmts":
@@ -1985,15 +2004,11 @@ class LayerManager {
1985
2004
 
1986
2005
 
1987
2006
  flyToBounds(guid, rect84) {
1988
- let viewer = this._viewer;
1989
-
1990
- if (rect84 instanceof Array && rect84.length === 4) {
1991
- let rect = Cesium.Rectangle.fromDegrees(rect84[0], rect84[1], rect84[2], rect84[3]);
1992
- viewer.camera.flyTo({
1993
- destination: rect
1994
- });
1995
- return;
1996
- }
2007
+ let viewer = this._viewer; // if(rect84 instanceof Array && rect84.length === 4) {
2008
+ // let rect = Cesium.Rectangle.fromDegrees(rect84[0], rect84[1], rect84[2], rect84[3]);
2009
+ // viewer.camera.flyTo({ destination: rect });
2010
+ // return;
2011
+ // }
1997
2012
 
1998
2013
  let layer = this.getLayerByGuid(guid);
1999
2014
 
@@ -3779,7 +3794,6 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
3779
3794
  gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
3780
3795
  if (scenceView) {
3781
3796
  language.value = scenceView._language;
3782
- console.log(111, language.value);
3783
3797
  loadModeData();
3784
3798
  viewModel = new MeasureViewModel(scenceView._viewer); //注册测量事件，以获取测量结果
3785
3799
 
@@ -3879,6 +3893,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
3879
3893
  azimuth;
3880
3894
 
3881
3895
  case "azimuth":
3896
+ mode.value = "space";
3882
3897
  viewModel.azimuthMeasure();
3883
3898
  break;
3884
3899
 
@@ -3998,25 +4013,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
3998
4013
 
3999
4014
  }, 8
4000
4015
  /* PROPS */
4001
- , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
4002
- onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('azimuth'), ["stop"])),
4003
- class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) == 'azimuth' ? 'is-active' : null),
4004
- title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).azimuthMeasure
4005
- }, {
4006
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_icon, {
4007
- size: 24
4008
- }, {
4009
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client_icons_vue_namespaceObject.IconMeasureAzimuth))]),
4010
- _: 1
4011
- /* STABLE */
4012
-
4013
- })]),
4014
- _: 1
4015
- /* STABLE */
4016
-
4017
- }, 8
4018
- /* PROPS */
4019
- , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
4016
+ , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-button @click.stop=\"startMeasure('azimuth')\" :class=\"isActive == 'azimuth' ? 'is-active' : null\" :title=\"language.azimuthMeasure\">\n <kq-icon :size=\"24\">\n <IconMeasureAzimuth />\n </kq-icon>\n </kq-button> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
4020
4017
  type: "danger",
4021
4018
  plain: "",
4022
4019
  onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)(clearMeasure, ["stop"]),
package/measure/index.js CHANGED
@@ -252,7 +252,6 @@ const __default__ = {
252
252
  gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
253
253
  if (scenceView) {
254
254
  language.value = scenceView._language;
255
- console.log(111, language.value);
256
255
  loadModeData();
257
256
  viewModel = new MeasureViewModel(scenceView._viewer); //注册测量事件，以获取测量结果
258
257
 
@@ -352,6 +351,7 @@ const __default__ = {
352
351
  azimuth;
353
352
 
354
353
  case "azimuth":
354
+ mode.value = "space";
355
355
  viewModel.azimuthMeasure();
356
356
  break;
357
357
 
@@ -471,25 +471,7 @@ const __default__ = {
471
471
 
472
472
  }, 8
473
473
  /* PROPS */
474
- , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
475
- onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('azimuth'), ["stop"])),
476
- class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) == 'azimuth' ? 'is-active' : null),
477
- title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).azimuthMeasure
478
- }, {
479
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_icon, {
480
- size: 24
481
- }, {
482
- default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(client_icons_vue_namespaceObject.IconMeasureAzimuth))]),
483
- _: 1
484
- /* STABLE */
485
-
486
- })]),
487
- _: 1
488
- /* STABLE */
489
-
490
- }, 8
491
- /* PROPS */
492
- , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
474
+ , ["class", "title"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <kq-button @click.stop=\"startMeasure('azimuth')\" :class=\"isActive == 'azimuth' ? 'is-active' : null\" :title=\"language.azimuthMeasure\">\n <kq-icon :size=\"24\">\n <IconMeasureAzimuth />\n </kq-icon>\n </kq-button> "), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
493
475
  type: "danger",
494
476
  plain: "",
495
477
  onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)(clearMeasure, ["stop"]),
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"1.0.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","xe-utils":"^3.5.4"}}
1
+ {"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"1.0.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","xe-utils":"^3.5.4"}}
package/scenceview/index.js CHANGED
@@ -947,33 +947,52 @@ class LayerManager {
947
947
 
948
948
  case "wms":
949
949
  //配置id时只能是单个图层
950
- promise = this._viewer.addWMSLayerGroup(url, {
951
- layers: layerData.id + ""
952
- }).then(group => {
953
- var layers = group._addedLayers || group._layers;
954
-
955
- if (layers && layers.length > 0) {
956
- //如果是kqserver类型，记录服务返回的图层信息
957
- if (layerData.sourceLayers) {
958
- var layerInfo = layerData.sourceLayers.find(item => {
959
- return item.id + "" == layerData.id + "";
960
- });
950
+ if (layerData.rect84) {
951
+ var options = {
952
+ url: url,
953
+ layers: layerData.id + "",
954
+ tilingScheme: layerData.epsg == 3857 ? new Cesium.WebMercatorTilingScheme() : new Cesium.GeographicTilingScheme(),
955
+ rectangle: Cesium.Rectangle.fromDegrees(layerData.rect84[0], layerData.rect84[1], layerData.rect84[2], layerData.rect84[3]),
956
+ parameters: {
957
+ transparent: 'true',
958
+ format: 'image/png'
959
+ }
960
+ };
961
+ if (layerData.styles) options.parameters.styles = layerData.styles;
962
+ layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.WebMapServiceImageryProvider(options));
963
+ this._guidMapping[layerData.guid] = layer.guid;
964
+ layerData.visible = true;
965
+ layerData.serverType = "imagerylayer";
966
+ } else {
967
+ promise = this._viewer.addWMSLayerGroup(url, {
968
+ layers: layerData.id + ""
969
+ }).then(group => {
970
+ var layers = group._addedLayers || group._layers;
971
+
972
+ if (layers && layers.length > 0) {
973
+ //如果是kqserver类型，记录服务返回的图层信息
974
+ if (layerData.sourceLayers) {
975
+ var layerInfo = layerData.sourceLayers.find(item => {
976
+ return item.id + "" == layerData.id + "";
977
+ });
961
978
 
962
- if (layerInfo) {
963
- for (var key in layerInfo) {
964
- if (!layerData[key]) {
965
- layerData[key] = layerInfo[key];
979
+ if (layerInfo) {
980
+ for (var key in layerInfo) {
981
+ if (!layerData[key]) {
982
+ layerData[key] = layerInfo[key];
983
+ }
966
984
  }
967
985
  }
968
986
  }
987
+
988
+ this._guidMapping[layerData.guid] = layers[0].guid;
989
+ layerData.name = name || layers[0].name;
990
+ layerData.visible = true;
991
+ layerData.serverType = "imagerylayer";
969
992
  }
993
+ });
994
+ }
970
995
 
971
- this._guidMapping[layerData.guid] = layers[0].guid;
972
- layerData.name = name || layers[0].name;
973
- layerData.visible = true;
974
- layerData.serverType = "imagerylayer";
975
- }
976
- });
977
996
  break;
978
997
 
979
998
  case "wmts":
@@ -1530,15 +1549,11 @@ class LayerManager {
1530
1549
 
1531
1550
 
1532
1551
  flyToBounds(guid, rect84) {
1533
- let viewer = this._viewer;
1534
-
1535
- if (rect84 instanceof Array && rect84.length === 4) {
1536
- let rect = Cesium.Rectangle.fromDegrees(rect84[0], rect84[1], rect84[2], rect84[3]);
1537
- viewer.camera.flyTo({
1538
- destination: rect
1539
- });
1540
- return;
1541
- }
1552
+ let viewer = this._viewer; // if(rect84 instanceof Array && rect84.length === 4) {
1553
+ // let rect = Cesium.Rectangle.fromDegrees(rect84[0], rect84[1], rect84[2], rect84[3]);
1554
+ // viewer.camera.flyTo({ destination: rect });
1555
+ // return;
1556
+ // }
1542
1557
 
1543
1558
  let layer = this.getLayerByGuid(guid);
1544
1559