@sapui5/sap.ui.vbm 1.136.1 → 1.136.2

package/package.json

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

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

@@ -24,7 +24,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.136.1
+	 * @version 1.136.2
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -47,7 +47,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.136.1
+	 * @version 1.136.2
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -238,7 +238,7 @@ sap.ui.define([
 
 		this._colladaBounds = null;
 
-		
+
 		// this._lassoTracker = null;
 	};
 
@@ -330,7 +330,7 @@ sap.ui.define([
 			this._rectangleTracker = new RectangleTracker(this);
 			// // this._lassoTracker = new LassoTracker(this);
 			// if(rectangleSelect)
-				
+
 			// if(lassoSelect && !rectangleSelect)
 			//     {
 			// 		this._lassoSelect = "created";	
@@ -348,7 +348,7 @@ sap.ui.define([
 			this._dragDropHandler.destroy();
 			this._dragDropHandler = null;
 			this._colladaBounds = null;
-            this._rectangleTracker = null;
+			this._rectangleTracker = null;
 			// this._lassoTracker = null;
 			this._viewport.removeEventDelegate(viewportEventDelegate);
 			// onBeforeRendering unsubscribes from DOM events.
@@ -421,51 +421,51 @@ sap.ui.define([
 		that._viewport.setBusy(true);
 
 		that._update = that._update
-		.then(function() {
-			that._parser.loadVBIJSON(payload);
-			
-			return that._sceneBuilder.synchronize();
-		})
-		.then(function() {
-			// further processing after scene(s) has been updated
-			that._processAutomation(payload);
-			that._processDetailWindow();
-			// that._createCollada(payload);
-			// check if last hover instance is still exist (it may be erased during update)
-			that._context.voQueues.toRemove.forEach(function(instances) {
-				instances.forEach(function(instance) {
-					if (that._hoverInstance === instance) {
-						that._hoverInstance = null;
-					}
+			.then(function() {
+				that._parser.loadVBIJSON(payload);
+
+				return that._sceneBuilder.synchronize();
+			})
+			.then(function() {
+				// further processing after scene(s) has been updated
+				that._processAutomation(payload);
+				that._processDetailWindow();
+				// that._createCollada(payload);
+				// check if last hover instance is still exist (it may be erased during update)
+				that._context.voQueues.toRemove.forEach(function(instances) {
+					instances.forEach(function(instance) {
+						if (that._hoverInstance === instance) {
+							that._hoverInstance = null;
+						}
+					}, that);
 				}, that);
-			}, that);
 
 
-			if (that._colladaBounds) {
-				that._colladaBounds.initialize();
-			}
+				if (that._colladaBounds) {
+					that._colladaBounds.initialize();
+				}
 
-			// update drag and drop handler
-			if (that._dragDropHandler) {
-				that._dragDropHandler.update();
-			}
-			
-			// scene has changed -> adjust camera clipping planes
-			that._viewport._resetBBox();
-			that._viewport._updateCamera();
+				// update drag and drop handler
+				if (that._dragDropHandler) {
+					that._dragDropHandler.update();
+				}
 
-			// clear before next update
-			that._context.voQueues.clear();
-			that._context.sceneQueues.clear();
-			that._context.windowQueues.clear();
+				// scene has changed -> adjust camera clipping planes
+				that._viewport._resetBBox();
+				that._viewport._updateCamera();
 
-			that._viewport.setBusy(false);
-		});
+				// clear before next update
+				that._context.voQueues.clear();
+				that._context.sceneQueues.clear();
+				that._context.windowQueues.clear();
+
+				that._viewport.setBusy(false);
+			});
 		// return last promise in chain
-		
+
 		return that._update;
 	};
-	
+
 	Adapter3D.prototype._processDetailWindow = function(payload) {
 		// show first only detail window from toAdd queue
 		// ignore all other detail windows as we can show only one at a time in compare to ActiveX implementation
@@ -791,12 +791,12 @@ sap.ui.define([
 	};
 
 	Adapter3D.prototype._genericEventHandler = function(name, event) {
-		
+
 		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;
@@ -1167,9 +1167,9 @@ sap.ui.define([
 			this._skipClick = false;
 			this._handleHover(event);
 		} else if (this._clickTimerId) {
-				clearTimeout(this._clickTimerId);
-				this._clickTimerId = null;
-				this._handleDoubleClick(event);
+			clearTimeout(this._clickTimerId);
+			this._clickTimerId = null;
+			this._handleDoubleClick(event);
 		} else {
 			this._clickTimerId = setTimeout(function() {
 				this._clickTimerId = null;
@@ -1193,6 +1193,14 @@ sap.ui.define([
 	 * @private
 	 */
 	Adapter3D.prototype._extendEventWithSelection = function(event) {
+
+		// As we want to manintain the state of object(selected/not selected)
+		// In case of drag and drop we will not calling further function
+		if (this._dragDropHandler.isDragAndDrop) {
+			this._dragDropHandler.isDragAndDrop = false;
+			return;
+		}
+
 		var instance = event.instance;
 		if (instance) {
 			if (event.originalEvent.type === "click") {
@@ -1210,10 +1218,19 @@ sap.ui.define([
 						action = "select";
 						exclusive = true;
 					}
-					event.selectionChanges = this._changeSelection(instance, action, exclusive);
+					if (instance.object3D) {
+						event.selectionChanges = this._changeSelectionAddtvAndSubtv(instance, action, exclusive);
+					} else {
+						event.selectionChanges = this._changeSelection(instance, action, exclusive);
+					}
+					
 				}
 			} else {
-				event.selectionChanges = this._changeSelection(instance, "toggle", false);
+				if (instance.object3D) {
+					event.selectionChanges = this._changeSelectionAddtvAndSubtv(instance, "toggle", false);
+				} else {
+					event.selectionChanges = this._changeSelection(instance, "toggle", false);
+				}
 			}
 		}
 	};
@@ -1252,7 +1269,7 @@ sap.ui.define([
 						deselected = group.selected.splice(0);
 					}
 					group.selected.push(instance);
-					selected = [ instance ];
+					selected = [instance];
 				}
 			}
 		} else if (action === "toggle") {
@@ -1269,15 +1286,15 @@ sap.ui.define([
 				}
 				// Select instance
 				group.selected.push(instance);
-				selected = [ instance ];
+				selected = [instance];
 			}
 		}
 
-		selected.forEach(function(instance) {
+		selected.forEach(function (instance) {
 			instance["VB:s"] = "true";
 		});
 
-		deselected.forEach(function(instance) {
+		deselected.forEach(function (instance) {
 			instance["VB:s"] = "false";
 		});
 
@@ -1285,7 +1302,132 @@ sap.ui.define([
 			selected: selected,
 			deselected: deselected
 		}
-		};
+	};
+
+	Adapter3D.prototype._changeSelectionAddtvAndSubtv = function (instance, action, exclusive) {
+		var selected = [];
+		var deselected = [];
+		var group = instance.voGroup;
+		var wasSelected = toBoolean(instance["VB:s"]);
+		var selectedIndex;
+
+		if (action === "select") {
+			if (group.maxSel !== "0") {
+				if (wasSelected) {
+					if (exclusive) {
+						// Deselect other selected instances in the group.
+						selectedIndex = group.selected.indexOf(instance);
+
+						// it was manually selected
+						if (selectedIndex >= 0) {
+							deselected = group.selected.splice(selectedIndex + 1).concat(group.selected.splice(0, selectedIndex));
+
+							// deselect all elements from rect selection as well
+							let found = [...this._rectangleTracker._selected];
+							for (let i = 0; i < found.length; i++) {
+								if (instance != found[i]._sapInstance) {
+									deselected.push(found[i]._sapInstance);
+								}
+							}
+
+							// To remove any dups present
+							deselected = [...new Map(deselected.map(item => [item.id, item])).values()];
+
+							this._rectangleTracker._selected.clear();
+						} else {
+							// considering it is from rect selection.
+							let matchingInstance = [...this._rectangleTracker._selected].find(u => u.uuid === instance.object3D.uuid);
+
+							deselected = group.selected.splice(0);
+
+							// deselect all elements from rect selection as well
+							let found = [...this._rectangleTracker._selected];
+							for (let i = 0; i < found.length; i++) {
+
+								if (matchingInstance.uuid != found[i].uuid) {
+									deselected.push(found[i]._sapInstance);
+									this._rectangleTracker._selected.delete(found[i]);
+								}
+							}
+
+							// To remove any dups present
+							deselected = [...new Map(deselected.map(item => [item.id, item])).values()];
+
+						}
+
+					}
+				} else {
+					if (exclusive || group.maxSel === "1") {
+
+						// Deselect other selected instances in the group.
+						selectedIndex = group.selected.indexOf(instance);
+
+						if (selectedIndex >= 0) {
+							deselected = group.selected.splice(selectedIndex + 1).concat(group.selected.splice(0, selectedIndex));
+						} else {
+							deselected = group.selected.splice(0);
+						}
+
+						let found = [...this._rectangleTracker._selected];
+						for (let i = 0; i < found.length; i++) {
+							deselected.push(found[i]._sapInstance);
+						}
+
+						// To remove any dups present
+						deselected = [...new Map(deselected.map(item => [item.id, item])).values()];
+
+						this._rectangleTracker._selected.clear();
+					}
+					if (!selectedIndex || selectedIndex < 0) {
+						group.selected.push(instance);
+					}
+					selected = [instance];
+				}
+			}
+		} else if (action === "toggle") {
+			if (wasSelected) {
+				if (group.minSel === "0" || group.selected.length > 1) {
+					// Deselect instance
+					selectedIndex = group.selected.indexOf(instance);
+					let found = [...this._rectangleTracker._selected].find(u => u.uuid === instance.object3D.uuid);
+
+					if (found) {
+						this._rectangleTracker._selected.delete(found);
+					}
+
+					// if the instance id previously selected and we are still not able to get it in data
+					//  we can still go ahead and that instance in deselected array to deselect it.
+					if (selectedIndex < 0) {
+						deselected.push(instance);
+					} else {
+						deselected = group.selected.splice(selectedIndex, 1);
+					}
+
+				}
+			} else if (group.maxSel !== "0") {
+				if (group.maxSel === "1") {
+					// Deselect all
+					deselected = group.selected.splice(0);
+				}
+				// Select instance
+				group.selected.push(instance);
+				selected = [instance];
+			}
+		}
+
+		selected.forEach(function (instance) {
+			instance["VB:s"] = "true";
+		});
+
+		deselected.forEach(function (instance) {
+			instance["VB:s"] = "false";
+		});
+
+		return {
+			selected: selected,
+			deselected: deselected
+		}
+	};
 
 
 	Adapter3D.prototype.enableRectangularSelection = function() {

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

@@ -117,11 +117,12 @@ sap.ui.define([
 			"_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor",
 			"_sap_ui_vbm_shared_ChartDataPointNotSelectedBackgroundOpacity"
 		] });
-		
-	AnalyticMap.DefaultRegionColor = values?values["_sap_ui_vbm_shared_ChoroplethRegionBG"] : "rgb(213,218,221)";
-	AnalyticMap.DefaultRegionColorBorder = values?values["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : "rgb(255,255,255)";
-	AnalyticMap.AltBorderColor = values?values["_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor"] : "#676767";
-	nonSelectOpacity = values?values["_sap_ui_vbm_shared_ChartDataPointNotSelectedBackgroundOpacity"] : "0.6";
+	const isValues= Object.keys(values || {}).length > 0;
+
+	AnalyticMap.DefaultRegionColor = isValues?values["_sap_ui_vbm_shared_ChoroplethRegionBG"] : "rgb(213,218,221)";
+	AnalyticMap.DefaultRegionColorBorder = isValues?values["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : "rgb(255,255,255)";
+	AnalyticMap.AltBorderColor = isValues?values["_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor"] : "#676767";
+	nonSelectOpacity = isValues?values["_sap_ui_vbm_shared_ChartDataPointNotSelectedBackgroundOpacity"] : "0.6";
 
 	AnalyticMap.DefaultRegionNonSelectColor = "RHLSA(0;1;1;" + nonSelectOpacity + ")";
 
@@ -992,8 +993,9 @@ sap.ui.define([
 					"_sap_ui_vbm_shared_ChoroplethRegionBG",
 					"_sap_ui_vbm_shared_ChoroplethRegionBorder"
 				] });
-				sColC = AnalyticMap.DefaultRegionColor = oColValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBG"] : AnalyticMap.DefaultRegionColor;
-				sColCB = AnalyticMap.DefaultRegionColorBorder = oColValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : AnalyticMap.DefaultRegionColorBorder;
+				const isValues= Object.keys(oColValues || {}).length > 0;
+				sColC = AnalyticMap.DefaultRegionColor = isValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBG"] : AnalyticMap.DefaultRegionColor;
+				sColCB = AnalyticMap.DefaultRegionColorBorder = isValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : AnalyticMap.DefaultRegionColorBorder;
 			if (this.getPlugin()) { // plug-in mode -> make sure color format matches plugin requirements
 				sColC = window.VBI.Utilities.String2VBColor(sColC);
 				sColCB = window.VBI.Utilities.String2VBColor(sColCB);

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

@@ -299,7 +299,7 @@ sap.ui.define([
 		// segmentedButton for for multiple content entries
 		this._oContentSegmentedButton = new SegmentedButton({
 			layoutData: oLayoutData.clone(),
-			select: this._onContentButtonSelect.bind(this)
+			selectionChange: this._onContentButtonSelect.bind(this)
 		});
 
 		// Left side...
@@ -628,12 +628,12 @@ sap.ui.define([
 	ContainerBase.prototype._contentChange = function() {
 		var aContent = this.getContent();
 		// remove and destroy all buttons for old content
-		this._oContentSegmentedButton.removeAllButtons();
+		this._oContentSegmentedButton.removeAllItems();
 		this._destroyButtons(this._aContentIcons);
 
 		this._aContentIcons = [];
 		if (aContent.length === 0) {
-			this._oContentSegmentedButton.removeAllButtons();
+			this._oContentSegmentedButton.removeAllItems();
 			this._setDefaultOnSegmentedButton();
 			this.switchContent(null);
 		}
@@ -660,7 +660,7 @@ sap.ui.define([
 	};
 
 	ContainerBase.prototype._onContentButtonSelect = function(oEvent) {
-		var sContentId = oEvent.getParameter("key");
+		var sContentId = oEvent.getParameter("item").getKey();
 		this._switchContent(sContentId);
 	};
 

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

@@ -86,7 +86,7 @@ sap.ui.define([
 				 * List Panel aggregation
 				 */
 				"listPanelStack": {
-					type: "sap.ui.vk.ListPanelStack",
+					type: "sap.ui.vbm.ListPanelStack",
 					multiple: false
 				},
 				/**
@@ -267,7 +267,8 @@ sap.ui.define([
 					this._box = new sap.m.HBox().addStyleClass("mapContainerHboxPopover");
 
 					this._popover = new sap.m.Popover({
-						enableScrolling: false,
+						horizontalScrolling: false,
+						verticalScrolling: false,
 						placement: sap.m.PlacementType.Horizontal,
 						content: this._box,
 						showHeader: false

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.136.2
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */

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

@@ -341,10 +341,11 @@ sap.ui.define([
 			   "_sap_ui_vbm_shared_ChartGood",
 			   "_sap_ui_vbm_shared_ChartNeutral"] });
 
-	VoBase.prototype.DefaultColorBad = colorParams? colorParams["_sap_ui_vbm_shared_ChartBad"] : "rgb(211, 32, 48)";
-	VoBase.prototype.DefaultColorCritical = colorParams? colorParams["_sap_ui_vbm_shared_ChartCritical"] : "rgb(225, 123, 36)";
-	VoBase.prototype.DefaultColorGood = colorParams? colorParams["_sap_ui_vbm_shared_ChartGood"] : "rgb(97, 166, 86)";
-	VoBase.prototype.DefaultColorNeutral = colorParams? colorParams["_sap_ui_vbm_shared_ChartNeutral"] : "rgb(132, 143, 148)";
+	const isValues= Object.keys(colorParams || {}).length > 0;
+	VoBase.prototype.DefaultColorBad = isValues? colorParams["_sap_ui_vbm_shared_ChartBad"] : "rgb(211, 32, 48)";
+	VoBase.prototype.DefaultColorCritical = isValues? colorParams["_sap_ui_vbm_shared_ChartCritical"] : "rgb(225, 123, 36)";
+	VoBase.prototype.DefaultColorGood = isValues? colorParams["_sap_ui_vbm_shared_ChartGood"] : "rgb(97, 166, 86)";
+	VoBase.prototype.DefaultColorNeutral = isValues? colorParams["_sap_ui_vbm_shared_ChartNeutral"] : "rgb(132, 143, 148)";
 
 	// VO Interface implementation ..............................................//
 

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

@@ -22,7 +22,7 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @author SAP SE
-		 * @version 1.136.1
+		 * @version 1.136.2
 		 * @alias sap.ui.vbm.adapter3d.ColladaBounds
 		 */
 	var ColladaBounds = BaseObject.extend("sap.ui.vbm.adapter3d.ColladaBounds", /** @lends sap.ui.vbm.adapter3d.ColladaBounds.prototype */ {

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

@@ -83,7 +83,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.136.2
 	 * @alias sap.ui.vbm.adapter3d.DragDropHandler
 	 */
 	var DragDropHandler = BaseObject.extend("sap.ui.vbm.adapter3d.DragDropHandler", /** @lends sap.ui.vbm.adapter3d.DragDropHandler.prototype */ {
@@ -99,6 +99,9 @@ sap.ui.define([
 			this._camera = this._viewport._camera;
 			this._cameraControls = this._viewport._cameraController;
 
+			// to detect the dragAndDrop happened
+			this.isDragAndDrop = false;
+
 			// current action state
 			this._state = STATE.PICK;
 
@@ -638,7 +641,16 @@ sap.ui.define([
 					var posAlias = this._adapter._parser.getAttributeAlias(dataType, posAttr);
 					var keyAlias = this._adapter._parser.getAttributeAlias(dataType, instance.voGroup.keyAttributeName);
 					var pos = instance.object3D.position;
-					var value = pos.x.toFixed(5) + ";" + pos.y.toFixed(5) + ";" + pos.z.toFixed(5);
+					var value = pos.x.toFixed(5) + ";" + pos.y.toFixed(5) + ";" + pos.z.toFixed(5); // new pos
+
+					var strInitialPos = instance.pos.split(";"); // prev pos
+					var vectorInitialPos = new Vector3(parseFloat(strInitialPos[0]), parseFloat(strInitialPos[1]), parseFloat(strInitialPos[2]));
+
+					if (vectorInitialPos.distanceTo(pos) > 0.5) { // fault tolerence 
+						this.isDragAndDrop = true;
+					} else {
+						this.isDragAndDrop = false;
+					}
 
 					// make sure position is updated in all 3 places:
 					// evaluated instance

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.136.2
 	 * @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.136.1
+	 * @version 1.136.2
 	 * @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.136.1
+	 * @version 1.136.2
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
 	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {