@sapui5/sap.ui.vbm 1.136.1 → 1.139.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.136.1",
+  "version": "1.139.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.136.1</version>
+	<version>1.139.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.136.1
+	 * @version 1.139.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.136.1
+	 * @version 1.139.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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.139.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.136.1
+		 * @version 1.139.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.136.1
+	 * @version 1.139.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.136.1
+	 * @version 1.139.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.136.1
+	 * @version 1.139.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.136.1
+	 * @version 1.139.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.136.1
+	 * @version 1.139.0
 	 * @alias sap.ui.vbm.adapter3d.RectangleTracker
 	 */
 	var RectangleTracker = BaseObject.extend("sap.ui.vbm.adapter3d.RectangleTracker", /** @lends sap.ui.vbm.adapter3d.RectangleTracker.prototype */ {
@@ -114,7 +114,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);
@@ -228,15 +228,20 @@ sap.ui.define([
 
 	RectangleTracker.prototype._onPointerMove = function (event) {
 		event.preventDefault();
-
-		if (!this._mouseDown) {
-			this._updatePointer(event, _pointer);
-			this._handleHover(_pointer);
-		}
-
+		//this._updateController(false);
 		if (this._mouseDown) {
-			this._updateController(false);
+			this._cameraControls.enableRotate = false;
 			this.onSelectMove(event);
+			this._updatePointer(event, _pointer);
+			this._handleHover(_pointer);
+		} 
+		// else if (!this._mouseDown) {
+		// 	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();
@@ -311,7 +316,7 @@ sap.ui.define([
 							E: [obj]
 						}]);
 					}
-				
+			
 				}
 			});
 
@@ -324,7 +329,10 @@ sap.ui.define([
 				});
 			}
 		}
