ry-vue-map 0.2.8 → 0.3.0

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

@@ -0,0 +1,213 @@
+<template>
+</template>
+
+<script>
+	import {
+		fitNew,
+		GPS,
+		staticImage as StaticImage
+	} from 'ry-map';
+	import Dto from './../../models/ryStaticLayers/index.js';
+	export default {
+		name: 'RyStaticLayers',
+		props: {
+			...new Dto(),
+		},
+		data() {
+			return {
+				bbox: [],
+				bboxMap: new Map(),
+				bboxGCJ02: [],
+				bboxMapGCJ02: new Map(),
+				staticMap: new Map(),
+				isCreate: true,
+				lastType: -1,
+			};
+		},
+		watch: {
+			modelArr(val) {
+				this._remove();
+				if (!val.length) return;
+				this.modelArr = val;
+				this.init(val);
+			},
+			gpsType(val) {
+				if (this.lastType == val) return;
+				this.gpsType = val;
+				this.lastType = val;
+				this.selectGPSAll(this.gpsType);
+			},
+			insert(val) {
+				this.insert = val;
+				this._insert(val);
+			    if(this.isFit){
+					setTimeout(() => {
+					 this.setFit();			
+					}, 50);
+				}
+			},
+			inserts(val) {
+				this.inserts = val;
+				this._inserts(val);
+			},
+			clear(val) {
+				if (val) {
+					this._remove();
+				}
+			},
+			isShowAll(val) {
+				if (val) {
+					this.showAll();
+					return;
+				}
+				this.hideAll();
+			},
+			isShow(val) {
+             if (!val) return;
+             this._isShow(val);
+            },
+
+
+		},
+
+		created() {
+			this.lastType = this.gpsType;
+			this.init(this.modelArr);
+		},
+
+		methods: {
+			init(arr) {
+				// this._insert();
+				if (!arr || !arr.length) return;
+				arr.forEach(val => {
+					this._insert(val);
+				});
+				if(this.isFit){
+					setTimeout(() => {
+					this.setFit();			
+					}, 50);
+				};
+			},
+			_inserts(arr) {
+				this.lastType = this.gpsType;
+				arr.forEach(val => {
+					this._insert(val, false);
+				});
+				if(this.isFit){
+					setTimeout(() => {
+					this.setFit();			
+					}, 50);
+				}
+			},
+			_insert(dto) {
+				const {
+					id,
+					url,
+					bbox,
+					zIndex,
+				} = dto;
+				if (!this.staticMap.has(id)) {
+					const img = new StaticImage({
+							id,
+							url,
+							imageExtent:bbox,
+							zIndex,
+							type:this.gpsType
+					},
+					this.map);
+					this.staticMap.set(id, img);
+				}
+				this.setBBOXArr(dto.id, bbox);
+			},
+			setBBOXArr(id, bbox) {
+				if (!this.bboxMap.has(id)) {
+					this.bbox.push(bbox);
+					this.bboxMap.set(id, bbox);
+				}
+				if (!this.bboxMapGCJ02.has(id)) {
+					const _bboxGCJ02 = this.convertBBoxGCJ02(bbox);
+					this.bboxGCJ02.push(_bboxGCJ02);
+					this.bboxMapGCJ02.set(id, _bboxGCJ02);
+				}
+			},
+
+			setFit() {
+				if (!this.bbox.length || !this.map) return;
+				if (this.bbox.length > 1) {
+					fitNew(this.map, this.gpsType == 1 ? this.bboxGCJ02 : this.bbox);
+				
+					return;
+				}
+				this.setFitFist(this.gpsType == 1 ? this.bboxGCJ02[0] : this.bbox[0]);
+			},
+			// bbox.length =1 执行此处
+			setFitFist(bbox) {
+				const bbox2 = [bbox[0], bbox[3], bbox[2], bbox[1]];
+				const bbox3 = [bbox[2], bbox[1], bbox[0], bbox[3]];
+				fitNew(this.map, [bbox2, bbox3]);
+			},
+			convertBBoxGCJ02(bbox) {
+				const pointArr = [];
+				const {
+					lat,
+					lon
+				} = GPS.gcj_encrypt(bbox[0], bbox[1]);
+				const {
+					lon: lon2,
+					lat: lat2
+				} = GPS.gcj_encrypt(bbox[2], bbox[3]);
+				pointArr.push(lon);
+				pointArr.push(lat);
+				pointArr.push(lon2);
+				pointArr.push(lat2);
+				return pointArr;
+			},
+
+			_remove() {
+				this.staticMap.forEach(val => {
+					val.removeImageLayer();
+					val = null;
+				});
+				this.staticMap.clear();
+				this.bboxMap.clear();
+				this.bbox = [];
+				this.bboxGCJ02 = [];
+				this.bboxMapGCJ02.clear();
+
+			},
+
+			selectGPSAll(type) {
+				 this.staticMap.forEach(val=> {
+                   val.selectGPS(type);
+                 });
+			},
+
+			showAll() {
+				this.staticMap.forEach(val => val.show());
+				if (this.restFit) {
+					this._restFit();
+				}
+			},
+
+			hideAll() {
+				this.staticMap.forEach(val => val.hide());
+			},
+
+			_isShow(val) {
+             const id = val.id;
+             if (this.staticMap.has(id)) {
+             const img = this.staticMap.get(id);
+             if (val.show) {
+              img.show();
+              return;
+             }
+             img.hide();
+        }
+        },
+
+		},
+	}
+</script>
+
+<style>
+</style>

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

@@ -84,7 +84,6 @@ export default {
     // },
     mapTypeAndLayer :{
       handler(e){
-		   console.log('111111');
         if(!Array.isArray(e) || !e[1])return;
         e.forEach((r,index)=>{
           if(index===1 && !this.switchMapDefaultTypeOrLayer){