mirage2d 1.1.12 → 1.1.13

package/dist/mirage2d.es.js

@@ -35684,6 +35684,7 @@ var crsType;
   crsType2["IMAGE"] = "IMAGE";
   crsType2["PGIS"] = "PGIS";
   crsType2["BAIDU"] = "BAIDU";
+  crsType2["GCJ02"] = "GCJ02";
   crsType2["CGCS2000_GK_Zone_3"] = "CGCS2000_GK_Zone_3";
   crsType2["CGCS2000_GK_Zone_6"] = "CGCS2000_GK_Zone_6";
   crsType2["CGCS2000_GK_CM_3"] = "CGCS2000_GK_CM_3";
@@ -79437,74 +79438,6 @@ class SpatialAnalysis {
       return getCenter$1(feature2.getExtent());
     }
   }
-  static ConvertCoordinatesTo3857(wkid, Coordinates) {
-    return proj4("EPSG:" + wkid, "EPSG:3857", Coordinates);
-  }
-  static ConvertCoordinatesTo4326(wkid, Coordinates) {
-    return proj4("EPSG:" + wkid, "EPSG:4326", Coordinates);
-  }
-  static ConvertLnglatToCGCS2000(lng, lat2, zone = 3) {
-    let daihao;
-    if (zone == 3) {
-      daihao = parseInt(((lng + 1.5) / 3).toString()) * 3;
-    } else {
-      daihao = parseInt(((lng + 6) / 6).toString()) * 6 - 3;
-    }
-    let data2 = [];
-    data2.push({ dh: 13, wkid: 4502 });
-    data2.push({ dh: 14, wkid: 4503 });
-    data2.push({ dh: 15, wkid: 4504 });
-    data2.push({ dh: 16, wkid: 4505 });
-    data2.push({ dh: 17, wkid: 4506 });
-    data2.push({ dh: 18, wkid: 4507 });
-    data2.push({ dh: 19, wkid: 4508 });
-    data2.push({ dh: 20, wkid: 4509 });
-    data2.push({ dh: 21, wkid: 4510 });
-    data2.push({ dh: 22, wkid: 4511 });
-    data2.push({ dh: 23, wkid: 4512 });
-    data2.push({ dh: 78, wkid: 4535 });
-    data2.push({ dh: 81, wkid: 4536 });
-    data2.push({ dh: 84, wkid: 4537 });
-    data2.push({ dh: 87, wkid: 4538 });
-    data2.push({ dh: 90, wkid: 4539 });
-    data2.push({ dh: 93, wkid: 4540 });
-    data2.push({ dh: 96, wkid: 4541 });
-    data2.push({ dh: 99, wkid: 4542 });
-    data2.push({ dh: 102, wkid: 4543 });
-    data2.push({ dh: 105, wkid: 4544 });
-    data2.push({ dh: 108, wkid: 4545 });
-    data2.push({ dh: 111, wkid: 4546 });
-    data2.push({ dh: 114, wkid: 4547 });
-    data2.push({ dh: 117, wkid: 4548 });
-    data2.push({ dh: 120, wkid: 4549 });
-    data2.push({ dh: 123, wkid: 4550 });
-    data2.push({ dh: 126, wkid: 4551 });
-    data2.push({ dh: 129, wkid: 4552 });
-    data2.push({ dh: 132, wkid: 4553 });
-    data2.push({ dh: 135, wkid: 4554 });
-    let wkid;
-    data2.forEach((element) => {
-      if (element.dh == daihao) {
-        wkid = element.wkid;
-        return;
-      }
-    });
-    if (wkid) {
-      return proj4("EPSG:4326", "EPSG:" + wkid, [lng, lat2]);
-    } else {
-      return [0, 0];
-    }
-  }
-  static ConvertWebMercatorToCGCS2000(x2, y2, zone = 3) {
-    let lnglat = toLonLat([x2, y2]);
-    return SpatialAnalysis.ConvertLnglatToCGCS2000(lnglat[0], lnglat[1], zone);
-  }
-  static webMktToLngLat(Coordinates) {
-    return toLonLat(Coordinates);
-  }
-  static lngLatToWebMkt(Coordinates) {
-    return fromLonLat(Coordinates);
-  }
   static to3857(Feature2) {
     let format2 = new GeoJSON$1();
     return format2.readFeature(Feature2, {
@@ -159696,6 +159629,240 @@ class SelectTransform {
     this.transformInteraction.setActive(b2);
   }
 }
+class proj {
+  constructor() {
+    __publicField(this, "data");
+    __publicField(this, "pi");
+    __publicField(this, "x_pi");
+    __publicField(this, "a");
+    __publicField(this, "ee");
+    registerProj4();
+    register$3(proj4);
+    this.data = [];
+    this.data.push({ dh: 13, wkid: 4502 });
+    this.data.push({ dh: 14, wkid: 4503 });
+    this.data.push({ dh: 15, wkid: 4504 });
+    this.data.push({ dh: 16, wkid: 4505 });
+    this.data.push({ dh: 17, wkid: 4506 });
+    this.data.push({ dh: 18, wkid: 4507 });
+    this.data.push({ dh: 19, wkid: 4508 });
+    this.data.push({ dh: 20, wkid: 4509 });
+    this.data.push({ dh: 21, wkid: 4510 });
+    this.data.push({ dh: 22, wkid: 4511 });
+    this.data.push({ dh: 23, wkid: 4512 });
+    this.data.push({ dh: 78, wkid: 4535 });
+    this.data.push({ dh: 81, wkid: 4536 });
+    this.data.push({ dh: 84, wkid: 4537 });
+    this.data.push({ dh: 87, wkid: 4538 });
+    this.data.push({ dh: 90, wkid: 4539 });
+    this.data.push({ dh: 93, wkid: 4540 });
+    this.data.push({ dh: 96, wkid: 4541 });
+    this.data.push({ dh: 99, wkid: 4542 });
+    this.data.push({ dh: 102, wkid: 4543 });
+    this.data.push({ dh: 105, wkid: 4544 });
+    this.data.push({ dh: 108, wkid: 4545 });
+    this.data.push({ dh: 111, wkid: 4546 });
+    this.data.push({ dh: 114, wkid: 4547 });
+    this.data.push({ dh: 117, wkid: 4548 });
+    this.data.push({ dh: 120, wkid: 4549 });
+    this.data.push({ dh: 123, wkid: 4550 });
+    this.data.push({ dh: 126, wkid: 4551 });
+    this.data.push({ dh: 129, wkid: 4552 });
+    this.data.push({ dh: 132, wkid: 4553 });
+    this.data.push({ dh: 135, wkid: 4554 });
+    this.pi = 3.141592653589793;
+    this.x_pi = 3.141592653589793 * 3e3 / 180;
+    this.a = 6378245;
+    this.ee = 0.006693421622965943;
+  }
+  ConvertToMapCoord(wkid, Coordinates) {
+    return { "Coord3857": this.ConvertCoordinatesTo3857(wkid, Coordinates), "Coord4326": this.ConvertCoordinatesTo4326(wkid, Coordinates) };
+  }
+  ConvertCoordinatesTo3857(wkid, Coordinates) {
+    if (wkid.toUpperCase().indexOf("EPSG:") == -1) {
+      wkid = "EPSG:" + wkid;
+    }
+    return proj4(wkid, "EPSG:3857", Coordinates);
+  }
+  ConvertCoordinatesTo4326(wkid, Coordinates) {
+    if (wkid.toUpperCase().indexOf("EPSG:") == -1) {
+      wkid = "EPSG:" + wkid;
+    }
+    return proj4(wkid, "EPSG:4326", Coordinates);
+  }
+  formatJsonTo3857(GeoJson) {
+    let featureList;
+    if (GeoJson.crs.properties.name == "EPSG:3857") {
+      featureList = new GeoJSON$1().readFeatures(GeoJson);
+    } else if (GeoJson.crs.properties.name == "EPSG:4326") {
+      featureList = new GeoJSON$1().readFeatures(GeoJson, {
+        dataProjection: "EPSG:4326",
+        featureProjection: "EPSG:3857"
+      });
+    } else {
+      featureList = new GeoJSON$1().readFeatures(GeoJson, {
+        dataProjection: GeoJson.crs.properties.name,
+        featureProjection: "EPSG:3857"
+      });
+    }
+    return featureList;
+  }
+  formatJsonTo4326Json(GeoJson) {
+    let featureList;
+    let format2 = new GeoJSON$1();
+    if (GeoJson.crs.properties.name == "EPSG:4326") {
+      featureList = format2.readFeatures(GeoJson);
+    } else if (GeoJson.crs.properties.name == "EPSG:3857") {
+      featureList = format2.readFeatures(GeoJson, {
+        dataProjection: "EPSG:3857",
+        featureProjection: "EPSG:4326"
+      });
+    } else {
+      featureList = format2.readFeatures(GeoJson, {
+        dataProjection: GeoJson.crs.properties.name,
+        featureProjection: "EPSG:4326"
+      });
+    }
+    return format2.writeFeaturesObject(featureList);
+  }
+  formatJsonToPoint(GeoJson) {
+    let featureList = this.formatJsonTo3857(GeoJson);
+    let newFeature = [];
+    featureList.forEach((feature2) => {
+      switch (feature2.getGeometry().getType()) {
+        case "Polygon":
+          newFeature.push(new Feature$1({
+            geometry: feature2.getGeometry().getInteriorPoint(),
+            properties: feature2.getProperties().properties
+          }));
+          break;
+        case "Point":
+          newFeature.push(feature2);
+          break;
+      }
+    });
+    return newFeature;
+  }
+  LnglatToCGCS2000(lng, lat2, zone = 3) {
+    let daihao;
+    if (zone == 3) {
+      daihao = parseInt(((lng + 1.5) / 3).toString()) * 3;
+    } else {
+      daihao = parseInt(((lng + 6) / 6).toString()) * 6 - 3;
+    }
+    let wkid;
+    this.data.forEach((element) => {
+      if (element.dh == daihao) {
+        wkid = element.wkid;
+        return;
+      }
+    });
+    if (wkid) {
+      return proj4("EPSG:4326", "EPSG:" + wkid, [lng, lat2]);
+    } else {
+      return [0, 0];
+    }
+  }
+  ConvertWebMercatorToCGCS2000(x2, y2, zone = 3) {
+    let lnglat = toLonLat([x2, y2]);
+    return this.LnglatToCGCS2000(lnglat[0], lnglat[1], zone);
+  }
+  webMktToLngLat(Coordinates) {
+    return toLonLat(Coordinates);
+  }
+  lngLatToWebMkt(Coordinates) {
+    return fromLonLat(Coordinates);
+  }
+  transformLat(x2, y2) {
+    let ret = -100 + 2 * x2 + 3 * y2 + 0.2 * y2 * y2 + 0.1 * x2 * y2 + 0.2 * Math.sqrt(Math.abs(x2));
+    ret += (20 * Math.sin(6 * x2 * this.pi) + 20 * Math.sin(2 * x2 * this.pi)) * 2 / 3;
+    ret += (20 * Math.sin(y2 * this.pi) + 40 * Math.sin(y2 / 3 * this.pi)) * 2 / 3;
+    ret += (160 * Math.sin(y2 / 12 * this.pi) + 320 * Math.sin(y2 * this.pi / 30)) * 2 / 3;
+    return ret;
+  }
+  transformLon(x2, y2) {
+    let ret = 300 + x2 + 2 * y2 + 0.1 * x2 * x2 + 0.1 * x2 * y2 + 0.1 * Math.sqrt(Math.abs(x2));
+    ret += (20 * Math.sin(6 * x2 * this.pi) + 20 * Math.sin(2 * x2 * this.pi)) * 2 / 3;
+    ret += (20 * Math.sin(x2 * this.pi) + 40 * Math.sin(x2 / 3 * this.pi)) * 2 / 3;
+    ret += (150 * Math.sin(x2 / 12 * this.pi) + 300 * Math.sin(x2 / 30 * this.pi)) * 2 / 3;
+    return ret;
+  }
+  transform(lat2, lon2) {
+    if (this.outOfChina(lat2, lon2)) {
+      return [lat2, lon2];
+    }
+    let dLat = this.transformLat(lon2 - 105, lat2 - 35);
+    let dLon = this.transformLon(lon2 - 105, lat2 - 35);
+    let radLat = lat2 / 180 * this.pi;
+    let magic = Math.sin(radLat);
+    magic = 1 - this.ee * magic * magic;
+    let sqrtMagic = Math.sqrt(magic);
+    dLat = dLat * 180 / (this.a * (1 - this.ee) / (magic * sqrtMagic) * this.pi);
+    dLon = dLon * 180 / (this.a / sqrtMagic * Math.cos(radLat) * this.pi);
+    let mgLat = lat2 + dLat;
+    let mgLon = lon2 + dLon;
+    return [mgLat, mgLon];
+  }
+  outOfChina(lat2, lon2) {
+    if (lon2 < 72.004 || lon2 > 137.8347)
+      return true;
+    if (lat2 < 0.8293 || lat2 > 55.8271)
+      return true;
+    return false;
+  }
+  wgs84ToGcj02(lat2, lon2) {
+    if (this.outOfChina(lat2, lon2)) {
+      return { lat: lat2, lon: lon2 };
+    }
+    let dLat = this.transformLat(lon2 - 105, lat2 - 35);
+    let dLon = this.transformLon(lon2 - 105, lat2 - 35);
+    let radLat = lat2 / 180 * this.pi;
+    let magic = Math.sin(radLat);
+    magic = 1 - this.ee * magic * magic;
+    let sqrtMagic = Math.sqrt(magic);
+    dLat = dLat * 180 / (this.a * (1 - this.ee) / (magic * sqrtMagic) * this.pi);
+    dLon = dLon * 180 / (this.a / sqrtMagic * Math.cos(radLat) * this.pi);
+    let mgLat = lat2 + dLat;
+    let mgLon = lon2 + dLon;
+    return { mgLat, mgLon };
+  }
+  gcj02ToWgs84(lat2, lon2) {
+    let gps = this.transform(lat2, lon2);
+    let lontitude = lon2 * 2 - gps[1];
+    let latitude = lat2 * 2 - gps[0];
+    return { latitude, lontitude };
+  }
+  gcj02ToBd09(lat2, lon2) {
+    let x2 = lon2, y2 = lat2;
+    let z2 = Math.sqrt(x2 * x2 + y2 * y2) + 2e-5 * Math.sin(y2 * this.x_pi);
+    let theta = Math.atan2(y2, x2) + 3e-6 * Math.cos(x2 * this.x_pi);
+    let tempLon = z2 * Math.cos(theta) + 65e-4;
+    let tempLat = z2 * Math.sin(theta) + 6e-3;
+    let gps = { tempLat, tempLon };
+    return gps;
+  }
+  bd09ToGcj02(lat2, lon2) {
+    let x2 = lon2 - 65e-4, y2 = lat2 - 6e-3;
+    let z2 = Math.sqrt(x2 * x2 + y2 * y2) - 2e-5 * Math.sin(y2 * this.x_pi);
+    let theta = Math.atan2(y2, x2) - 3e-6 * Math.cos(x2 * this.x_pi);
+    let tempLon = z2 * Math.cos(theta);
+    let tempLat = z2 * Math.sin(theta);
+    let gps = { tempLat, tempLon };
+    return gps;
+  }
+  wgs84ToBd09(lat2, lon2) {
+    let gcj02 = this.wgs84ToGcj02(lat2, lon2);
+    let bd09 = this.gcj02ToBd09(gcj02[0], gcj02[1]);
+    return bd09;
+  }
+  bd09_To_gps84(lat2, lon2) {
+    let gcj02 = this.bd09ToGcj02(lat2, lon2);
+    let gps84 = this.gcj02ToWgs84(gcj02[0], gcj02[1]);
+    gps84[0] = gps84[0].toFixed(6);
+    gps84[1] = gps84[1].toFixed(6);
+    return gps84;
+  }
+}
 class MirageMap extends baseMap {
   constructor(mapID = "map", option) {
     super();
@@ -159720,6 +159887,7 @@ class MirageMap extends baseMap {
     __publicField(this, "option");
     __publicField(this, "controls");
     __publicField(this, "selectTransform");
+    __publicField(this, "Proj");
     this._mapOption = {
       zoom: 13,
       center: { lng: 102.103952024454, lat: 26.1693520685273 },
@@ -159788,6 +159956,7 @@ class MirageMap extends baseMap {
         baseLayerSwitch: null,
         swipe: new swipeControl(this)
       };
+      this.Proj = new proj();
       this.init(mapID);
     } else {
       return;
@@ -159936,14 +160105,14 @@ class MirageMap extends baseMap {
       let xy = (_a2 = this._map) == null ? void 0 : _a2.getEventCoordinate(evt.originalEvent);
       if (xy) {
         let lnglat = transform$4(xy, "EPSG:3857", "EPSG:4326");
+        let xy2000 = this.Proj.LnglatToCGCS2000(lnglat[0], lnglat[1], 3);
         this.trigger(XMapEventType.onMapMove, {
           lng: lnglat[0],
           lat: lnglat[1],
-          crsx: xy[0],
-          crsy: xy[1],
+          crsx: xy2000[0].toFixed(2),
+          crsy: xy2000[1].toFixed(2),
           level: Math.round(this._view.getZoom())
         });
-        let xy2000 = SpatialAnalysis.ConvertLnglatToCGCS2000(lnglat[0], lnglat[1], 3);
         this.controls.locationbar.updateMousePosition(toolbox.format(this._mapOption.controls.locationBar.template, {
           lng: lnglat[0].toFixed(6),
           lat: lnglat[1].toFixed(6),
@@ -159961,11 +160130,12 @@ class MirageMap extends baseMap {
       if (evt.frameState) {
         const state = evt.frameState.viewState;
         let lnglat = transform$4(state.center, "EPSG:3857", "EPSG:4326");
+        let xy2000 = this.Proj.LnglatToCGCS2000(lnglat[0], lnglat[1], 3);
         this.trigger(XMapEventType.onMapMove, {
           lng: lnglat[0],
           lat: lnglat[1],
-          crsx: state.center[0],
-          crsy: state.center[1],
+          crsx: xy2000[0].toFixed(2),
+          crsy: xy2000[1].toFixed(2),
           level: Math.round(state.zoom)
         });
       }
@@ -160241,11 +160411,11 @@ class MirageMap extends baseMap {
   setCenter(lnglat, zoom, dataWkID = crsType.EPSG3857, flash = false) {
     let mlnglat;
     if (dataWkID == crsType.EPSG4326) {
-      mlnglat = SpatialAnalysis.ConvertCoordinatesTo3857(dataWkID, lnglat);
+      mlnglat = this.Proj.ConvertCoordinatesTo3857(dataWkID, lnglat);
     } else if (dataWkID == crsType.EPSG3857) {
       mlnglat = lnglat;
     } else {
-      mlnglat = SpatialAnalysis.ConvertCoordinatesTo3857(dataWkID, lnglat);
+      mlnglat = this.Proj.ConvertCoordinatesTo3857(dataWkID, lnglat);
     }
     this._view.setCenter(mlnglat);
     if (zoom) {
@@ -169485,6 +169655,7 @@ class baseGraphic extends Feature$1 {
   constructor(options) {
     super();
     __publicField(this, "option");
+    __publicField(this, "Proj");
     this.option = {
       lnglat: [0, 0],
       dataWkID: crsType.EPSG3857,
@@ -169559,6 +169730,7 @@ class baseGraphic extends Feature$1 {
       attribute: null
     };
     this.option = UJson.merge(this.option, options, true);
+    this.Proj = new proj();
   }
   setAttribute(attribute) {
     let featureAtt = UJson.merge(this.getProperties(), attribute, true);
@@ -169631,7 +169803,7 @@ class LabelGraphic extends baseGraphic {
         case crsType.CGCS2000_GK_CM_6:
           break;
         default:
-          this.setGeometry(new Point$4(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
+          this.setGeometry(new Point$4(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
           break;
       }
     }
@@ -169685,7 +169857,7 @@ class LabelGraphic extends baseGraphic {
     } else if (this.option.dataWkID == crsType.EPSG3857) {
       pp.setCoordinates([lng, lat2]);
     } else {
-      pp.setCoordinates(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
+      pp.setCoordinates(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
     }
   }
 }
@@ -169706,7 +169878,7 @@ class PointGraphic extends baseGraphic {
         case crsType.CGCS2000_GK_CM_6:
           break;
         default:
-          this.setGeometry(new Point$4(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
+          this.setGeometry(new Point$4(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
           break;
       }
     }
@@ -169748,7 +169920,7 @@ class PointGraphic extends baseGraphic {
     } else if (this.option.dataWkID == crsType.EPSG3857) {
       pp.setCoordinates([lng, lat2]);
     } else {
-      pp.setCoordinates(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
+      pp.setCoordinates(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
     }
   }
 }
@@ -169768,7 +169940,7 @@ class ImagePointGraphic extends baseGraphic {
         case crsType.CGCS2000_GK_CM_6:
           break;
         default:
-          this.setGeometry(new Point$4(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
+          this.setGeometry(new Point$4(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, options.lnglat)));
           break;
       }
     }
@@ -169830,7 +170002,7 @@ class ImagePointGraphic extends baseGraphic {
     } else if (this.option.dataWkID == crsType.EPSG3857) {
       pp.setCoordinates([lng, lat2]);
     } else {
-      pp.setCoordinates(SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
+      pp.setCoordinates(this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, [lng, lat2]));
     }
   }
 }
@@ -170065,7 +170237,7 @@ class LineGraphic extends baseGraphic {
           break;
         default:
           this.option.lnglat.forEach((element, index2) => {
-            this.option.lnglat[index2] = SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, element);
+            this.option.lnglat[index2] = this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, element);
           });
           this.setGeometry(new LineString$2(this.option.lnglat));
           break;
@@ -170147,7 +170319,7 @@ class PolygonGraphic extends baseGraphic {
         default:
           this.option.lnglat.forEach((element) => {
             element.forEach((xy, index2) => {
-              element[index2] = SpatialAnalysis.ConvertCoordinatesTo3857(this.option.dataWkID, xy);
+              element[index2] = this.Proj.ConvertCoordinatesTo3857(this.option.dataWkID, xy);
             });
           });
           this.setGeometry(new ol_geom_Polygon(this.option.lnglat));
@@ -170258,8 +170430,12 @@ class CurveGraphic extends baseGraphic {
           break;
         case crsType.CGCS2000_GK_CM_6:
           break;
+        case crsType.BAIDU:
+          break;
+        case crsType.GCJ02:
+          break;
         default:
-          this.setGeometry(this.createRegularPolygonCurve(SpatialAnalysis.ConvertCoordinatesTo4326(this.option.dataWkID, this.option.lnglat), this.option.style.radius, this.option.style.startAngle, this.option.style.stopAngle, this.option.style.rotation));
+          this.setGeometry(this.createRegularPolygonCurve(this.Proj.ConvertCoordinatesTo4326(this.option.dataWkID, this.option.lnglat), this.option.style.radius, this.option.style.startAngle, this.option.style.stopAngle, this.option.style.rotation));
           break;
       }
     }
@@ -170295,7 +170471,7 @@ class CurveGraphic extends baseGraphic {
     } else if (this.option.dataWkID == crsType.EPSG3857) {
       this.setGeometry(this.createRegularPolygonCurve(toLonLat(this.option.lnglat), this.option.style.radius, startAngle, stopAngle, this.option.style.rotation));
     } else {
-      this.setGeometry(this.createRegularPolygonCurve(SpatialAnalysis.ConvertCoordinatesTo4326(this.option.dataWkID, this.option.lnglat), this.option.style.radius, startAngle, stopAngle, this.option.style.rotation));
+      this.setGeometry(this.createRegularPolygonCurve(this.Proj.ConvertCoordinatesTo4326(this.option.dataWkID, this.option.lnglat), this.option.style.radius, startAngle, stopAngle, this.option.style.rotation));
     }
   }
   createRegularPolygonCurve(origin, radius, startAngle, stopAngle, rotation) {
@@ -210907,80 +211083,6 @@ var resource = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   __proto__: null,
   getJSON
 }, Symbol.toStringTag, { value: "Module" }));
-class proj {
-  constructor() {
-    registerProj4();
-    register$3(proj4);
-  }
-  ConvertToMapCoord(wkid, Coordinates) {
-    return { "Coord3857": this.ConvertCoordinatesTo3857(wkid, Coordinates), "Coord4326": this.ConvertCoordinatesTo4326(wkid, Coordinates) };
-  }
-  ConvertCoordinatesTo3857(wkid, Coordinates) {
-    if (wkid.toUpperCase().indexOf("EPSG:") == -1) {
-      wkid = "EPSG:" + wkid;
-    }
-    return proj4(wkid, "EPSG:3857", Coordinates);
-  }
-  ConvertCoordinatesTo4326(wkid, Coordinates) {
-    if (wkid.toUpperCase().indexOf("EPSG:") == -1) {
-      wkid = "EPSG:" + wkid;
-    }
-    return proj4(wkid, "EPSG:4326", Coordinates);
-  }
-  formatJsonTo3857(GeoJson) {
-    let featureList;
-    if (GeoJson.crs.properties.name == "EPSG:3857") {
-      featureList = new GeoJSON$1().readFeatures(GeoJson);
-    } else if (GeoJson.crs.properties.name == "EPSG:4326") {
-      featureList = new GeoJSON$1().readFeatures(GeoJson, {
-        dataProjection: "EPSG:4326",
-        featureProjection: "EPSG:3857"
-      });
-    } else {
-      featureList = new GeoJSON$1().readFeatures(GeoJson, {
-        dataProjection: GeoJson.crs.properties.name,
-        featureProjection: "EPSG:3857"
-      });
-    }
-    return featureList;
-  }
-  formatJsonTo4326Json(GeoJson) {
-    let featureList;
-    let format2 = new GeoJSON$1();
-    if (GeoJson.crs.properties.name == "EPSG:4326") {
-      featureList = format2.readFeatures(GeoJson);
-    } else if (GeoJson.crs.properties.name == "EPSG:3857") {
-      featureList = format2.readFeatures(GeoJson, {
-        dataProjection: "EPSG:3857",
-        featureProjection: "EPSG:4326"
-      });
-    } else {
-      featureList = format2.readFeatures(GeoJson, {
-        dataProjection: GeoJson.crs.properties.name,
-        featureProjection: "EPSG:4326"
-      });
-    }
-    return format2.writeFeaturesObject(featureList);
-  }
-  formatJsonToPoint(GeoJson) {
-    let featureList = this.formatJsonTo3857(GeoJson);
-    let newFeature = [];
-    featureList.forEach((feature2) => {
-      switch (feature2.getGeometry().getType()) {
-        case "Polygon":
-          newFeature.push(new Feature$1({
-            geometry: feature2.getGeometry().getInteriorPoint(),
-            properties: feature2.getProperties().properties
-          }));
-          break;
-        case "Point":
-          newFeature.push(feature2);
-          break;
-      }
-    });
-    return newFeature;
-  }
-}
 class eventTarget {
   constructor() {
     __publicField(this, "events", new Map());
@@ -211036,6 +211138,7 @@ class GaodeRoute extends baseGaode {
     super(options);
   }
   query(option) {
+    let ccf = new proj();
     let apitype = [{
       type: "\u9A7E\u8F66",
       url: "/amap/v3/direction/driving"
@@ -211060,7 +211163,9 @@ class GaodeRoute extends baseGaode {
           let points = element.polyline.split(";");
           points.forEach((element2) => {
             let p5 = element2.split(",");
-            paths.points.push([parseFloat(p5[0]), parseFloat(p5[1])]);
+            debugger;
+            let wgs = ccf.gcj02ToWgs84(parseFloat(p5[1]), parseFloat(p5[0]));
+            paths.points.push([wgs.lontitude, wgs.latitude]);
           });
         });
         console.log(paths.points);
@@ -211077,39 +211182,64 @@ class GaodePOI extends baseGaode {
     super(options);
   }
   query(option) {
+    let ccf = new proj();
+    let obj = {
+      queryType: 1,
+      keywords: "",
+      location: "",
+      radius: "3000",
+      city: "\u897F\u5B89\u5E02",
+      city_limit: true,
+      polygon: "",
+      extensions: "base",
+      offset: 20,
+      page: 1,
+      success: null,
+      error: null
+    };
+    obj = Object.assign({}, obj, option);
     let apitype = [{
       type: "\u5468\u8FB9\u641C\u7D22",
       url: "/amap/v3/place/around",
       parameters: {
-        keywords: option.keywords,
-        location: option.location,
-        radius: option.radius
+        key: this.option.key,
+        keywords: obj.keywords,
+        location: obj.location,
+        radius: obj.radius,
+        offset: obj.offset,
+        page: obj.page
       }
     }, {
       type: "\u5173\u952E\u5B57\u641C\u7D22",
       url: "/amap/v3/place/text",
       parameters: {
-        keywords: option.keywords,
-        region: option.region || "",
-        city: option.city || "",
-        city_limit: option.city_limit || false
+        key: this.option.key,
+        keywords: obj.keywords,
+        city: option.city,
+        city_limit: option.city_limit,
+        offset: obj.offset,
+        page: obj.page
       }
     }, {
       type: "\u591A\u8FB9\u5F62\u533A\u57DF\u641C\u7D22",
       url: "/amap/v3/place/polygon",
       parameters: {
+        key: this.option.key,
         keywords: option.keywords,
-        polygon: option.location,
-        radius: option.radius
+        polygon: option.polygon,
+        offset: obj.offset,
+        page: obj.page
       }
     }];
-    let obj = {
-      key: this.option.key,
-      extensions: "base"
-    };
-    obj = Object.assign({}, obj, apitype[option.queryType].parameters);
-    let url = apitype[option.queryType].url + paramsToUrl(obj);
+    obj.keywords = obj.keywords.replace("", "|");
+    let url = apitype[obj.queryType].url + paramsToUrl(apitype[obj.queryType].parameters);
     fetchJson(url).then(function(data2) {
+      data2.pois.forEach((element) => {
+        let p5 = element.location.split(",");
+        debugger;
+        let wgs = ccf.gcj02ToWgs84(parseFloat(p5[1]), parseFloat(p5[0]));
+        element.lnglat = [wgs.lontitude, wgs.latitude];
+      });
       option.success(data2);
     }).catch(function(e2) {
       if (option.error)