@sapui5/sap.ui.vbm 1.93.1 → 1.96.1

package/package.json

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

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

@@ -23,7 +23,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.93.1
+	 * @version 1.96.1
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -1298,13 +1298,16 @@ sap.ui.define([
 	 * @private
 	 */
 	Adapter.prototype._processDetailWindows = function(obj) {
-		//No transformation needed for removal - pass it along to VBI as is.
-
 		var oGeoMap = this._map();
 		var that = this;
 
-		/*Only delta supported for Windows - Set*/
-		if (obj.SAPVB.Windows.Set.name) {
+		// "Remove" and "Set" verbs supported only
+		if (!obj.SAPVB.Windows.Set && !obj.SAPVB.Windows.Remove) {
+			return this;
+		}
+		// No transformation needed for removal - pass it along to VBI as is.
+		// Only delta supported for Windows - Set
+		if (obj.SAPVB.Windows.Set && obj.SAPVB.Windows.Set.name) {
 
 			var findPredicate =  function(prop, name) {
 				return function(d) {
@@ -1321,7 +1324,7 @@ sap.ui.define([
 				for (var sAttribute in wnd.Window) {
 					if (wnd.Window.hasOwnProperty(sAttribute)) {
 						if (sAttribute.endsWith(".bind")) {
-							//Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
+							// Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
 							if (sAttribute.startsWith("pos")) {
 								var aParameters = wnd.Window[sAttribute].split(".");
 								if (aParameters[0] in oModelData) {
@@ -1345,7 +1348,7 @@ sap.ui.define([
 
 			obj.SAPVB.Windows.Set = aWindows;
 
-			//Dereference VOs
+			// Dereference VOs
 			if (obj.SAPVB.Scenes && obj.SAPVB.Scenes.Set && obj.SAPVB.Scenes.Set.name && obj.SAPVB.Scenes.Set.Scene && obj.SAPVB.Scenes.Set.Scene.VO) {
 
 				var aVOs = [].concat(obj.SAPVB.Scenes.Set.Scene.VO).map(function(v) {
@@ -1374,18 +1377,18 @@ sap.ui.define([
 					for (var sAttribute in v) {
 						if (v.hasOwnProperty(sAttribute)) {
 							if (sAttribute.endsWith(".bind")) {
-								//Only known bound attribute is text - has values like DetailData.0.Column.1.Text
+								// Only known bound attribute is text - has values like DetailData.0.Column.1.Text
 								var aParameters = v[sAttribute].split(".");
 
 								if (obj.SAPVB.Data && obj.SAPVB.Data.Set) {
-									//Only Delta supported for Detail Window
+									// Only Delta supported for Detail Window
 									[].concat(obj.SAPVB.Data.Set).forEach(dereferenceBoundAttributes(oVO, sAttribute, aParameters), this);
 								}
 							}
 						}
 					}
 
-					//Process relevant actions
+					// Process relevant actions
 					if (obj.SAPVB.Actions && obj.SAPVB.Actions.Set) {
 						[].concat(obj.SAPVB.Actions.Set).filter(function(a) { return a.Action.refVO === oVO.id; }).forEach(function(fa) {
 							that._attachHandler.call(oGeoMap, fa.Action.name, that._handler, that);
@@ -1394,12 +1397,13 @@ sap.ui.define([
 
 					return oVO;
 				}, this);
-
-				//delete obj.SAPVB["Actions"];
+				// delete obj.SAPVB["Actions"];
 				obj.SAPVB.Scenes.Set.Scene.VO = aVOs;
 			}
-			oGeoMap.load(obj);
 		}
+		// pass it to VBI (this is hazardous as if payload contains something not related to Detail Windows in Scene,
+		// VO or Data sections then it will be processed twice with unpredictable results)
+		oGeoMap.load(obj);
 		return this;
 	};
 

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

@@ -42,7 +42,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.93.1
+	 * @version 1.96.1
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -6,16 +6,17 @@
 // Provides control sap.ui.vbm.Areas.
 sap.ui.define([
 	"./VoAggregation",
+	"sap/ui/unified/Menu",
 	"sap/base/Log",
 	"./library"
-], function(VoAggregation, Log, library) {
+], function(VoAggregation, Menu, Log, library) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.Areas";
 
 	/**
 	 * Constructor for a new Areas.
-	 * 
+	 *
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type specific Visual Object aggregation for <i>Area</i> instances.
@@ -67,7 +68,7 @@ sap.ui.define([
 						 */
 						instance: {
 							type: "sap.ui.vbm.Area"
-						},						
+						},
 						/**
 						 * The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1 to point 2 has number
 						 * 0
@@ -282,21 +283,19 @@ sap.ui.define([
 			if ((Area = this.findInstance(event.Action.instance))) {
 				var eventContext = {
 				                  data: event,
-				                  edge: parseInt(event.Action.Params.Param['2']['#'], 10)                
+				                  edge: parseInt(event.Action.Params.Param['2']['#'], 10)
 				};
-				
+
 				if (s == "edgeContextMenu") {
 					Area.mClickPos = [
 						event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
 					];
-					// lazy load sap.ui.unified library for using the Menu
-					sap.ui.getCore().loadLibrary("sap.ui.unified");
 
 					if (this.oParent.mVBIContext.m_Menus) {
 						this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 					}
 					// create an empty menu
-					var oMenuObject = new sap.ui.unified.Menu();
+					var oMenuObject = new Menu();
 					oMenuObject.vbi_data = {};
 					oMenuObject.vbi_data.menuRef = "CTM";
 					oMenuObject.vbi_data.VBIName = "DynContextMenu";

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

@@ -7,13 +7,14 @@
 sap.ui.define([
 	"sap/ui/core/Control",
 	"jquery.sap.global",
-	"./library"
-], function(Control, jQuery, library) {
+	"./library",
+	"./ClusterRenderer"
+], function(Control, jQuery, library, ClusterRenderer) {
 	"use strict";
 
 	/**
 	 * Constructor for a new Cluster.
-	 * 
+	 *
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Cluster control to visualize clustered objects on a map. The Cluster control does not cluster anything itself, instead it only shows a

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

@@ -8,10 +8,11 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/theming/Parameters",
 	"./ClusterContainer",
+	"sap/ui/unified/Menu",
 	"jquery.sap.global",
 	"sap/base/Log",
 	"./library"
-], function(Element, Parameters, ClusterContainer, jQuery, Log, library) {
+], function(Element, Parameters, ClusterContainer, Menu, jQuery, Log, library) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.ClusterBase";
@@ -390,14 +391,12 @@ sap.ui.define([
 					oVo.mClickPos = [
 						event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
 					];
-					// lazy load sap.ui.unified library for using the Menu
-					sap.ui.getCore().loadLibrary("sap.ui.unified");
 
 					if (this.oParent.mVBIContext.m_Menus) {
 						this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 					}
 					// create an empty menu
-					var oMenuObject = new sap.ui.unified.Menu();
+					var oMenuObject = new Menu();
 					oMenuObject.vbi_data = {};
 					oMenuObject.vbi_data.menuRef = "CTM";
 					oMenuObject.vbi_data.VBIName = "DynContextMenu";
@@ -543,15 +542,13 @@ sap.ui.define([
 		oCluster.mClickPos = [
 			oEvent.clientX - oMapDiv.offsetLeft, oEvent.clientY - oMapDiv.offsetTop
 		];
-		// lazy load sap.ui.unified library for using the Menu
-		sap.ui.getCore().loadLibrary("sap.ui.unified");
 
 		try {
 			if (this.oParent.mVBIContext.m_Menus) {
 				this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 			}
 			// create an empty menu
-			var oMenuObject = new sap.ui.unified.Menu();
+			var oMenuObject = new Menu();
 			oMenuObject.vbi_data = {};
 			oMenuObject.vbi_data.menuRef = "CTM";
 			oMenuObject.vbi_data.VBIName = "DynContextMenu";

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

@@ -37,7 +37,6 @@ sap.ui.define([
 
 		var col = oControl.getColor();
 		var type = oControl.getType();
-		IconPool.insertFontFaceStyle();
 		var iiconVal = oControl.getIcon();
 		var icon, icInfo;
 		if (iiconVal) {

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

@@ -6,8 +6,9 @@
 // Provides control sap.ui.vbm.Containers.
 sap.ui.define([
 	"./VoAggregation",
+	"sap/ui/unified/Menu",
 	"./library"
-], function(VoAggregation, library) {
+], function(VoAggregation, Menu, library) {
 	"use strict";
 
 	/**
@@ -214,15 +215,12 @@ sap.ui.define([
 				oContainer.mClickPos = [
 					oEvent.clientX - oMapDivRect.left, oEvent.clientY - oMapDivRect.top
 				];
-				// lazy load sap.ui.unified library for using the Menu
-				sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 				try {
 					if (this.oParent.mVBIContext.m_Menus) {
 						this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 					}
 					// create an empty menu
-					var oMenuObject = new sap.ui.unified.Menu();
+					var oMenuObject = new Menu();
 					oMenuObject.vbi_data = {};
 					oMenuObject.vbi_data.menuRef = "CTM";
 					oMenuObject.vbi_data.VBIName = "DynContextMenu";

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

@@ -7,17 +7,18 @@
 sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/theming/Parameters",
+	"sap/ui/unified/Menu",
 	"jquery.sap.global",
 	"sap/base/Log",
 	"./library"
-], function(Element, Parameters, jQuery, Log, library) {
+], function(Element, Parameters, Menu, jQuery, Log, library) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.GeoJsonLayer";
 
 	/**
 	 * Constructor for a new GeoJsonLayer.
-	 * 
+	 *
 	 * @param {string} [sId] id for the new control, generated automatically if no id is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class GeoJsonLayer aggregation container. A GeoJsonLayer can render the content of an assigned GeoJSON. The naming is associated to the
@@ -158,7 +159,7 @@ sap.ui.define([
 
 	/**
 	 * Add GeoJSON object to the layer
-	 * 
+	 *
 	 * @param {object} aData GeoJSON object or an array of those
 	 * @returns {void}
 	 * @public
@@ -726,7 +727,7 @@ sap.ui.define([
 		}
 // if( this.mEventRegistry[ "drop" ] || this.isEventRegistered( "drop" ) )
 // aActions.push( { "id": id + "3", "name": "drop", "refScene": "MainScene", "refVO": id, "refEvent": "Drop" } );
-//	    
+//
 // if( this.mEventRegistry[ "edgeClick" ] || this.isEventRegistered( "edgeClick" ) )
 // aActions.push( { "id": id + "7", "name": "edgeClick", "refScene": "MainScene", "refVO": id, "refEvent": "EdgeClick" });
 // if( this.mEventRegistry[ "edgeContextMenu" ] || this.isEventRegistered( "edgeContextMenu" ) )
@@ -737,7 +738,7 @@ sap.ui.define([
 
 	/**
 	 * Returns Properties for Features like name, bounding box, and midpoint
-	 * 
+	 *
 	 * @param {string[]} aFeatureIds Array of Feature Ids. The Feature Id must match the GeoJSON tag.
 	 * @returns {array} Array of Feature Information Objects. Each object in the array has the properties BBox: Bounding Box for the Feature in format
 	 *          "lonMin;latMin;lonMax;latMax", Midpoint: Centerpoint for Feature in format "lon;lat", Name: Name of the Feature, and Properties: Array
@@ -777,14 +778,12 @@ sap.ui.define([
 					oOverlay.mClickPos = [
 						event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
 					];
-					// lazy load sap.ui.unified library for using the Menu
-					sap.ui.getCore().loadLibrary("sap.ui.unified");
 
 					if (this.oParent.mVBIContext.m_Menus) {
 						this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 					}
 					// create an empty menu
-					var oMenuObject = new sap.ui.unified.Menu();
+					var oMenuObject = new Menu();
 					oMenuObject.vbi_data = {};
 					oMenuObject.vbi_data.menuRef = "CTM";
 					oMenuObject.vbi_data.VBIName = "DynContextMenu";
@@ -812,7 +811,7 @@ sap.ui.define([
 
 	/**
 	 * open a Detail Window
-	 * 
+	 *
 	 * @param {sap.ui.vbm.Feature} oFeature VO instance for which the Detail Window should be opened
 	 * @param {object} oParams Parameter object
 	 * @param {string} oParams.caption Text for Detail Window caption
@@ -835,7 +834,7 @@ sap.ui.define([
 
 	/**
 	 * open the context menu
-	 * 
+	 *
 	 * @param {sap.ui.vbm.Feature} oFeature VO instance for which the Detail Window should be opened
 	 * @param {object} oMenu the context menu to be opened
 	 * @returns {void}

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

@@ -8,8 +8,9 @@ sap.ui.define([
 	"./VBI",
 	"jquery.sap.global",
 	"sap/base/Log",
-	"./library"
-	], function(VBI, jQuery, Log, library) {
+	"./library",
+	"./GeoMapRenderer"
+	], function(VBI, jQuery, Log, library, GeoMapRenderer) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.GeoMap";

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

@@ -10,13 +10,45 @@ sap.ui.define([
 	"sap/ui/core/RenderManager",
 	"jquery.sap.global",
 	"sap/base/Log",
+	"./library",
+	"./VBIRenderer",
 	"./lib/sapvbi",
-	"./library"
-], function(Control, RenderManager, jQuery, Log, sapvbi, library) {
+	"./lib/saputilities", 		// utility functions
+	"./lib/sapvbicontext", 		// control context
+	"./lib/sapdataprovider",	// data provider
+	"./lib/sapresources",		// resources
+	"./lib/sapgeomath",			// geo math functions
+	"./lib/sapmaplayer",
+	"./lib/sapmapprovider",
+	"./lib/sapmapmanager",		// map support
+	"./lib/sapvoutils",
+	"./lib/sapvobase",			// visual objects base and vo implementation
+	"./lib/sapevents",			// event subscription
+	"./lib/saplabels",			// labels
+	"./lib/sappositioning",		// GetPosFrom/// and co
+	"./lib/sapscene",			// scene handling, scenes
+	"./lib/sapwindow",			// window handling, detail and so on
+	"./lib/sapactions",			// actions handling, framework event subscription
+	"./lib/sapautomations",
+	"./lib/sapgeolocation",
+	"./lib/sapgeotool",			// geo tools for VBI namespace
+	"./lib/sapscale",
+	"./lib/sapnavigation",
+	"./lib/sapvbmenu",			// context menu
+	"./lib/sapprojection",		// map projection (mercator, linear)
+	"./lib/sapvbcluster",		// VO clustering
+	"./lib/sapparsing",			// expression evaluation
+	"./lib/sapconfig",
+	"./lib/saplassotrack",
+	"./lib/saprecttrack",
+	"./lib/sapheatmap"
+], function(Control, RenderManager, jQuery, Log, library, VBIRenderer) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.VBI";
 
+	VBI.Utilities.GetTransparentImage();
+
 	/**
 	 * Constructor for a new VBI.
 	 *
@@ -872,13 +904,13 @@ sap.ui.define([
 
 	/**
 	 * Retrieve information on a specific cluster object.
-	 * 
-	 * Type : 
+	 *
+	 * Type :
 	 * <ul>
-	 * <li>0 : contained VOs</li> 
-	 * <li>1 : child clusters (tree clustering only)</li> 
-	 * <li>2 : parent Node (tree clustering only)</li> 
-	 * <li>10 : Information on Node</li> 
+	 * <li>0 : contained VOs</li>
+	 * <li>1 : child clusters (tree clustering only)</li>
+	 * <li>2 : parent Node (tree clustering only)</li>
+	 * <li>10 : Information on Node</li>
 	 * <li>11 : Edges of the Voronoi Area (tree clustering only, not merged with rectangle)</li>
 	 * </ul>
 	 *

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.1
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */
@@ -177,6 +177,7 @@ sap.ui.define([
 		this._bbox = new THREE.Box3(); // scene bounding box
 
 		this._cameraController = new OrbitControls(this._camera, this._renderer.domElement);
+		this._cameraController.listenToKeyEvents(this._renderer.domElement);
 		this._cameraController.addEventListener("end", this._cameraEnd.bind(this));
 		this._cameraController.addEventListener("change", this._cameraUpdate.bind(this));
 		this._cameraController.update();
@@ -489,7 +490,7 @@ sap.ui.define([
 				box.union(_box);
 			}
 		}
-		
+
 		var children = object.children;
 		for (i = 0; i < children.length; ++i) {
 			calcBBox(children[i], box);
@@ -506,7 +507,7 @@ sap.ui.define([
 		}
 		return this._bbox;
 	};
-	
+
 	// debug: visualize scene bounding box & sphere
 	// var sceneBox, sceneSphere;
 
@@ -569,13 +570,13 @@ sap.ui.define([
 	// private, update OrbitControls -> adjust target point so it's always on the ground (XZ) plane to ensure zoom is always works in a same way
 	Viewport.prototype._updateController = function() {
 		var dir = this._cameraController.target.clone().sub(this._camera.position).normalize();
-		var normal = new THREE.Vector3(0, this._camera.position.y > 0 ? 1 : -1, 0); 
+		var normal = new THREE.Vector3(0, this._camera.position.y > 0 ? 1 : -1, 0);
 		var plane = new THREE.Plane(normal), target = new THREE.Vector3();
 		var ray = new THREE.Ray(this._camera.position, dir);
 		// adjust only if intersection exists
 		if (ray.intersectPlane(plane, target)) {
 			// when camera is almost on XZ plane, intersection point could be very far or very close
-			// setting it straight as camera target makes navigation unusable, as either 
+			// setting it straight as camera target makes navigation unusable, as either
 			// small mouse movements results in huge move of camera in space (when intersection is far away)
 			// or huge mouse movements result in bearly visible camera move in space (when intersection point is too close)
 			// so don't update camera target in those extreme cases

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

@@ -6,10 +6,11 @@
 // Provides control sap.ui.vbm.VoAggregation.
 sap.ui.define([
 	"./VoAbstract",
+	"sap/ui/unified/Menu",
 	"jquery.sap.global",
 	"sap/base/Log",
 	"./library"
-], function(VoAbstract, jQuery, Log, library) {
+], function(VoAbstract, Menu, jQuery, Log, library) {
 	"use strict";
 
 	/**
@@ -808,14 +809,11 @@ sap.ui.define([
 						event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
 					];
 
-					// lazy load sap.ui.unified library for using the Menu
-					sap.ui.getCore().loadLibrary("sap.ui.unified");
-
 					if (this.oParent.mVBIContext.m_Menus) {
 						this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
 					}
 					// create an empty menu
-					var oMenuObject = new sap.ui.unified.Menu();
+					var oMenuObject = new Menu();
 					oMenuObject.vbi_data = {};
 					oMenuObject.vbi_data.menuRef = "CTM";
 					oMenuObject.vbi_data.VBIName = "DynContextMenu";

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.1
 	 * @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

@@ -378,7 +378,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.1
 	 * @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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.1
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
 	 */	
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {