@rio-cloud/rio-uikit 0.16.2-beta.9 → 0.16.2

package/lib/es/components/map/components/features/basics/marker/Marker.js

@@ -1,26 +1,24 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 exports.getOrCreateIcon = getOrCreateIcon;
 exports.isHMapIcon = exports.isDomMakerNeeded = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-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 _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _server = _interopRequireDefault(require("react-dom/server"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _proptypes = _interopRequireDefault(require("../../../../utils/proptypes"));
 var _eventHandling = require("../../../../utils/eventHandling");
 var _MapException = _interopRequireDefault(require("../../../../exceptions/MapException"));
 var _context = require("../../../context");
-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; } }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/* eslint-disable no-undef */
+
 var isHMapIcon = function isHMapIcon(icon) {
   return icon instanceof H.map.Icon;
 };
@@ -33,127 +31,114 @@ function getOrCreateIcon(icon) {
   if (!icon || isHMapIcon(icon) || icon instanceof H.map.DomIcon) {
     return;
   }
-  var renderedIcon = /*#__PURE__*/_react["default"].isValidElement(icon) ? _server["default"].renderToStaticMarkup(icon) : icon;
+  var renderedIcon = /*#__PURE__*/_react["default"].isValidElement(icon) ? _server["default"].renderToStaticMarkup( /*#__PURE__*/_react["default"].cloneElement(icon)) : icon;
   return new H.map.DomIcon(renderedIcon);
 }
