@sapui5/sap.ui.vbm 1.140.0 → 1.141.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.140.0",
+  "version": "1.141.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.140.0</version>
+	<version>1.141.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.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.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.140.0
+		 * @version 1.141.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.140.0
+	 * @version 1.141.0
 	 * @alias sap.ui.vbm.adapter3d.DragDropHandler
 	 */
 	var DragDropHandler = BaseObject.extend("sap.ui.vbm.adapter3d.DragDropHandler", /** @lends sap.ui.vbm.adapter3d.DragDropHandler.prototype */ {

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.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

@@ -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.140.0
+	 * @version 1.141.0
 	 * @alias sap.ui.vbm.adapter3d.RectangleTracker
 	 */
 	var RectangleTracker = BaseObject.extend("sap.ui.vbm.adapter3d.RectangleTracker", /** @lends sap.ui.vbm.adapter3d.RectangleTracker.prototype */ {
@@ -148,6 +148,9 @@ 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;
@@ -420,6 +423,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);
@@ -447,52 +458,46 @@ 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);
 
+			// 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.copy(_tmpPoint);
-			_vecTopRight.set(endPoint.x, _tmpPoint.y, 0);
-			_vecDownRight.copy(endPoint);
-			_vecDownLeft.set(_tmpPoint.x, endPoint.y, 0);
 
 			_vecTopLeft.unproject(this._camera);
 			_vecTopRight.unproject(this._camera);
 			_vecDownRight.unproject(this._camera);
 			_vecDownLeft.unproject(this._camera);
 
-			_vectemp1.copy(_vecTopLeft).sub(_vecNear);
-			_vectemp2.copy(_vecTopRight).sub(_vecNear);
-			_vectemp3.copy(_vecDownRight).sub(_vecNear);
-			_vectemp1.normalize();
-			_vectemp2.normalize();
-			_vectemp3.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);
+			// 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);
 
 			var planes = _frustum.planes;
 
-			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);
+			// 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[5].normal.multiplyScalar(-1);
 		}
 
