@tmsfe/tms-core 0.0.47 → 0.0.48

package/package.json

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

package/src/distanceUtils.ts

@@ -1,7 +1,7 @@
 /**
  * 经纬度距离计算
  */
-
+import { roundStr } from './stringUtils';
 
 // 将角度换算为弧度
 function convertDegreesToRadians(degrees: number): number {
@@ -32,6 +32,34 @@ function calCoordinateDistance(
   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,7 +10,7 @@ import AutoReport from './report/proxy/index';
 import md5 from './md5';
 import { rpxToPx } from './rpx';
 import { serialize } from './objUtils';
-import { calCoordinateDistance } from './distanceUtils';
+import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
 import * as ipxHelper from './ipxHelper';
@@ -212,6 +212,7 @@ const api = {
   rpxToPx,
   serialize,
   calCoordinateDistance,
+  formatDistance,
   createRequest,
   getEnvInfo,
   isAppPageExist,

package/src/index.js

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