dtable-utils 5.0.20 → 5.0.21-beta.2

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;

package/lib/constants/geolocation.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+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: '″'
+};
+
+exports.DMS_SPLITTER_TYPE = DMS_SPLITTER_TYPE;
+exports.LAT_DIRECTION_TYPE = LAT_DIRECTION_TYPE;
+exports.LNG_DIRECTION_TYPE = LNG_DIRECTION_TYPE;

package/lib/index.js

@@ -210,6 +210,7 @@ exports.getCollaboratorsName = collaborator.getCollaboratorsName;
 exports.getCollaboratorsNames = collaborator.getCollaboratorsNames;
 exports.getGeolocationByGranularity = geolocation.getGeolocationByGranularity;
 exports.getGeolocationDisplayString = geolocation.getGeolocationDisplayString;
+exports.getGeolocationFormattedPoint = geolocation.getGeolocationFormattedPoint;
 exports.getDepartmentName = department.getDepartmentName;
 exports.getDigitalSignImageUrl = digitalSign.getDigitalSignImageUrl;
 exports.getLongtextDisplayString = longText.getLongtextDisplayString;

package/lib/view/summaries.js

@@ -19,6 +19,7 @@ require('../constants/filter/filter-is-within.js');
 require('../constants/sort.js');
 require('../constants/group.js');
 var number = require('../column/number.js');
+require('@babel/runtime/helpers/slicedToArray');
 require('dayjs');
 var core$1 = require('../group/core.js');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-utils",
-  "version": "5.0.20",
+  "version": "5.0.21-beta.2",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",