-
-	}
+		return _frustum; // ✅ return the frustum so selecting() can use it
+	};
 
 	RectangleTracker.prototype.searchChildInFrustum = function (frustum, object) {
 		var count = 0;

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.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.140.0
+	 * @version 1.141.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.140.0"
+		version: "1.141.0"
 	});
 
 	sap.ui.loader.config({

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

@@ -163,7 +163,9 @@ sap.ui.define([
 				let markerCoordinates = marker.geometry.coordinates;
 				if (marker.geometry.type === 'Point') {
 					// create a DOM element for the marker (parent div)
-					const el = VectorUtils.createSpotElement(marker);
+					let createdSpot = VectorUtils.createSpotElement(marker, spotid);
+					const el = createdSpot.spotEl;
+					spotid = createdSpot.spotId;
 					if (marker.properties.Label) {
 						const child_e1 = VectorUtils.createMarkerLabel(marker.properties.Label, marker.properties.LabelBGColor);
 						el.appendChild(child_e1);
@@ -180,7 +182,7 @@ sap.ui.define([
 					let spot = new maplibregl.Marker({
 						element: el,
 						draggable: true,
-						offset: [0, -20]
+						anchor: 'bottom'
 					}).setLngLat(marker.geometry.coordinates)
 						.on('dragend', onDragEnd)
 						.addTo(map);
@@ -514,15 +516,21 @@ sap.ui.define([
 					}
 				} else if (marker.geometry.type == "LineString") {
 
-					const colorStr = marker.properties.LineColor; 
-					let textColor = '#000000'; // Default color
-
-					if (colorStr) {
-						const [r, g, b, a] = VectorUtils.parseRGBAString(colorStr);
-						textColor = VectorUtils.getContrastTextColor(r, g, b);
-					    marker.properties.labelHaloColor = `rgba(${r}, ${g}, ${b}, ${a})`;
+					if (marker.properties.Label) {
+						const midpoint = getMidpoint(marker.geometry.coordinates);
+				
+						const routeLabelEl = VectorUtils.createRouteLabel(
+							marker.properties.Label,
+							marker.properties.LabelBGColor
+						);
+				
+						new maplibregl.Marker({
+							element: routeLabelEl,
+							anchor: 'left',   
+						})
+						.setLngLat(midpoint)
+						.addTo(map);
 					}
-					marker.properties.textColor = textColor;
 					const coords = marker.geometry.coordinates;
 					const startCoord = coords[0];  // First coordinate
 					const endCoord = coords[coords.length - 1];  // Last coordinate
@@ -621,29 +629,17 @@ sap.ui.define([
 				},
 				'filter': ['==', '$type', 'LineString']
 			});
-
-			map.addLayer({
-				id: 'line-labels',
-				type: 'symbol',
-				source: 'geojson-source',
-				layout: {
-					'symbol-placement': 'line-center',
-					'text-field': ['get', 'Label'],
-					'text-font': ['Open Sans Regular', 'Arial Unicode MS Regular'],
-					'text-size': 14,
-					'text-rotation-alignment': 'map',
-					'text-keep-upright': true
-				},
-                paint: {
-                    'text-color': ['get', 'lineLabelTextColor'], 
-                    'text-halo-color': ['get', 'labelHaloColor'], 
-                    'text-halo-width': 4,              
-                    'text-halo-blur': 0.8,
-                    'text-opacity': ['get', 'opacity']
-                },
-
-				filter: ['all', ['==', ['get', 'ShowLabel'], true]]
-			});
+			
+			function getMidpoint(coords) {
+				if (coords.length < 2) return coords[0]; 
+				
+				const start = coords[0];
+				const end = coords[coords.length - 1];
+				const midLng = (start[0] + end[0]) / 2;
+				const midLat = (start[1] + end[1]) / 2;
+				
+				return [midLng, midLat];
+			}
 
 			// Create a new FeatureCollection for the points
 			const pointGeoJSON = {
@@ -933,7 +929,7 @@ sap.ui.define([
 				PayloadGenerator.onMapContextMenu(coords, currentZoom, currentCenter, screenX, screenY);
 			}
 		};
-
+		
 		var that = this;
 		map.on('idle', () => {
 			const container = map.getContainer();

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

@@ -12,7 +12,7 @@ sap.ui.define([
          *
          * @private
          * @author SAP SE
-         * @version 1.140.0
+         * @version 1.141.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.140.0
+         * @version 1.141.0
          * @alias sap.ui.vbm.vector.RectangularSelection
          */
 

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

@@ -223,12 +223,10 @@ sap.ui.define([
                         "Image": currSpot.I ? currSpot.I : "",
                         "base64": resources.find(resource => resource.name === currSpot.I)?.value || defaultbase64,
                         "Key": currSpot.K ? currSpot.K : "",
-                        "Scale": currSpot.S ? currSpot.S : "",
+                        "Scale": currSpot.S ? currSpot.S : "1;1;1",
                         "DisplayRole": currSpot.R ? currSpot.R : "",
                         "DragData": currSpot.DD ? currSpot.DD : "",
                         "Alignment": currSpot.AL ? currSpot.AL : "",
-                        "height": resources.find(resource => resource.name === currSpot.I) ? '45px' : '30px',
-                        "width": resources.find(resource => resource.name === currSpot.I) ? '45px' : '24px',
                         "menu": menus,
                         "type": "{00100000-2012-0004-B001-64592B8DB964}"
                     };
@@ -273,15 +271,12 @@ sap.ui.define([
                     "Image": currSpot.I ? currSpot.I : "",
                     "base64": resources.find(resource => resource.name === currSpot.I)?.value || defaultbase64,
                     "Key": currSpot.K ? currSpot.K : "",
-                    "Scale": currSpot.S ? currSpot.S : "",
+                    "Scale": currSpot.S ? currSpot.S : "1;1;1",
                     "DisplayRole": currSpot.R ? currSpot.R : "",
                     "DragData": currSpot.DD ? currSpot.DD : "",
                     "Alignment": currSpot.AL ? currSpot.AL : "",
-                    "height": resources.find(resource => resource.name === currSpot.I) ? '45px' : '30px',
-                    "width": resources.find(resource => resource.name === currSpot.I) ? '45px' : '24px',
                     "type": "{00100000-2012-0004-B001-64592B8DB964}"
-
-                };
+                 };
 
                 let coord_array = currSpot.A.split(";");
 
@@ -361,7 +356,6 @@ sap.ui.define([
                         routeProperties["opacity"] = opacity;
                         }
 
-                    //itearate through the route points and add the coordinates to the GeoJSON
                     let coord_array = currRoute.H.split(";");
                     let coord_collection = [];
 
@@ -369,6 +363,7 @@ sap.ui.define([
                         coord_collection.push([Number(coord_array[i]), Number(coord_array[i + 1])])
                     }
 
+
                     let geometry = {
                         "coordinates": coord_collection,
                         "type": "LineString"
@@ -814,6 +809,13 @@ sap.ui.define([
             }
         }
 
+        if (obj.SAPVB.Data.Set && (typeof obj.SAPVB.Data.Set === 'object') && !(jQuery.isEmptyObject(obj.SAPVB.Data.Set))) {
+            if (!Array.isArray(obj.SAPVB.Data.Set) && !(obj.SAPVB.Data.Set.name) && !(obj.SAPVB.Data.Set.type)) {
+                //Full Update - Replace complete Data Section
+                featureCollection.splice(0, featureCollection.length);
+            }
+        }
+
     }
 
     // Get the datatypes 

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

@@ -34,18 +34,28 @@ sap.ui.define([
         });
     };
 
-    VectorUtils.createSpotElement = (marker) => {
-        // create a DOM element for the marker (parent div)
+     VectorUtils.createSpotElement = (marker, spotid) => {
         const el = document.createElement('div');
-
-        // Set background image for the marker
-        var base64decoded = "data:image/png;base64," + marker.properties.base64;
+        const base64decoded = "data:image/png;base64," + (marker.properties.base64 || "");
+        el.id = '__mapmarker' + spotid++;
         el.style.backgroundImage = `url(${base64decoded})`;
-        el.style.width = marker.properties.width;
-        el.style.height = marker.properties.height;
-        el.style.backgroundSize = 'cover'; // Ensure image fits
-        return el;
+        el.style.backgroundSize = 'cover';
+        el.style.pointerEvents = 'none';
+        el.style.display = 'inline-block';
+        el.style.transform = 'translate(-50%, -100%)'; 
+    
+        // load the image to get natural size 
+        const img = new Image();
+        img.src = base64decoded;
+        img.onload = () => {
+            const scaleParts = (marker.properties.Scale || "1;1;1").split(';').map(Number);
+            const [sx, sy] = scaleParts.some(isNaN) ? [1, 1] : [scaleParts[0], scaleParts[1]];
+            el.style.width = `${img.naturalWidth * sx}px`;
+            el.style.height = `${img.naturalHeight * sy}px`;
+        };
+        return {spotEl:el, spotId:spotid};        
     };
+    
     VectorUtils.isAccepted = (drag, drop) => {
         var validDrop = drag.some(item => drop.includes(item));
         return validDrop;
@@ -252,8 +262,43 @@ sap.ui.define([
         obj.style.color = textColor;
         obj.style.fontFamily = 'Arial, sans-serif';
         obj.style.fontSize = '14px';
+        obj.style.padding = '2px 6px';
+        obj.style.borderRadius = '4px';
+        obj.style.whiteSpace = 'pre-wrap';   
+        obj.style.boxSizing = 'border-box';
+        obj.style.textAlign = 'center';
+    
         return obj;
     }
+
+VectorUtils.createRouteLabel = (label, labelcolor) => {
+    let r, g, b, a;
+    const obj = document.createElement('div');
+    obj.className = 'route-label';
+    obj.textContent = label;
+
+    if (!labelcolor) {
+        [r, g, b, a] = [211, 211, 211, 1]; 
+    } else {
+        [r, g, b, a] = VectorUtils.parseRGBAString(labelcolor);
+    }
+
+    const textColor = VectorUtils.getContrastTextColor(r, g, b);
+
+    obj.style.backgroundColor = `rgba(${r}, ${g}, ${b}, ${a})`;
+    obj.style.border = `2px solid rgba(${r}, ${g}, ${b}, ${a})`;
+    obj.style.color = textColor;
+    obj.style.fontFamily = 'Arial, sans-serif';
+    obj.style.fontSize = '14px';
+    obj.style.padding = '2px 6px';
+    obj.style.borderRadius = '4px';
+    obj.style.whiteSpace = 'pre-wrap';   
+    obj.style.boxSizing = 'border-box';
+    obj.style.textAlign = 'center';
+
+    return obj;
+};
+
     VectorUtils.rgbaToHexAndOpacity = (rgbaString) => {
         const rgbaRegex = /rgba?\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d*\.?\d+)\s*\)/i;
         const match = rgbaString.match(rgbaRegex);