@sapui5/sap.ui.vbm 1.136.0 → 1.136.2

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

@@ -7,7 +7,7 @@ sap.ui.define([
 	var Vector2 = THREE.Vector2;
 	var _frustum = new THREE.Frustum;
 	var _center = new THREE.Vector3;
-	var _tmpPoint = new THREE.Vector3;
+	//var _tmpPoint = new THREE.Vector3;
 	var _vecNear = new THREE.Vector3;
 	var _vecTopLeft = new THREE.Vector3;
 	var _vecTopRight = new THREE.Vector3;
@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @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);
@@ -114,7 +118,7 @@ sap.ui.define([
 		var ref = this._viewport.getDomRef();
 		if (ref) {
 			this._dom = ref;
-			this._addListener(ref, "pointerup", this._onPointerCancel);
+			this._addListener(ref, "pointerup", this._onPointerUp);
 			this._addListener(ref, "pointerdown", this._onPointerDown);
 			this._addListener(ref, "pointermove", this._onPointerMove);
 			this._addListener(ref, "pointerleave", this._onPointerCancel);
@@ -148,185 +152,196 @@ sap.ui.define([
 	};
 
 	RectangleTracker.prototype._onPointerDown = function (event) {
+		if (event.button !== 0) {
+			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;
-						});
+		this._previousSelected = new Set(this._selected);
+	};
 
-						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._onPointerMove = function (event) {
+		event.preventDefault();
+		//this._updateController(false);
+		if (this._mouseDown) {
+			this._cameraControls.enableRotate = false;
+			this.onSelectMove(event);
+			this._updatePointer(event, _pointer);
+			this._handleHover(_pointer);
+		} 
+		// else if (!this._mouseDown) {
+		// 	this._cameraControls.enableRotate = false;
+		// }
+	}
+	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";
 				}
-			});
-			
-			if (dataMap != undefined) {
-				var payload = that._constructPayload(dataMap);
-				if (payload.Data.Merge.N.length > 0) {
-					this._adapter.fireSubmit({
-						data: JSON.stringify(payload)
-					});
+			} 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.clear();
+		return { dataType, keyAlias, obj };
 	};
 
-	RectangleTracker.prototype._onPointerMove = function (event) {
-		event.preventDefault();
+	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] }]);
+		}
+	};
 
-		if (!this._mouseDown) {
-			this._updatePointer(event, _pointer);
-			this._handleHover(_pointer);
+	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();
 
-		if (this._mouseDown) {
-			this._updateController(false);
-			this.onSelectMove(event);
-			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]);
-				}
-			}
-			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";
-						}
-					}
+		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;
 
