@tmsfe/tms-core 0.0.24 → 0.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/distanceBetweenPoints.js

@@ -0,0 +1,73 @@
+
+// 墨卡托坐标转经纬度
+function mercator2LonLat(p) {
+  const r = p.y / 111319.49077777778;
+  const n =    Math.atan(Math.exp(0.017453292519943295 * r)) / 0.008726646259971648 - 90;
+  return {
+    x: p.x / 111319.49077777778,
+    y: n,
+  };
+}
+
+
+// 角度转弧度
+function angle2Rad(t) {
+  return (t * Math.PI) / 180;
+}
+
+
+function client2ServerX(t) {
+  return t - 20037508;
+}
+
+function client2ServerY(t) {
+  return t - 30240971;
+}
+
+function longitude2ClientX(t) {
+  return Number(111319.49077777778 * Number(t) + 20037508).toFixed(0);
+}
+
+function latitude2ClientY(t) {
+  const n =    Math.log(Math.tan(0.008726646259971648 * (90 + Number(t)))) / 0.017453292519943295;
+  return Number(111319.49077777778 * n + 30240971).toFixed(0);
+}
+
+function geoPointToServerPoint(t) {
+  let n = {};
+  if (t) {
+    n = {
+      x: client2ServerX(longitude2ClientX(t.longitude)),
+      y: client2ServerY(latitude2ClientY(t.latitude)),
+    };
+  }
+  return n;
+}
+
+
+/**
+ * 两个经纬度间地理距离（单位:米）
+ * @param {*} start {longitude, latitude}
+ * @param {*} end {longitude, latitude}
+ * @returns
+ */
+function distanceBetweenPoints(start, end) {
+  let s = geoPointToServerPoint(start);
+  let t = geoPointToServerPoint(end);
+  s = mercator2LonLat(s); // eslint-disable-line
+  t = mercator2LonLat(t); // eslint-disable-line
+  const deltaY = angle2Rad(s.y) - angle2Rad(t.y);
+  const deltaX = angle2Rad(s.x) - angle2Rad(t.x);
+  let res =    2
+    * Math.asin(Math.sqrt(Math.pow(Math.sin(deltaY / 2), 2) // eslint-disable-line
+          + Math.cos(angle2Rad(s.y))
+            * Math.cos(angle2Rad(t.y))
+            * Math.pow(Math.sin(deltaX / 2), 2))); // eslint-disable-line
+  res *= 6378137;
+  res = Math.floor(res * 10000 + 0.5) / 10000;
+  return res;
+}
+
+export {
+  distanceBetweenPoints,
+};

package/src/index.js

@@ -11,6 +11,7 @@ import { cache as report, startListenApp } from './report';
 import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
 import { rpxToPx } from './rpx';
+import { distanceBetweenPoints } from './distanceBetweenPoints';
 import {
   formatPlate,
   subStr,
@@ -180,6 +181,7 @@ const api = {
 
   /** rpx转px */
   rpxToPx,
+  distanceBetweenPoints,
 
   storage,
 

package/src/location/index.ts

@@ -90,6 +90,7 @@ class Location extends LocationBase {
         const { ad_info: adInfo = {} } = result;
 
         const loc = {
+          nationCode: adInfo.nation_code,
           province: adInfo.province,
           cityName: adInfo.city,
           adCode: adInfo.adcode,