xy-map 1.1.44 → 1.1.46

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "xy-map",
-  "version": "1.1.44",
+  "version": "1.1.46",
   "description": "雄越地图",
   "main": "xy-map.umd.min.js",
   "scripts": {
-    "pub": "npm publish --registry=https://registry.npmjs.org/"
+    "pub": "npm publish --force --registry=https://registry.npm.taobao.org/"
   },
   "keywords": [],
   "author": "hanjing",

package/xy-map.common.js

@@ -70755,6 +70755,11 @@ function closeMeasureArea(map) {
 
 
 
+// 常量定义
+const PI = Math.PI;
+const a = 6378245.0; // 长半轴
+const ee = 0.00669342162296594323; // 偏心率平方
+
 // list转geoJson
 const toGeoJson = (list, type, props = 'position') => {
   let pointsData = list.map((item, index) => {
@@ -70808,6 +70813,36 @@ const geometryCollectionToFeatureCollection = geometryCollection => {
   return featureCollection;
 };
 
+// WGS84转高德坐标系
+const wgs84ToGcj02 = coord => {
+  // 输入检查
+  if (!Array.isArray(coord) || coord.length !== 2) {
+    throw new Error('Input must be an array with [longitude, latitude]');
+  }
+  let [lng, lat] = coord.map(Number);
+
+  // 检查输入是否为有效数字
+  if (isNaN(lng) || isNaN(lat)) {
+    throw new Error('Coordinates must be valid numbers');
+  }
+
+  // 如果不在中国范围内，直接返回原坐标
+  if (outOfChina(lng, lat)) {
+    return [lng, lat];
+  }
+  let dLat = transformLat(lng - 105.0, lat - 35.0);
+  let dLng = transformLng(lng - 105.0, lat - 35.0);
+  let radLat = lat / 180.0 * PI;
+  let magic = Math.sin(radLat);
+  magic = 1 - ee * magic * magic;
+  let sqrtMagic = Math.sqrt(magic);
+  dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * PI);
+  dLng = dLng * 180.0 / (a / sqrtMagic * Math.cos(radLat) * PI);
+  let gcjLat = lat + dLat;
+  let gcjLng = lng + dLng;
+  return [gcjLng, gcjLat];
+};
+
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
 const mercatorTolonlat = Json => {
   Json.features.forEach(item => {
@@ -70829,6 +70864,28 @@ const mercatorTolonlat = Json => {
     return coord;
   }
 };
+// 判断坐标是否在中国范围内
+function outOfChina(lng, lat) {
+  return lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271;
+}
+
+// 变换纬度
+function transformLat(x, y) {
+  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+  ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+  ret += (20.0 * Math.sin(y * PI) + 40.0 * Math.sin(y / 3.0 * PI)) * 2.0 / 3.0;
+  ret += (160.0 * Math.sin(y / 12.0 * PI) + 320 * Math.sin(y * PI / 30.0)) * 2.0 / 3.0;
+  return ret;
+}
+
+// 变换经度
+function transformLng(x, y) {
+  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+  ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+  ret += (20.0 * Math.sin(x * PI) + 40.0 * Math.sin(x / 3.0 * PI)) * 2.0 / 3.0;
+  ret += (150.0 * Math.sin(x / 12.0 * PI) + 300.0 * Math.sin(x / 30.0 * PI)) * 2.0 / 3.0;
+  return ret;
+}
 
 /**
  * 加载图片
@@ -81507,10 +81564,10 @@ function esm_assert_assert(condition, message) {
 
 
 
-const PI = Math.PI;
-const PI_4 = PI / 4;
-const DEGREES_TO_RADIANS = PI / 180;
-const RADIANS_TO_DEGREES = 180 / PI;
+const web_mercator_utils_PI = Math.PI;
+const PI_4 = web_mercator_utils_PI / 4;
+const DEGREES_TO_RADIANS = web_mercator_utils_PI / 180;
+const RADIANS_TO_DEGREES = 180 / web_mercator_utils_PI;
 const TILE_SIZE = 512;
 const EARTH_CIRCUMFERENCE = 40.03e6;
 const MAX_LATITUDE = 85.051129;
@@ -81527,14 +81584,14 @@ function web_mercator_utils_lngLatToWorld(lngLat) {
   esm_assert_assert(Number.isFinite(lat) && lat >= -90 && lat <= 90, 'invalid latitude');
   const lambda2 = lng * DEGREES_TO_RADIANS;
   const phi2 = lat * DEGREES_TO_RADIANS;
-  const x = TILE_SIZE * (lambda2 + PI) / (2 * PI);
-  const y = TILE_SIZE * (PI + Math.log(Math.tan(PI_4 + phi2 * 0.5))) / (2 * PI);
+  const x = TILE_SIZE * (lambda2 + web_mercator_utils_PI) / (2 * web_mercator_utils_PI);
+  const y = TILE_SIZE * (web_mercator_utils_PI + Math.log(Math.tan(PI_4 + phi2 * 0.5))) / (2 * web_mercator_utils_PI);
   return [x, y];
 }
 function web_mercator_utils_worldToLngLat(xy) {
   const [x, y] = xy;
-  const lambda2 = x / TILE_SIZE * (2 * PI) - PI;
-  const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * PI) - PI)) - PI_4);
+  const lambda2 = x / TILE_SIZE * (2 * web_mercator_utils_PI) - web_mercator_utils_PI;
+  const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * web_mercator_utils_PI) - web_mercator_utils_PI)) - PI_4);
   return [lambda2 * RADIANS_TO_DEGREES, phi2 * RADIANS_TO_DEGREES];
 }
 function getMeterZoom(options) {
@@ -104624,7 +104681,7 @@ function getWebGLContext() {
 ;// CONCATENATED MODULE: ./node_modules/ktx-parse/dist/ktx-parse.modern.js
 const t = new Uint8Array([0]),
   e = (/* unused pure expression or super */ null && ([171, 75, 84, 88, 32, 50, 48, 187, 13, 10, 26, 10]));
-var n, i, s, a, r, o, l, f;
+var n, i, s, ktx_parse_modern_a, r, o, l, f;
 !function (t) {
   t[t.NONE = 0] = "NONE", t[t.BASISLZ = 1] = "BASISLZ", t[t.ZSTD = 2] = "ZSTD", t[t.ZLIB = 3] = "ZLIB";
 }(n || (n = {})), function (t) {
@@ -104633,7 +104690,7 @@ var n, i, s, a, r, o, l, f;
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.ETC1S = 163] = "ETC1S", t[t.UASTC = 166] = "UASTC";
 }(s || (s = {})), function (t) {
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.SRGB = 1] = "SRGB";
-}(a || (a = {})), function (t) {
+}(ktx_parse_modern_a || (ktx_parse_modern_a = {})), function (t) {
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.LINEAR = 1] = "LINEAR", t[t.SRGB = 2] = "SRGB", t[t.ITU = 3] = "ITU", t[t.NTSC = 4] = "NTSC", t[t.SLOG = 5] = "SLOG", t[t.SLOG2 = 6] = "SLOG2";
 }(r || (r = {})), function (t) {
   t[t.ALPHA_STRAIGHT = 0] = "ALPHA_STRAIGHT", t[t.ALPHA_PREMULTIPLIED = 1] = "ALPHA_PREMULTIPLIED";
@@ -104650,8 +104707,8 @@ class U {
       versionNumber: 2,
       descriptorBlockSize: 40,
       colorModel: s.UNSPECIFIED,
-      colorPrimaries: a.SRGB,
-      transferFunction: a.SRGB,
+      colorPrimaries: ktx_parse_modern_a.SRGB,
+      transferFunction: ktx_parse_modern_a.SRGB,
       flags: o.ALPHA_STRAIGHT,
       texelBlockDimension: {
         x: 4,
@@ -118474,9 +118531,19 @@ const mapHoverHtml = (arr, e, beforeHtml, afterHtml) => {
 ;// CONCATENATED MODULE: ./src/package/util/gaodeApi.js
 
 
-// 获取浏览器定位
-function GeoAddress(lnglat) {
+
+/**
+ * 获取浏览器定位
+ * @description 通过高德地图API获取当前浏览器的地理位置信息
+ * @property {number} lnglat - [经度，纬度 ]
+ * @property {Boolean} changeCoordinate - 是否将坐标从wgs84转gcj02
+ 
+ */
+function GeoAddress(lnglat, changeCoordinate = true) {
   return new Promise(resolve => {
+    if (changeCoordinate) {
+      lnglat = wgs84ToGcj02(lnglat);
+    }
     node_modules_axios.get(`https://restapi.amap.com/v3/geocode/regeo?key=39d46e3fcb4c9740d08e8ecb1f15ff8c&location=${lnglat[0]},${lnglat[1]}&extensions=all`).then(({
       data
     }) => {

package/xy-map.umd.js

@@ -70773,6 +70773,11 @@ function closeMeasureArea(map) {
 
 
 
+// 常量定义
+const PI = Math.PI;
+const a = 6378245.0; // 长半轴
+const ee = 0.00669342162296594323; // 偏心率平方
+
 // list转geoJson
 const toGeoJson = (list, type, props = 'position') => {
   let pointsData = list.map((item, index) => {
@@ -70826,6 +70831,36 @@ const geometryCollectionToFeatureCollection = geometryCollection => {
   return featureCollection;
 };
 
+// WGS84转高德坐标系
+const wgs84ToGcj02 = coord => {
+  // 输入检查
+  if (!Array.isArray(coord) || coord.length !== 2) {
+    throw new Error('Input must be an array with [longitude, latitude]');
+  }
+  let [lng, lat] = coord.map(Number);
+
+  // 检查输入是否为有效数字
+  if (isNaN(lng) || isNaN(lat)) {
+    throw new Error('Coordinates must be valid numbers');
+  }
+
+  // 如果不在中国范围内，直接返回原坐标
+  if (outOfChina(lng, lat)) {
+    return [lng, lat];
+  }
+  let dLat = transformLat(lng - 105.0, lat - 35.0);
+  let dLng = transformLng(lng - 105.0, lat - 35.0);
+  let radLat = lat / 180.0 * PI;
+  let magic = Math.sin(radLat);
+  magic = 1 - ee * magic * magic;
+  let sqrtMagic = Math.sqrt(magic);
+  dLat = dLat * 180.0 / (a * (1 - ee) / (magic * sqrtMagic) * PI);
+  dLng = dLng * 180.0 / (a / sqrtMagic * Math.cos(radLat) * PI);
+  let gcjLat = lat + dLat;
+  let gcjLng = lng + dLng;
+  return [gcjLng, gcjLat];
+};
+
 // 3857墨卡托坐标系转换为4326 (WGS84)经纬度坐标
 const mercatorTolonlat = Json => {
   Json.features.forEach(item => {
@@ -70847,6 +70882,28 @@ const mercatorTolonlat = Json => {
     return coord;
   }
 };
+// 判断坐标是否在中国范围内
+function outOfChina(lng, lat) {
+  return lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271;
+}
+
+// 变换纬度
+function transformLat(x, y) {
+  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+  ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+  ret += (20.0 * Math.sin(y * PI) + 40.0 * Math.sin(y / 3.0 * PI)) * 2.0 / 3.0;
+  ret += (160.0 * Math.sin(y / 12.0 * PI) + 320 * Math.sin(y * PI / 30.0)) * 2.0 / 3.0;
+  return ret;
+}
+
+// 变换经度
+function transformLng(x, y) {
+  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+  ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+  ret += (20.0 * Math.sin(x * PI) + 40.0 * Math.sin(x / 3.0 * PI)) * 2.0 / 3.0;
+  ret += (150.0 * Math.sin(x / 12.0 * PI) + 300.0 * Math.sin(x / 30.0 * PI)) * 2.0 / 3.0;
+  return ret;
+}
 
 /**
  * 加载图片
@@ -81525,10 +81582,10 @@ function esm_assert_assert(condition, message) {
 
 
 
-const PI = Math.PI;
-const PI_4 = PI / 4;
-const DEGREES_TO_RADIANS = PI / 180;
-const RADIANS_TO_DEGREES = 180 / PI;
+const web_mercator_utils_PI = Math.PI;
+const PI_4 = web_mercator_utils_PI / 4;
+const DEGREES_TO_RADIANS = web_mercator_utils_PI / 180;
+const RADIANS_TO_DEGREES = 180 / web_mercator_utils_PI;
 const TILE_SIZE = 512;
 const EARTH_CIRCUMFERENCE = 40.03e6;
 const MAX_LATITUDE = 85.051129;
@@ -81545,14 +81602,14 @@ function web_mercator_utils_lngLatToWorld(lngLat) {
   esm_assert_assert(Number.isFinite(lat) && lat >= -90 && lat <= 90, 'invalid latitude');
   const lambda2 = lng * DEGREES_TO_RADIANS;
   const phi2 = lat * DEGREES_TO_RADIANS;
-  const x = TILE_SIZE * (lambda2 + PI) / (2 * PI);
-  const y = TILE_SIZE * (PI + Math.log(Math.tan(PI_4 + phi2 * 0.5))) / (2 * PI);
+  const x = TILE_SIZE * (lambda2 + web_mercator_utils_PI) / (2 * web_mercator_utils_PI);
+  const y = TILE_SIZE * (web_mercator_utils_PI + Math.log(Math.tan(PI_4 + phi2 * 0.5))) / (2 * web_mercator_utils_PI);
   return [x, y];
 }
 function web_mercator_utils_worldToLngLat(xy) {
   const [x, y] = xy;
-  const lambda2 = x / TILE_SIZE * (2 * PI) - PI;
-  const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * PI) - PI)) - PI_4);
+  const lambda2 = x / TILE_SIZE * (2 * web_mercator_utils_PI) - web_mercator_utils_PI;
+  const phi2 = 2 * (Math.atan(Math.exp(y / TILE_SIZE * (2 * web_mercator_utils_PI) - web_mercator_utils_PI)) - PI_4);
   return [lambda2 * RADIANS_TO_DEGREES, phi2 * RADIANS_TO_DEGREES];
 }
 function getMeterZoom(options) {
@@ -104642,7 +104699,7 @@ function getWebGLContext() {
 ;// CONCATENATED MODULE: ./node_modules/ktx-parse/dist/ktx-parse.modern.js
 const t = new Uint8Array([0]),
   e = (/* unused pure expression or super */ null && ([171, 75, 84, 88, 32, 50, 48, 187, 13, 10, 26, 10]));
-var n, i, s, a, r, o, l, f;
+var n, i, s, ktx_parse_modern_a, r, o, l, f;
 !function (t) {
   t[t.NONE = 0] = "NONE", t[t.BASISLZ = 1] = "BASISLZ", t[t.ZSTD = 2] = "ZSTD", t[t.ZLIB = 3] = "ZLIB";
 }(n || (n = {})), function (t) {
@@ -104651,7 +104708,7 @@ var n, i, s, a, r, o, l, f;
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.ETC1S = 163] = "ETC1S", t[t.UASTC = 166] = "UASTC";
 }(s || (s = {})), function (t) {
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.SRGB = 1] = "SRGB";
-}(a || (a = {})), function (t) {
+}(ktx_parse_modern_a || (ktx_parse_modern_a = {})), function (t) {
   t[t.UNSPECIFIED = 0] = "UNSPECIFIED", t[t.LINEAR = 1] = "LINEAR", t[t.SRGB = 2] = "SRGB", t[t.ITU = 3] = "ITU", t[t.NTSC = 4] = "NTSC", t[t.SLOG = 5] = "SLOG", t[t.SLOG2 = 6] = "SLOG2";
 }(r || (r = {})), function (t) {
   t[t.ALPHA_STRAIGHT = 0] = "ALPHA_STRAIGHT", t[t.ALPHA_PREMULTIPLIED = 1] = "ALPHA_PREMULTIPLIED";
@@ -104668,8 +104725,8 @@ class U {
       versionNumber: 2,
       descriptorBlockSize: 40,
       colorModel: s.UNSPECIFIED,
-      colorPrimaries: a.SRGB,
-      transferFunction: a.SRGB,
+      colorPrimaries: ktx_parse_modern_a.SRGB,
+      transferFunction: ktx_parse_modern_a.SRGB,
       flags: o.ALPHA_STRAIGHT,
       texelBlockDimension: {
         x: 4,
@@ -118492,9 +118549,19 @@ const mapHoverHtml = (arr, e, beforeHtml, afterHtml) => {
 ;// CONCATENATED MODULE: ./src/package/util/gaodeApi.js
 
 
-// 获取浏览器定位
-function GeoAddress(lnglat) {
+
+/**
+ * 获取浏览器定位
+ * @description 通过高德地图API获取当前浏览器的地理位置信息
+ * @property {number} lnglat - [经度，纬度 ]
+ * @property {Boolean} changeCoordinate - 是否将坐标从wgs84转gcj02
+ 
+ */
+function GeoAddress(lnglat, changeCoordinate = true) {
   return new Promise(resolve => {
+    if (changeCoordinate) {
+      lnglat = wgs84ToGcj02(lnglat);
+    }
     node_modules_axios.get(`https://restapi.amap.com/v3/geocode/regeo?key=39d46e3fcb4c9740d08e8ecb1f15ff8c&location=${lnglat[0]},${lnglat[1]}&extensions=all`).then(({
       data
     }) => {