@sapui5/sap.ui.vbm 1.107.0 → 1.109.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.107.0",
+  "version": "1.109.0",
   "description": "SAPUI5 Library sap.ui.vbm",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/vbm/.library

@@ -3,7 +3,7 @@
 	<name>sap.ui.vbm</name>
 	<vendor>SAP SE</vendor>
 	<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
-	<version>1.107.0</version>
+	<version>1.109.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 

package/src/sap/ui/vbm/Adapter.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

package/src/sap/ui/vbm/Adapter3D.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new object
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -293,6 +293,9 @@ sap.ui.define([
 			this._disconnectViewport();
 			this._viewport = associatedViewport;
 			this._connectViewport();
+			var orbitInstance = this._viewport.getOrbitControl();
+			orbitInstance.setConfig(this._context.config);
+			orbitInstance.setUtilities(Utilities);
 		}
 	};
 
@@ -751,11 +754,12 @@ sap.ui.define([
 	};
 
 	Adapter3D.prototype._genericEventHandler = function(name, event) {
-		// special handling section for hardcoded keys
-		// 'h' button pressed -> change camera to 'home' (initial) view
-		if (event.keyCode == 72) {
+		
+		var homeButtonKey = Utilities.parseKeyboardShortcut(this._context.config.has("HOME_VIEW") ? this._context.config.get("HOME_VIEW") : "72");
+		
+		if (Utilities.matchKeyboardShortcut(event, homeButtonKey)) {
 			this._viewport.applyCameraHome(false); // no fly-to animation needed here
-			return;
+		    return;
 		}
 
 		var instance = event.instance;

package/src/sap/ui/vbm/AnalyticMap.js

@@ -9,8 +9,9 @@ sap.ui.define([
 	"sap/ui/core/theming/Parameters",
 	"jquery.sap.global",
 	"sap/base/Log",
-	"./library"
-], function(GeoMap, VoBase, Parameters, jQuery, Log, library) {
+	"./library",
+	"./AnalyticMapRenderer"
+], function(GeoMap, VoBase, Parameters, jQuery, Log, library, AnalyticMapRenderer) {
 	"use strict";
 
 	/**
@@ -92,7 +93,9 @@ sap.ui.define([
 				 */
 				regionDeselect: {}
 			}
-		}
+		},
+		
+		renderer: AnalyticMapRenderer
 	});
 
 	// ...........................................................................//

package/src/sap/ui/vbm/AnalyticMapRenderer.js

@@ -11,7 +11,9 @@ sap.ui.define([
 	 * @class MapRenderer renderer.
 	 * @static
 	 */
-	var AnalyticMapRenderer = {};
+	var AnalyticMapRenderer = {
+		apiVersion: 2			// Semantic Rendering
+	};
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.

package/src/sap/ui/vbm/Cluster.js

@@ -70,7 +70,9 @@ sap.ui.define([
 				}
 
 			}
-		}
+		},
+
+		renderer: ClusterRenderer
 	});
 
 	// ...........................................................................//

package/src/sap/ui/vbm/ClusterRenderer.js