-
+		this._mouseDown = false;
+		this._dom.style.cursor = this._hovered ? "pointer" : "auto";
+		this._updateController(true);
+		this.onSelectOver();
 	};
 
 	RectangleTracker.prototype._constructPayload = function (dataMap) {
@@ -488,7 +496,7 @@ 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) {

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

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

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

@@ -38,6 +38,8 @@ sap.ui.define([
 	let spotid = 0;
 	let fixedBounds;
 	var containerID;
+	let previousCenter = null;
+    let previousZoom = null;
 
 
 
@@ -57,6 +59,12 @@ sap.ui.define([
 	}
 
 	VBI.MapRenderer.renderMap = () => {
+		
+		if (this.map) {
+			previousCenter = this.map.getCenter();
+			previousZoom = this.map.getZoom();
+			this.map.remove();  
+		}
 
 		let geoJSON = VBI.VBITransformer.getTransformedJSON();
 
@@ -68,10 +76,23 @@ sap.ui.define([
 		document.head.appendChild(styleSheet);
 
 		const map = VectorUtils.createMap(geoJSON, map_container);
+
+		if (previousCenter && previousZoom !== null) {
+			map.jumpTo({
+				center: [previousCenter.lng, previousCenter.lat],
+				zoom: previousZoom
+
+			});
+		}
+
 		const canvas = map.getCanvasContainer();
 		const rectangularSelection = new RectangularSelection(map);
 		const lassoSelection = new LassoSelection(map);
 		const mapCanvas = map.getCanvas();
+		const popupLink = new maplibregl.Popup({
+			closeButton: false,
+			closeOnClick: false
+		});
 		mapCanvas.id = VectorUtils._setcanvasid();
 		// Set `true` to dispatch the event before other functions
 		// call it. This is necessary for disabling the default map
@@ -129,7 +150,11 @@ sap.ui.define([
 			// Create a popup, but don't add it to the map yet.
 			const popup = new maplibregl.Popup({
 				closeButton: false,
-				closeOnClick: false
+				closeOnClick: false,
+				offset: {
+					'top': [0, 0],
+					'bottom': [0, -25]
+				}
 			});
 			// add markers to map only for Points
 			const pointFeatures = [];
@@ -139,8 +164,9 @@ sap.ui.define([
 					// create a DOM element for the marker (parent div)
 					const el = VectorUtils.createSpotElement(marker);
 					if (marker.properties.Icon) {
+						const iconColor = marker.properties.contentColor? marker.properties.contentColor : "#000000";
 						// Create child element for the SAP icon (icon overlay)
-						const child_el = VectorUtils.createIconElement(marker.properties.Icon);
+						const child_el = VectorUtils.createIconElement(marker.properties.Icon, iconColor);
 						child_el.id = '__mapspot' + spotid++;
 						// Append the icon inside the marker
 						el.appendChild(child_el);
@@ -148,8 +174,8 @@ sap.ui.define([
 					//  add marker to map
 					let spot = new maplibregl.Marker({
 						element: el,
-						draggable: true
-						//	offset: [0, -25]
+						draggable: true,
+						offset: [0, -20]
 					}).setLngLat(marker.geometry.coordinates)
 						.on('dragend', onDragEnd)
 						.addTo(map);
@@ -370,8 +396,69 @@ sap.ui.define([
 							if (that.Apressed || that.Rpressed) {
 								el.style.cursor = 'crosshair';
 							} else {
-								var tooltip = marker.properties.ToolTip.replace(/\n/g, '<br>');
-								popup.setLngLat(marker.geometry.coordinates).setHTML(tooltip).addTo(map);
+								function renderTooltip(marker, popup, map) {
+									if (!document.getElementById('custom-maplibre-tooltip-style')) {
+										const style = document.createElement('style');
+										style.id = 'custom-maplibre-tooltip-style';
+										style.innerHTML = `
+                                            .maplibregl-popup {
+                                                background: transparent !important;
+                                                box-shadow: none !important;
+                                                padding: 0 !important;
+                                                width: auto;
+                                            }
+                                            .maplibregl-popup-content {
+                                                background: transparent !important;
+                                                padding: 0 !important;
+                                                box-shadow: none !important;
+                                                border-radius: 0 !important;
+                                                width: auto;
+                                            }
+                                        `;
+										document.head.appendChild(style);
+									}
+
+									const isDarkTheme = window.matchMedia &&
+										window.matchMedia('(prefers-color-scheme: dark)').matches;
+
+									const outerBorderColor = 'none';
+									const innerBgColor = isDarkTheme ? '#545555' : '#f0f0f0';
+									const textColor = isDarkTheme ? 'white' : 'f0f0f0';
+
+									const tooltipContent = marker.properties.ToolTip.replace(/\n/g, '<br>');
+
+								const tooltip = `
+
+								<div style="
+							      background-color: ${innerBgColor};
+								  color: ${textColor};
+                                  padding: 8px;
+                                  border-radius: 6px;
+                                  max-height: 180px;
+                                  display: inline-block;
+                                  font-family: Arial;
+                                  font-size: 0.875rem;
+                                  width: auto;
+                                  white-space: nowrap;
+                                  border: 2px solid ${outerBorderColor};
+                                  ">
+                                  ${tooltipContent}
+                                  </div>`;
+
+									popup.setLngLat(marker.geometry.coordinates)
+										.setHTML(tooltip)
+										.addTo(map);
+								}
+
+								// 2. Initial render
+								renderTooltip(marker, popup, map);
+
+								// 3. Re-render tooltip on system theme change
+								window.matchMedia('(prefers-color-scheme: dark)')
+									.addEventListener('change', () => {
+										popup.remove();
+										renderTooltip(marker, popup, map);
+									});
 							}
 						}
 
@@ -566,10 +653,59 @@ sap.ui.define([
 
 		});
 		// Change mouse cursor when hovering over the line
-		map.on('mouseenter', 'geojson-source-route', function () {
+		map.on('mouseenter', 'geojson-source-route', function (event) {
 			if (!that.Apressed && !that.Rpressed) {
 				map.getCanvas().style.cursor = 'pointer';
 			}
+				if (!document.getElementById('custom-maplibre-tooltip-style')) {
+				const style = document.createElement('style');
+				style.id = 'custom-maplibre-tooltip-style';
+				style.innerHTML = `
+                                            .maplibregl-popup {
+                                                background: transparent !important;
+                                                box-shadow: none !important;
+                                                padding: 0 !important;
+                                                width: auto;
+                                            }
+                                            .maplibregl-popup-content {
+                                                background: transparent !important;
+                                                padding: 0 !important;
+                                                box-shadow: none !important;
+                                                border-radius: 0 !important;
+                                                width: auto;
+                                            } `;
+				document.head.appendChild(style);
+			}
+
+			const isDarkTheme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+			
+			const outerBorderColor = 'none';
+			const innerBgColor = isDarkTheme ? '#545555' : '#f0f0f0';
+			const textColor = isDarkTheme ? 'white' : 'f0f0f0';
+
+			const coordinates = event.lngLat;
+			const description = event.features[0].properties.ToolTip || "";
+
+			const tooltipContent = description.replace(/\n/g, '<br>');
+
+			const tooltip = ` <div style="
+			                      background-color: ${innerBgColor};
+                                  color: ${textColor};
+                                  padding: 8px;
+                                  border-radius: 6px;
+                                  max-height: 180px;
+                                  display: inline-block;
+                                  font-family: Arial;
+                                  font-size: 0.875rem;
+                                  width: auto;
+                                  white-space: nowrap;
+                                  border: 2px solid ${outerBorderColor};
+                                  ">
+                                  ${tooltipContent}
+                                  </div> `;
+
+			popupLink.setLngLat(coordinates).setHTML(tooltip).addTo(map);
+
 		});
 
 		// Revert mouse cursor back when not hovering
@@ -577,6 +713,7 @@ sap.ui.define([
 			if (!that.Apressed && !that.Rpressed) {
 				map.getCanvas().style.cursor = '';
 			}
+			popupLink.remove();
 		});
 		map.on('click', 'geojson-source-route', function (e) {
 			//Trigger payload

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

@@ -12,7 +12,7 @@ sap.ui.define([
          *
          * @private
          * @author SAP SE
-         * @version 1.136.1
+         * @version 1.139.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.136.1
+         * @version 1.139.0
          * @alias sap.ui.vbm.vector.RectangularSelection
          */
 

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

@@ -362,8 +362,13 @@ sap.ui.define([
                         // "id"           :  currRoute['VB:ix'],
                         "id": route_id++,
                     };
-
-                    featureCollection.push(route_data);
+                    let indexNum = featureCollection.findIndex(item => item.properties.Key === route_data.properties.Key)
+                    if (indexNum !== -1) {
+                        featureCollection[indexNum] = route_data
+                    }
+                    else {
+                        featureCollection.push(route_data);
+                    }
                 }
             }
         } else {
@@ -416,7 +421,13 @@ sap.ui.define([
                     // "id"           :  currRoute['VB:ix'],
                     "id": route_id++,
                 };
-                featureCollection.push(route_data);
+                let indexNum = featureCollection.findIndex(item => item.properties.Key === route_data.properties.Key)
+                if (indexNum !== -1) {
+                    featureCollection[indexNum] = route_data
+                }
+                else {
+                    featureCollection.push(route_data);
+                }
             }
         }
     }

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

@@ -50,7 +50,7 @@ sap.ui.define([
         var validDrop = drag.some(item => drop.includes(item));
         return validDrop;
     };
-    VectorUtils.createIconElement = (Icon) => {
+    VectorUtils.createIconElement = (Icon, iconColor) => {
         const child_el = document.createElement('div');
         child_el.className = 'marker';
         child_el.style.position = 'absolute';  // Position it absolutely inside the parent
@@ -59,6 +59,7 @@ sap.ui.define([
         child_el.style.transform = 'translate(-50%, -50%)'; // Center the icon
         child_el.style.fontFamily = 'SAP-icons';
         child_el.style.fontSize = '20px';  // Adjust size as needed
+        child_el.style.color = iconColor;
         var iconInfo = sap.ui.core.IconPool.getIconInfo(Icon);
         child_el.innerHTML = iconInfo.content;
         return child_el;