@rio-cloud/rio-uikit 0.16.2-beta.12 → 0.16.2-beta.13

package/components/map/components/Map.js

@@ -59,14 +59,14 @@ var getBounds = function getBounds(boundingBox) {
     right = boundingBox.right;
   return new H.geo.Rect(top, left, bottom, right);
 };
-var getLayer = function getLayer(api, layer, language, useWebGL) {
+var getLayer = function getLayer(api, layer, language, enableWebGL) {
   switch (layer) {
     case MAP_LAYER_TRAFFIC:
       return /*#__PURE__*/React.createElement(TrafficLayer, {
         api: api,
         language: language,
         key: layer,
-        useWebGL: useWebGL
+        useWebGL: enableWebGL
       });
     case MAP_LAYER_INCIDENTS:
       return /*#__PURE__*/React.createElement(IncidentsLayer, {
@@ -79,17 +79,17 @@ var getLayer = function getLayer(api, layer, language, useWebGL) {
         api: api,
         language: language,
         key: layer,
-        useWebGL: useWebGL
+        useWebGL: enableWebGL
       });
     default:
       null;
   }
 };
-var getBaseLayer = function getBaseLayer(api, baseLayer, language, useWebGL, darkMode) {
+var getBaseLayer = function getBaseLayer(api, baseLayer, language, enableWebGL, darkMode) {
   switch (baseLayer) {
     case MAP_TYPE_DEFAULT:
       {
-        return !darkMode && useWebGL ? /*#__PURE__*/React.createElement(DefaultVectorLayer, {
+        return !darkMode && enableWebGL ? /*#__PURE__*/React.createElement(DefaultVectorLayer, {
           api: api,
           language: language,
           key: baseLayer
@@ -173,7 +173,8 @@ var Map = function Map(props) {
     onZoomOut = props.onZoomOut,
     mapSettingsTooltip = props.mapSettingsTooltip,
     mapSettings = props.mapSettings,
-    useWebGL = props.useWebGL,
+    enableWebGL = props.enableWebGL,
+    enableDevicePixelRatio = props.enableDevicePixelRatio,
     darkMode = props.darkMode;
   var mapRef = useRef(null);
   var _useState = useState(false),
@@ -209,13 +210,13 @@ var Map = function Map(props) {
       onMapTypeChange(MAP_TYPE_DEFAULT);
     }
   }, [isDarkMode]);
-  var devicePixelRatio = window.devicePixelRatio || 1;
+  var devicePixelRatio = enableDevicePixelRatio ? window.devicePixelRatio || 1 : 1;
   useEffect(function () {
     console.debug('initialize here map');
     var bounds = boundingBox && getBounds(boundingBox);
     var platform = getPlatform(credentials);
     var defaultLayers = platform.createDefaultLayers();
-    var defaultLayer = getDefaultBaseLayer(defaultLayers, baseLayer, useWebGL);
+    var defaultLayer = getDefaultBaseLayer(defaultLayers, baseLayer, enableWebGL);
 
     // Instantiate (and display) a map object:
     var mapConfig = {
@@ -268,7 +269,7 @@ var Map = function Map(props) {
         hereMap.dispose();
       }
     };
-  }, [useWebGL]);
+  }, [enableWebGL, enableDevicePixelRatio]);
 
   // Update BoundingBox from outside
   useEffect(function () {
@@ -388,8 +389,8 @@ var Map = function Map(props) {
       onShowClusterChange: handleShowClusterChange,
       mapSettingsTooltip: mapSettingsTooltip
     }
-  }, mapSettings), getBaseLayer(api, baseLayer, language, useWebGL, darkMode), map(function (layer) {
-    return getLayer(api, layer, language, useWebGL);
+  }, mapSettings), getBaseLayer(api, baseLayer, language, enableWebGL, darkMode), map(function (layer) {
+    return getLayer(api, layer, language, enableWebGL);
   }, activeLayers), children && /*#__PURE__*/React.createElement("div", {
     className: 'MapElements'
   }, isFunction(children) ? children(api) : enrichChildrenWithApi(children, api))));
@@ -417,7 +418,8 @@ Map.defaultProps = {
   onShowClusterChange: function onShowClusterChange() {},
   onZoomIn: function onZoomIn() {},
   onZoomOut: function onZoomOut() {},
-  useWebGL: true,
+  enableWebGL: true,
+  enableDevicePixelRatio: true,
   darkMode: false
 };
 Map.propTypes = {
@@ -446,7 +448,8 @@ Map.propTypes = {
   getApi: PropTypes.func,
   mapSettingsTooltip: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   mapSettings: PropTypes.node,
-  useWebGL: PropTypes.bool,
+  enableWebGL: PropTypes.bool,
+  enableDevicePixelRatio: PropTypes.bool,
   darkMode: PropTypes.bool
 };
 export default Map;

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

@@ -11,7 +11,8 @@ var DefaultRasterLayer = function DefaultRasterLayer(props) {
     language: language,
     mapType: 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/components/map/components/features/layers/baselayers/useBaseLayer.js

@@ -41,9 +41,10 @@ export var useBaseLayer = function useBaseLayer(props) {
   useEffect(function () {
     if (!baseLayer) {
       var additionalParametersWithLocale = _objectSpread(_objectSpread({}, additionalParameters), {}, {
-        lg: mapToLongLocale(language),
-        ppi: getPPI()
+        lg: mapToLongLocale(language)
+        // ppi: getPPI(),
       });
+
       var defaultLayers = api.platform.createDefaultLayers(additionalParametersWithLocale);
       var newBaseLayer = getDefaultBaseLayer(defaultLayers, mapType, isWebGL);
       api.map.setBaseLayer(newBaseLayer);

package/lib/es/components/map/components/Map.js

@@ -70,14 +70,14 @@ var getBounds = function getBounds(boundingBox) {
     right = boundingBox.right;
   return new H.geo.Rect(top, left, bottom, right);
 };
-var getLayer = function getLayer(api, layer, language, useWebGL) {
+var getLayer = function getLayer(api, layer, language, enableWebGL) {
   switch (layer) {
     case _constants.MAP_LAYER_TRAFFIC:
       return /*#__PURE__*/_react["default"].createElement(_TrafficLayer["default"], {
         api: api,
         language: language,
         key: layer,
-        useWebGL: useWebGL
+        useWebGL: enableWebGL
       });
     case _constants.MAP_LAYER_INCIDENTS:
       return /*#__PURE__*/_react["default"].createElement(_IncidentsLayer["default"], {
@@ -90,17 +90,17 @@ var getLayer = function getLayer(api, layer, language, useWebGL) {
         api: api,
         language: language,
         key: layer,
-        useWebGL: useWebGL
+        useWebGL: enableWebGL
       });
     default:
       null;
   }
 };
-var getBaseLayer = function getBaseLayer(api, baseLayer, language, useWebGL, darkMode) {
+var getBaseLayer = function getBaseLayer(api, baseLayer, language, enableWebGL, darkMode) {
   switch (baseLayer) {
     case _constants.MAP_TYPE_DEFAULT:
       {
-        return !darkMode && useWebGL ? /*#__PURE__*/_react["default"].createElement(_DefaultVectorLayer["default"], {
+        return !darkMode && enableWebGL ? /*#__PURE__*/_react["default"].createElement(_DefaultVectorLayer["default"], {
           api: api,
           language: language,
           key: baseLayer
@@ -184,7 +184,8 @@ var Map = function Map(props) {
     onZoomOut = props.onZoomOut,
     mapSettingsTooltip = props.mapSettingsTooltip,
     mapSettings = props.mapSettings,
-    useWebGL = props.useWebGL,
+    enableWebGL = props.enableWebGL,
+    enableDevicePixelRatio = props.enableDevicePixelRatio,
     darkMode = props.darkMode;
   var mapRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
@@ -220,13 +221,13 @@ var Map = function Map(props) {
       onMapTypeChange(_constants.MAP_TYPE_DEFAULT);
     }
   }, [isDarkMode]);
-  var devicePixelRatio = window.devicePixelRatio || 1;
+  var devicePixelRatio = enableDevicePixelRatio ? window.devicePixelRatio || 1 : 1;
   (0, _react.useEffect)(function () {
     console.debug('initialize here map');
     var bounds = boundingBox && getBounds(boundingBox);
     var platform = getPlatform(credentials);
     var defaultLayers = platform.createDefaultLayers();
-    var defaultLayer = (0, _useBaseLayer.getDefaultBaseLayer)(defaultLayers, baseLayer, useWebGL);
+    var defaultLayer = (0, _useBaseLayer.getDefaultBaseLayer)(defaultLayers, baseLayer, enableWebGL);
 
     // Instantiate (and display) a map object:
     var mapConfig = {
@@ -279,7 +280,7 @@ var Map = function Map(props) {
         hereMap.dispose();
       }
     };
-  }, [useWebGL]);
+  }, [enableWebGL, enableDevicePixelRatio]);
 
   // Update BoundingBox from outside
   (0, _react.useEffect)(function () {
@@ -399,8 +400,8 @@ var Map = function Map(props) {
       onShowClusterChange: handleShowClusterChange,
       mapSettingsTooltip: mapSettingsTooltip
     }
-  }, mapSettings), getBaseLayer(api, baseLayer, language, useWebGL, darkMode), (0, _map["default"])(function (layer) {
-    return getLayer(api, layer, language, useWebGL);
+  }, mapSettings), getBaseLayer(api, baseLayer, language, enableWebGL, darkMode), (0, _map["default"])(function (layer) {
+    return getLayer(api, layer, language, enableWebGL);
   }, activeLayers), children && /*#__PURE__*/_react["default"].createElement("div", {
     className: 'MapElements'
   }, (0, _isFunction["default"])(children) ? children(api) : enrichChildrenWithApi(children, api))));
@@ -428,7 +429,8 @@ Map.defaultProps = {
   onShowClusterChange: function onShowClusterChange() {},
   onZoomIn: function onZoomIn() {},
   onZoomOut: function onZoomOut() {},
-  useWebGL: true,
+  enableWebGL: true,
+  enableDevicePixelRatio: true,
   darkMode: false
 };
 Map.propTypes = {
@@ -457,7 +459,8 @@ Map.propTypes = {
   getApi: _propTypes["default"].func,
   mapSettingsTooltip: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].node]),
   mapSettings: _propTypes["default"].node,
-  useWebGL: _propTypes["default"].bool,
+  enableWebGL: _propTypes["default"].bool,
+  enableDevicePixelRatio: _propTypes["default"].bool,
   darkMode: _propTypes["default"].bool
 };
 var _default = Map;

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

@@ -48,9 +48,10 @@ var useBaseLayer = function useBaseLayer(props) {
   (0, _react.useEffect)(function () {
     if (!baseLayer) {
       var additionalParametersWithLocale = _objectSpread(_objectSpread({}, additionalParameters), {}, {
-        lg: (0, _localization.mapToLongLocale)(language),
-        ppi: (0, _mapUtils.getPPI)()
+        lg: (0, _localization.mapToLongLocale)(language)
+        // ppi: getPPI(),
       });
+
       var defaultLayers = api.platform.createDefaultLayers(additionalParametersWithLocale);
       var newBaseLayer = getDefaultBaseLayer(defaultLayers, mapType, isWebGL);
       api.map.setBaseLayer(newBaseLayer);

package/lib/es/types.ts

@@ -873,7 +873,8 @@ export interface MapProps {
     getApi?: Function;
     mapSettingsTooltip?: string | React.ReactNode;
     mapSettings?: React.ReactNode;
-    useWebGl?: boolean;
+    enableWebGl?: boolean;
+    enableDevicePixelRatio?: boolean;
     children?: any;
 }
 

package/lib/es/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.16.2-beta.12"
+    "version": "0.16.2-beta.13"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rio-cloud/rio-uikit",
-    "version": "0.16.2-beta.12",
+    "version": "0.16.2-beta.13",
     "description": "The RIO UIKIT component library",
     "repository": "https://collaboration.msi.audi.com/stash/projects/RIOFRONT/repos/uikit-web/browse",
     "scripts": {

package/types.ts

@@ -873,7 +873,8 @@ export interface MapProps {
     getApi?: Function;
     mapSettingsTooltip?: string | React.ReactNode;
     mapSettings?: React.ReactNode;
-    useWebGl?: boolean;
+    enableWebGl?: boolean;
+    enableDevicePixelRatio?: boolean;
     children?: any;
 }
 

package/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.16.2-beta.12"
+    "version": "0.16.2-beta.13"
 }