feat(git): bump version 1.8.3

digitregroup · Dec 7, 2023 · b7cfe1e · b7cfe1e
1 parent 742963a
commit b7cfe1e
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 63 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,6 +19,8 @@ jobs:
           registry-url: "https://registry.npmjs.org"
       - name: Install Node Dependencies
         run: yarn install
+      - name: Build node
+        run: yarn build-node
       - name: Check package version
         run: yarn check-version
       - name: Publish to NPM

diff --git a/node/providers/Google/Geocoder.js b/node/providers/Google/Geocoder.js
@@ -11,28 +11,28 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-var _ProviderGeocoder2 = _interopRequireDefault(require("../ProviderGeocoder"));
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var _ProviderGeocoder2 = _interopRequireDefault(require("../ProviderGeocoder"));
 
-var GoogleGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
+/**
+ * The goal is to implement methods defined in ProviderGeocoder abstract class
+ * with unified output and input
+ */
+var GoogleGeocoder =
+/*#__PURE__*/
+function (_ProviderGeocoder) {
   (0, _inherits2.default)(GoogleGeocoder, _ProviderGeocoder);
 
-  var _super = _createSuper(GoogleGeocoder);
-
   function GoogleGeocoder(config) {
     var _this;
 
     (0, _classCallCheck2.default)(this, GoogleGeocoder);
-    _this = _super.call(this); // Provider name
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(GoogleGeocoder).call(this)); // Provider name
 
     _this.providerName = 'Google'; // Loaded configuration
 

diff --git a/node/providers/Google/Map.js b/node/providers/Google/Map.js
@@ -11,32 +11,28 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _ProviderMap2 = _interopRequireDefault(require("../ProviderMap"));
 
 var _leaflet = _interopRequireDefault(require("leaflet"));
 
 var _leafletGridlayer = _interopRequireDefault(require("../../../vendors/leaflet.gridlayer.googlemutant"));
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var GoogleMap = /*#__PURE__*/function (_ProviderMap) {
+var GoogleMap =
+/*#__PURE__*/
+function (_ProviderMap) {
   (0, _inherits2.default)(GoogleMap, _ProviderMap);
 
-  var _super = _createSuper(GoogleMap);
-
   function GoogleMap(config) {
     var _this;
 
     (0, _classCallCheck2.default)(this, GoogleMap);
-    _this = _super.call(this);
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(GoogleMap).call(this));
     _this.providerName = 'Google';
     _this.config = config;
     return _this;

diff --git a/node/providers/Here/Geocoder.js b/node/providers/Here/Geocoder.js
@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -21,34 +23,32 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _ProviderGeocoder2 = _interopRequireDefault(require("../ProviderGeocoder"));
 
 var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var path = _interopRequireWildcard(require("path"));
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
+var HereGeocoder =
+/*#__PURE__*/
+function (_ProviderGeocoder) {
   (0, _inherits2.default)(HereGeocoder, _ProviderGeocoder);
 
-  var _super = _createSuper(HereGeocoder);
-
   function HereGeocoder(config) {
     var _this;
 
     (0, _classCallCheck2.default)(this, HereGeocoder);
-    _this = _super.call(this);
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(HereGeocoder).call(this));
     _this.providerName = 'Here';
     _this.config = config;
     _this.mappingAdmLevel = {
@@ -111,7 +111,9 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
   }, {
     key: "suggest",
     value: function () {
-      var _suggest = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(query, callback) {
+      var _suggest = (0, _asyncToGenerator2.default)(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee(query, callback) {
         var _this3 = this;
 
         var url, params, buildParametersOptions, response, json, domTomCountryCodes, suggestions;
@@ -177,7 +179,7 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
                   var labelParts = next.label.split(', '); // France, Corrèze => France, (19) Corrèze
 
                   var newLabel = labelParts.slice(0, -1).concat(['(' + departmentCode[0] + ') ' + labelParts.pop(-1)]).join(', ');
-                  return [].concat((0, _toConsumableArray2.default)(res), [_objectSpread(_objectSpread({}, next), {}, {
+                  return [].concat((0, _toConsumableArray2.default)(res), [_objectSpread({}, next, {
                     label: newLabel
                   })]);
                 }, []) // Format response (inverse order label)
@@ -207,8 +209,11 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
   }, {
     key: "reverse",
     value: function () {
-      var _reverse = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(searchRequest, callback) {
-        var url, params, response, json, results;
+      var _reverse = (0, _asyncToGenerator2.default)(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee2(searchRequest, callback) {
+        var url, params, response, paramsURLSearchParams, _url, json, results;
+
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -244,15 +249,53 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
                   params += this._buildParameters(this.config.reverse.options);
                 }
 
-                _context2.next = 14;
+                response = {};
+
+                if (!this.config.cacheEnable) {
+                  _context2.next = 24;
+                  break;
+                }
+
+                if (!(!this.config.cacheUrl || !this.config.cacheKey)) {
+                  _context2.next = 16;
+                  break;
+                }
+
+                throw new Error("Missing parameter cacheUrl || cacheKey");
+
+              case 16:
+                paramsURLSearchParams = new URLSearchParams(params);
+                params = Object.fromEntries(paramsURLSearchParams.entries());
+                _url = new URL(path.join("reverse-geocoder"), this.config.cacheUrl).toString();
+                _context2.next = 21;
+                return (0, _crossFetch.default)(_url, {
+                  method: "post",
+                  headers: {
+                    'Content-Type': 'application/json',
+                    'x-api-key': this.config.cacheKey
+                  },
+                  body: JSON.stringify({
+                    "params": params
+                  })
+                });
+
+              case 21:
+                response = _context2.sent;
+                _context2.next = 27;
+                break;
+
+              case 24:
+                _context2.next = 26;
                 return (0, _crossFetch.default)(url + params);
 
-              case 14:
+              case 26:
                 response = _context2.sent;
-                _context2.next = 17;
+
+              case 27:
+                _context2.next = 29;
                 return response.json();
 
-              case 17:
+              case 29:
                 json = _context2.sent;
                 results = [];
 
@@ -262,7 +305,7 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
 
                 callback(results, response.status);
 
-              case 21:
+              case 33:
               case "end":
                 return _context2.stop();
             }
@@ -279,8 +322,11 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
   }, {
     key: "geocode",
     value: function () {
-      var _geocode = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(searchRequest, callback) {
-        var url, params, dptCode, response, json, results;
+      var _geocode = (0, _asyncToGenerator2.default)(
+      /*#__PURE__*/
+      _regenerator.default.mark(function _callee3(searchRequest, callback) {
+        var url, params, dptCode, response, paramsURLSearchParams, _url2, json, results;
+
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -349,15 +395,53 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
                   params += this._buildParameters(this.config.geocode.options);
                 }
 
-                _context3.next = 12;
+                response = {};
+
+                if (!this.config.cacheEnable) {
+                  _context3.next = 22;
+                  break;
+                }
+
+                if (!(!this.config.cacheUrl || !this.config.cacheKey)) {
+                  _context3.next = 14;
+                  break;
+                }
+
+                throw new Error("Missing parameter cacheUrl || cacheKey");
+
+              case 14:
+                paramsURLSearchParams = new URLSearchParams(params);
+                params = Object.fromEntries(paramsURLSearchParams.entries());
+                _url2 = new URL(path.join("geocoder"), this.config.cacheUrl).toString();
+                _context3.next = 19;
+                return (0, _crossFetch.default)(_url2, {
+                  method: "post",
+                  headers: {
+                    'Content-Type': 'application/json',
+                    'x-api-key': this.config.cacheKey
+                  },
+                  body: JSON.stringify({
+                    "params": params
+                  })
+                });
+
+              case 19:
+                response = _context3.sent;
+                _context3.next = 25;
+                break;
+
+              case 22:
+                _context3.next = 24;
                 return (0, _crossFetch.default)(url + params);
 
-              case 12:
+              case 24:
                 response = _context3.sent;
-                _context3.next = 15;
+
+              case 25:
+                _context3.next = 27;
                 return response.json();
 
-              case 15:
+              case 27:
                 json = _context3.sent;
                 results = [];
 
@@ -367,7 +451,7 @@ var HereGeocoder = /*#__PURE__*/function (_ProviderGeocoder) {
 
                 callback(results, response.status);
 
-              case 19:
+              case 31:
               case "end":
                 return _context3.stop();
             }

diff --git a/node/providers/Here/Map.js b/node/providers/Here/Map.js
@@ -11,32 +11,28 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _ProviderMap2 = _interopRequireDefault(require("../ProviderMap"));
 
 var _leaflet = _interopRequireDefault(require("leaflet"));
 
 var _leafletTilelayerHere = _interopRequireDefault(require("../../../vendors/Leaflet.TileLayer.HERE/leaflet-tilelayer-here"));
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var HereMap = /*#__PURE__*/function (_ProviderMap) {
+var HereMap =
+/*#__PURE__*/
+function (_ProviderMap) {
   (0, _inherits2.default)(HereMap, _ProviderMap);
 
-  var _super = _createSuper(HereMap);
-
   function HereMap(config) {
     var _this;
 
     (0, _classCallCheck2.default)(this, HereMap);
-    _this = _super.call(this);
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(HereMap).call(this));
     _this.providerName = 'Here';
     _this.config = config;
     return _this;

diff --git a/node/providers/ProviderGeocoder.js b/node/providers/ProviderGeocoder.js
@@ -15,7 +15,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
  * This class define (but not implement) common methods of each provider
  * It also define shared variables
  */
-var ProviderGeocoder = /*#__PURE__*/function () {
+var ProviderGeocoder =
+/*#__PURE__*/
+function () {
   function ProviderGeocoder() {
     (0, _classCallCheck2.default)(this, ProviderGeocoder);
 

diff --git a/node/providers/ProviderMap.js b/node/providers/ProviderMap.js
@@ -19,7 +19,9 @@ var _leaflet = _interopRequireDefault(require("leaflet"));
  *
  * You can choose to manipulate directly leaflet or write methods here
  */
-var ProviderMap = /*#__PURE__*/function () {
+var ProviderMap =
+/*#__PURE__*/
+function () {
   function ProviderMap() {
     (0, _classCallCheck2.default)(this, ProviderMap);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitregroup/map-location-factory",
-  "version": "1.8.0",
+  "version": "1.8.3",
   "description": "Map and location factory",
   "files": [
     "browser",