ry-vue-map 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-map",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "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.3",
+    "ry-map": "^0.4.6",
     "vue": "~2.6.14",
     "vue-demi": "^0.13.11",
     "vue-router": "~3.5.2",

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

@@ -60,6 +60,7 @@
 				}
 			},
 			isShowAll(val) {
+
 				if (val) {
 					this.showAll();
 					return;

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

@@ -25,24 +25,7 @@
           			
           			</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>
-
-
-
 </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,
@@ -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);
@@ -178,8 +123,8 @@
 						lMap.getView().fit(this.bbox, [
 							50, 50, 50, 50
 						]);
-					    const {geo,width,color} = this.boundaryModel;
-						lMap.initMapMaskEvent(map.getLayers(), geo,width,color);
+					    const {geo,width,color,lineDash} = this.boundaryModel;
+						lMap.initMapMaskEvent(map.getLayers(), geo,{width,color,lineDash});
 					}
 				});
 			},