xy-map 1.0.54 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-map",
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "地图组件",
   "main": "src/index.js",
   "scripts": {

package/src/map.js

@@ -6,33 +6,36 @@ var defaultOptions = {
   pitch: 0, // 3d倾斜视角
   bearing: 0, // 旋转
   terrain: 1.5, // 开启地形传0不开启
-  build: true, // 显示建筑
+  build: false, // 显示建筑
   pitchWithRotate: true, // 禁止绕x轴旋转 false禁止
   attributionControl: true, // 隐藏地图所属信息
   projection: 'globe',
   fog: true, // 雾
   // style: 'mapbox://styles/mapbox-map-design/ckhqrf2tz0dt119ny6azh975y',
   // style: 'mapbox://styles/mapbox/cj3kbeqzo00022smj7akz3o1e',
-  style: 'mapbox://styles/mapbox/satellite-v9',
+  // style: 'mapbox://styles/mapbox/satellite-v9',
   // style: 'mapbox://styles/mapbox/streets-v12',
-  // style: {
-  //   'version': 8,
-  //   'name': '自定义瓦片',
-  //   'sprite': '',
-  //   'sources': {
-  //     'nav': {
-  //       'type': 'raster',
-  //       'tiles': ['https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg'],
-  //       // 'tiles': ['https://webst01.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'],
-  //       'tileSize': 256
-  //     }
-  //   },
-  //   'layers': [{
-  //     'id': 'nav',
-  //     'type': 'raster',
-  //     'source': 'nav',
-  //   }]
-  // },
+  style: {
+    'version': 8,
+    'name': '自定义瓦片',
+    'sprite': 'mapbox://sprites/mapbox/streets-v9',
+    'glyphs': 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf',
+    'sources': {
+      'nav': {
+        'type': 'raster',
+        'tiles': [
+          'https://api.mapbox.com/v4/mapbox.satellite/{z}/{x}/{y}.jpg?access_token=pk.eyJ1IjoiaGo0NjI3NzEzOTYiLCJhIjoiY2w5YzNjOTZvMDF6NDNwb2d6YmJkYWRpMCJ9.-fW-OChGB1oY2DCMO_c8sg',
+          // 'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}'
+        ],
+        'tileSize': 256
+      }
+    },
+    'layers': [{
+      'id': 'nav',
+      'type': 'raster',
+      'source': 'nav',
+    }]
+  },
   defaultLanguage: 'zh',
   // preserveDrawingBuffer: true, // 允许地图导出为图片
   // sprite: 'mapbox://sprites/mapbox/bright-v8', //不受地图旋转缩放影响的图标等，类似精灵漂浮在空中，当有 layer 使用了 background-pattern、fill-pattern、line-pattern、fill-extrusion-pattern、icon-image 等属性时，sprite 必填。
@@ -55,9 +58,7 @@ var defaultOptions = {
 import mapBoxGl from 'mapbox-gl'
 import 'mapbox-gl/dist/mapbox-gl.css'
 import './style/map.css'
-import {
-  Message
-} from 'element-ui'
+// import { Message } from 'element-ui'
 
 var popup = null
 
@@ -83,6 +84,7 @@ class mapSdk {
 
       // console.log(map)
       map.on('style.load', () => {
+        resolve(map)
         if (this.options.is3d) {
           this.addFog()
           if (this.options.terrain && this.options.terrain > 0) {
@@ -94,12 +96,9 @@ class mapSdk {
       })
 
       map.on('load', () => {
-        resolve(map)
-        // if (this.options.is3d) {
-        //   if (this.options.build) {
-        //     this.addBuildings()
-        //   }
-        // }
+        if (this.options.is3d && this.options.build) {
+          this.addBuildings()
+        }
       })
 
       // 监听报错
@@ -108,8 +107,6 @@ class mapSdk {
         // Message.error('地图资源加载失败\n' + e.error.message)
       })
     })
-
-
   }
 
   /**