-var Marker = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2["default"])(Marker, _React$Component);
-  var _super = _createSuper(Marker);
-  function Marker(props, context) {
-    var _this;
-    (0, _classCallCheck2["default"])(this, Marker);
-    _this = _super.call(this, props, context);
-    //console.log(context);
-    _this.setupMarker(props);
-    return _this;
-  }
-
-  // eslint-disable-next-line camelcase
-  (0, _createClass2["default"])(Marker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      var _this$props = this.props,
-        position = _this$props.position,
-        customData = _this$props.customData,
-        icon = _this$props.icon;
-      (0, _eventHandling.checkAndUpdateEventListenerMap)(this.marker, this.props, nextProps);
-      if (position !== nextProps.position) {
-        this.marker.setGeometry(this.getConvertedPosition(nextProps));
-      }
-      this.marker.draggable = !!nextProps.draggable;
-      if (customData !== nextProps.customData) {
-        this.marker.setData(nextProps.customData);
-      }
-      if (icon !== nextProps.icon) {
-        if (isDomMakerNeeded(icon) !== isDomMakerNeeded(nextProps.icon)) {
-          // icon type changed so we need to change the marker type
-          this.destroyMarker();
-          this.setupMarker(nextProps);
-        } else {
-          this.marker.setIcon(getOrCreateIcon(nextProps.icon));
-        }
-      }
-    }
-  }, {
-    key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate() {
-      return false;
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.destroyMarker();
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      return null;
-    }
-  }, {
-    key: "setupMarker",
-    value: function setupMarker(nextProps) {
-      var _this$props2 = this.props,
-        customData = _this$props2.customData,
-        draggable = _this$props2.draggable;
-      var MarkerConstructor = isDomMakerNeeded(nextProps.icon) ? H.map.DomMarker : H.map.Marker;
-      this.marker = new MarkerConstructor(this.getConvertedPosition(nextProps), {
-        icon: getOrCreateIcon(nextProps.icon)
-      });
-      this.marker.setData(customData);
-      this.marker.draggable = !!draggable;
-      this.context.group.addObject(this.marker);
-      (0, _eventHandling.addEventListenerMap)(this.marker, nextProps.eventListenerMap, this.context.map);
+var convertPosition = function convertPosition(pos) {
+  return Array.isArray(pos) ? new H.geo.MultiPoint(pos) : pos;
+};
+var checkPositionProperties = function checkPositionProperties(position) {
+  ['lat', 'lng'].forEach(function (propertyName) {
+    // eslint-disable-next-line no-prototype-builtins
+    if (!position.hasOwnProperty(propertyName)) {
+      throw new _MapException["default"]("Error in Marker: position object requires property \"".concat(propertyName, "\""));
     }
-  }, {
-    key: "destroyMarker",
-    value: function destroyMarker() {
-      (0, _eventHandling.removeEventListenerMap)(this.marker);
-      if (this.context.group.getObjects().includes(this.marker)) {
-        this.context.group.removeObject(this.marker);
+  });
+};
+var getPosition = function getPosition(position) {
+  if (!position) {
+    throw new _MapException["default"]('Error in Marker: invalid position property');
+  }
+  if (Array.isArray(position)) {
+    position.forEach(function (pos) {
+      return checkPositionProperties(pos);
+    });
+  } else {
+    checkPositionProperties(position);
+  }
+  return position;
+};
+var getConvertedPosition = function getConvertedPosition(position) {
+  return convertPosition(getPosition(position));
+};
+var setupMarker = function setupMarker(props, api) {
+  var position = props.position,
+    customData = props.customData,
+    icon = props.icon,
+    draggable = props.draggable,
+    eventListenerMap = props.eventListenerMap;
+  var MarkerConstructor = isDomMakerNeeded(icon) ? H.map.DomMarker : H.map.Marker;
+  var marker = new MarkerConstructor(getConvertedPosition(position), {
+    icon: getOrCreateIcon(icon, api.settings.baseLayer)
+  });
+  marker.setData(customData);
+  marker.draggable = !!draggable;
+  api.map.addObject(marker);
+  (0, _eventHandling.addEventListenerMap)(marker, eventListenerMap, api.map);
+  return marker;
+};
+var destroyMarker = function destroyMarker(marker, api) {
+  (0, _eventHandling.removeEventListenerMap)(marker);
+  if (api.map.getObjects().includes(marker)) {
+    api.map.removeObject(marker);
+  }
+  marker.dispose();
+};
+var Marker = function Marker(props) {
+  var position = props.position,
+    customData = props.customData,
+    icon = props.icon,
+    eventListenerMap = props.eventListenerMap;
+  var _useContext = (0, _react.useContext)(_context.MapContext),
+    api = _useContext.api;
+  var markerRef = (0, _react.useRef)();
+  (0, _react.useEffect)(function () {
+    markerRef.current = setupMarker(props, api);
+    return function () {
+      if (markerRef.current) {
+        destroyMarker(markerRef.current, api);
+        markerRef.current = undefined;
       }
-      this.marker.dispose();
+    };
+  }, []);
+
+  // Update marker position
+  (0, _react.useEffect)(function () {
+    if (markerRef.current) {
+      markerRef.current.setGeometry(getConvertedPosition(position));
     }
-  }, {
-    key: "getConvertedPosition",
-    value: function getConvertedPosition(props) {
-      return this.convertPosition(this.getPosition(props));
+  }, [position, markerRef.current]);
+
+  // Update marker custom data
+  (0, _react.useEffect)(function () {
+    if (markerRef.current) {
+      markerRef.current.setData(customData);
     }
-  }, {
-    key: "getPosition",
-    value: function getPosition(props) {
-      var _this2 = this;
-      var position = props.position;
-      if (!position) {
-        throw new _MapException["default"]('Error in Marker: invalid position property');
-      }
-      if (Array.isArray(position)) {
-        position.forEach(function (pos) {
-          return _this2.checkPositionProperties(pos);
-        });
-      } else {
-        this.checkPositionProperties(position);
-      }
-      return position;
+  }, [customData, markerRef.current]);
+
+  // Update EventListenerMap
+  (0, _react.useEffect)(function () {
+    if (markerRef.current) {
+      // use exports to make methods accessible for stubbing
+      var mapApi = (0, _eventHandling.removeEventListenerMap)(markerRef.current);
+      (0, _eventHandling.addEventListenerMap)(markerRef.current, eventListenerMap, mapApi);
     }
-  }, {
-    key: "checkPositionProperties",
-    value: function checkPositionProperties(position) {
-      ['lat', 'lng'].forEach(function (propertyName) {
-        // eslint-disable-next-line no-prototype-builtins
-        if (!position.hasOwnProperty(propertyName)) {
-          throw new _MapException["default"]("Error in Marker: position object requires property \"".concat(propertyName, "\""));
-        }
-      });
+  }, [eventListenerMap, markerRef.current]);
+
+  // If icon type changed, we need to change the marker type
+  (0, _react.useEffect)(function () {
+    if (!(markerRef.current && icon)) {
+      return;
     }
-  }, {
-    key: "convertPosition",
-    value: function convertPosition(pos) {
-      return Array.isArray(pos) ? new H.geo.MultiPoint(pos) : pos;
+    if (isDomMakerNeeded(icon)) {
+      destroyMarker(markerRef.current, api);
+      markerRef.current = setupMarker(props, api);
+    } else {
+      markerRef.current.setIcon(getOrCreateIcon(icon));
     }
-  }]);
-  return Marker;
-}(_react["default"].Component);
-Marker.contextType = _context.MapContext;
+  }, [icon, markerRef.current]);
+  return null;
+};
 Marker.propTypes = {
   position: _propTypes["default"].oneOfType([_proptypes["default"].position, _proptypes["default"].positions]).isRequired,
   icon: _proptypes["default"].icon,

package/lib/es/components/map/components/features/basics/marker/TextMarker.js

@@ -7,58 +7,31 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrongTypeException = exports.emptyTextException = exports["default"] = void 0;
 var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-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 _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _MapException = _interopRequireDefault(require("../../../../exceptions/MapException"));
 var _proptypes = _interopRequireDefault(require("../../../../utils/proptypes"));
 var _Marker = _interopRequireDefault(require("./Marker"));
-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 emptyTextException = 'Error in TextMarker: TextMarker without text makes no sense';
 exports.emptyTextException = emptyTextException;
 var wrongTypeException = 'Error in TextMarker: property text must be string type';
 exports.wrongTypeException = wrongTypeException;
-var TextMarker = /*#__PURE__*/function (_React$PureComponent) {
-  (0, _inherits2["default"])(TextMarker, _React$PureComponent);
-  var _super = _createSuper(TextMarker);
-  function TextMarker() {
-    (0, _classCallCheck2["default"])(this, TextMarker);
-    return _super.apply(this, arguments);
+var TextMarker = function TextMarker(props) {
+  var other = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(props), props));
+  var textDiv = "<div class=\"bg-white padding-x-5 padding-y-3 border border-color-darker shadow-accent\">".concat(getText(props.text), "</div>");
+  return /*#__PURE__*/_react["default"].createElement(_Marker["default"], (0, _extends2["default"])({}, other, {
+    icon: textDiv
+  }));
+};
+var getText = function getText(text) {
+  if (!text) {
+    throw new _MapException["default"](emptyTextException);
   }
-  (0, _createClass2["default"])(TextMarker, [{
-    key: "render",
-    value: function render() {
-      var other = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(this.props), this.props));
-
-      // const textDiv = ReactDomServer.renderToStaticMarkup(
-      //     <div style={{ border: '1px solid black', padding: '0 2px' }}>{this.getText()}</div>
-      // );
-
-      var textDiv = "<div>".concat(this.getText(), "</div>");
-      return /*#__PURE__*/_react["default"].createElement(_Marker["default"], (0, _extends2["default"])({}, other, {
-        icon: textDiv
-      }));
-    }
-  }, {
-    key: "getText",
-    value: function getText() {
-      var text = this.props.text;
-      if (!text) {
-        throw new _MapException["default"](emptyTextException);
-      }
-      if (typeof text !== 'string') {
-        throw new _MapException["default"](wrongTypeException);
-      }
-      return text;
-    }
-  }]);
-  return TextMarker;
-}(_react["default"].PureComponent);
+  if (typeof text !== 'string') {
+    throw new _MapException["default"](wrongTypeException);
+  }
+  return text;
+};
 TextMarker.propTypes = {
   position: _propTypes["default"].oneOfType([_proptypes["default"].position, _proptypes["default"].positions]).isRequired,
   text: _propTypes["default"].string.isRequired

package/lib/es/components/map/components/features/layers/Layer.js

@@ -24,7 +24,7 @@ var Layer = function Layer(props) {
         newLayer.dispose();
       }
     };
-  }, []);
+  }, [api.map]);
   return null;
 };
 Layer.propTypes = {

package/lib/es/components/map/components/features/layers/MarkerLayer.js

@@ -25,13 +25,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * Not very different to the SimpleClusterLayer, but with a different intention.
  */
 var MarkerLayer = function MarkerLayer(props) {
-  var context = (0, _react.useContext)(_context.MapContext);
+  var _useContext = (0, _react.useContext)(_context.MapContext),
+    api = _useContext.api;
   var simpleTheme = props.simpleTheme,
     _props$clusterDissolv = props.clusterDissolvable,
     clusterDissolvable = _props$clusterDissolv === void 0 ? true : _props$clusterDissolv,
     rest = (0, _objectWithoutProperties2["default"])(props, _excluded);
+
   // Norbert: Not an ideal solution
-  var showCluster = !clusterDissolvable || (0, _getOr["default"])(true, 'settings.showCluster', context);
+  var showCluster = !clusterDissolvable || (0, _getOr["default"])(true, 'settings.showCluster', api);
   var newProps = _objectSpread({
     clusterTheme: simpleTheme && (0, _clustering.wrapSimpleTheme)(simpleTheme)
   }, rest);
@@ -40,9 +42,10 @@ var MarkerLayer = function MarkerLayer(props) {
   }));
 };
 MarkerLayer.propTypes = {
-  // api: mapProps.api,
   simpleTheme: _proptypes["default"].clusterTheme,
-  clusterDissolvable: _propTypes["default"].bool
+  clusterDissolvable: _propTypes["default"].bool,
+  clusterStrategy: _propTypes["default"].oneOf(['FASTGRID', 'GRID', 'DYNAMICGRID']),
+  eps: _propTypes["default"].number
 };
 var _default = MarkerLayer;
 exports["default"] = _default;

