ry-vue-map 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-map",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "private": false,
   "main": "lib/ryui.umd.min.js",
   "description": "ry公共组件库",
@@ -45,7 +45,7 @@
     "kml-to-geojson": "^1.0.13",
     "nprogress": "~0.2.0",
     "ol": "^6.14.1",
-    "ry-map": "^0.4.5",
+    "ry-map": "^0.4.6",
     "vue": "~2.6.14",
     "vue-demi": "^0.13.11",
     "vue-router": "~3.5.2",

package/src/components/maps/models/ryOfflineMap/view.js

@@ -16,7 +16,7 @@ export default class MapDto {
     // 最大缩放率
     this.maxZoom = {
       type: Number,
-      default: 18,
+      default: 21,
     };
 
     // 最小缩放率

package/src/components/maps/ryMap/src/index.vue

@@ -21,25 +21,20 @@
 			<slot name="polygon" :mapDto="{map,lMap}">
 
 			</slot>
-			
+
 			<slot name="marker" :mapDto="{map,lMap}">
-			
+
 			</slot>
 		</template>
-		
-		<SwitchMap 
-		     v-if="isSwitchMapTool && isShowSwitchMap" 
-			 :height="switchMapHeight"
-			 :switchMapDefaultTypeOrLayer="switchMapDefaultTypeOrLayer" 
-			 :mapTypeAndLayer="mapTypeAndLayer"
-			 class="move-box" :style="{
+
+		<SwitchMap v-if="isSwitchMapTool && isShowSwitchMap" :height="switchMapHeight"
+			:switchMapDefaultTypeOrLayer="switchMapDefaultTypeOrLayer" :mapTypeAndLayer="mapTypeAndLayer"
+			class="move-box" :style="{
             top:switchMapPosTop + 'px',
             right:isSwitchMapRight?switchMapPosLeftOrRight + 'px':'none',
             left:!isSwitchMapRight?switchMapPosLeftOrRight + 'px':'none'
-            }" :bottom-right="isSwitchMapRight" 
-		    @changeSwitchMap="changeSwitchMap"
-		   :isDisabled= "isDisabledSwitchMapTabEvent"
-		 />
+            }" :bottom-right="isSwitchMapRight" @changeSwitchMap="changeSwitchMap"
+			:isDisabled="isDisabledSwitchMapTabEvent" />
 
 		<!-- 'current': !isRyMapTool || !isRight -->
 	</div>
