gis-map-universal 0.3.3 → 0.3.5

package/gismap.umd.js

@@ -70222,6 +70222,22 @@ var AbstractShape = /** @class */ (function (_super) {
 
 /***/ }),
 
+/***/ "31ee":
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__("9349");
+if(content.__esModule) content = content.default;
+if(typeof content === 'string') content = [[module.i, content, '']];
+if(content.locals) module.exports = content.locals;
+// add the styles to the DOM
+var add = __webpack_require__("499e").default
+var update = add("8e1612b2", content, true, {"sourceMap":false,"shadowMode":false});
+
+/***/ }),
+
 /***/ "330d":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -75287,22 +75303,6 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ "3f89":
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__("6ea1");
-if(content.__esModule) content = content.default;
-if(typeof content === 'string') content = [[module.i, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var add = __webpack_require__("499e").default
-var update = add("47193479", content, true, {"sourceMap":false,"shadowMode":false});
-
-/***/ }),
-
 /***/ "3f8c":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -103675,20 +103675,6 @@ function setWithCredentials(xhrWithCredentials) {
 }
 //# sourceMappingURL=featureloader.js.map
 
-/***/ }),
-
-/***/ "6ea1":
-/***/ (function(module, exports, __webpack_require__) {
-
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
-exports = ___CSS_LOADER_API_IMPORT___(false);
-// Module
-exports.push([module.i, "#cesiumContainer[data-v-fdf1c8ba]{position:absolute;top:0;left:0;height:100%;width:100%;margin:0;overflow:hidden;padding:0;font-family:sans-serif}", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "6fc0":
@@ -127948,6 +127934,20 @@ function assert(assertion, errorCode) {
 }
 //# sourceMappingURL=asserts.js.map
 
+/***/ }),
+
+/***/ "9349":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Imports
+var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
+exports = ___CSS_LOADER_API_IMPORT___(false);
+// Module
+exports.push([module.i, "#cesiumContainer[data-v-83e771ae]{position:absolute;top:0;left:0;height:100%;width:100%;margin:0;overflow:hidden;padding:0;font-family:sans-serif}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "9484":
@@ -156750,6 +156750,17 @@ function assembleFont(attrs) {
 }
 //# sourceMappingURL=text.js.map
 
+/***/ }),
+
+/***/ "bc9f":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_83e771ae_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("31ee");
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_83e771ae_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_83e771ae_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "bd02":
@@ -166802,17 +166813,6 @@ module.exports = cloneDeep;
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba"), __webpack_require__("62e4")(module)))
 
-/***/ }),
-
-/***/ "cd67":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fdf1c8ba_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("3f89");
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fdf1c8ba_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fdf1c8ba_prod_scoped_true_lang_css__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "cd7e":
@@ -457188,20 +457188,20 @@ var LatlonPick_component = normalizeComponent(
     };
   },
   methods: {
-    initBaseLayers() {
+    initBaseLayers() {  // http://10.166.157.210:8090/
       let that = this;
       const superMapRestUrl =
-        "https://10.0.111.11:8090/iserver/services/map-WorkSpace/rest/maps/t2";
+        "https://10.0.111.11:8090/iserver/services/map-WorkSpace/rest/maps/t2";     // 弃用底图
       const wmsUrl =
-        "https://10.0.111.11:8090/iserver/services/map-JHArea/wms111/JHArea";
+        "https://10.0.111.11:8090/iserver/services/map-JHArea-2/wms130/JHArea";      // 四市高亮面
       const baseRoadUrl =
-        "https://10.0.111.11:8090/iserver/services/map-baseRoad/wms130";
-      const G35Url = "https://10.0.111.11:8090/iserver/services/map-G35/wms130";
+        "https://10.0.111.11:8090/iserver/services/map-baseRoad-2/wms130";            // 全省道路线
+      const G35Url = "https://10.0.111.11:8090/iserver/services/map-G35/wms130";    // G35高亮线
       const styleURL =
-        "https://10.0.111.11:8090/iserver/services/map-mvt-BaseMapG35/restjsr/v1/vectortile/maps/BaseMapG35/style.json";
+        "https://10.0.111.11:8090/iserver/services/map-mvt-BaseMapG352/restjsr/v1/vectortile/maps/BaseMapG35/style.json";// 底图
       // 加载ArcGIS服务
       const arcgisUrl =
-        "http://124.128.27.156:18085/arcgis/rest/services/BaseService/darkColor/MapServer";
+        "http://124.128.27.156:18085/arcgis/rest/services/BaseService/darkColor/MapServer";  // 测试用arcgis服务
       const arcgisLayer = new Tile["default"]({
         source: new source_TileArcGISRest({
           ratio: 1,
@@ -457259,7 +457259,7 @@ var LatlonPick_component = normalizeComponent(
             FORMAT: "image/png",
           },
         }),
-        zIndex: 2,
+        zIndex: 5,
         projection: "EPSG:3857",
       });
       this.map.addLayer(G35layer);
@@ -457287,10 +457287,7 @@ var LatlonPick_component = normalizeComponent(
         that.map.addLayer(vectorLayer);
       });
       // 加载geojson数据
-      let geoJSONUrl =
-        // "https://geo.datav.aliyun.com/areas_v2/bound/370000_full.json";
-        // "https://geo.datav.aliyun.com/areas_v3/bound/100000.json";
-        'http://10.166.154.218:8081/imgforGis/china_full.json'
+      let geoJSONUrl = 'http://10.166.154.218:8081/imgforGis/china_full.json'
       fetch(geoJSONUrl)
         .then((response) => response.json())
         .then((data) => {
@@ -457309,11 +457306,11 @@ var LatlonPick_component = normalizeComponent(
             style: function (feature) {
               return new Style["default"]({
                 fill: new Fill["default"]({
-                  color: "#142747", // 这里设置填充颜色为半透明的红色
+                  color: "#103253"//"#142747", // 填充颜色
                 }),
                 stroke: new Stroke["default"]({
-                  color: "#3777d9", // 边界线的颜色
-                  width: 1, // 边界线的宽度
+                  color: "#3777d9", // 边界线颜色
+                  width: 1, // 边界线宽度
                 }),
               });
             },
@@ -458119,9 +458116,7 @@ var Cluster_Cluster = /** @class */ (function (_super) {
                 let bz = 1;
                 feature.get("features").forEach((e) => {
                   let state = e.getProperties().otherInfo.state;
-                  if (state === 1) {
-                    bz = 1;
-                  } else {
+                  if (state === 0) {
                     bz = 0;
                   }
                 });
@@ -458591,14 +458586,103 @@ gisMap2d_src.install = function (Vue) {
 
 // 默认导出组件
 /* harmony default export */ var gisMap2d = (gisMap2d_src);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"50d482b6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMap3d/src/index.vue?vue&type=template&id=fdf1c8ba&scoped=true
-var srcvue_type_template_id_fdf1c8ba_scoped_true_render = function render(){var _vm=this,_c=_vm._self._c;return _vm._m(0)
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"50d482b6-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMap3d/src/index.vue?vue&type=template&id=83e771ae&scoped=true
+var srcvue_type_template_id_83e771ae_scoped_true_render = function render(){var _vm=this,_c=_vm._self._c;return _vm._m(0)
 }
-var srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns = [function (){var _vm=this,_c=_vm._self._c;return _c('div',[_c('div',{attrs:{"id":"cesiumContainer"}})])
+var srcvue_type_template_id_83e771ae_scoped_true_staticRenderFns = [function (){var _vm=this,_c=_vm._self._c;return _c('div',[_c('div',{attrs:{"id":"cesiumContainer"}})])
 }]
 
 
-// CONCATENATED MODULE: ./packages/gisMap3d/src/index.vue?vue&type=template&id=fdf1c8ba&scoped=true
+// CONCATENATED MODULE: ./packages/gisMap3d/src/index.vue?vue&type=template&id=83e771ae&scoped=true
+
+// CONCATENATED MODULE: ./packages/gisMap3d/src/js/addModel.js
+/* harmony default export */ var addModel = ({
+  data() {
+    return {};
+  },
+  methods: {
+    addModel(models) {
+      // window.viewer.entities.removeAll();
+      debugger;
+      if (models && models.length > 0) {
+        for (var i = 0; i < models.length; i++) {
+          let position = Cesium.Cartesian3.fromDegrees(
+            models[i].lonlat[0],
+            models[i].lonlat[1],
+            models[i].height
+          );
+          let heading = Cesium.Math.toRadians(0);
+          let pitch = 0;
+          let roll = 0;
+          let hpr = new Cesium.HeadingPitchRoll(heading, pitch, roll);
+          let orientation = Cesium.Transforms.headingPitchRollQuaternion(
+            position,
+            hpr
+          );
+          let type = null;
+          if (models[i].type) {
+            type = models[i].type;
+          }
+          let entity = window.viewer.entities.add({
+            name: models[i].name,
+            id: models[i].id,
+            type: type,
+            position: position,
+            orientation: orientation,
+            model: {
+              uri: models[i].uri,
+              // distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
+              //   100,
+              //   5000
+              // ), //设置模型可见范围，100米到5000米
+              minimumPixelSize: 50,
+              maximumScale: 10000,
+              scale: new Cesium.Cartesian3(2.0, 2.0, 2.0), // 在每个轴上放大模型2倍
+            },
+          });
+
+          var modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(position);
+          debugger;
+          var model = window.viewer.scene.primitives.add(
+            Cesium.Model.fromGltf({
+              url: models[i].uri,
+              show: true,
+              modelMatrix: modelMatrix,
+              scale: 2.0,
+              minimumPixelSize: 10,
+              maximumScale: 20000,
+              allowPicking: false,
+              debugShowBoundingVolume: false,
+              debugWireframe: false,
+            })
+          );
+          // window.viewer.trackedEntity = entity;
+        }
+      }
+      // console.log(window.viewer.entities);
+      window.viewer.screenSpaceEventHandler.setInputAction(function (click) {
+        var pickedObject = window.viewer.scene.pick(click.position);
+        debugger
+        if (
+          Cesium.defined(pickedObject) &&
+          pickedObject.id instanceof Cesium.Model
+        ) {
+          var model = pickedObject.id;
+          console.log(
+            "Clicked model:",
+            model.id,
+            model.name,
+            model.gltf.asset.version
+          ); // 假设模型有name和gltf属性
+          // ... 处理模型点击事件的逻辑 ...
+        } else {
+          console.log("No object picked or not a Model instance");
+          // ... 处理拾取失败的情况 ...
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    },
+  },
+});
 
 // CONCATENATED MODULE: ./packages/gisMap3d/src/js/createGlobe.js
 /* harmony default export */ var createGlobe = ({
@@ -458649,10 +458733,10 @@ var srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns = [function (){
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMap3d/src/index.vue?vue&type=script&lang=js
 
-// import addModel from "./js/addModel.js";
+
 
 /* harmony default export */ var gisMap3d_srcvue_type_script_lang_js = ({
-  mixins: [ createGlobe],
+  mixins: [addModel,createGlobe],
   name: "gisMap3d",
   data() {
     return {
@@ -458666,14 +458750,14 @@ var srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns = [function (){
           height: 0,
           uri: "/model/大桥.gltf"
         },
-        {
-          id: "1_car",
-          name: "测试3D模型1_car",
-          type: "gltf",
-          lonlat: [118.75, 36.46],
-          height: 0,
-          uri: "/model/轿车.gltf"
-        },
+        // {
+        //   id: "1_car",
+        //   name: "测试3D模型1_car",
+        //   type: "gltf",
+        //   lonlat: [118.75, 36.46],
+        //   height: 0,
+        //   uri: "/model/轿车.gltf"
+        // },
         {
           id: "1_lj",
           name: "测试3D模型1_lj",
@@ -458717,7 +458801,7 @@ var srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns = [function (){
         // 脚本加载完成，可使用
         this.initMap() //tunnel.gltf
         // this.addModel('/model/轿车.gltf', [118.75, 36.46], 0)
-        // this.addModel(this.models)
+        this.addModel(this.models)
       })
       .catch((error) => {
         console.error("加载脚本失败:", error);
@@ -458731,8 +458815,8 @@ var srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns = [function (){
 
 // CONCATENATED MODULE: ./packages/gisMap3d/src/index.vue?vue&type=script&lang=js
  /* harmony default export */ var packages_gisMap3d_srcvue_type_script_lang_js = (gisMap3d_srcvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./packages/gisMap3d/src/index.vue?vue&type=style&index=0&id=fdf1c8ba&prod&scoped=true&lang=css
-var srcvue_type_style_index_0_id_fdf1c8ba_prod_scoped_true_lang_css = __webpack_require__("cd67");
+// EXTERNAL MODULE: ./packages/gisMap3d/src/index.vue?vue&type=style&index=0&id=83e771ae&prod&scoped=true&lang=css
+var srcvue_type_style_index_0_id_83e771ae_prod_scoped_true_lang_css = __webpack_require__("bc9f");
 
 // CONCATENATED MODULE: ./packages/gisMap3d/src/index.vue
 
@@ -458745,11 +458829,11 @@ var srcvue_type_style_index_0_id_fdf1c8ba_prod_scoped_true_lang_css = __webpack_
 
 var gisMap3d_src_component = normalizeComponent(
   packages_gisMap3d_srcvue_type_script_lang_js,
-  srcvue_type_template_id_fdf1c8ba_scoped_true_render,
-  srcvue_type_template_id_fdf1c8ba_scoped_true_staticRenderFns,
+  srcvue_type_template_id_83e771ae_scoped_true_render,
+  srcvue_type_template_id_83e771ae_scoped_true_staticRenderFns,
   false,
   null,
-  "fdf1c8ba",
+  "83e771ae",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gis-map-universal",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "GIS通用组件",
   "main": "gismap.umd.js",
   "private": false,