-					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 (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",
@@ -412,6 +427,14 @@ sap.ui.define([
 		this.startPoint = startPoint || this.startPoint;
 		this.endPoint = endPoint || this.endPoint;
 		this.collection = [];
+		const dx = Math.abs(endPoint.x - startPoint.x);
+		const dy = Math.abs(endPoint.y - startPoint.y);
+
+		// if less than 2-3 pixels movement => treat as click, skip updateFrustum
+		if (dx < 0.002 && dy < 0.002) {
+			// 👉 handle as simple click (use raycaster for single object select)
+			return;
+		}
 		this.updateFrustum(this.startPoint, this.endPoint);
 		this.searchChildInFrustum(_frustum, this._scene);
 		this._scene.remove(this._planeMesh);
@@ -439,18 +462,20 @@ sap.ui.define([
 
 		if (this._camera.isPerspectiveCamera) {
 
-			_tmpPoint = startPoint;
-			_tmpPoint.x = Math.min(startPoint.x, endPoint.x);
-			_tmpPoint.y = Math.max(startPoint.y, endPoint.y);
-			endPoint.x = Math.max(startPoint.x, endPoint.x);
-			endPoint.y = Math.min(startPoint.y, endPoint.y);
+			// Normalize rectangle regardless of drag direction
+			var minX = Math.min(startPoint.x, endPoint.x);
+			var maxX = Math.max(startPoint.x, endPoint.x);
+			var minY = Math.min(startPoint.y, endPoint.y);
+			var maxY = Math.max(startPoint.y, endPoint.y);
 
-			_vecNear.setFromMatrixPosition(this._camera.matrixWorld);
-			_vecTopLeft.copy(_tmpPoint);
-			_vecTopRight.set(endPoint.x, _tmpPoint.y, 0);
-			_vecDownRight.copy(endPoint);
-			_vecDownLeft.set(_tmpPoint.x, endPoint.y, 0);
 
+			_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);
+			
 			_vecTopLeft.unproject(this._camera);
 			_vecTopRight.unproject(this._camera);
 			_vecDownRight.unproject(this._camera);
@@ -459,9 +484,12 @@ sap.ui.define([
 			_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);
@@ -471,6 +499,7 @@ sap.ui.define([
 			_vectemp1.sub(_vecNear);
 			_vectemp2.sub(_vecNear);
 			_vectemp3.sub(_vecNear);
+			_vectemp4.sub(_vecNear);
 
 			var planes = _frustum.planes;
 
@@ -484,11 +513,11 @@ sap.ui.define([
 		}
 
 
-	}
+	};
 
 	RectangleTracker.prototype.searchChildInFrustum = function (frustum, object) {
 		var count = 0;
-		if (object._sapInstance != undefined && !object.geomtry) {
+		if (object._sapInstance != undefined && ((object._sapInstance["VB:c"] == 'true' ) || !(object._sapInstance["VB:c"]) )) {
 			var box1 = new THREE.BoxHelper(object, 0x000000);
 			var vertices = box1.geometry.attributes.position.array;
 			for (var i = 0, l = vertices.length; i < l; i += 3) {
@@ -590,7 +619,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.136.0
+	 * @version 1.136.2
 	 * @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.136.0
+	 * @version 1.136.2
 	 * @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

@@ -6,12 +6,12 @@
  * Initialization Code and shared classes of library sap.ui.vbm.
  */
 sap.ui.define([
-	"sap/ui/core/Core",
+	"sap/ui/base/DataType",
+	"sap/ui/core/Lib",
 	"sap/m/library",
 	"sap/ui/core/library",
-	"sap/ui/unified/library",
-	"sap/ui/core/Lib"
-], function(Core,mlibrary,clibrary,ulibrary,Lib) {
+	"sap/ui/unified/library"
+], function(DataType,Lib,_mlibrary,_clibrary,_ulibrary) {
 	"use strict";
 
 	/**
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @public
 	 */
 
@@ -29,8 +29,9 @@ sap.ui.define([
 
 	var vbmLibrary = Lib.init({
 		name: "sap.ui.vbm",
+		apiVersion: 2,
 		types: [
-			"sap.ui.vbm.ClusterInfoType", "sap.ui.vbm.SemanticType"
+			"sap.ui.vbm.ClusterInfoType", "sap.ui.vbm.SemanticType", "sap.ui.vbm.RouteType"
 		],
 		controls: [
 			"sap.ui.vbm.AnalyticMap", "sap.ui.vbm.GeoMap", "sap.ui.vbm.VBI", "sap.ui.vbm.Cluster", "sap.ui.vbm.Viewport","sap.ui.vbm.ContainerLegendItem",
@@ -45,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.136.0"
+		version: "1.136.2"
 	});
 
 	sap.ui.loader.config({
@@ -132,6 +133,7 @@ sap.ui.define([
 		Hidden: "Hidden"
 
 	};
+	DataType.registerEnum("sap.ui.vbm.SemanticType", vbmLibrary.SemanticType);
 
 	/**
 	 * Cluster Info Type
@@ -179,6 +181,7 @@ sap.ui.define([
 		Edges: 11
 
 	};
+	// As of 2025-05-23, this enum is not used in managed properties and therefore not registered
 
 	/**
 	 * Route type, determining how line between start and endpoint should be drawn.
@@ -204,6 +207,7 @@ sap.ui.define([
 		Geodesic: "Geodesic"
 
 	};
+	DataType.registerEnum("sap.ui.vbm.RouteType", vbmLibrary.RouteType);
 
 	vbmLibrary.getResourceBundle = function() {
 		var oResourceBundle = Lib.getResourceBundleFor("sap.ui.vbm")