ry-vue-map 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ry-vue-map",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "private": false,
   "main": "lib/ryui.umd.min.js",
   "description": "ry公共组件库",
@@ -38,7 +38,7 @@
     "element-ui": "~2.15.6",
     "nprogress": "~0.2.0",
     "ol": "^6.14.1",
-    "ry-map": "^0.2.4",
+    "ry-map": "^0.2.5",
     "vue": "~2.6.14",
     "vue-router": "~3.5.2",
     "vue-server-renderer": "^2.6.14",

package/src/components/maps/models/ryMap/map.js

@@ -117,4 +117,9 @@ export default class MapDto {
       ]
     }
   }
+  isShowSwitchMap={
+  	type: Boolean,
+  	default: true,
+  }
+  
 }

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

@@ -3,42 +3,73 @@
 </template>
 
 <script>
-  
-  import {
-    CrossHair
-  } from 'ry-map';
-  
-  export default {
-    name: 'RyCrossHair',
-    props: {
-      map: {
-        type: Object,
-        default: () => null,
-      }
-    },
-    created() {
-      this.map.addControl(new CrossHair(() => {
-        this.$emit('click', this.getCenter());
-      }));
-    },
-    data() {
-      return {
+	import {
+		watch
+	} from 'fs';
+	import {
+		CrossHair
+	} from 'ry-map';
 
-      }
-    },
-    methods: {
-      // 点击获取地图把心中心点坐标
-      getCenter() {
-        if (!this.map) {
-          return;
-        }
-        const view = this.map.getView();
-        let [x, y] = view.getCenter();
-        return [x, y];
-      }
-    }
-  }
+	export default {
+		name: 'RyCrossHair',
+		props: {
+			map: {
+				type: Object,
+				default: () => null,
+			},
+			isHide: {
+				type: Boolean,
+				default: false,
+			}
+		},
+		created() {
+			if (this.isHide && !this.crossHair) {
+				this.createCrossHair();
+			}
+			// this.map.addControl(new CrossHair(() => {
+			// 	this.$emit('click', this.getCenter());
+			// }));
+		},
+		watch: {
+			isHide(val) {
+				if (val && !this.crossHair) {
+					this.createCrossHair();
+					return;
+				}
+				this.removeControl();
+			}
+		},
+		data() {
+			return {
+				crossHair: null
+			}
+		},
+		methods: {
+			// 点击获取地图把心中心点坐标
+			getCenter() {
+				if (!this.map) {
+					return;
+				}
+				const view = this.map.getView();
+				let [x, y] = view.getCenter();
+				return [x, y];
+			},
+			createCrossHair() {
+				this.crossHair = new CrossHair(() => {
+					this.$emit('click', this.getCenter());
+				});
+				this.map.addControl(this.crossHair);
+			},
+			removeControl() {
+				if (!this.map || !this.crossHair) {
+					return;
+				}
+				this.map.removeControl(this.crossHair);
+				this.crossHair = null;
+			}
+		}
+	}
 </script>
 
 <style>
-</style>
+</style>

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

@@ -7,7 +7,6 @@
          'right':isRight
        }"
        v-if="lMap.map && isRyMapTool"
-
        @crossHairClick="crossHairClick($event)"
        :lMap="lMap"
       :isShowRangingTool="isShowRangingTool"
@@ -41,7 +40,7 @@
     </template>
 
    <SwitchMap
-      v-if="isSwitchMapTool"
+      v-if="isSwitchMapTool && isShowSwitchMap"
       :height="switchMapHeight"
       :switchMapDefaultTypeOrLayer="switchMapDefaultTypeOrLayer"
       :mapTypeAndLayer = "mapTypeAndLayer"
@@ -125,7 +124,7 @@
       changeSwitchMap({mapType,layerType}){
          this.lMap.selectMapLayer(mapType,layerType);
          if(this.lastMapType == mapType) return;
-         this.lastMapType=mapType;
+		  this.lastMapType= mapType > 1? 0 : mapType;
          let _mapType= mapType;
          if(mapType > 1){
            _mapType=0;
@@ -144,6 +143,7 @@
          this.$emit('changeSwitchMap',{mapType:_mapType,layerType});
       },
       loadMap(el) {
+		// const dto =
         this.lMap.init({
           el,
           type: this.mapType,
@@ -169,6 +169,10 @@
               mapServices: this.lMap,
               ryMapTool: this.$refs.mapTool
             });
+
+			if(!this.isShowSwitchMap){
+				this.lastMapType= this.mapType > 2 ? 0 : this.mapType;
+			}
           }
         });
       },

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

@@ -46,7 +46,7 @@
         <slot></slot>
       </aside>
     </template>
-    <ry-cross-hair v-if="lMap && isCrossHair" :map="lMap.map" @click="onClick($event)"></ry-cross-hair>
+    <ry-cross-hair v-if="lMap" 	   :isHide="isCrossHair"  :map="lMap.map" @click="onClick($event)"></ry-cross-hair>
   </div>
 
 </template>
@@ -82,6 +82,7 @@
       },
       isShowDrawTool(val) {
         this.isShowDrawTool = val;
+	    this.isCrossHair = val;
       },
       isRight(val) {
         this.isShowDrawTool = val;
@@ -243,7 +244,6 @@
           }
           this.x = pointArr[0];
           this.y = pointArr[1];
-　　　　　　
           let  _pointArr= pointArr;
           if(this.gpsType){
              let {lon,lat} =  GPS.gcj_decrypt(pointArr[0],pointArr[1]);
@@ -268,7 +268,6 @@
          this.lMap.onCancel();
       },
       selectGPSAll(type){
-        // this.onDelete();
         this.lMap.removeDrawArr();
         if(this.drawPolygon){
            this.drawPolygon.selectGPS(type,true);

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

@@ -62,7 +62,7 @@
           this.setFit();
         }
       },
-      gpsType(val){
+      gpsType(val){	
         if(this.lastType == val) return;
         this.gpsType=val;
         this.lastType=val;

package/src/components/maps/switchMap/src/newIndex.vue

@@ -86,6 +86,9 @@ export default {
       },
       immediate:true
     }
+  },
+  created(){
+	  
   },
   mounted() {
     if(!this.switchMapDefaultTypeOrLayer){

package/src/utils/lMapServices.js

@@ -287,6 +287,12 @@ export default class LMapServices {
     //   callback();
     // }
   }
+	
+	skipCurrentDraw(){
+		  if (this._lPolygon) {
+						this._lPolygon.skipCurrentDraw();
+			}
+	}
 
   onCancel() {
     if (this._lPolygon) {