@@ -123,15 +118,15 @@
 				mapType,
 				layerType
 			}) {
-		
+
 				this.lMap.selectMapLayer(mapType, layerType);
 				this._setMaxZoom(mapType, layerType);
-                let _mapType = mapType;
-                if (mapType > 1) {
-                	_mapType = 0;
-                }
-				if (this.lastMapType == _mapType ) return;
-		
+				let _mapType = mapType;
+				if (mapType > 1) {
+					_mapType = 0;
+				}
+				if (this.lastMapType == _mapType) return;
+
 				this.lastMapType = _mapType;
 
 				const center = this.lMap.getCenter();
@@ -153,7 +148,7 @@
 				this.$emit('changeSwitchMap', {
 					mapType: _mapType,
 					layerType,
-					type:mapType
+					type: mapType
 				});
 			},
 			_setMaxZoom(type, layerType) {
@@ -171,8 +166,8 @@
 					type: this.mapType,
 					layerType: this.layerType,
 					viewOptions: this.getViewOptions(),
-					
-					callback: (map,layers) => {
+
+					callback: (map, layers) => {
 						this.map = map;
 
 						if (this.bbox.length > 0) {
@@ -254,15 +249,15 @@
 						if (evt.dragging) {
 							return;
 						}
-					
+
 						const pixel = this.map.getEventPixel(evt.originalEvent);
 						const hit = this.map.hasFeatureAtPixel(pixel);
 						if (hit) {
 							const _feature = this.map.forEachFeatureAtPixel(evt.pixel, feature => feature);
-						    this.$emit('mapClick2', _feature);
+							this.$emit('mapClick2', _feature);
 							const _id = _feature.getId();
 							if (_id === undefined) {
-							    // this.$emit('mapClick2', _feature);
+								// this.$emit('mapClick2', _feature);
 								return;
 							}
 							this.$emit('mapClick', _id);
@@ -346,4 +341,4 @@
 	.move-box {
 		position: absolute;
 	}
-</style>
+</style>

package/src/components/maps/ryOfflineMap/src/index.vue

@@ -1,48 +1,31 @@
 <template>
 	<div class="map-box">
 		<div v-lmap:loadMap class="map-style"></div>
-          <RyMapTool class="ry-map-tool" :class="{
+		<RyMapTool class="ry-map-tool" :class="{
             'left':!isRight,
             'right':isRight
           }" v-if="lMap.map && isRyMapTool" @crossHairClick="crossHairClick($event)" :lMap="lMap"
-          			:isShowRangingTool="isShowRangingTool" :initModifyPolygon="initModifyPolygon"
-          			:isShowDrawTool="isShowDrawTool" :isRight="isRight" :isCrossHair="isCrossHair" :hideAdd="hideAdd"
-          			:hidePoint="hidePoint" :hideCancel="hideCancel" :hideDelete="hideDelete" :hideSave="hideSave"
-          			:hideLine="hideLine" :hideArea="hideArea" :isSwitchMap="isSwitchMap" :isSwitchMapRight="isSwitchMapRight"
-          			:gpsType="lastMapType" @loadDrawPolygonEvent="loadDrawPolygonEvent($event)" @success="drawSuccess($event)"
-          			@error="drawError($event)">
-          			<template>
-          				<slot name="maptool"></slot>
-          			</template>
-          		</RyMapTool>
-          
-          		<template v-if="map">
-          			<slot name="polygon" :mapDto="{map,lMap}">
-          
-          			</slot>
-          			
-          			<slot name="marker" :mapDto="{map,lMap}">
-          			
-          			</slot>
-          		</template>
-          	<!-- 	
-          		<SwitchMap 
-          		     v-if="isSwitchMapTool && isShowSwitchMap" 
-          			 :height="switchMapHeight"
-          			 :switchMapDefaultTypeOrLayer="switchMapDefaultTypeOrLayer" 
-          			 :mapTypeAndLayer="mapTypeAndLayer"
-          			 class="move-box" :style="{
-               top:switchMapPosTop + 'px',
-               right:isSwitchMapRight?switchMapPosLeftOrRight + 'px':'none',
-               left:!isSwitchMapRight?switchMapPosLeftOrRight + 'px':'none'
-               }" :bottom-right="isSwitchMapRight" 
-          		    @changeSwitchMap="changeSwitchMap"
-          		   :isDisabled= "isDisabledSwitchMapTabEvent"
-          		 /> -->
-	</div>
+			:isShowRangingTool="isShowRangingTool" :initModifyPolygon="initModifyPolygon"
+			:isShowDrawTool="isShowDrawTool" :isRight="isRight" :isCrossHair="isCrossHair" :hideAdd="hideAdd"
+			:hidePoint="hidePoint" :hideCancel="hideCancel" :hideDelete="hideDelete" :hideSave="hideSave"
+			:hideLine="hideLine" :hideArea="hideArea" :isSwitchMap="isSwitchMap" :isSwitchMapRight="isSwitchMapRight"
+			:gpsType="lastMapType" @loadDrawPolygonEvent="loadDrawPolygonEvent($event)" @success="drawSuccess($event)"
+			@error="drawError($event)">
+			<template>
+				<slot name="maptool"></slot>
+			</template>
+		</RyMapTool>
+
+		<template v-if="map">
+			<slot name="polygon" :mapDto="{map,lMap}">
 
+			</slot>
 
+			<slot name="marker" :mapDto="{map,lMap}">
 
+			</slot>
+		</template>
+	</div>
 </template>
 <script>
 	import MapServices from '@/utils/lMapServices.js';
@@ -50,7 +33,6 @@
 	import ViewDto from './../../models/ryMap/view.js';
 	import MapToolDto from './../../models/ryMapTool/mapTool.js';
 	import RyMapTool from '../../ryMapTool/src/index';
-	// import SwitchMap from '../../switchMap/src/newIndex';
 	import {
 		ViewOptions,
 		fitNew,
@@ -102,9 +84,9 @@
 			m(val) {
 				this.m = val;
 			},
-		     boundaryModel(val){
-			       	if(!this.map) return;
-			 }
+			boundaryModel(val) {
+				if (!this.map) return;
+			}
 		},
 		data() {
 			return {
@@ -121,43 +103,6 @@
 		},
 
 		methods: {
-			changeSwitchMap({
-				mapType,
-				layerType
-			}) {
-
-				this.lMap.selectMapLayer(mapType, layerType);
-				this._setMaxZoom(mapType, layerType);
-				let _mapType = mapType;
-				if (mapType > 1) {
-					_mapType = 0;
-				}
-				if (this.lastMapType == _mapType) return;
-
-				this.lastMapType = _mapType;
-
-				const center = this.lMap.getCenter();
-				if (center && center.length) {
-					if (_mapType == 0) {
-						const {
-							lon,
-							lat
-						} = GPS.gcj_decrypt(center[0], center[1]);
-						this.lMap.setCenter([lon, lat]);
-					} else {
-						const {
-							lon,
-							lat
-						} = GPS.gcj_encrypt(center[0], center[1]);
-						this.lMap.setCenter([lon, lat]);
-					}
-				}
-				this.$emit('changeSwitchMap', {
-					mapType: _mapType,
-					layerType,
-					type: mapType
-				});
-			},
 			_setMaxZoom(type, layerType) {
 				if (type == 2 || layerType == 0) {
 					this.setMaxZoom(18);
@@ -169,17 +114,30 @@
 			async loadMap(el) {
 				this.lMap.initOfflineMap(100, {
 					el,
-					urls:this.urls,
+					urls: this.urls,
 					callback: ({
 						map,
 						lMap
 					}) => {
 						lMap.setView(this.center, this.bbox);
-						lMap.getView().fit(this.bbox, [
+						const _view = lMap.getView();
+						_view.fit(this.bbox, [
 							50, 50, 50, 50
 						]);
-					    const {geo,width,color} = this.boundaryModel;
-						lMap.initMapMaskEvent(map.getLayers(), geo,width,color);
+						_view.setMaxZoom(this.minZoom);
+						_view.setMaxZoom(this.maxZoom);
+						// _view.seZoom(this.zoom);
+						const {
+							geo,
+							width,
+							color,
+							lineDash
+						} = this.boundaryModel;
+						lMap.initMapMaskEvent(map.getLayers(), geo, {
+							width,
+							color,
+							lineDash
+						});
 					}
 				});
 			},