diff --git a/src/components/MapBox.vue b/src/components/MapBox.vue index e053e73..f53f633 100644 --- a/src/components/MapBox.vue +++ b/src/components/MapBox.vue @@ -24,117 +24,7 @@ export default { isflow: false, // 飞机经纬度变化时是否跟随飞机 currentStyleIndex: 0, // 当前选中的地图样式索引 guidedMarker: null, // 指点飞行地图标记 - // 地图样式 - mapStyles: [ - // mapbox官方样式 卫星地图 - { - name: '谷歌卫星', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - google: { - type: 'raster', - tileSize: 256, - tiles: ['https://sb.im/google-maps/vt?lyrs=s&x={x}&y={y}&z={z}'] - } - }, - layers: [{ id: 'GoogleRasterLayer', type: 'raster', source: 'google' }] - }, - { - name: '必应卫星', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - bing: { - type: 'raster', - tileSize: 256, - tiles: [ - 'https://ecn.t3.tiles.virtualearth.net/tiles/a{quadkey}.jpeg?g=1' - ], - attribution: '© Microsoft, Bing Maps' - } - }, - layers: [{ id: 'BingRasterLayer', type: 'raster', source: 'bing' }] - }, - { - name: 'Mapbox Streets', - sprite: 'mapbox://sprites/mapbox/streets-v11', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - mapbox: { - type: 'raster', - tileSize: 256, - tiles: ['https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/{z}/{x}/{y}?access_token=YOUR_MAPBOX_ACCESS_TOKEN'] - } - }, - layers: [{ id: 'MapboxStreetsLayer', type: 'raster', source: 'mapbox' }] - }, - { - name: 'Google Maps', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - google: { - type: 'raster', - tileSize: 256, - tiles: ['https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}'] - } - }, - layers: [{ id: 'GoogleMapsLayer', type: 'raster', source: 'google' }] - }, - { - name: 'OpenStreetMap', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - osm: { - type: 'raster', - tileSize: 256, - tiles: ['https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'] - } - }, - layers: [{ id: 'OSMRasterLayer', type: 'raster', source: 'osm' }] - }, - // 第三方 高德矢量 - { - name: '高德矢量', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - gaode: { - type: 'raster', - tileSize: 256, // 瓦片大小 256 512像素 - tiles: [ - 'http://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}' - ] - } - }, - layers: [{ id: 'GaodeVectorLayer', type: 'raster', source: 'gaode' }] - }, - // 第三方 高德卫星 - { - name: '高德卫星', - sprite: this.$store.state.settings.host + '/Public/map/sprite', - glyphs: 'mapbox://fonts/mapbox/{fontstack}/{range}.pbf', - version: 8, - sources: { - gaode: { - type: 'raster', - tileSize: 256, // 瓦片大小 256 512像素 - tiles: [ - 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}' - ] - } - }, - layers: [{ id: 'GaodeRasterLayer', type: 'raster', source: 'gaode' }] - } - ] + mapStyles: this.$store.state.mapStyleList// 地图样式 } }, props: { @@ -204,7 +94,7 @@ export default { color: 'white', 'horizon-blend': 0.01 }) - // 添加等高线图层 + // // 添加等高线图层 // this.map.addSource('contours', { // type: 'vector', // url: 'mapbox://mapbox.mapbox-terrain-v2' @@ -223,7 +113,7 @@ export default { // 'line-width': 1 // 设置等高线宽度 // } // }) - // 3D地图 + // // 3D地图 // this.map.addSource('mapbox-dem', { // type: 'raster-dem', // url: 'mapbox://mapbox.mapbox-terrain-dem-v1', diff --git a/src/components/Statistics.vue b/src/components/Statistics.vue index 30c9342..a0f9d1f 100644 --- a/src/components/Statistics.vue +++ b/src/components/Statistics.vue @@ -1,72 +1,12 @@ @@ -74,13 +14,9 @@