dtable-utils 5.0.18 → 5.0.20-beta.1

package/es/archive/clause-module/search.js

@@ -14,6 +14,7 @@ import '@babel/runtime/helpers/typeof';
 import '../../date.js';
 import '@babel/runtime/helpers/defineProperty';
 import '@babel/runtime/helpers/toConsumableArray';
+import '@babel/runtime/helpers/slicedToArray';
 
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }

package/es/cell-value-get/cell-value.js

@@ -131,7 +131,6 @@ var getFormulaDisplayString = function getFormulaDisplayString(cellValue, column
  * @param {object} formulaRows formula results of rows. Default as "{}"
  * @param {array} collaborators e.g. [{ email, name, ... }, ...]. Default as "[]"
  * @param {array} departments e.g. [{ name, id }, ...]. Default as "[]"
- * @param {bool} isBaiduMap  Determine the way to connect latitude and longitude. Default as true
  * @param {string} geolocationHyphen Used as a connector between province, city, district and detail. Default as empty string
  * @returns formatted cell value, string|array
  */
@@ -144,8 +143,6 @@ var getCellValueDisplayString = function getCellValueDisplayString(row, type, ke
     collaborators = _ref2$collaborators === void 0 ? [] : _ref2$collaborators,
     _ref2$departments = _ref2.departments,
     departments = _ref2$departments === void 0 ? [] : _ref2$departments,
-    _ref2$isBaiduMap = _ref2.isBaiduMap,
-    isBaiduMap = _ref2$isBaiduMap === void 0 ? true : _ref2$isBaiduMap,
     _ref2$geolocationHyph = _ref2.geolocationHyphen,
     geolocationHyphen = _ref2$geolocationHyph === void 0 ? '' : _ref2$geolocationHyph;
   if (!row) return '';
@@ -166,7 +163,6 @@ var getCellValueDisplayString = function getCellValueDisplayString(row, type, ke
     case CellType.GEOLOCATION:
       {
         return getGeolocationDisplayString(cellValue, data, {
-          isBaiduMap: isBaiduMap,
           hyphen: geolocationHyphen
         });
       }

package/es/cell-value-get/geolocation.js

@@ -1,19 +1,54 @@
 import { GROUP_GEOLOCATION_GRANULARITY } from '../constants/group.js';
 import { GEOLOCATION_FORMAT } from '../constants/column.js';
-import { isValidPosition } from '../validate/geolocation.js';
+import { isNumber } from '../number.js';
+import { DMS_SPLITTER_TYPE, LAT_DIRECTION_TYPE, LNG_DIRECTION_TYPE } from '../constants/geolocation.js';
+
+/**
+ * Convert decimal to DMS
+ * @param {number} lat
+ * @param {bool} isLat Latitude: N/S, Longitude: E/W
+ * @returns { dms, direction }, object
+ */
+var convertToDMS = function convertToDMS(decimal) {
+  var isLat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  if (!isNumber(decimal) && typeof decimal !== 'string') return {};
+  var numDecimal = typeof decimal === 'string' ? Number.parseFloat(decimal) : decimal;
+  if (!isNumber(numDecimal)) return {};
+  var degrees = Math.floor(Math.abs(numDecimal));
+  var minutesDecimal = Number.parseFloat(((Math.abs(numDecimal) - degrees) * 60).toFixed(8));
+  var minutes = Math.floor(minutesDecimal);
+  var seconds = Number.parseFloat(((minutesDecimal - minutes) * 60).toFixed(8));
+  var direction = '';
+  if (isLat) {
+    direction = numDecimal >= 0 ? LAT_DIRECTION_TYPE.N : LAT_DIRECTION_TYPE.S;
+  } else {
+    direction = numDecimal >= 0 ? LNG_DIRECTION_TYPE.E : LNG_DIRECTION_TYPE.W;
+  }
+  return {
+    dms: "".concat(degrees).concat(DMS_SPLITTER_TYPE.DEG).concat(minutes).concat(DMS_SPLITTER_TYPE.MIN).concat(seconds).concat(DMS_SPLITTER_TYPE.SEC),
+    direction: direction
+  };
+};
+var getLatLngDisplayString = function getLatLngDisplayString(lat, lng) {
+  var _convertToDMS = convertToDMS(lat, true),
+    lat_dms = _convertToDMS.dms,
+    lat_direction = _convertToDMS.direction;
+  var _convertToDMS2 = convertToDMS(lng),
+    lng_dms = _convertToDMS2.dms,
+    lng_direction = _convertToDMS2.direction;
+  if (!lat_dms || !lng_dms) return '';
+  return "".concat(lat_direction).concat(lat_dms, ", ").concat(lng_direction).concat(lng_dms);
+};
 
 /**
  * Get formatted geolocation
  * @param {object} loc
  * @param {object} formats , e.g. { geo_format, ... }
- * @param {bool} isBaiduMap Determine the way to connect latitude and longitude. Default as true
  * @param {string} hyphen Used as a connector between province, city, district and detail. Default as empty string
  * @returns formatted geolocation, string
  */
 var getGeolocationDisplayString = function getGeolocationDisplayString(loc, formats) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-    _ref$isBaiduMap = _ref.isBaiduMap,
-    isBaiduMap = _ref$isBaiduMap === void 0 ? true : _ref$isBaiduMap,
     _ref$hyphen = _ref.hyphen,
     hyphen = _ref$hyphen === void 0 ? '' : _ref$hyphen;
   if (!loc) return '';
@@ -24,8 +59,7 @@ var getGeolocationDisplayString = function getGeolocationDisplayString(loc, form
       {
         var lng = loc.lng,
           lat = loc.lat;
-        if (!isValidPosition(lng, lat)) return '';
-        return isBaiduMap ? "".concat(lng, ", ").concat(lat) : "".concat(lat, ", ").concat(lng);
+        return getLatLngDisplayString(lat, lng);
       }
     case GEOLOCATION_FORMAT.COUNTRY_REGION:
       {
@@ -101,4 +135,4 @@ var getGeolocationByGranularity = function getGeolocationByGranularity(geolocati
   }
 };
 
-export { getGeolocationByGranularity, getGeolocationDisplayString };
+export { convertToDMS, getGeolocationByGranularity, getGeolocationDisplayString, getLatLngDisplayString };

package/es/cell-value-set/geolocation.js

@@ -1,39 +1,148 @@
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import { GEOLOCATION_FORMAT } from '../constants/column.js';
+import '../constants/filter/filter-column-options.js';
+import '../constants/filter/filter-modifier.js';
+import '../constants/filter/filter-predicate.js';
+import '../constants/filter/filter-is-within.js';
+import '../constants/formula.js';
+import '../constants/sort.js';
+import '../constants/group.js';
+import { LAT_DIRECTION_TYPE, LNG_DIRECTION_TYPE, DMS_SPLITTER_TYPE } from '../constants/geolocation.js';
+import { isNumber } from '../number.js';
+
 var provinceReg = /.+省|.+自治区|.+特别行政区|北京市|天津市|上海市|重庆市|安徽|福建|甘肃|广东|广西|贵州|海南|河北|河南|黑龙江|湖北|湖南|吉林|江苏|江西|辽宁|内蒙古|宁夏|青海|山东|山西|陕西|四川|西藏|新疆|云南|浙江|北京|上海|天津|重庆/;
 var cityReg = /.+自治州|[^市]+市|.+盟|.+地区|.+区划/;
 var districtReg = /(.+市|.+县|.+旗|.+区)/;
+var LNG_LAT_REG = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
+var DMS_DEG_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(DMS_SPLITTER_TYPE.DEG));
+var DMS_MIN_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(DMS_SPLITTER_TYPE.MIN));
+var DMS_SEC_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(DMS_SPLITTER_TYPE.SEC));
+var parseDMS = function parseDMS(dms, direction) {
+  if (typeof dms !== 'string') {
+    return null;
+  }
+  var degMatches = dms.match(DMS_DEG_REG);
+  var minMatches = dms.match(DMS_MIN_REG);
+  var secMatches = dms.match(DMS_SEC_REG);
+  var strDeg = degMatches && degMatches[1];
+  var strMin = minMatches && minMatches[1];
+  var strSec = secMatches && secMatches[1];
+  if (!strDeg && !strMin && !strSec) {
+    // invalid DMS
+    return null;
+  }
+  var deg = Number.parseFloat(strDeg);
+  var min = Number.parseFloat(strMin);
+  var sec = Number.parseFloat(strSec);
+  if (!isNumber(deg) && !isNumber(min) && !isNumber(sec)) {
+    return null;
+  }
+  deg = deg || 0;
+  min = min || 0;
+  sec = sec || 0;
+  var decimal = deg + min / 60 + sec / 3600;
+  if (direction === LAT_DIRECTION_TYPE.S || direction === LNG_DIRECTION_TYPE.W) {
+    return -Math.abs(decimal);
+  }
+  return decimal;
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. 'N30°50′50.55″, E30.50′50.55″'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLngDMS = function parseLatLngDMS(strLatLngDMS) {
+  if (typeof strLatLngDMS !== 'string') {
+    return {};
+  }
+  var _strLatLngDMS$split$m = strLatLngDMS.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLatLngDMS$split$m2 = _slicedToArray(_strLatLngDMS$split$m, 2),
+    strLatDMS = _strLatLngDMS$split$m2[0],
+    strLngDMS = _strLatLngDMS$split$m2[1];
+  if (!strLatDMS || !strLngDMS) {
+    // invalid LatLng DMS
+    return {};
+  }
+  var latDirection = strLatDMS[0];
+  var lngDirection = strLngDMS[0];
+  if (!latDirection || !lngDirection || latDirection !== LAT_DIRECTION_TYPE.N && latDirection !== LAT_DIRECTION_TYPE.S || lngDirection !== LNG_DIRECTION_TYPE.E && lngDirection !== LNG_DIRECTION_TYPE.W) {
+    // invalid lat/lng direction
+    return {};
+  }
+  var strLat = strLatDMS.substring(1);
+  var strLng = strLngDMS.substring(1);
+  var lat = parseDMS(strLat, latDirection);
+  var lng = parseDMS(strLng, lngDirection);
+  if (!isNumber(lat) || !isNumber(lng)) {
+    return {};
+  }
+  return {
+    lat: lat,
+    lng: lng
+  };
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. '30.50, 30.50'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLngLatDegree = function parseLngLatDegree(strLngLat) {
+  // match floating point numbers
+  // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
+  // ^0\.\d+$        --> floating point type starting with 0
+  // ^[1-9]\d*$      --> non-zero integer
+  // 0
+  if (typeof strLngLat !== 'string') {
+    return {};
+  }
+  var _strLngLat$split$map = strLngLat.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLngLat$split$map2 = _slicedToArray(_strLngLat$split$map, 2),
+    strLng = _strLngLat$split$map2[0],
+    strLat = _strLngLat$split$map2[1];
+  if (!strLng || !strLat || !strLng.match(LNG_LAT_REG) || !strLat.match(LNG_LAT_REG)) {
+    return {};
+  }
+  var numLng = Number(strLng);
+  var numLat = Number(strLat);
+  if (!isNumber(numLng) || !isNumber(numLat)) {
+    return {};
+  }
+  return {
+    lat: numLat,
+    lng: numLng
+  };
+};
+
+/**
+ * Parse LatLng-DMS/LngLat-Degree string to degree
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLng = function parseLatLng(strLatLng) {
+  if (strLatLng && (strLatLng.includes(LAT_DIRECTION_TYPE.N) && strLatLng.includes(LNG_DIRECTION_TYPE.E) || strLatLng.includes(LAT_DIRECTION_TYPE.S) && strLatLng.includes(LNG_DIRECTION_TYPE.W))) {
+    return parseLatLngDMS(strLatLng);
+  }
+  return parseLngLatDegree(strLatLng);
+};
 var formatTextToGeolocation = function formatTextToGeolocation(value, columnData) {
   // compatible with the old version, the old version data may be null or undefined
   var _ref = columnData || {},
     _ref$geo_format = _ref.geo_format,
-    geo_format = _ref$geo_format === void 0 ? 'geolocation' : _ref$geo_format;
+    geo_format = _ref$geo_format === void 0 ? GEOLOCATION_FORMAT.GEOLOCATION : _ref$geo_format;
   var cellValue = value || '';
   if (cellValue.length < 3) {
     return {};
   }
-  if (geo_format === 'lng_lat') {
-    // match floating point numbers
-    // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
-    // ^0\.\d+$        --> floating point type starting with 0
-    // ^[1-9]\d*$      --> non-zero integer
-    // 0
-    var reg = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
-    if (cellValue.indexOf(',') < 0) return {};
-    var lng_lat = cellValue.split(',');
-    if (lng_lat.length !== 2) {
-      return {};
-    }
-    var lng = lng_lat[0].trim();
-    var lat = lng_lat[1].trim();
-    if (!lng || !lat) {
-      return {};
-    }
-    if (!lng.match(reg) || !lat.match(reg)) {
-      return {};
-    }
-    return {
-      lng: lng,
-      lat: lat
-    };
+  if (geo_format === GEOLOCATION_FORMAT.LNG_LAT) {
+    return parseLatLng(cellValue);
   }
   var matchedProvince = cellValue.match(provinceReg);
   var province = '';
@@ -65,4 +174,4 @@ var formatTextToGeolocation = function formatTextToGeolocation(value, columnData
   };
 };
 
-export { formatTextToGeolocation };
+export { formatTextToGeolocation, parseDMS, parseLatLng, parseLatLngDMS, parseLngLatDegree };

package/es/constants/geolocation.js

@@ -0,0 +1,17 @@
+var LAT_DIRECTION_TYPE = {
+  N: 'N',
+  // North
+  S: 'S' // South
+};
+var LNG_DIRECTION_TYPE = {
+  E: 'E',
+  // East
+  W: 'W' // West
+};
+var DMS_SPLITTER_TYPE = {
+  DEG: '°',
+  MIN: '′',
+  SEC: '″'
+};
+
+export { DMS_SPLITTER_TYPE, LAT_DIRECTION_TYPE, LNG_DIRECTION_TYPE };

package/es/date.js

@@ -8,6 +8,22 @@ var MATCH_1_2 = /\d\d?/; // 0 - 99
 var MATCH2 = /\d\d/; // 00 - 99
 var MATCH4 = /\d{4}/; // 0000 - 9999
 
+var DATE_REG = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/;
+var DATE_WITH_TIME_REG = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]/;
+var RU_DATE_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])\.(0?[1-9]|1[012])\.\d{4}$/;
+var RU_TIME_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])\.(0?[1-9]|1[012])\.\d{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+
+// month <=12 day <= 9
+// month <=12 day >= 13
+var US_DATE_REG = /^([1-9]|1[0-2])\/([1-9]|[1-2][3-9]|3[0-1])\/[0-9]{4}$/;
+var US_TIME_REG = /^([1-9]|1[0-2])\/([1-9]|[1-2][3-9]|3[0-1])\/[0-9]{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+
+// 9 < day <= 12
+// 9 < month <= 12
+var MID_DATE_REG = /^(1[0-2])\/(1[0-2])\/[0-9]{4}$/;
+var MID_TIME_REG = /^(1[0-2])\/(1[0-2])\/[0-9]{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+var EU_DATE_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])[\/\.](0?[1-9]|1[012])[\/\.]\d{4}$/;
+var EU_TIME_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])[\/\.](0?[1-9]|1[012])[\/\.]\d{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
 var MATCHER_EXPRESSIONS = {
   mm: [MATCH_1_2, DATE_UNIT.MINUTES],
   HH: [MATCH_1_2, DATE_UNIT.HOURS],
@@ -165,13 +181,32 @@ var DateUtils = /*#__PURE__*/function () {
   }, {
     key: "parseDateWithFormat",
     value: function parseDateWithFormat(dateString, format) {
+      var newFormat = format;
       if (dateString.includes('T')) {
         // ISO 8601 format with "T" separator directly using Date object
         var dateObj = new Date(dateString);
         return this.isValidDateObject(dateObj) ? dateObj : this.getValidDate(dateString);
       }
+      if (dateString.match(DATE_REG) || dateString.match(DATE_WITH_TIME_REG)) {
+        newFormat = format.indexOf('HH:mm') > -1 ? "".concat(DEFAULT_DATE_FORMAT, " HH:mm") : DEFAULT_DATE_FORMAT;
+      }
+      if (dateString.match(RU_DATE_REG) || dateString.match(RU_TIME_REG)) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'DD.MM.YYYY HH:mm' : 'DD.MM.YYYY';
+      }
+      var isUSDate = dateString.match(US_DATE_REG) || dateString.match(US_TIME_REG);
+      if (isUSDate) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'M/D/YYYY HH:mm' : 'M/D/YYYY';
+      }
+      var isEUDate = dateString.match(EU_DATE_REG) || dateString.match(EU_TIME_REG);
+      var isUsOrEuDate = dateString.match(MID_DATE_REG) || dateString.match(MID_TIME_REG);
+      var isUSFormat = ['M/D/YYYY HH:mm', 'M/D/YYYY'].includes(newFormat);
+      if (isUsOrEuDate && isUSFormat) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'M/D/YYYY HH:mm' : 'M/D/YYYY';
+      } else if (isEUDate) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY';
+      }
       try {
-        var parser = this.makeParser(format);
+        var parser = this.makeParser(newFormat);
         var _parser = parser(dateString),
           year = _parser.year,
           month = _parser.month,

package/es/view/summaries.js

@@ -15,6 +15,7 @@ import '../constants/filter/filter-is-within.js';
 import '../constants/sort.js';
 import '../constants/group.js';
 import { isNumericColumn } from '../column/number.js';
+import '@babel/runtime/helpers/slicedToArray';
 import 'dayjs';
 import { getGroupsRowIds as _getGroupsRowIds } from '../group/core.js';
 

package/lib/archive/clause-module/search.js

@@ -18,6 +18,7 @@ require('@babel/runtime/helpers/typeof');
 require('../../date.js');
 require('@babel/runtime/helpers/defineProperty');
 require('@babel/runtime/helpers/toConsumableArray');
+require('@babel/runtime/helpers/slicedToArray');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/lib/cell-value-get/cell-value.js

@@ -139,7 +139,6 @@ var getFormulaDisplayString = function getFormulaDisplayString(cellValue, column
  * @param {object} formulaRows formula results of rows. Default as "{}"
  * @param {array} collaborators e.g. [{ email, name, ... }, ...]. Default as "[]"
  * @param {array} departments e.g. [{ name, id }, ...]. Default as "[]"
- * @param {bool} isBaiduMap  Determine the way to connect latitude and longitude. Default as true
  * @param {string} geolocationHyphen Used as a connector between province, city, district and detail. Default as empty string
  * @returns formatted cell value, string|array
  */
@@ -152,8 +151,6 @@ var getCellValueDisplayString = function getCellValueDisplayString(row, type, ke
     collaborators = _ref2$collaborators === void 0 ? [] : _ref2$collaborators,
     _ref2$departments = _ref2.departments,
     departments = _ref2$departments === void 0 ? [] : _ref2$departments,
-    _ref2$isBaiduMap = _ref2.isBaiduMap,
-    isBaiduMap = _ref2$isBaiduMap === void 0 ? true : _ref2$isBaiduMap,
     _ref2$geolocationHyph = _ref2.geolocationHyphen,
     geolocationHyphen = _ref2$geolocationHyph === void 0 ? '' : _ref2$geolocationHyph;
   if (!row) return '';
@@ -174,7 +171,6 @@ var getCellValueDisplayString = function getCellValueDisplayString(row, type, ke
     case cellType.CellType.GEOLOCATION:
       {
         return geolocation.getGeolocationDisplayString(cellValue, data, {
-          isBaiduMap: isBaiduMap,
           hyphen: geolocationHyphen
         });
       }

package/lib/cell-value-get/geolocation.js

@@ -4,20 +4,55 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var group = require('../constants/group.js');
 var column = require('../constants/column.js');
-var geolocation = require('../validate/geolocation.js');
+var number = require('../number.js');
+var geolocation = require('../constants/geolocation.js');
+
+/**
+ * Convert decimal to DMS
+ * @param {number} lat
+ * @param {bool} isLat Latitude: N/S, Longitude: E/W
+ * @returns { dms, direction }, object
+ */
+var convertToDMS = function convertToDMS(decimal) {
+  var isLat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  if (!number.isNumber(decimal) && typeof decimal !== 'string') return {};
+  var numDecimal = typeof decimal === 'string' ? Number.parseFloat(decimal) : decimal;
+  if (!number.isNumber(numDecimal)) return {};
+  var degrees = Math.floor(Math.abs(numDecimal));
+  var minutesDecimal = Number.parseFloat(((Math.abs(numDecimal) - degrees) * 60).toFixed(8));
+  var minutes = Math.floor(minutesDecimal);
+  var seconds = Number.parseFloat(((minutesDecimal - minutes) * 60).toFixed(8));
+  var direction = '';
+  if (isLat) {
+    direction = numDecimal >= 0 ? geolocation.LAT_DIRECTION_TYPE.N : geolocation.LAT_DIRECTION_TYPE.S;
+  } else {
+    direction = numDecimal >= 0 ? geolocation.LNG_DIRECTION_TYPE.E : geolocation.LNG_DIRECTION_TYPE.W;
+  }
+  return {
+    dms: "".concat(degrees).concat(geolocation.DMS_SPLITTER_TYPE.DEG).concat(minutes).concat(geolocation.DMS_SPLITTER_TYPE.MIN).concat(seconds).concat(geolocation.DMS_SPLITTER_TYPE.SEC),
+    direction: direction
+  };
+};
+var getLatLngDisplayString = function getLatLngDisplayString(lat, lng) {
+  var _convertToDMS = convertToDMS(lat, true),
+    lat_dms = _convertToDMS.dms,
+    lat_direction = _convertToDMS.direction;
+  var _convertToDMS2 = convertToDMS(lng),
+    lng_dms = _convertToDMS2.dms,
+    lng_direction = _convertToDMS2.direction;
+  if (!lat_dms || !lng_dms) return '';
+  return "".concat(lat_direction).concat(lat_dms, ", ").concat(lng_direction).concat(lng_dms);
+};
 
 /**
  * Get formatted geolocation
  * @param {object} loc
  * @param {object} formats , e.g. { geo_format, ... }
- * @param {bool} isBaiduMap Determine the way to connect latitude and longitude. Default as true
  * @param {string} hyphen Used as a connector between province, city, district and detail. Default as empty string
  * @returns formatted geolocation, string
  */
 var getGeolocationDisplayString = function getGeolocationDisplayString(loc, formats) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-    _ref$isBaiduMap = _ref.isBaiduMap,
-    isBaiduMap = _ref$isBaiduMap === void 0 ? true : _ref$isBaiduMap,
     _ref$hyphen = _ref.hyphen,
     hyphen = _ref$hyphen === void 0 ? '' : _ref$hyphen;
   if (!loc) return '';
@@ -28,8 +63,7 @@ var getGeolocationDisplayString = function getGeolocationDisplayString(loc, form
       {
         var lng = loc.lng,
           lat = loc.lat;
-        if (!geolocation.isValidPosition(lng, lat)) return '';
-        return isBaiduMap ? "".concat(lng, ", ").concat(lat) : "".concat(lat, ", ").concat(lng);
+        return getLatLngDisplayString(lat, lng);
       }
     case column.GEOLOCATION_FORMAT.COUNTRY_REGION:
       {
@@ -105,5 +139,7 @@ var getGeolocationByGranularity = function getGeolocationByGranularity(geolocati
   }
 };
 
+exports.convertToDMS = convertToDMS;
 exports.getGeolocationByGranularity = getGeolocationByGranularity;
 exports.getGeolocationDisplayString = getGeolocationDisplayString;
+exports.getLatLngDisplayString = getLatLngDisplayString;

package/lib/cell-value-set/geolocation.js

@@ -2,42 +2,155 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var column = require('../constants/column.js');
+require('../constants/filter/filter-column-options.js');
+require('../constants/filter/filter-modifier.js');
+require('../constants/filter/filter-predicate.js');
+require('../constants/filter/filter-is-within.js');
+require('../constants/formula.js');
+require('../constants/sort.js');
+require('../constants/group.js');
+var geolocation = require('../constants/geolocation.js');
+var number = require('../number.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+
 var provinceReg = /.+省|.+自治区|.+特别行政区|北京市|天津市|上海市|重庆市|安徽|福建|甘肃|广东|广西|贵州|海南|河北|河南|黑龙江|湖北|湖南|吉林|江苏|江西|辽宁|内蒙古|宁夏|青海|山东|山西|陕西|四川|西藏|新疆|云南|浙江|北京|上海|天津|重庆/;
 var cityReg = /.+自治州|[^市]+市|.+盟|.+地区|.+区划/;
 var districtReg = /(.+市|.+县|.+旗|.+区)/;
+var LNG_LAT_REG = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
+var DMS_DEG_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.DEG));
+var DMS_MIN_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.MIN));
+var DMS_SEC_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.SEC));
+var parseDMS = function parseDMS(dms, direction) {
+  if (typeof dms !== 'string') {
+    return null;
+  }
+  var degMatches = dms.match(DMS_DEG_REG);
+  var minMatches = dms.match(DMS_MIN_REG);
+  var secMatches = dms.match(DMS_SEC_REG);
+  var strDeg = degMatches && degMatches[1];
+  var strMin = minMatches && minMatches[1];
+  var strSec = secMatches && secMatches[1];
+  if (!strDeg && !strMin && !strSec) {
+    // invalid DMS
+    return null;
+  }
+  var deg = Number.parseFloat(strDeg);
+  var min = Number.parseFloat(strMin);
+  var sec = Number.parseFloat(strSec);
+  if (!number.isNumber(deg) && !number.isNumber(min) && !number.isNumber(sec)) {
+    return null;
+  }
+  deg = deg || 0;
+  min = min || 0;
+  sec = sec || 0;
+  var decimal = deg + min / 60 + sec / 3600;
+  if (direction === geolocation.LAT_DIRECTION_TYPE.S || direction === geolocation.LNG_DIRECTION_TYPE.W) {
+    return -Math.abs(decimal);
+  }
+  return decimal;
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. 'N30°50′50.55″, E30.50′50.55″'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLngDMS = function parseLatLngDMS(strLatLngDMS) {
+  if (typeof strLatLngDMS !== 'string') {
+    return {};
+  }
+  var _strLatLngDMS$split$m = strLatLngDMS.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLatLngDMS$split$m2 = _slicedToArray__default["default"](_strLatLngDMS$split$m, 2),
+    strLatDMS = _strLatLngDMS$split$m2[0],
+    strLngDMS = _strLatLngDMS$split$m2[1];
+  if (!strLatDMS || !strLngDMS) {
+    // invalid LatLng DMS
+    return {};
+  }
+  var latDirection = strLatDMS[0];
+  var lngDirection = strLngDMS[0];
+  if (!latDirection || !lngDirection || latDirection !== geolocation.LAT_DIRECTION_TYPE.N && latDirection !== geolocation.LAT_DIRECTION_TYPE.S || lngDirection !== geolocation.LNG_DIRECTION_TYPE.E && lngDirection !== geolocation.LNG_DIRECTION_TYPE.W) {
+    // invalid lat/lng direction
+    return {};
+  }
+  var strLat = strLatDMS.substring(1);
+  var strLng = strLngDMS.substring(1);
+  var lat = parseDMS(strLat, latDirection);
+  var lng = parseDMS(strLng, lngDirection);
+  if (!number.isNumber(lat) || !number.isNumber(lng)) {
+    return {};
+  }
+  return {
+    lat: lat,
+    lng: lng
+  };
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. '30.50, 30.50'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLngLatDegree = function parseLngLatDegree(strLngLat) {
+  // match floating point numbers
+  // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
+  // ^0\.\d+$        --> floating point type starting with 0
+  // ^[1-9]\d*$      --> non-zero integer
+  // 0
+  if (typeof strLngLat !== 'string') {
+    return {};
+  }
+  var _strLngLat$split$map = strLngLat.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLngLat$split$map2 = _slicedToArray__default["default"](_strLngLat$split$map, 2),
+    strLng = _strLngLat$split$map2[0],
+    strLat = _strLngLat$split$map2[1];
+  if (!strLng || !strLat || !strLng.match(LNG_LAT_REG) || !strLat.match(LNG_LAT_REG)) {
+    return {};
+  }
+  var numLng = Number(strLng);
+  var numLat = Number(strLat);
+  if (!number.isNumber(numLng) || !number.isNumber(numLat)) {
+    return {};
+  }
+  return {
+    lat: numLat,
+    lng: numLng
+  };
+};
+
+/**
+ * Parse LatLng-DMS/LngLat-Degree string to degree
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLng = function parseLatLng(strLatLng) {
+  if (strLatLng && (strLatLng.includes(geolocation.LAT_DIRECTION_TYPE.N) && strLatLng.includes(geolocation.LNG_DIRECTION_TYPE.E) || strLatLng.includes(geolocation.LAT_DIRECTION_TYPE.S) && strLatLng.includes(geolocation.LNG_DIRECTION_TYPE.W))) {
+    return parseLatLngDMS(strLatLng);
+  }
+  return parseLngLatDegree(strLatLng);
+};
 var formatTextToGeolocation = function formatTextToGeolocation(value, columnData) {
   // compatible with the old version, the old version data may be null or undefined
   var _ref = columnData || {},
     _ref$geo_format = _ref.geo_format,
-    geo_format = _ref$geo_format === void 0 ? 'geolocation' : _ref$geo_format;
+    geo_format = _ref$geo_format === void 0 ? column.GEOLOCATION_FORMAT.GEOLOCATION : _ref$geo_format;
   var cellValue = value || '';
   if (cellValue.length < 3) {
     return {};
   }
-  if (geo_format === 'lng_lat') {
-    // match floating point numbers
-    // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
-    // ^0\.\d+$        --> floating point type starting with 0
-    // ^[1-9]\d*$      --> non-zero integer
-    // 0
-    var reg = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
-    if (cellValue.indexOf(',') < 0) return {};
-    var lng_lat = cellValue.split(',');
-    if (lng_lat.length !== 2) {
-      return {};
-    }
-    var lng = lng_lat[0].trim();
-    var lat = lng_lat[1].trim();
-    if (!lng || !lat) {
-      return {};
-    }
-    if (!lng.match(reg) || !lat.match(reg)) {
-      return {};
-    }
-    return {
-      lng: lng,
-      lat: lat
-    };
+  if (geo_format === column.GEOLOCATION_FORMAT.LNG_LAT) {
+    return parseLatLng(cellValue);
   }
   var matchedProvince = cellValue.match(provinceReg);
   var province = '';
@@ -70,3 +183,7 @@ var formatTextToGeolocation = function formatTextToGeolocation(value, columnData
 };
 
 exports.formatTextToGeolocation = formatTextToGeolocation;
+exports.parseDMS = parseDMS;
+exports.parseLatLng = parseLatLng;
+exports.parseLatLngDMS = parseLatLngDMS;
+exports.parseLngLatDegree = parseLngLatDegree;