ry-vue-map 0.0.2 → 0.0.4

package/src/views/map/index.vue

@@ -2,21 +2,20 @@
   <div class="map-style">
 
     <ry-map
+	  
        projection="EPSG:4326"
-      :mapType="0"
-      :layerType="2"
       :zoom="15"
       :minZoom="1"
       :maxZoom="18"
       :center="center"
       @load="load($event)"
-      :isCrossHair="true"
+      :isCrossHair="isRyMapTool"
       :isRight="true"
       :isRyMapTool="true"
       @drawSuccess="drawSuccess"
       @drawError="drawError"
       :isShowRangingTool="true"
-      :isShowDrawTool="true"
+      :isShowDrawTool="isRyMapTool"
       :bindMapClick="true"
       @mapClick="mapClick($event)"
       @crossHairClick="crossHairClick($event)"
@@ -25,11 +24,13 @@
       :switchMapPosTop = '60'
       :switchMapPosLeftOrRight="20"
       :switchMapHeight="40"
-      :switchMapDefaultTypeOrLayer="null"
+	    :switchMapDefaultTypeOrLayer="[1,2]"
       @mapMoveend="mapMoveend($event)"
       @loadDrawPolygonEvent="loadDrawPolygonEvent($event)"
       :initModifyPolygon="geoJson"
       @changeSwitchMap="changeSwitchMap($event)"
+	    :isShowSwitchMap="false"
+	  
       >
       <!--    <template slot="maptool">
         <button>ry</button>
@@ -41,7 +42,8 @@
       :hideSave="true"
       :hideLine="true"
       :hideArea="true" -->
-
+	<!--  :layerType="2"
+	  :mapType="1" -->
       <template #polygon="{mapDto}">
    <!-- <ry-polygon  :map="mapDto.map" :isShow="true" :polygonColor="colors" :model="polygonModel" :clear="isClear"  @onLoad="onLoad($event)"></ry-polygon> -->
      <ry-polygon  :isFit="false" :gpsType="gpsType"  :map="mapDto.map" :model="polygonModel"  ></ry-polygon>
@@ -93,16 +95,21 @@
             <button>ry</button>
           </template>
      </RyMapTool> -->
-
+    <button @click="onClick()">测试</button>
   </div>
 </template>
 
 <script>
   import RyMap from '@/components/maps/ryMap/src/index.vue';
   import RyMapTool from '@/components/maps/ryMapTool/src/index.vue';
-    import RyPolygon from '@/components/maps/ryPolygon/src/index.vue'
+  import RyPolygon from '@/components/maps/ryPolygon/src/index.vue';
   import RyPolygons from '@/components/maps/ryPolygons/src/index.vue';
-    import RyClusters from '@/components/maps/ryClusters/src/index.vue';
+  import RyClusters from '@/components/maps/ryClusters/src/index.vue';
+  import gJson from './3301';
+  import gJson2 from "./331123";
+import {  createPolygonBoundary,GPS } from "ry-map";
+// import {  convertWGS84,convertGCJ02 } from "ry-map/src/lzh";
+
   const g1 =
     "{\"type\":\"Feature\",\"bbox\":[120.15521468766134,30.17913,120.15548537675164,30.179627590685214],\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[[120.15521468766134,30.17961706012091],[120.155403,30.17913],[120.15548537675164,30.179627590685214],[120.15521468766134,30.17961706012091]]]},\"properties\":{\"perimeter\":139.0,\"squaremeter\":715.18,\"mu\":1.07,\"center\":[120.15535003220648,30.179378795342608],\"areacode\":\"3301\",\"geohash\":\"wtm7wj\",\"extend\":null}}";
   const g2 =
@@ -194,10 +201,13 @@
           id: 'ceshis',
           isShow: false,
         },
-        gpsType:1,
+        gpsType:0,
+		isRyMapTool:true,
       };
     },
     created() {
+
+		
       this.geoJson = JSON.parse(g1);
       // setTimeout(r=> {this.colors=['red','#000']},3000);
       //   setTimeout(r=> {this.isClear=true;}, 5000);
@@ -285,18 +295,26 @@
     },
     methods: {
       load(obj) {
-        this.lMap = obj.mapServices;
-        this.map = obj.map;
-      },
+      this.lMap = obj.mapServices;
+      this.map = obj.map;
+			// let g10 = GPS.convertGCJ02(gJson2);
+			// convertWGS84
+			// convertWGS84,convertGCJ02
+      const geo = createPolygonBoundary(gJson2);
+	  this.map.addLayer(geo );
+	  },
       drawSuccess(obj) {
+				  // alert(this.gpsType);
+				
           this.polygonModel={
             fillColor: '#000',
             stroke: '#fff',
             width: 4,
-            text:'测试2',
+            text:'',
             geo:obj.geoJson,
             id: 'ceshi',
           };
+		  // setTimeout(r=>   this.gpsType=1,10);
       },
       drawError(obj) {
       },
@@ -321,13 +339,15 @@
          },50);
       },
       changeSwitchMap(obj){
-
         if(obj.mapType==2){
           this.gpsType=0;
           return;
         }
         this.gpsType=obj.mapType;
-      }
+      },
+	  onClick(){
+		  this.isRyMapTool=!this.isRyMapTool;
+	  }
     }
   };
 </script>