@sapui5/sap.ui.vbm 1.141.0 → 1.143.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.141.0",
+  "version": "1.143.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.141.0</version>
+	<version>1.143.0</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.141.0
+	 * @version 1.143.0
 	 * @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.141.0
+	 * @version 1.143.0
 	 * @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/Viewport.js

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

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

@@ -22,7 +22,7 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @author SAP SE
-		 * @version 1.141.0
+		 * @version 1.143.0
 		 * @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.141.0
+	 * @version 1.143.0
 	 * @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;
 
@@ -612,6 +615,9 @@ sap.ui.define([
 		var payload = {
 			version    : "2.0",
 			"xmlns:VB" : "VB",
+			Action     : {
+			    name      : "DRAG_DROP"
+			},
             Data: {
                 Merge: {
                     N: []
@@ -638,7 +644,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.141.0
+	 * @version 1.143.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.141.0
+	 * @version 1.143.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.141.0
+	 * @version 1.143.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/RectangleTracker.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.143.0
 	 * @alias sap.ui.vbm.adapter3d.RectangleTracker
 	 */
 	var RectangleTracker = BaseObject.extend("sap.ui.vbm.adapter3d.RectangleTracker", /** @lends sap.ui.vbm.adapter3d.RectangleTracker.prototype */ {
@@ -53,11 +53,15 @@ sap.ui.define([
 			this._camera = this._viewport._camera;
 			this._cameraControls = this._viewport._cameraController;
 			this._selected = new Set();
+			this._previousSelected = new Set();
+			this.disableRect = false;
 			this._renderer = this._renderer;
 			this.init();
-			var helper = new THREE.CameraHelper(this._camera);
-			helper.geometry.setDrawRange(0, 0);
-			this._addToScene(helper, this._scene, true, 1);
+			if (!this._adapter._cameraHelper) {
+				this._adapter._cameraHelper = new THREE.CameraHelper(this._camera);
+				this._adapter._cameraHelper.geometry.setDrawRange(0, 0);
+				this._addToScene(this._adapter._cameraHelper, this._scene, true, 1);
+			}
 			this._snapBox = new THREE.BoxHelper(undefined, 0x00ffff);
 			// invisible, layer #1 (disable hit test)
 			this._addToScene(this._snapBox, this._scene, false, 1);
@@ -152,81 +156,22 @@ sap.ui.define([
 			return; // Don't start selection if it's not the left button
 		}
 		this._updateController(true);
-		this.onSelectStart(event);
-		var that = this;
+		// To start the selection if our arrow is on white space or
+		// not particulary on selectable object.
+		if (window.getComputedStyle(event.target).cursor == "auto") {
+			this._cameraControls.setEnabled(false);
+			this.onSelectStart(event);
+			this.disableRect = true;
+		} else {
+			this.disableRect = false;
+			return;
+		}
 		event.cursor = event.cursor || this._getXY(event);
 		this._mouseDown = true;
 		var rect = this._viewport.getDomRef().getBoundingClientRect();
 		startPoint.x = (event.cursor.x / rect.width) * 2 - 1;
 		startPoint.y = -(event.cursor.y / rect.height) * 2 + 1;
-		var dataMap = new Map();
-		var dataType;
-		var keyAlias;
-		if (!event.ctrlKey) {
-			this._selected.forEach(function (item) {
-				if (item.type != 'InstancedMesh' || item.type != 'PlaneGeometry') {
-					var obj = {};
-					if (item._sapInstance != undefined) {
-						var val = item._sapInstance;
-						item._sapInstance["VB:s"] = "false";
-						that._adapter._sceneBuilder.updateHotInstance(val);
-					    dataType = item._sapInstance.voGroup.datasource; // VO group data source linked to a DataType by name
-						keyAlias = that._adapter._parser.getAttributeAlias(dataType, item._sapInstance.voGroup.keyAttributeName);
-						obj[keyAlias] = item._sapInstance.id;
-						obj["VB:s"] = "false";
-					} else if (item.userData.name == "ColladaBounds") {
-						if (item.userData._sapInstance["VB:s"] == "true") {
-							var instance = item.userData._sapInstance;
-							var selectionChanges = that._adapter._changeSelection(instance, "toggle", false);
-							that._adapter._sceneBuilder.updateSelection(selectionChanges.selected, selectionChanges.deselected);
-							dataType = item.userData._sapInstance.voGroup.datasource; // VO group data source linked to a DataType by name
-							keyAlias = that._adapter._parser.getAttributeAlias(dataType, item.userData._sapInstance.voGroup.keyAttributeName);
-							obj[keyAlias] = item.userData.id;
-							obj["VB:s"] = "false";
-						}
-					}
-					
-					var existingData = dataMap.get(dataType);
-					if (existingData != undefined ) {
-						// Check if there's already an entry for this dataType
-						var existingEntry = existingData.find(function (entry) {
-							return entry.name === dataType;
-						});
-
-						if (existingEntry) {
-							// If an entry exists for this dataType, push the new object to its E array if it's not already present
-							var existingObject = existingEntry.E.find(function (e) {
-								if (item._sapInstance != undefined)
-								  return e[keyAlias] ===  item._sapInstance.id
-								else
-								  return e[keyAlias] ===   item.userData.id;
-							});
-							if (!existingObject  && JSON.stringify(obj) !== '{}' ) {
-								// If the object doesn't exist, push it to the E array
-								existingEntry.E.push(obj);
-							}
-						}
-					} else {
-						// If no data exists for this dataType, create a new array and add the object
-						dataMap.set(dataType, [{
-							name: dataType,
-							E: [obj]
-						}]);
-					}
-				}
-			});
-			
-			if (dataMap != undefined) {
-				var payload = that._constructPayload(dataMap);
-				if (payload.Data.Merge.N.length > 0) {
-					this._adapter.fireSubmit({
-						data: JSON.stringify(payload)
-					});
-				}
-			}
-		}
-
-		this._selected.clear();
+		this._previousSelected = new Set(this._selected);
 	};
 
 	RectangleTracker.prototype._onPointerMove = function (event) {
@@ -242,106 +187,168 @@ sap.ui.define([
 		// 	this._cameraControls.enableRotate = false;
 		// }
 	}
-		RectangleTracker.prototype._onPointerUp = function (event) {
-			this._updateController(true);
-		if (!this._mouseDown) {
-			var that = this;
-			event.cursor = event.cursor || this._getXY(event);
-			var rect = this._viewport.getDomRef().getBoundingClientRect();
-			endPoint.x = (event.cursor.x / rect.width) * 2 - 1;
-			endPoint.y = -(event.cursor.y / rect.height) * 2 + 1;
-			endPoint.z = 0.5
-			var isSelected = this.selecting(_frustum);
-			var dataMap = new Map();
-			var dataType;
-			var keyAlias;
-			var obj = {};
-			if (isSelected.length > 0) {
-				for (var i = 0; i < isSelected.length; i++) {
-					this._selected.add(isSelected[i]);
+	RectangleTracker.prototype.buildEntry = function (item, selected, items) {
+		let dataType, keyAlias;
+		let obj = {};
+
+		if (item._sapInstance != undefined) {
+			const val = item._sapInstance;
+			item._sapInstance["VB:s"] = selected ? "true" : "false";
+			// maybe updateHotInstance only for selected?
+			this._adapter._sceneBuilder.updateHotInstance(val);
+			dataType = item._sapInstance.voGroup.datasource;
+			keyAlias = this._adapter._parser.getAttributeAlias(dataType, item._sapInstance.voGroup.keyAttributeName);
+			obj[keyAlias] = item._sapInstance.id;
+			obj["VB:s"] = selected ? "true" : "false";
+		} else if (item.userData.name === "ColladaBounds") {
+			if (selected === true) {
+				var id = item.userData.id;
+				var meshCount = item.userData.count;
+				var count = 0;
+				items.forEach(function (itemA) {
+					if (itemA.userData.id == id)
+						count++;
+				});
+				if (count == meshCount) {
+					var instance = item.userData._sapInstance;
+					var selectionChanges = this._adapter._changeSelection(instance, "select", false);
+					this._adapter._sceneBuilder.updateSelection(selectionChanges.selected, selectionChanges.deselected);
+					dataType = item.userData._sapInstance.voGroup.datasource; // VO group data source linked to a DataType by name
+					keyAlias = this._adapter._parser.getAttributeAlias(dataType, item.userData._sapInstance.voGroup.keyAttributeName);
+					obj[keyAlias] = item.userData.id;
+					obj["VB:s"] = "true";
+				}
+			} else {
+				if (item.userData._sapInstance["VB:s"] == "true") {
+					var instance = item.userData._sapInstance;
+					var selectionChanges = this._adapter._changeSelection(instance, "toggle", false);
+					this._adapter._sceneBuilder.updateSelection(selectionChanges.selected, selectionChanges.deselected);
+					// your ColladaBounds logic with selected/deselected
+					dataType = item.userData._sapInstance.voGroup.datasource;
+					keyAlias = this._adapter._parser.getAttributeAlias(dataType, item.userData._sapInstance.voGroup.keyAttributeName);
+					obj[keyAlias] = item.userData.id;
+					obj["VB:s"] = selected ? "true" : "false";
 				}
 			}
-			this._selected.forEach(function (item) {
-			    obj = {};
-				if (item.type != 'InstancedMesh' || item.type != 'PlaneGeometry') {
-					if (item._sapInstance != undefined) {
-						var val = item._sapInstance;
-						item._sapInstance["VB:s"] = "true";
-						that._adapter._sceneBuilder.updateHotInstance(val);
-						dataType = item._sapInstance.voGroup.datasource; // VO group data source linked to a DataType by name
-						keyAlias = that._adapter._parser.getAttributeAlias(dataType, item._sapInstance.voGroup.keyAttributeName);
-						obj[keyAlias] = item._sapInstance.id;
-						obj["VB:s"] = "true";
-						// that._adapter._handleHover(val);	
-					} else if (item.userData.name == "ColladaBounds") {
-						var id = item.userData.id;
-						var meshCount = item.userData.count;
-						var count = 0;
-						that._selected.forEach(function (itemA) {
-							if (itemA.userData.id == id)
-								count++;
-						});
-						if (count == meshCount) {
-							var instance = item.userData._sapInstance;
-							var selectionChanges = that._adapter._changeSelection(instance, "select", false);
-							that._adapter._sceneBuilder.updateSelection(selectionChanges.selected, selectionChanges.deselected);
-							dataType = item.userData._sapInstance.voGroup.datasource; // VO group data source linked to a DataType by name
-							keyAlias = that._adapter._parser.getAttributeAlias(dataType, item.userData._sapInstance.voGroup.keyAttributeName);
-							obj[keyAlias] = item.userData.id;
-							obj["VB:s"] = "true";
-						}
-					}
+		}
 
+		return { dataType, keyAlias, obj };
+	};
 
-					var existingData = dataMap.get(dataType);
-					if (existingData != undefined) {
-						// Check if there's already an entry for this dataType
-						var existingEntry = existingData.find(function (entry) {
-							return entry.name === dataType;
-						});
-						if (existingEntry) {
-							// If an entry exists for this dataType, push the new object to its E array if it's not already present
-							var existingObject = existingEntry.E.find(function (e) {
-								if (item._sapInstance != undefined)
-									return e[keyAlias] === item._sapInstance.id
-								else
-									return e[keyAlias] === item.userData.id;
-							});
-							if (!existingObject && JSON.stringify(obj) !== '{}') {
-								// If the object doesn't exist, push it to the E array
-								existingEntry.E.push(obj);
-							}
-						}
-					} else {
-						// If no data exists for this dataType, create a new array and add the object
-						dataMap.set(dataType, [{
-							name: dataType,
-							E: [obj]
-						}]);
+	RectangleTracker.prototype.addToDataMap = function (dataMap, dataType, obj, keyAlias, item) {
+		if (!dataType || !obj) return;
+		const existingData = dataMap.get(dataType);
+		if (existingData) {
+			const existingEntry = existingData.find(entry => entry.name === dataType);
+			if (existingEntry) {
+				const existingObject = existingEntry.E.find(e => {
+					if (item._sapInstance != undefined)
+						return e[keyAlias] === item._sapInstance.id;
+					else
+						return e[keyAlias] === item.userData.id;
+				});
+				if (!existingObject && JSON.stringify(obj) !== '{}') existingEntry.E.push(obj);
+			}
+		} else {
+			dataMap.set(dataType, [{ name: dataType, E: [obj] }]);
+		}
+	};
+
+	RectangleTracker.prototype._onPointerUp = function (event) {
+		this._updateController(true);
+		if (this._mouseDown) return;
+
+		// case we are restricting rect selection to achieve drag drop, camera movement and additive single as well
+		if (!this.disableRect) return;
+
+		event.cursor = event.cursor || this._getXY(event);
+		var rect = this._viewport.getDomRef().getBoundingClientRect();
+		endPoint.x = (event.cursor.x / rect.width) * 2 - 1;
+		endPoint.y = -(event.cursor.y / rect.height) * 2 + 1;
+		endPoint.z = 0.5
+
+		const inside = this.selecting(_frustum); // all objects in rectangle
+		if (!inside || inside.length === 0) {
+			this._mouseDown = false;
+			this._cameraControls.setEnabled(true);
+			this._dom.style.cursor = this._hovered ? "pointer" : "auto";
+			this.onSelectOver();
+			return;
+		}
+		// build new selection set
+		const newSelected = new Set(inside);
+		
+		// clearing all selected item
+		// do not worry as we are having selected item stored in _previousSelected set
+		// and newly selected are in newSelected set
+		this._selected.clear();
+
+		var deselected = [];
+
+		if (!event.ctrlKey && !event.shiftKey) {
+			// deselect items not in rectangle anymore
+			deselected = [...this._previousSelected].filter(i => !newSelected.has(i));
+			let instance = newSelected?.values()?.next()?.value?._sapInstance; // get 1st instance;
+
+			if (instance) {
+				var group = instance.voGroup;
+				const removeSelected = group.selected.reduceRight((acc, i, idx) => {
+					if (!newSelected.has(i.object3D)) {
+						acc.push(...group.selected.splice(idx, 1));
 					}
-			
-				}
-			});
+					return acc;
+				}, []);
+
+				deselected = [...deselected, ...removeSelected.map(item => ({ _sapInstance: item }))]; // to deselect manually selected objects.
+
+			}
 
+		} else {
+			// additive selection 
+			// so maintain prevselected item as well.
+			[...this._previousSelected].forEach(i => this._selected.add(i));
 		}
-		if (dataMap != undefined) {
-			var payload = that._constructPayload(dataMap);
+
+		// update your internal set
+		newSelected.forEach(i => this._selected.add(i));
+
+		// build a single dataMap for deselection + selection
+		const dataMap = new Map();
+
+		// handle deselection
+		deselected.forEach(item => {
+			const { dataType, keyAlias, obj } = this.buildEntry(item, false, deselected); // VB:s false
+			this.addToDataMap(dataMap, dataType, obj, keyAlias, item);
+		});
+
+		// handle selection
+		inside.forEach(item => {
+			const { dataType, keyAlias, obj } = this.buildEntry(item, true, inside); // VB:s true
+			this.addToDataMap(dataMap, dataType, obj, keyAlias, item);
+		});
+
+		if (dataMap.size > 0) {
+			const payload = this._constructPayload(dataMap);
 			if (payload.Data.Merge.N.length > 0) {
-				this._adapter.fireSubmit({
-					data: JSON.stringify(payload)
-				});
+				this._adapter.fireSubmit({ data: JSON.stringify(payload) });
 			}
 		}
+
 		this._mouseDown = false;
 		this._dom.style.cursor = this._hovered ? "pointer" : "auto";
+		this._cameraControls.setEnabled(true);
 		this._updateController(true);
 		this.onSelectOver();
 	};
 
+
 	RectangleTracker.prototype._constructPayload = function (dataMap) {
 		var payload = {
 			version: "2.0",
 			"xmlns:VB": "VB",
+			Action     : {
+			    name      : "RECTANGULAR_SELECTION"
+			},
 			Data: {
 				Merge: {
 					N: []
@@ -464,39 +471,51 @@ sap.ui.define([
 			var minY = Math.min(startPoint.y, endPoint.y);
 			var maxY = Math.max(startPoint.y, endPoint.y);
 
+
+			_vecNear.setFromMatrixPosition(this._camera.matrixWorld);
 			// Define corners in NDC (normalized device coordinates)
 			_vecTopLeft.set(minX, maxY, 0);
 			_vecTopRight.set(maxX, maxY, 0);
 			_vecDownRight.set(maxX, minY, 0);
 			_vecDownLeft.set(minX, minY, 0);
-
-			// Camera position
-			_vecNear.setFromMatrixPosition(this._camera.matrixWorld);
-
+			
 			_vecTopLeft.unproject(this._camera);
 			_vecTopRight.unproject(this._camera);
 			_vecDownRight.unproject(this._camera);
 			_vecDownLeft.unproject(this._camera);
 
-			// Far points (deep into the scene)
-			_vectemp1.copy(_vecTopLeft).sub(_vecNear).normalize().multiplyScalar(this.deep).add(_vecNear);
-			_vectemp2.copy(_vecTopRight).sub(_vecNear).normalize().multiplyScalar(this.deep).add(_vecNear);
-			_vectemp3.copy(_vecDownRight).sub(_vecNear).normalize().multiplyScalar(this.deep).add(_vecNear);
-			_vectemp4.copy(_vecDownLeft).sub(_vecNear).normalize().multiplyScalar(this.deep).add(_vecNear);
+			_vectemp1.copy(_vecTopLeft).sub(_vecNear);
+			_vectemp2.copy(_vecTopRight).sub(_vecNear);
+			_vectemp3.copy(_vecDownRight).sub(_vecNear);
+			_vectemp4.copy(_vecDownLeft).sub(_vecNear)
+
+			_vectemp1.normalize();
+			_vectemp2.normalize();
+			_vectemp3.normalize();
+			_vectemp4.normalize();
+
+
+			_vectemp1.multiplyScalar(this.deep);
+			_vectemp2.multiplyScalar(this.deep);
+			_vectemp3.multiplyScalar(this.deep);
+			_vectemp4.multiplyScalar(this.deep);
+			_vectemp1.sub(_vecNear);
+			_vectemp2.sub(_vecNear);
+			_vectemp3.sub(_vecNear);
+			_vectemp4.sub(_vecNear);
 
 			var planes = _frustum.planes;
 
-			// Build planes around the selection frustum
-			planes[0].setFromCoplanarPoints(_vecNear, _vecTopLeft, _vecTopRight);   // top
-			planes[1].setFromCoplanarPoints(_vecNear, _vecTopRight, _vecDownRight); // right
-			planes[2].setFromCoplanarPoints(_vecNear, _vecDownRight, _vecDownLeft); // bottom
-			planes[3].setFromCoplanarPoints(_vecNear, _vecDownLeft, _vecTopLeft);   // left
-			planes[4].setFromCoplanarPoints(_vecTopRight, _vecDownRight, _vecDownLeft); // near plane
-			planes[5].setFromCoplanarPoints(_vectemp3, _vectemp2, _vectemp1);       // far plane
+			planes[0].setFromCoplanarPoints(_vecNear, _vecTopLeft, _vecTopRight);
+			planes[1].setFromCoplanarPoints(_vecNear, _vecTopRight, _vecDownRight);
+			planes[2].setFromCoplanarPoints(_vecDownRight, _vecDownLeft, _vecNear);
+			planes[3].setFromCoplanarPoints(_vecDownLeft, _vecTopLeft, _vecNear);
+			planes[4].setFromCoplanarPoints(_vecTopRight, _vecDownRight, _vecDownLeft);
+			planes[5].setFromCoplanarPoints(_vectemp3, _vectemp2, _vectemp1);
 			planes[5].normal.multiplyScalar(-1);
 		}
 
-		return _frustum; // ✅ return the frustum so selecting() can use it
+
 	};
 
 	RectangleTracker.prototype.searchChildInFrustum = function (frustum, object) {
@@ -603,7 +622,7 @@ sap.ui.define([
 			this._camera = null;
 			this._cameraControls = null;
 			this._raycaster = null;
-			this._selected = null;
+			// this._selected = null;
 			this._renderer = null;
 			this._element = null;
 			this._snapBox = null;

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.143.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/VBIJSONParser.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.143.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/library.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.141.0
+	 * @version 1.143.0
 	 * @public
 	 */
 
@@ -46,7 +46,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.141.0"
+		version: "1.143.0"
 	});
 
 	sap.ui.loader.config({

package/src/sap/ui/vbm/vector/PayloadGenerator.js

@@ -12,7 +12,7 @@ sap.ui.define([
          *
          * @private
          * @author SAP SE
-         * @version 1.141.0
+         * @version 1.143.0
          * @alias sap.ui.vbm.vector.PayloadGenerator
          */
     var adapter = {};

package/src/sap/ui/vbm/vector/RectangularSelection.js

@@ -12,7 +12,7 @@ sap.ui.define([
          *
          * @private
          * @author SAP SE
-         * @version 1.141.0
+         * @version 1.143.0
          * @alias sap.ui.vbm.vector.RectangularSelection
          */
 

package/src/sap/ui/vbm/vector/VBITransformer.js

@@ -742,12 +742,27 @@ sap.ui.define([
                             // code block
                         }
                     }
-
                 }
             }
         }
 
-
+        featureCollection = Object.values(
+            featureCollection.reduce((acc, f) => {
+                const key = f.properties?.Key;
+                if (!key) return acc; // skip if no key
+
+                if (!acc[key]) {
+                    acc[key] = { ...f };
+                } else {
+                    // Merge properties if duplicate found
+                    acc[key].properties = {
+                        ...acc[key].properties,
+                        ...f.properties
+                    };
+                }
+                return acc;
+            }, {})
+        );
         if (obj.SAPVB.Data.Remove) {
 
             let del = obj.SAPVB.Data.Remove;

package/src/sap/ui/vbm/vector/VectorUtils.js

@@ -40,7 +40,6 @@ sap.ui.define([
         el.id = '__mapmarker' + spotid++;
         el.style.backgroundImage = `url(${base64decoded})`;
         el.style.backgroundSize = 'cover';
-        el.style.pointerEvents = 'none';
         el.style.display = 'inline-block';
         el.style.transform = 'translate(-50%, -100%)';