@sapui5/sap.ui.vbm 1.84.5 → 1.84.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.84.5",
+  "version": "1.84.8",
   "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.84.5</version>
+	<version>1.84.8</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.Adapter
@@ -21,13 +21,12 @@ 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.84.5
+	 * @version 1.84.8
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.vbm.Adapter
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
-	 * @experimental Since 1.48.0 This class is experimental and might be modified or removed in future versions.
 	 */
 	var Adapter = Element.extend("sap.ui.vbm.Adapter", /** @lends sap.ui.vbm.Adapter.prototype */ {
 		metadata: {
@@ -101,6 +100,32 @@ sap.ui.define([
 			"start",
 			"tooltip"];
 
+		this._areaProperties = [
+			"key", //K: VoBase
+			"color", //C: Area, OBJECT_BASE_DATA->FILL_COLOR
+			"colorBorder", //D/CB: Area, OBJECT_BASE_DATA->BORDER_COLOR
+			"posarray", //H, PM (multipart) /P: Area, AREA_EXTENSION->BORDER_POINTS
+			"selectColor", //SC: OBJECT_BASE_DATA->SELECT_COLOR
+			"dragdata", //DD: VoAggregation, OBJECT_BASE_DATA->DRAG_DATA
+			"VB:s", //VB:s: elected, OBJECT_BASE_DATA->SELECTED
+			"VB:c", //H/VB:c: VoAggregation (changeable) OBJECT_BASE_DATA->CHANGEABLE
+			"hotScale", //HS: VoAggregation
+			"hotDeltaColor", //HC/HDC: VoAggregation, OBJECT_BASE_DATA->HOT_COLOR
+			"borderDash", //BD: Area
+			"selectColor", //SC: VoAggregation
+			"fxdir", //FD: VoAggregation
+			"fxsize", //FS: VoAggregation
+			"entity", //ET: VoAggregation
+			"labelBgColor", //LC/LBC: VoAggregation
+			"labelBorderColor", //LBBC: VoAggregation
+			"labelPos",  //LP: VoAggregation
+			"labelText", //LT: VoAggregation
+			"labelArrow", //??VOBase
+			"label", //L
+			"labelAlignment", //"LA"
+			"tooltip" //B/TT: VoAggregation
+		];
+
 			// Allowed Spot properties
 		this._spotProperties = [
 			"alignment",
@@ -473,6 +498,7 @@ sap.ui.define([
 		 * 	"Set": [
 		 * 		{ "name": "Spots", "type": "N", ....},
 		 *      { "name": "Links", "type": "N", ....},
+		 *      { "name": "Areas", "type": "N", ....},
 		 * 	]
 		 * }
 		 *
@@ -482,6 +508,7 @@ sap.ui.define([
 		 *			"N": [
 		 *				{ "name": "Spots", ... },
 		 *				{ "name": "Links", ... },
+		 *              { "name": "Areas", ... },
 		 *			]
 		 *		}
 		 *	}
@@ -780,13 +807,18 @@ sap.ui.define([
 						processDragAndDrop();
 						break;
 					case "{00100000-2012-0004-B001-F311DE491C77}": // Area
+						processProperties(this._areaProperties, this._propsAnomalies);
+						voTemplate = new sap.ui.vbm.Area(settings);
+						voAggregation = new sap.ui.vbm.Areas(this._ui5Id(definition.id));
+						processDragAndDrop();
+						break;
+					case "{00100000-2014-0004-BDA8-87B904609063}": // "ExtArea" GUID??? from sapvobase
+					case "{00100000-2014-0004-B001-9F1B43BE944A}": // "ExtLink" GUID??? from sapvobase
 					case "{00100000-2013-0004-B001-7EB3CCC039C4}": // Circle
 					case "{00100000-2013-0004-B001-686F01B57873}": // Geo Circle
 					case "{00100000-2012-0004-B001-BFED458C3076}": // Box
 					case "{00100000-2012-0004-B001-383477EA1DEB}": // Pie Chart
 					case "{388951f5-a66b-4423-a5ad-e0ee13c2246f}": // Decal
-					case "ExtLink": // GUID???
-					case "ExtArea": // GUID???
 					default:
 						log.debug("unsupported VO type: " + definition.type);
 						return;
@@ -910,6 +942,9 @@ sap.ui.define([
 			case "Drop":
 				this._event = "drop";
 				break;
+			case "CreateComplete":
+				this._event = "createComplete";
+				break;
 			case "Select":
 				this._event = "select";
 				break;
@@ -1290,13 +1325,16 @@ sap.ui.define([
 	 * @private
 	 */
 	Adapter.prototype._processDetailWindows = function(obj) {
-		//No transformation needed for removal - pass it along to VBI as is.
-
 		var oGeoMap = this._map();
 		var that = this;
 
-		/*Only delta supported for Windows - Set*/
-		if (obj.SAPVB.Windows.Set.name) {
+		// "Remove" and "Set" verbs supported only
+		if (!obj.SAPVB.Windows.Set && !obj.SAPVB.Windows.Remove) {
+			return this;
+		}
+		// No transformation needed for removal - pass it along to VBI as is.
+		// Only delta supported for Windows - Set
+		if (obj.SAPVB.Windows.Set && obj.SAPVB.Windows.Set.name) {
 
 			var findPredicate =  function(prop, name) {
 				return function(d) {
@@ -1313,7 +1351,7 @@ sap.ui.define([
 				for (var sAttribute in wnd.Window) {
 					if (wnd.Window.hasOwnProperty(sAttribute)) {
 						if (jQuery.sap.endsWith(sAttribute, ".bind")) {
-							//Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
+							// Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
 							if (jQuery.sap.startsWith(sAttribute, "pos")) {
 								var aParameters = wnd.Window[sAttribute].split(".");
 								if (aParameters[0] in oModelData) {
@@ -1337,7 +1375,7 @@ sap.ui.define([
 
 			obj.SAPVB.Windows.Set = aWindows;
 
-			//Dereference VOs
+			// Dereference VOs
 			if (obj.SAPVB.Scenes && obj.SAPVB.Scenes.Set && obj.SAPVB.Scenes.Set.name && obj.SAPVB.Scenes.Set.Scene && obj.SAPVB.Scenes.Set.Scene.VO) {
 
 				var aVOs = [].concat(obj.SAPVB.Scenes.Set.Scene.VO).map(function(v) {
@@ -1366,18 +1404,18 @@ sap.ui.define([
 					for (var sAttribute in v) {
 						if (v.hasOwnProperty(sAttribute)) {
 							if (jQuery.sap.endsWith(sAttribute, ".bind")) {
-								//Only known bound attribute is text - has values like DetailData.0.Column.1.Text
+								// Only known bound attribute is text - has values like DetailData.0.Column.1.Text
 								var aParameters = v[sAttribute].split(".");
 
 								if (obj.SAPVB.Data && obj.SAPVB.Data.Set) {
-									//Only Delta supported for Detail Window
+									// Only Delta supported for Detail Window
 									[].concat(obj.SAPVB.Data.Set).forEach(dereferenceBoundAttributes(oVO, sAttribute, aParameters), this);
 								}
 							}
 						}
 					}
 
-					//Process relevant actions
+					// Process relevant actions
 					if (obj.SAPVB.Actions && obj.SAPVB.Actions.Set) {
 						[].concat(obj.SAPVB.Actions.Set).filter(function(a) { return a.Action.refVO === oVO.id; }).forEach(function(fa) {
 							that._attachHandler.call(oGeoMap, fa.Action.name, that._handler, that);
@@ -1386,12 +1424,13 @@ sap.ui.define([
 
 					return oVO;
 				}, this);
-
-				//delete obj.SAPVB["Actions"];
+				// delete obj.SAPVB["Actions"];
 				obj.SAPVB.Scenes.Set.Scene.VO = aVOs;
 			}
-			oGeoMap.load(obj);
 		}
+		// pass it to VBI (this is hazardous as if payload contains something not related to Detail Windows in Scene,
+		// VO or Data sections then it will be processed twice with unpredictable results)
+		oGeoMap.load(obj);
 		return this;
 	};
 
@@ -1462,12 +1501,15 @@ sap.ui.define([
 			}
 			if (oEventData.Action && oEventData.Action.object) {
 				// Whatever back-end refers to as Links, they are referred to as Routes by Geomap
-				if (oEventData.Action.object === "Route") {
-					oEventData.Action.object = "Link";
+				var routeName = "Route", linkName = "Link";
+				var actionObjects = [oEventData.Action.object];
+				if (oEventData.Action.object === routeName) {
+					actionObjects.push(linkName);
+					oEventData.Action.object = linkName;
 				}
 
 				var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
-					return oEventData.Action.object === action.refVO && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
+					return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
 				});
 
 				if (oAction) {

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.Adapter3D
@@ -42,7 +42,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.84.5
+	 * @version 1.84.8
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.AnalyticMap.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Area.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Areas.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Box.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Boxes.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Circle.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Circles.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Cluster.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.ClusterBase.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.ClusterContainer.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.ClusterDistance.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.ClusterGrid.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.ClusterTree.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Container.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Containers.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.DragSource.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.DropTarget.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Feature.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.FeatureCollection.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.GeoCircle.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.GeoCircles.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.GeoJsonLayer.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.GeoMap.
@@ -1054,7 +1054,8 @@ sap.ui.define([
 				case "click":
 					// fire the click..................................................//
 					this.fireClick({
-						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
+						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "contextMenu":
@@ -1069,7 +1070,8 @@ sap.ui.define([
 				case "drop":
 					// fire the drop..................................................//
 					this.fireDrop({
-						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
+						pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "zoomChanged":
@@ -1080,7 +1082,8 @@ sap.ui.define([
 						viewportBB: {
 							upperLeft: datEvent.Action.Params.Param[3]['#'],
 							lowerRight: datEvent.Action.Params.Param[4]['#']
-						}
+						},
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "centerChanged":
@@ -1091,7 +1094,8 @@ sap.ui.define([
 						viewportBB: {
 							upperLeft: datEvent.Action.Params.Param[3]['#'],
 							lowerRight: datEvent.Action.Params.Param[4]['#']
-						}
+						},
+						data: datEvent //include VBI data to the UI5 event payload
 					});
 					break;
 				case "select":
@@ -1117,6 +1121,12 @@ sap.ui.define([
 							this.mIACreateCB = null;
 							throw exc;
 						}
+					} else {
+						// If interactive editing was triggered indirectly (e.g. via vbiJSON load) then fire event
+						datEvent.Action.name = "CreateComplete";
+						//include VBI data to the UI5 event payload
+						this.fireEvent("createComplete", {data: datEvent}, true);
+						e.preventDefault();
 					}
 					break;
 				case "keydown":
@@ -2222,4 +2232,4 @@ sap.ui.define([
 
 	return GeoMap;
 
-}, /* bExport= */true);
+}, /* bExport= */true);

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // Provides control sap.ui.vbm.HeatPoint.
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // Provides control sap.ui.vbm.HeatPoint.
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Legend.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.LegendItem.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Pie.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.PieItem.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Pies.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Region.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Resource.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Route.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Routes.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Spot.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.Spots.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 /* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(function() {

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([
@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */

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

@@ -1,6 +1,6 @@
 /*!
 * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
 */
 
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoAbstract.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoAggregation.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vbm.VoBase.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.ModelHandler
@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.
@@ -378,7 +378,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.PolygonHandler
@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.
@@ -50,7 +50,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -355,6 +355,8 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 
 				var iframe = document.createElement("iframe");
 				iframe.style.visibility = "hidden";
+				// use sandbox attribute to disable script execution and all other suspicious activities in iframe as we cannot affectively escape input HTML.
+				iframe.sandbox = "allow-same-origin";
 				iframe.width = width;
 				iframe.height = height;
 				document.body.appendChild(iframe);
@@ -903,6 +905,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		material = material || new THREE.MeshPhongMaterial({
 			specular: 0x444444,
 			shininess: 0,
+			opacity: 0.99,
 			transparent: true,
 			depthTest: true,
 			depthWrite: false,
@@ -924,6 +927,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 		// this._scene.add(cube);
 
 		instance.object3D = new THREE.Mesh(new THREE.DecalGeometry(target, origin, this._decalHelper.rotation, size), material)
+		instance.object3D.renderOrder = 100;
 		instance.object3D.matrixAutoUpdate = false;
 		instance.object3D.layers.set(1); // put it to layer #1 to disable hit test
 		this._scene.add(instance.object3D);

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the base visual object.

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides class sap.ui.vbm.adapter3d.VBIJSONParser
@@ -58,7 +58,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @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/lib/sapscene.js

@@ -3352,7 +3352,7 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
 		}
 		var sCopyright = scene.m_MapLayerStack.GetCopyright();
 		if (sCopyright) {
-			scene.m_DivCopyright.innerHTML = sCopyright;
+			scene.m_DivCopyright.innerHTML = jQuery.sap.encodeHTML(sCopyright);
 		} else {
 			scene.m_DivCopyright.style.paddingRight = 0;
 			scene.m_DivCopyright.style.paddingLeft = 0;

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

@@ -282,7 +282,7 @@ VBI.Utilities.CreateCaption = function(id, text, left, top, right, bottom, toolt
 	}
 
 	newElement.className = "vbi-2d-caption vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -299,7 +299,7 @@ VBI.Utilities.CreateLabel = function(id, text, left, top, right, bottom, tooltip
 	newElement.style.textAlign = VBI.Utilities.Align[align];
 	newElement.style.title = tooltip;
 	newElement.className = "vbi-2d-label vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -317,7 +317,7 @@ VBI.Utilities.CreateLink = function(id, text, left, top, right, bottom, href, to
 	newElement.className = "vbi-2d-link vbi-2d-common";
 	newElement.href = href ? href : "javascrip" + "t:void(0)"; // separated to fool ESLint
 	newElement.title = tooltip;
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	return newElement;
 };
 
@@ -349,7 +349,7 @@ VBI.Utilities.CreateButton = function(id, text, left, top, right, bottom, toolti
 	newElement.style.height = (bottom - top).toString() + "px";
 	newElement.style.textAlign = VBI.Utilities.Align[align];
 	newElement.className = "vbi-2d-button vbi-2d-common";
-	newElement.innerHTML = text;
+	newElement.innerHTML = jQuery.sap.encodeHTML(text);
 	newElement.title = tooltip;
 	return newElement;
 };
@@ -408,7 +408,7 @@ VBI.Utilities.CreateDetailPhone = function(id, left, top, width, height, titlete
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-window-title";
 	title.className = "vbi-detail-title-phone";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the close.......................................................//
@@ -495,7 +495,7 @@ VBI.Utilities.CreateDetail = function(id, left, top, width, height, titletext, p
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-window-title";
 	title.className = "vbi-detail-title";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the close.......................................................//
@@ -623,7 +623,7 @@ VBI.Utilities.CreateLegend = function(id, top, titletext, padding, bClickRow) {
 	title.setAttribute("role", sap.ui.core.AccessibleRole.Heading);
 	title.id = id + "-title";
 	title.className = "vbi-legend-title";
-	title.innerHTML = titletext;
+	title.innerHTML = jQuery.sap.encodeHTML(titletext);
 	header.appendChild(title);
 
 	// create the content.....................................................//

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

@@ -101,7 +101,7 @@
 			if (trace == null) {
 				return;
 			}
-			VBI.m_Log = VBI.m_Log + text + "<br>";
+			VBI.m_Log = VBI.m_Log + jQuery.sap.encodeHTML(text) + "<br>";
 			trace.innerHTML = VBI.m_Log;
 		},
 

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

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 /**
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.84.5
+	 * @version 1.84.8
 	 * @public
 	 */
 
@@ -47,7 +47,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.84.5"
+		version: "1.84.8"
 	});
 
 	jQuery.sap.registerModuleShims({

package/src/sap/ui/vbm/themes/base/library.source.less

@@ -1,6 +1,6 @@
 /*
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 @import "../../../../../sap/ui/core/themes/base/base.less";
 @import "../../../../../sap/ui/core/themes/base/global.less";

package/src/sap/ui/vbm/themes/sap_belize/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

package/src/sap/ui/vbm/themes/sap_belize_plus/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../sap_belize/library.source.less";

package/src/sap/ui/vbm/themes/sap_bluecrystal/library.source.less

@@ -1,6 +1,6 @@
 /*
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_bluecrystal/base.less";

package/src/sap/ui/vbm/themes/sap_fiori_3/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

package/src/sap/ui/vbm/themes/sap_fiori_3_dark/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

package/src/sap/ui/vbm/themes/sap_fiori_3_hcw/library.source.less

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 @import "../base/library.source.less";

package/src/sap/ui/vbm/themes/sap_hcb/library.source.less

@@ -1,6 +1,6 @@
 /*
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_hcb/global.less";