@tmsfe/tms-core 0.0.45 → 0.0.48

package/package.json

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

package/src/distanceUtils.ts

@@ -0,0 +1,65 @@
+/**
+ * 经纬度距离计算
+ */
+import { roundStr } from './stringUtils';
+
+// 将角度换算为弧度
+function convertDegreesToRadians(degrees: number): number {
+  return (degrees * Math.PI) / 180;
+}
+
+function haverSin(theta: number): number {
+  const val = Math.sin(theta / 2);
+  return val * val;
+}
+
+// 计算两点间距离，单位 m
+function calCoordinateDistance(
+  a: { latitude: number, longitude: number },
+  b: { latitude: number, longitude: number },
+): number {
+  // 地球半径 平均值，千米
+  const earthRadius = 6371;
+  const lat1 = convertDegreesToRadians(a.latitude);
+  const lon1 = convertDegreesToRadians(a.longitude);
+  const lat2 = convertDegreesToRadians(b.latitude);
+  const lon2 = convertDegreesToRadians(b.longitude);
+  // 差值
+  const vLon = Math.abs(lon1 - lon2);
+  const vLat = Math.abs(lat1 - lat2);
+  const h = haverSin(vLat) + (Math.cos(lat1) * Math.cos(lat2) * haverSin(vLon));
+  const distance = 2 * earthRadius * Math.asin(Math.sqrt(h));
+  return distance * 1000;
+}
+
+/**
+ * 对距离进行格式化
+ * @param {Number} distance 距离，单位米
+ * @param {Number} keep 保留几位小数
+ * @param {Boolean} removeTrailingZero 是否移除字符串末尾的无效数字0
+ * @param {String} unit 单位风格类型：en-英文-m/km，EN-英文大写-M/KM，zh-中文-米/千米，ZH-中文-米/公里
+ * @returns 格式化后的字符串；distance非法时返回空字符串
+ */
+function formatDistance(distance: number|string, keep = 2, removeTrailingZero = false, unit = 'en'): string {
+  const distanceNum = parseFloat(String(distance));
+  if (isNaN(distanceNum)) return '';
+
+  // 数字部分格式化
+  const num = distanceNum >= 1000 ? distanceNum / 1000 : distanceNum;
+  const numStr = roundStr(num, keep, removeTrailingZero);
+  // 单位部分格式化
+  let units;
+  switch (unit) {
+    case 'zh': units = ['米', '千米']; break;
+    case 'ZH': units = ['米', '公里']; break;
+    case 'EN': units = ['M', 'KM']; break;
+    default: units = ['m', 'km']; break;
+  }
+  const unitStr = units[distanceNum >= 1000 ? 1 : 0];
+  return `${numStr}${unitStr}`;
+}
+
+export {
+  calCoordinateDistance,
+  formatDistance,
+};

package/src/index-proxy.js

@@ -10,6 +10,7 @@ import AutoReport from './report/proxy/index';
 import md5 from './md5';
 import { rpxToPx } from './rpx';
 import { serialize } from './objUtils';
+import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
 import * as ipxHelper from './ipxHelper';
@@ -210,6 +211,8 @@ const api = {
   getLocationManager,
   rpxToPx,
   serialize,
+  calCoordinateDistance,
+  formatDistance,
   createRequest,
   getEnvInfo,
   isAppPageExist,

package/src/index.js

@@ -10,6 +10,7 @@ import md5 from './md5';
 import { callCloudFunc } from './cloudService';
 import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
+import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import { rpxToPx } from './rpx';
 import {
   formatPlate,
@@ -169,6 +170,10 @@ const api = {
   /* 处理对象方法 */
   serialize,
 
+  /* 距离方法 */
+  calCoordinateDistance,
+  formatDistance,
+
   /* 获取外部合作商openid */
   getMpOpenId, // 变更为 getOuterOpenId
   getOuterOpenId,

package/src/report/proxy/helper.ts

@@ -11,7 +11,7 @@ function reportData(...args: any[]): any {
     const tms = getApp()?.tms || wx.tms;
     reporter = tms.getReporter();
   }
-  // console.log('自动埋点：', ...args);
+  console.log('自动埋点：', ...args);
   reporter.report2(...args);
 }