package/lib/es/components/map/components/features/layers/RoadRestrictionLayer.js

@@ -9,7 +9,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _constants = require("../../constants");
-var _mapUtils = require("../../mapUtils");
 var _Layer = _interopRequireDefault(require("./Layer"));
 var _excluded = ["useWebGL"];
 var createRoadRestrictionLayer = function createRoadRestrictionLayer(useWebGL) {
@@ -19,7 +18,7 @@ var createRoadRestrictionLayer = function createRoadRestrictionLayer(useWebGL) {
     }).createTileLayer('truckonlytile', 'normal.day', _constants.TILE_SIZE, _constants.FORMAT, {
       style: 'default',
       lg: language,
-      ppi: useWebGL ? undefined : (0, _mapUtils.getPPI)()
+      ppi: undefined
     });
   };
 };

package/lib/es/components/map/components/features/layers/TrafficLayer.js

@@ -11,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
 var _constants = require("../../constants");
 var _Layer = _interopRequireDefault(require("./Layer"));
 var _excluded = ["useWebGL"];
-var createVebGlTrafficLayer = function createVebGlTrafficLayer(api, language) {
+var createWebGlTrafficLayer = function createWebGlTrafficLayer(api, language) {
   // use new Here 3.1 API traffic layer for WebGL
   // https://developer.here.com/documentation/maps/3.1.37.0/dev_guide/topics/migration.html
 
@@ -33,7 +33,7 @@ var createRasterTrafficLayer = function createRasterTrafficLayer(api, language)
 var TrafficLayer = function TrafficLayer(props) {
   var useWebGL = props.useWebGL,
     remainingProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
-  var createLayerCallback = useWebGL ? createVebGlTrafficLayer : createRasterTrafficLayer;
+  var createLayerCallback = useWebGL ? createWebGlTrafficLayer : createRasterTrafficLayer;
   return /*#__PURE__*/_react["default"].createElement(_Layer["default"], (0, _extends2["default"])({}, remainingProps, {
     createLayer: createLayerCallback
   }));

package/lib/es/components/map/components/features/layers/baselayers/DefaultRasterLayer.js

@@ -16,7 +16,8 @@ var DefaultRasterLayer = function DefaultRasterLayer(props) {
     language: language,
     mapType: _constants.MAP_TYPE_DEFAULT,
     additionalParameters: {
-      style: 'alps'
+      // should not be used as Vector map does not support it it would different anyhow
+      //style: 'alps',
     }
   });
   return null;

package/lib/es/components/map/components/features/layers/baselayers/useBaseLayer.js

@@ -49,7 +49,10 @@ var useBaseLayer = function useBaseLayer(props) {
     if (!baseLayer) {
       var additionalParametersWithLocale = _objectSpread(_objectSpread({}, additionalParameters), {}, {
         lg: (0, _localization.mapToLongLocale)(language),
-        ppi: (0, _mapUtils.getPPI)()
+        // ppi: getPPI(),
+
+        // need to be set for better performence of legacy map
+        engineType: isWebGL ? undefined : H.map.render.RenderEngine.EngineType.P2D
       });
       var defaultLayers = api.platform.createDefaultLayers(additionalParametersWithLocale);
       var newBaseLayer = getDefaultBaseLayer(defaultLayers, mapType, isWebGL);

package/lib/es/components/map/components/features/layers/clustering/ClusterLayer.js

@@ -20,6 +20,16 @@ var convertData = function convertData(data, converterFunc) {
   return data.map(converterFunc ? converterFunc : DEFAULT_DATA_CONVERTER);
 };
 var DEFAULT_CLUSTER_THEME = new H.clustering.Provider([]).getTheme();
+var getClusterStrategy = function getClusterStrategy(strategy) {
+  switch (strategy) {
+    case 'GRID':
+      return H.clustering.Provider.Strategy.GRID;
+    case 'DYNAMICGRID':
+      return H.clustering.Provider.Strategy.DYNAMICGRID;
+    default:
+      return H.clustering.Provider.Strategy.FASTGRID;
+  }
+};
 var ClusterLayer = function ClusterLayer(_ref) {
   var data = _ref.data,
     dataConverter = _ref.dataConverter,
@@ -28,8 +38,12 @@ var ClusterLayer = function ClusterLayer(_ref) {
     maxZoom = _ref.maxZoom,
     _ref$clusterTheme = _ref.clusterTheme,
     clusterTheme = _ref$clusterTheme === void 0 ? DEFAULT_CLUSTER_THEME : _ref$clusterTheme,
-    eventListenerMap = _ref.eventListenerMap;
-  var context = (0, _react.useContext)(_context.MapContext);
+    eventListenerMap = _ref.eventListenerMap,
+    clusterStrategy = _ref.clusterStrategy,
+    _ref$eps = _ref.eps,
+    eps = _ref$eps === void 0 ? 100 : _ref$eps;
+  var _useContext = (0, _react.useContext)(_context.MapContext),
+    api = _useContext.api;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     provider = _useState2[0],
@@ -37,8 +51,8 @@ var ClusterLayer = function ClusterLayer(_ref) {
   (0, _react.useEffect)(function () {
     var newProviderOptions = {
       clusteringOptions: {
-        strategy: H.clustering.Provider.Strategy.DYNAMICGRID,
-        eps: 100,
+        strategy: getClusterStrategy(clusterStrategy),
+        eps: eps,
         minWeight: minWeight ? parseInt(minWeight, 10) : 2
       },
       min: minZoom ? parseInt(minZoom, 10) : 0,
@@ -49,14 +63,14 @@ var ClusterLayer = function ClusterLayer(_ref) {
     };
     var newProvider = new H.clustering.Provider(convertData(data, dataConverter), newProviderOptions);
     var objectLayer = new H.map.layer.ObjectLayer(newProvider);
-    context.map.addLayer(objectLayer);
+    api.map.addLayer(objectLayer);
     setProvider(newProvider);
     return function () {
-      context.map.removeLayer(objectLayer);
+      api.map.removeLayer(objectLayer);
       objectLayer.dispose();
       newProvider.dispose();
     };
-  }, [minWeight, minZoom, maxZoom]);
+  }, [minWeight, minZoom, maxZoom, api.map]);
 
   // Effect to update data points of provider
   (0, _react.useLayoutEffect)(function () {
@@ -65,7 +79,7 @@ var ClusterLayer = function ClusterLayer(_ref) {
     }
   }, [data, dataConverter]);
   (0, _hooks.useUpdateProp)(provider, 'setTheme', clusterTheme);
-  (0, _hooks.useUpdateEventListenerMap)(provider, eventListenerMap, context.map);
+  (0, _hooks.useUpdateEventListenerMap)(provider, eventListenerMap, api.map);
   return null;
 };
 ClusterLayer.propTpyes = {
@@ -75,7 +89,9 @@ ClusterLayer.propTpyes = {
   minZoom: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
   maxZoom: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
   clusterTheme: _proptypes["default"].clusterTheme,
-  eventListenerMap: _propTypes["default"].object
+  eventListenerMap: _propTypes["default"].object,
+  clusterStrategy: _propTypes["default"].oneOf(['FASTGRID', 'GRID', 'DYNAMICGRID']),
+  eps: _propTypes["default"].number
 };
 var _default = ClusterLayer;
 exports["default"] = _default;

package/lib/es/components/map/components/features/settings/builtinSettings/MapTypeSettings.js

@@ -15,12 +15,13 @@ var _MapSettingsPanel = _interopRequireDefault(require("../MapSettingsPanel"));
 var _MapSettingsItem = _interopRequireDefault(require("../MapSettingsItem"));
 var _MapSettingsTile = _interopRequireDefault(require("../MapSettingsTile"));
 var _MapIcon = require("../../../../icons/MapIcon");
-var _excluded = ["mapType", "onMapTypeChange"];
+var _excluded = ["mapType", "onMapTypeChange", "enableNightMap"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var MapTypeSettings = function MapTypeSettings(props) {
   var mapType = props.mapType,
     onMapTypeChange = props.onMapTypeChange,
+    enableNightMap = props.enableNightMap,
     remainingProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var type = (0, _react.useMemo)(function () {
     return {
@@ -61,7 +62,19 @@ var MapTypeSettings = function MapTypeSettings(props) {
   return /*#__PURE__*/_react["default"].createElement(_MapSettingsTile["default"], (0, _extends2["default"])({
     className: "MapTypeSettings",
     inactiveIcon: getIcon(type),
-    panel: /*#__PURE__*/_react["default"].createElement(_MapSettingsPanel["default"], null, /*#__PURE__*/_react["default"].createElement(_MapSettingsItem["default"], {
+    panel: /*#__PURE__*/_react["default"].createElement(_MapSettingsPanel["default"], null, enableNightMap && /*#__PURE__*/_react["default"].createElement(_MapSettingsItem["default"], {
+      className: "MapTypeNight",
+      onClick: function onClick() {
+        return onMapTypeChange(_constants.MAP_TYPE_NIGHT);
+      },
+      isActive: type.isNight,
+      activeIcon: /*#__PURE__*/_react["default"].createElement(_MapIcon.MapIcon, {
+        name: _MapIcon.MAP_TYPE_NIGHT_ACTIVE
+      }),
+      inactiveIcon: /*#__PURE__*/_react["default"].createElement(_MapIcon.MapIcon, {
+        name: _MapIcon.MAP_TYPE_NIGHT_INACTIVE
+      })
+    }), /*#__PURE__*/_react["default"].createElement(_MapSettingsItem["default"], {
       className: "MapTypeSatelite",
       onClick: function onClick() {
         return onMapTypeChange(_constants.MAP_TYPE_SATELLITE);
@@ -114,10 +127,12 @@ var MapTypeSettings = function MapTypeSettings(props) {
 };
 MapTypeSettings.displayName = 'MapTypeSettings';
 MapTypeSettings.defaultProps = {
-  onMapTypeChange: function onMapTypeChange() {}
+  onMapTypeChange: function onMapTypeChange() {},
+  enableNightMap: true
 };
 MapTypeSettings.propTypes = {
   mapType: _propTypes["default"].string,
+  enableNightMap: _propTypes["default"].bool,
   onMapTypeChange: _propTypes["default"].func
 };
 var _default = MapTypeSettings;