@@ -11,7 +11,9 @@ sap.ui.define([
 	 * @class Cluster renderer.
 	 * @static
 	 */
-	var ClusterRenderer = {};
+	var ClusterRenderer = {
+		apiVersion: 2     // Semantic Rendering
+	};
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
@@ -21,15 +23,12 @@ sap.ui.define([
 	 */
 	ClusterRenderer.render = function(oRm, oControl) {
 		// write the HTML into the render manager
-		oRm.write("<div align='center'");
-		oRm.writeAttribute("role", sap.ui.core.AccessibleRole.Presentation);
-		oRm.writeAttribute("tabindex", "-1");
-		oRm.writeControlData(oControl);
-		oRm.addClass("sapUiVbicluster-main");
-		oRm.writeClasses(oControl);
-
-		oRm.writeStyles();
-		oRm.write(">"); // span element
+		oRm.openStart("div", oControl);
+		oRm.attr("align", "center");
+		oRm.attr("role", sap.ui.core.AccessibleRole.Presentation);
+		oRm.attr("tabindex", "-1");
+		oRm.class("sapUiVbicluster-main");
+		oRm.openEnd();
 
 		var Id1 = oControl.getId() + "-" + "backgroundcircle";
 		var Id2 = Id1 + "-" + "innercircle";
@@ -55,58 +54,88 @@ sap.ui.define([
 		}
 		var classOuter, classInner, classTextbox, classIcon;
 		if (type == sap.ui.vbm.SemanticType.Error) {
-			classOuter = "class = 'sapUiVbicluster-backgroundcircle sapUiVbicluster-border-error'";
-			classInner = "class = 'sapUiVbicluster-innercircle sapUiVbicluster-background-error'";
-			classIcon = "class = 'sapUiVbicluster-icon sapUiVbicluster-iconLight'";
-			classTextbox = "class = 'sapUiVbicluster-textbox sapUiVbicluster-textbox-error'";
+			classOuter = "sapUiVbicluster-backgroundcircle sapUiVbicluster-border-error";
+			classInner = "sapUiVbicluster-innercircle sapUiVbicluster-background-error";
+			classIcon = "sapUiVbicluster-icon sapUiVbicluster-iconLight";
+			classTextbox = "sapUiVbicluster-textbox sapUiVbicluster-textbox-error";
 		} else if (type == sap.ui.vbm.SemanticType.Warning) {
-			classOuter = "class = 'sapUiVbicluster-backgroundcircle sapUiVbicluster-border-warning'";
-			classInner = "class = 'sapUiVbicluster-innercircle sapUiVbicluster-background-warning'";
-			classIcon = "class = 'sapUiVbicluster-icon sapUiVbicluster-iconLight'";
-			classTextbox = "class = 'sapUiVbicluster-textbox sapUiVbicluster-textbox-warning'";
+			classOuter = "sapUiVbicluster-backgroundcircle sapUiVbicluster-border-warning";
+			classInner = "sapUiVbicluster-innercircle sapUiVbicluster-background-warning";
+			classIcon = "sapUiVbicluster-icon sapUiVbicluster-iconLight";
+			classTextbox = "sapUiVbicluster-textbox sapUiVbicluster-textbox-warning";
 		} else if (type == sap.ui.vbm.SemanticType.Success) {
-			classOuter = "class = 'sapUiVbicluster-backgroundcircle sapUiVbicluster-border-success'";
-			classInner = "class = 'sapUiVbicluster-innercircle sapUiVbicluster-background-success sapUiVbicluster-inner-light'";
-			classIcon = "class = 'sapUiVbicluster-icon sapUiVbicluster-iconSuccess'";
-			classTextbox = "class = 'sapUiVbicluster-textbox sapUiVbicluster-textbox-success'";
+			classOuter = "sapUiVbicluster-backgroundcircle sapUiVbicluster-border-success";
+			classInner = "sapUiVbicluster-innercircle sapUiVbicluster-background-success sapUiVbicluster-inner-light";
+			classIcon = "sapUiVbicluster-icon sapUiVbicluster-iconSuccess";
+			classTextbox = "sapUiVbicluster-textbox sapUiVbicluster-textbox-success";
 		} else if (type == sap.ui.vbm.SemanticType.None && col) {
 			// not type but color
-			classOuter = "class = 'sapUiVbicluster-backgroundcircle' style = 'border-color: " + col + "'";
-			classInner = "class = 'sapUiVbicluster-innercircle sapUiVbicluster-inner-light' style = 'border-color: " + col + "'";
-			classIcon = "class = 'sapUiVbicluster-icon' style = 'color: " + col + "'";
-			classTextbox = "class = 'sapUiVbicluster-textbox' style = 'border-color: " + col + "'";
+			classOuter = "sapUiVbicluster-backgroundcircle";
+			classInner = "sapUiVbicluster-innercircle sapUiVbicluster-inner-light";
+			classIcon = "sapUiVbicluster-icon";
+			classTextbox = "sapUiVbicluster-textbox";
 		} else {
-			classOuter = "class = 'sapUiVbicluster-backgroundcircle sapUiVbicluster-border-default'";
-			classInner = "class = 'sapUiVbicluster-innercircle sapUiVbicluster-background-default sapUiVbicluster-inner-light'";
-			classIcon = "class = 'sapUiVbicluster-icon sapUiVbicluster-iconDefault'";
-			classTextbox = "class = 'sapUiVbicluster-textbox sapUiVbicluster-textbox-default'";
+			classOuter = "sapUiVbicluster-backgroundcircle sapUiVbicluster-border-default";
+			classInner = "sapUiVbicluster-innercircle sapUiVbicluster-background-default sapUiVbicluster-inner-light";
+			classIcon = "sapUiVbicluster-icon sapUiVbicluster-iconDefault";
+			classTextbox = "sapUiVbicluster-textbox sapUiVbicluster-textbox-default";
 		}
 
-		var ariaRolePresentation = "role = '" +  sap.ui.core.AccessibleRole.Presentation + "'";
-		var ariaRoleImg = "role = '" +  sap.ui.core.AccessibleRole.Img + "'";
-		var ariaRoleDescription = "role = '" +  sap.ui.core.AccessibleRole.Description + "'";
+		var ariaRolePresentation = sap.ui.core.AccessibleRole.Presentation;
+		var ariaRoleImg = sap.ui.core.AccessibleRole.Img;
+		var ariaRoleDescription = sap.ui.core.AccessibleRole.Description;
+
+		oRm.openStart("div", Id1);
+		oRm.class(classOuter);
+
+		if (type == sap.ui.vbm.SemanticType.None && col) {
+			oRm.style("border-color", col)
+		}
+		oRm.attr("role", ariaRolePresentation);
+		oRm.openEnd();
+
+		oRm.openStart("div", Id2);
+		oRm.class(classInner);
+		if (type == sap.ui.vbm.SemanticType.None && col) {
+			oRm.style("border-color", col)
+		}
+		oRm.attr("role", ariaRolePresentation);
+		oRm.openEnd();
+
+
 
-		oRm.write("<div id= " + Id1 + " " + classOuter + " " + ariaRolePresentation + ">");
-		oRm.write("<div id= " + Id2 + " " + classInner + " " + ariaRolePresentation + ">");
 
 		if (icon) {
 			var IdIcon = oControl.getId() + "-" + "icon";
-			oRm.write("<span id= " + IdIcon + " " + classIcon + " " + ariaRoleImg + ">");
-			oRm.writeEscaped(icon);
-			oRm.write("</span>");
+			oRm.openStart("span", IdIcon);
+			oRm.class(classIcon);
+			if (type == sap.ui.vbm.SemanticType.None && col) {
+				oRm.style("color", col)
+			}
+			oRm.attr("role", ariaRoleImg);
+			oRm.openEnd();
+			oRm.text(icon);
+			oRm.close("span");
 		}
 
-		oRm.write("</div>"); // end of cluster-innercircle
+		oRm.close("div"); // end of cluster-innercircle
 		if ((oControl.getText())) {
 			var IdTextbox = oControl.getId() + "-" + "textbox";
-			oRm.write("<div id= " + IdTextbox + " " + classTextbox + " " + ariaRoleDescription +">");
-			oRm.write("<div>");
-			oRm.writeEscaped(oControl.getText());
-			oRm.write("</div>");
-			oRm.write("</div>");
+			oRm.openStart("div", IdTextbox);
+			oRm.class(classTextbox);
+			if (type == sap.ui.vbm.SemanticType.None && col) {
+				oRm.style("border-color", col);
+			}
+			oRm.attr("role", ariaRoleDescription);
+			oRm.openEnd();
+			oRm.openStart("div");
+			oRm.openEnd();
+			oRm.text(oControl.getText());
+			oRm.close("div");
+			oRm.close("div");
 		}
-		oRm.write("</div>"); // end of cluster-backgroundcircle
-		oRm.write("</div>");
+		oRm.close("div"); // end of cluster-backgroundcircle
+		oRm.close("div");
 
 	};
 

package/src/sap/ui/vbm/GeoMap.js

@@ -125,7 +125,7 @@ sap.ui.define([
 					defaultValue: null
 				},
 				/**
-				 * @deprecated This property should not longer be used. Its functionality has been replaced by the <code>clusters</code>
+				 * @deprecated since version 1.31 This property should not longer be used. Its functionality has been replaced by the <code>clusters</code>
 				 *             aggregation.
 				 */
 				clustering: {
@@ -178,7 +178,7 @@ sap.ui.define([
 					singularName: "geoJsonLayer"
 				},
 				/**
-				 * @deprecated This aggregation should not longer be used. Its functionality has been replaced by the more generic<code>geoJsonLayers</code>
+				 * @deprecated since version 1.31 This aggregation should not longer be used. Its functionality has been replaced by the more generic<code>geoJsonLayers</code>
 				 *             aggregation.
 				 */
 				featureCollections: {
@@ -448,7 +448,9 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+
+		renderer: GeoMapRenderer
 	});
 	// /**
 	// * This file defines behavior for the control,
@@ -729,7 +731,7 @@ sap.ui.define([
 	 * @param {object} oClustering Cluster Definition object
 	 * @returns {sap.ui.vbm.GeoMap} This allows method chaining
 	 * @public
-	 * @deprecated This property should not longer be used. Its functionality has been replaced by the <code>clusters</code> aggregation.
+	 * @deprecated since version 1.31 This property should not longer be used. Its functionality has been replaced by the <code>clusters</code> aggregation.
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	GeoMap.prototype.setClustering = function(oClustering) {

package/src/sap/ui/vbm/GeoMapRenderer.js

@@ -10,7 +10,9 @@ sap.ui.define([
 	/*
 	 * @class GeoMap renderer. @static
 	 */
-	var GeoMapRenderer = {};
+	var GeoMapRenderer = {
+		 apiVersion: 2		// Semantic Rendering
+	};
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.

package/src/sap/ui/vbm/PieItem.js

@@ -57,7 +57,7 @@ sap.ui.define([
 			},
 			events: {
 				/**
-				 * @deprecated This event should no longer be used. Click event from Pie and Pies now includes Pie Item index when event occurs.
+				 * @deprecated since version 1.31 This event should no longer be used. Click event from Pie and Pies now includes Pie Item index when event occurs.
 				 */
 				 click: {}
 			}

package/src/sap/ui/vbm/VBI.js

@@ -96,7 +96,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * @deprecated This property should not longer be used. Its functionality is covered by method <code>load</code>.
+				 * @deprecated since version 1.31 This property should not longer be used. Its functionality is covered by method <code>load</code>.
 				 */
 				config: {
 					type: "object",
@@ -382,7 +382,9 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+
+		renderer: VBIRenderer
 	});
 
 	// ...........................................................................//

package/src/sap/ui/vbm/VBIRenderer.js

@@ -9,7 +9,9 @@ sap.ui.define(function() {
 	 * @class VBI renderer.
 	 * @static
 	 */
-	var VBIRenderer = {};
+	var VBIRenderer = {
+		apiVersion: 2		// Semantic Rendering
+	};
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
@@ -18,37 +20,32 @@ sap.ui.define(function() {
 	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
 	 */
 	VBIRenderer.render = function(oRm, oControl) {
-		// console.log( "sap.ui.vbm.VBIRenderer.render.....\r\n");
 		var sAriaLabel = oControl.getAriaLabel();
 		var aLabelledBy = oControl.getAriaLabelledBy();
 		var aDescribedBy = oControl.getAriaDescribedBy();
 
 		// write the HTML into the render manager
-		oRm.write("<div");
-		oRm.writeControlData(oControl);
-		oRm.writeAttribute("role", "Figure");
+		oRm.openStart("div", oControl);
+		oRm.attr("role", "Figure");
+
 
 		if (sAriaLabel) {
-			oRm.writeAttributeEscaped("aria-label", sAriaLabel);
+			oRm.attr("aria-label", sAriaLabel);
 		}
 
 		// aria-labelledby references
 		if (aLabelledBy && aLabelledBy.length > 0) {
-			oRm.writeAttributeEscaped("aria-labelledby", aLabelledBy.join(" "));
+			oRm.attr("aria-labelledby", aLabelledBy.join(" "));
 		}
 		// aria-describedby references
 		if (aDescribedBy && aDescribedBy.length > 0) {
-			oRm.writeAttributeEscaped("aria-describedby", aDescribedBy.join(" "));
+			oRm.attr("aria-describedby", aDescribedBy.join(" "));
 		}
-
-		oRm.writeAttribute("tabindex", "0");
-		oRm.addClass("vbi-main");
-		oRm.writeClasses(oControl);
-		oRm.addStyle("width", oControl.getWidth());
-		oRm.addStyle("height", oControl.getHeight());
-
-		oRm.writeStyles();
-		oRm.write(">"); // span element
+		oRm.attr("tabindex", "0");
+		oRm.class("vbi-main");
+		oRm.style("width", oControl.getWidth());
+		oRm.style("height", oControl.getHeight());
+		oRm.openEnd();
 
 		var id = oControl.getId();
 		
@@ -58,30 +55,40 @@ sap.ui.define(function() {
 				// for IE 11 do the regexp test........................................//
 				if ((navigator.appName == "Microsoft Internet Explorer") || /(trident)\/[\w.]+;.*rv:([\w.]+)/i.test(navigator.userAgent)) {
 					// write the object tag
-					oRm.write("<object id='VBI" + id + "'" + " data-sap-ui-preserve='" + id + "' CLASSID='CLSID:00100000-2011-0070-2000-FC7214A1CD7B' " + "width='" + oControl.getWidth() + "' " + "height='" + oControl.getHeight() + "' " +
-
-					">");
-
+					oRm.openStart("object", "'VBI" + id + "'" + " data-sap-ui-preserve='" + id + "' CLASSID='CLSID:00100000-2011-0070-2000-FC7214A1CD7B'");
+					oRm.attr("width", oControl.getWidth());
+					oRm.attr("height", oControl.getHeight());
+					oRm.openEnd();
 					// set a link to the native installer...............................//
-					oRm.write("<a href='https://help.sap.com/viewer/product/SAP_VISUAL_BUSINESS_2.1' > Get the Visual Business PlugIn.</a>");
+					oRm.openStart("a");
+					oRm.attr("href", "https://help.sap.com/viewer/product/SAP_VISUAL_BUSINESS_2.1");
+					oRm.openEnd();
+					oRm.text("Get the Visual Business PlugIn.");
+					oRm.close("a");
 
-					oRm.write("</object>");
+					oRm.close("object");
 
 				} else {
 					// write the embed tag
-					oRm.write("<embed id='VBI" + id + "'" + " data-sap-ui-preserve='" + id + "' type='application/x-visualbusiness' " + "width='" + oControl.getWidth() + "' " + "height='" + oControl.getHeight() + "' " + ">");
+					oRm.openStart("write", "'VBI" + id + "'" + " data-sap-ui-preserve='" + id + "' type='application/x-visualbusiness'");
+					oRm.attr("width", oControl.getWidth());
+					oRm.attr("height", oControl.getHeight());
+					oRm.openEnd();
 
 				}
 				// render the information for using the native plugin
 			}
 		}
 		
-		oRm.write("<div class='vbi-hidden' role='" + sap.ui.core.AccessibleRole.Presentation + "'>");
-			this.renderDependants(oRm, oControl.m_renderList);
-		oRm.write("</div>");
+		oRm.openStart("div");
+		oRm.class("vbi-hidden");
+		oRm.attr("role", sap.ui.core.AccessibleRole.Presentation);
+		oRm.openEnd();
+		this.renderDependants(oRm, oControl.m_renderList);
+		oRm.close("div");
 		oControl.m_renderList = [];
 
-		oRm.write("</div>");
+		oRm.close("div");
 
 		// the config is not loaded here any more, due the set config will be.....//
 		// called, then queueing or execution will take place.....................//
@@ -94,9 +101,11 @@ sap.ui.define(function() {
 			// We need to find a better solution because the real problem
 			// is the fact that we fire the container creation event twice.
 			if (!oEntry.control.getDomRef()) {
-				oRm.write("<div data='" + oEntry.data + "'>");
+				oRm.openStart("div");
+				oRm.attr("data", oEntry.data);
+				oRm.openEnd();
 				oRm.renderControl(oEntry.control);
-				oRm.write("</div>");
+				oRm.close("div");
 			}
 		} 
 	};

package/src/sap/ui/vbm/Viewport.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */
@@ -81,7 +81,9 @@ sap.ui.define([
 					}
 				}
 			}
-		}
+		},
+
+		renderer: ViewportRenderer
 	});
 
 	var EPS = 0.000001;
@@ -182,6 +184,10 @@ sap.ui.define([
 		this._cameraController.update();
 	};
 
+	Viewport.prototype.getOrbitControl = function () {
+		return this._cameraController;
+	};
+	
 	Viewport.prototype.exit = function () {
 		if (this._resizeListenerId) {
 			ResizeHandler.deregister(this._resizeListenerId);

package/src/sap/ui/vbm/ViewportRenderer.js

@@ -9,20 +9,19 @@ sap.ui.define(function() {
 	* Viewport renderer.
 	* @namespace
 	*/
-	var ViewportRenderer = {};
+	var ViewportRenderer = {
+		apiVersion: 2		// Semantic Rendering
+	};
 
 	ViewportRenderer.render = function(rm, control) {
-		rm.write("<div");
-		rm.writeControlData(control);
-		rm.writeAttribute("tabindex", 0);
-		rm.writeAttribute("role", "figure");
-		rm.addStyle("width", control.getWidth());
-		rm.addStyle("height", control.getHeight());
-		rm.writeStyles();
-		rm.addClass("sapUiVbmViewport");
-		rm.writeClasses();
-		rm.write(">");
-		rm.write("</div>");
+	    rm.openStart("div", control);
+		rm.attr("tabindex", 0);
+		rm.attr("role", "figure");
+		rm.style("width", control.getWidth())
+		rm.style("height", control.getHeight());
+		rm.class("sapUiVbmViewport");
+		rm.openEnd();
+		rm.close("div");
 	};
 
 	return ViewportRenderer;

package/src/sap/ui/vbm/VoAggregation.js

@@ -354,7 +354,7 @@ sap.ui.define([
 		var key = (name.indexOf(".") !== -1) ? name.split(".")[1] : name;
 		for (var nJ = 0, len = aVO.length; nJ < len; ++nJ) {
 			// get the control.....................................................//
-			if (aVO[nJ].sId === key || aVO[nJ].getKey() === key) {
+			if (aVO[nJ].getKey() === key) {
 				return aVO[nJ];
 			}
 		}

package/src/sap/ui/vbm/adapter3d/DragDropHandler.js

@@ -83,7 +83,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.DragDropHandler
 	 */
 	var DragDropHandler = BaseObject.extend("sap.ui.vbm.adapter3d.DragDropHandler", /** @lends sap.ui.vbm.adapter3d.DragDropHandler.prototype */ {

package/src/sap/ui/vbm/adapter3d/ModelHandler.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
 	 */
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {

package/src/sap/ui/vbm/adapter3d/ObjectFactory.js

@@ -377,7 +377,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.ObjectFactory
 	 */
 	var ObjectFactory = BaseObject.extend("sap.ui.vbm.adapter3d.ObjectFactory", /** @lends sap.ui.vbm.adapter3d.ObjectFactory.prototype */ {});

package/src/sap/ui/vbm/adapter3d/PolygonHandler.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
 	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {

package/src/sap/ui/vbm/adapter3d/SceneBuilder.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {

package/src/sap/ui/vbm/adapter3d/Utilities.js

@@ -561,5 +561,140 @@ sap.ui.define([
 		return (layers.mask & ( 1 << channel | 0 ) ) !== 0;
 	};
 
+	Utilities.parseKeyboardShortcut = function (shortcutsString) {
+
+		var shortcutsArray = [];
+		var shortcutObject = {},
+		code = false,
+		shortcuts;
+		shortcutObject.ctrlKey = false;
+		shortcutObject.altKey = false;
+		shortcutObject.shiftKey = false;
+		
+
+		if (typeof shortcutsString === 'string') {
+			shortcuts = shortcutsString.split(",");
+		} else {
+			shortcuts = shortcutsString;
+			shortcutObject.keyCode = shortcuts;
+			shortcutsArray.push(shortcutObject);
+			return shortcutsArray;
+		}
+
+		shortcuts.forEach(parseShortcut);
+
+		function parseShortcut(shortcut) {
+			if (shortcut.includes("CTRL")) {
+				shortcutObject.ctrlKey = true;
+				 code = true;
+			}
+			if (shortcut.includes("ALT")) {
+				shortcutObject.altKey = true;
+				code = true;
+			}
+			if (shortcut.includes("SHIFT")) {
+				shortcutObject.shiftKey = true;
+				code = true;
+			}
+
+			if (code) {
+				var keys = shortcut.split("+");
+				shortcutObject.keyCode = keys[keys.length - 1];
+			} else {
+				shortcutObject.keyCode = shortcut;
+			}
+			shortcutsArray.push({
+				shiftKey: shortcutObject.shiftKey,
+				ctrlKey: shortcutObject.ctrlKey,
+				altKey: shortcutObject.altKey,
+				keyCode: shortcutObject.keyCode
+			});
+			shortcutObject.ctrlKey = false;
+			shortcutObject.altKey = false;
+			shortcutObject.shiftKey = false;
+			shortcutObject.keyCode = '';
+		}
+
+		return shortcutsArray;
+
+	};
+
+	Utilities.matchKeyboardShortcut = function (event, shortcutsArray) {
+		// The below code will return true if a single pair of shortcut matches with the clicked event
+		var flag = false,
+			eventCount = 0,
+			eventExists = false,
+			shortcutsCount = 0;
+
+		if (event.altKey) {
+			eventCount++;
+			eventExists = true;
+		}
+		if (event.shiftKey) {
+			eventCount++;
+			eventExists = true;
+		}
+		if (event.ctrlKey) {
+			eventCount++;
+			eventExists = true;
+		}
+
+		for (var i = 0; i < shortcutsArray.length; i++) {
+			var key = false,
+				trueCount = 0,
+				specifierCount = 0,
+				specifierExists = false;
+
+			if (shortcutsArray[i].altKey || shortcutsArray[i].shiftKey || shortcutsArray[i].ctrlKey) {
+				specifierExists = true;
+				if (shortcutsArray[i].altKey) {
+					shortcutsCount++;
+				}
+				if (shortcutsArray[i].ctrlKey) {
+					shortcutsCount++;
+				}
+				if (shortcutsArray[i].shiftKey) {
+					shortcutsCount++;
+				}
+			}
+			if (event.keyCode == shortcutsArray[i].keyCode) {
+
+				trueCount++;
+				key = true;
+			} else {
+				key = false;
+				flag = false;
+				continue;
+			}
+			if (event.altKey || shortcutsArray[i].altKey) {
+				if (event.altKey == shortcutsArray[i].altKey) {
+					trueCount++;
+					specifierCount++;
+				}
+			}
+			if (event.shiftKey || shortcutsArray[i].shiftKey) {
+				if (event.shiftKey == shortcutsArray[i].shiftKey) {
+					trueCount++;
+					specifierCount++;
+				}
+			}
+			if (event.ctrlKey || shortcutsArray[i].ctrlKey) {
+				if (event.ctrlKey == shortcutsArray[i].ctrlKey) {
+					trueCount++;
+					specifierCount++;
+				}
+			}
+
+			if ((trueCount > 1 && key == true && specifierCount == eventCount && eventCount == shortcutsCount ) ||
+				(trueCount = 1 && key == true && specifierExists == false && eventExists == false)) {
+				flag = true;
+				break;
+			}
+
+		}
+
+		return flag;
+	};
+
 	return Utilities;
 });

package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @alias sap.ui.vbm.adapter3d.VBIJSONParser
 	 */
 	var VBIJSONParser = BaseObject.extend("sap.ui.vbm.adapter3d.VBIJSONParser", /** @lends sap.ui.vbm.adapter3d.VBIJSONParser.prototype */ {

package/src/sap/ui/vbm/adapter3d/thirdparty/OrbitControls.js

@@ -21,6 +21,7 @@
 		constructor( object, domElement ) {
 
 			super();
+			var that = this;
 			if ( domElement === undefined ) console.warn( 'THREE.OrbitControls: The second parameter "domElement" is now mandatory.' );
 			if ( domElement === document ) console.error( 'THREE.OrbitControls: "document" should not be used as the target "domElement". Please use "renderer.domElement" instead.' );
 			this.object = object;
@@ -570,63 +571,50 @@
 			}
 
 			function handleKeyDown( event ) {
-
+				const cameraRotateLeft  = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ROTATE_LEFT") ? that.config.get("CAMERA_ROTATE_LEFT") : "SHIFT+"+scope.keys.LEFT);
+				const cameraRotateRight = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ROTATE_RIGHT") ? that.config.get("CAMERA_ROTATE_RIGHT") : "SHIFT+"+scope.keys.RIGHT);
+				const cameraRotateUp    = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ROTATE_UP") ? that.config.get("CAMERA_ROTATE_UP") : "SHIFT+"+scope.keys.UP);
+				const cameraRotateDown  = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ROTATE_DOWN") ? that.config.get("CAMERA_ROTATE_DOWN") : "SHIFT+"+scope.keys.DOWN);
+				const cameraPanLeft     = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_PAN_LEFT") ? that.config.get("CAMERA_PAN_LEFT") : scope.keys.LEFT);
+				const cameraPanRight    = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_PAN_RIGHT") ? that.config.get("CAMERA_PAN_RIGHT") : scope.keys.RIGHT);
+				const cameraPanUp       = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_PAN_UP") ? that.config.get("CAMERA_PAN_UP") : scope.keys.UP);
+				const cameraPanDown     = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_PAN_DOWN") ? that.config.get("CAMERA_PAN_DOWN") : scope.keys.DOWN);
+				const cameraZoomIn      = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ZOOM_IN") ? that.config.get("CAMERA_ZOOM_IN") : scope.keys.PLUS+","+scope.keys.NUMPLUS);
+				const cameraZoomOut     = that.utilities.parseKeyboardShortcut(that.config.has("CAMERA_ZOOM_OUT") ? that.config.get("CAMERA_ZOOM_OUT") : scope.keys.MINUS+","+scope.keys.NUMMINUS);
 				let needsUpdate = true;
 
-				switch ( event.keyCode ) {
-
-					case scope.keys.UP:
-						if (event.shiftKey) {
-							if (scope.enableRotate) {
-								rotate(0, scope.keyRotateSpeed);
-							}
-						} else if (scope.enablePan) {
-							pan( 0, scope.keyPanSpeed );
-						}
-						break;
-
-					case scope.keys.DOWN:
-						if (event.shiftKey) {
-							if (scope.enableRotate) {
-								rotate(0, - scope.keyRotateSpeed);
-							}
-						} else if (scope.enablePan) {
-							pan( 0, - scope.keyPanSpeed );
-						}
-						break;
-
-					case scope.keys.LEFT:
-						if (event.shiftKey) {
-							if (scope.enableRotate) {
-								rotate(scope.keyRotateSpeed, 0);
-							}
-						} else if (scope.enablePan) {
-							pan( scope.keyPanSpeed, 0 );
-						}
-						break;
-
-					case scope.keys.RIGHT:
-						if (event.shiftKey) {
-							if (scope.enableRotate) {
-								rotate(-scope.keyRotateSpeed, 0);
-							}
-						} else if (scope.enablePan) {
-							pan( - scope.keyPanSpeed, 0 );
-						}
-						break;
-
-					case scope.keys.MINUS:
-					case scope.keys.NUMMINUS:
-						dollyOut(getZoomScale());
-						break;
-
-					case scope.keys.PLUS:
-					case scope.keys.NUMPLUS:
-						dollyIn(getZoomScale());
-						break;
-
-					default:
-						needsUpdate = false;
+				if (that.utilities.matchKeyboardShortcut(event, cameraRotateLeft)) {
+					rotate(scope.keyRotateSpeed, 0);
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraRotateRight)) {
+					rotate(-scope.keyRotateSpeed, 0);
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraRotateUp)) {
+					rotate(0, scope.keyRotateSpeed);
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraRotateDown)) {
+					rotate(0, - scope.keyRotateSpeed);
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraPanLeft)) {
+					pan( scope.keyPanSpeed, 0 );
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraPanRight)) {
+					pan( - scope.keyPanSpeed, 0 );
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraPanUp)) {
+					pan( 0, scope.keyPanSpeed );
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraPanDown)) {
+					pan( 0, - scope.keyPanSpeed );
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraZoomIn)) {
+					dollyIn(getZoomScale());
+				}
+				else if (that.utilities.matchKeyboardShortcut(event, cameraZoomOut)) {
+					dollyOut(getZoomScale());
+				}
+				else {
+					needsUpdate = false;
 				}
 
 				if ( needsUpdate ) {
@@ -1147,6 +1135,14 @@
 
 		}
 
+		setConfig(config) {
+			this.config = config;
+		   }
+	
+		   setUtilities(utilities) {
+			this.utilities = utilities;
+		   }
+
 	}
 
 	// This set of controls performs orbiting, dollying (zooming), and panning.

package/src/sap/ui/vbm/lib/sapscene.js

@@ -3325,7 +3325,9 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
 			}
 
 			// reset div reference..............................................//
-			scene.m_Div.parentElement.removeChild(scene.m_Div);
+			if (scene.m_Div.parentElement) {
+				scene.m_Div.parentElement.removeChild(scene.m_Div);
+			}
 			scene.m_Div = null;
 
 			// clear any timers.................................................//

package/src/sap/ui/vbm/library.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.107.0
+	 * @version 1.109.0
 	 * @public
 	 */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 			"sap.ui.vbm.ClusterBase", "sap.ui.vbm.ClusterTree", "sap.ui.vbm.ClusterGrid", "sap.ui.vbm.ClusterDistance", "sap.ui.vbm.Heatmap",
 			"sap.ui.vbm.HeatPoint", "sap.ui.vbm.ClusterContainer", "sap.ui.vbm.Adapter", "sap.ui.vbm.Adapter3D"
 		],
-		version: "1.107.0"
+		version: "1.109.0"
 	});
 
 	sap.ui.loader.config({