@sapui5/sap.ui.vbm 1.93.1 → 1.96.1

package/src/sap/ui/vbm/lib/sapvbi.js

@@ -1,11 +1,16 @@
-// ...........................................................................//
-// VBI namespace.............................................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// VBI namespace
 // Author: Ulrich Roegelein
 
+sap.ui.define(function() {
+	"use strict";
+
 /* global VBI */// declare unusual global vars for JSLint/SAPUI5 validation
 (function() {
-	"use strict";
 	// .......................................................................//
 	// check if there is already a VBI object................................//
 	// .......................................................................//
@@ -101,7 +106,7 @@
 			if (trace == null) {
 				return;
 			}
-			VBI.m_Log = VBI.m_Log + text + "<br>";
+			VBI.m_Log = VBI.m_Log + jQuery.sap.encodeHTML(text) + "<br>";
 			trace.innerHTML = VBI.m_Log;
 		},
 
@@ -153,48 +158,10 @@
 		}
 
 	};
-
-	// .......................................................................//
-	// this is the list of java script files needed for VBI..................//
-	// use sap require to load additional scripts.............................//
-	jQuery.sap.require("sap.ui.vbm.lib.saputilities"); // utility functions
-	jQuery.sap.require("sap.ui.vbm.lib.sapvbicontext"); // control context
-	jQuery.sap.require("sap.ui.vbm.lib.sapdataprovider"); // data provider
-	jQuery.sap.require("sap.ui.vbm.lib.sapresources"); // resources
-	jQuery.sap.require("sap.ui.vbm.lib.sapgeomath"); // geo math functions
-	jQuery.sap.require("sap.ui.vbm.lib.sapmaplayer");
-	jQuery.sap.require("sap.ui.vbm.lib.sapmapprovider");
-	jQuery.sap.require("sap.ui.vbm.lib.sapmapmanager"); // map support
-	jQuery.sap.require("sap.ui.vbm.lib.sapvoutils");
-	jQuery.sap.require("sap.ui.vbm.lib.sapvobase"); // visual objects base and vo implementation
-	jQuery.sap.require("sap.ui.vbm.lib.sapevents"); // event subscription
-	jQuery.sap.require("sap.ui.vbm.lib.saplabels"); // labels
-	jQuery.sap.require("sap.ui.vbm.lib.sappositioning"); // GetPosFrom... and co
-	jQuery.sap.require("sap.ui.vbm.lib.sapscene"); // scene handling, scenes
-	jQuery.sap.require("sap.ui.vbm.lib.sapwindow"); // window handling, detail and so on
-	jQuery.sap.require("sap.ui.vbm.lib.sapactions"); // actions handling, framework event subscription
-	jQuery.sap.require("sap.ui.vbm.lib.sapautomations");
-	jQuery.sap.require("sap.ui.vbm.lib.sapgeolocation");
-	jQuery.sap.require("sap.ui.vbm.lib.sapgeotool"); // geo tools for VBI namespace
-	jQuery.sap.require("sap.ui.vbm.lib.sapscale");
-	jQuery.sap.require("sap.ui.vbm.lib.sapnavigation");
-	jQuery.sap.require("sap.ui.vbm.lib.sapvbmenu"); // context menu
-	jQuery.sap.require("sap.ui.vbm.lib.sapprojection"); // map projection (mercator, linear)
-	jQuery.sap.require("sap.ui.vbm.lib.sapvbcluster"); // VO clustering
-	jQuery.sap.require("sap.ui.vbm.lib.sapparsing"); // expression evaluation
-	jQuery.sap.require("sap.ui.vbm.lib.sapconfig");
-	jQuery.sap.require("sap.ui.vbm.lib.saplassotrack");
-	jQuery.sap.require("sap.ui.vbm.lib.saprecttrack");
-
-	jQuery.sap.require("sap.ui.core.IconPool");
-	jQuery.sap.require("sap.ui.core.theming.Parameters");
-	window.VBI.Utilities.GetTransparentImage();
-
 })();
 
 // based on sources from: https://github.com/MihaiValentin/setDragImage-IE polyfill
 (function() {
-	"use strict";
 	if (!window.DataTransfer) { // return if drag not supported
 		return;
 	}
@@ -239,3 +206,5 @@
 		};
 	}
 })();
+
+});

package/src/sap/ui/vbm/lib/sapvbicontext.js

@@ -1,13 +1,17 @@
-// ...........................................................................//
-// this module does the vbicontext handling..................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// this module does the vbicontext handling
 // Author: Ulrich Roegelein
+// the scene manager manages the scene instances in a component context
 
-// ...........................................................................//
-// the scene manager manages the scene instances in a component context......//
+sap.ui.define(["./sapvbi"]
+, function() {
+	"use strict";
 
 VBI.VBIContext = function(control) {
-	"use strict";
 	/* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
 	var vbcx = {};
 	vbcx.vbiclass = "VBIContext";
@@ -407,3 +411,5 @@ VBI.VBIContext = function(control) {
 
 	return vbcx;
 };
+
+});

package/src/sap/ui/vbm/lib/sapvbmenu.js

@@ -1,17 +1,21 @@
-// ...........................................................................//
-// Menus namespace.........................................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// Menus namespace
 // Author: Juergen Gatter
-
-// ...........................................................................//
-// helper functions..........................................................//
-
-// ...........................................................................//
-// menus provider..........................................................//
-// ...........................................................................//
+// helper functions
+// menus provider
+
+sap.ui.define([
+	"sap/ui/unified/Menu",
+	"sap/ui/unified/MenuItem",
+	"./sapvbi"
+], function(Menu, MenuItem) {
+	"use strict";
 
 VBI.Menus = function() {
-	"use strict";
 	/* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
 	var menus = {};
 	menus.m_menus = []; // array of menus
@@ -26,7 +30,7 @@ VBI.Menus = function() {
 	};
 
 	menus.loadMainMenu = function(dat, ctx) {
-		var oMenuObject = new sap.ui.unified.Menu();
+		var oMenuObject = new Menu();
 		menus.loadMenu(oMenuObject, dat, ctx, oMenuObject.getId());
 		oMenuObject.vbi_data = {};
 		oMenuObject.vbi_data.menuRef = dat.id;
@@ -54,7 +58,7 @@ VBI.Menus = function() {
 			var subid;
 			subid = id + "_" + ii;
 			var sText = subdat.Separator == undefined ? subdat.text : "---------------------------";
-			var oMenuItem = new sap.ui.unified.MenuItem("vbimi_" + subid, {
+			var oMenuItem = new MenuItem("vbimi_" + subid, {
 				text: sText
 			});
 			oMenuItem.vbi_data = {};
@@ -69,7 +73,7 @@ VBI.Menus = function() {
 				VBI.Trace("Adding Menuitem: menuitem_" + subid + " with text " + sText);
 			}
 			if (subdat.MenuItem != undefined) {
-				var oSubMenu = new sap.ui.unified.Menu("vbim_" + subid);
+				var oSubMenu = new Menu("vbim_" + subid);
 				oMenuItem.setSubmenu(oSubMenu);
 				menus.loadMenu(oSubMenu, subdat, ctx, subid);
 			} else if (subdat.id != "") {
@@ -171,3 +175,5 @@ VBI.Menus = function() {
 
 	return menus;
 };
+
+});

package/src/sap/ui/vbm/lib/sapvobase.js

@@ -1,20 +1,23 @@
-// ...........................................................................//
-// VisualObjects namespace...................................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// VisualObjects namespace
 // Author: Ulrich Roegelein
-
-// ...........................................................................//
-// visual objects are the items that can be placed in a scene................//
-// they support full databinding to the visual business datacontext..........//
-// ...........................................................................//
-
-// ...........................................................................//
-// visual objects............................................................//
+// visual objects are the items that can be placed in a scene
+// they support full databinding to the visual business datacontext
+// visual objects
 // for Utilities, NodeProperties, AttributeProperties and DNDInfo so voutils.//
 
+sap.ui.define([
+	"sap/ui/core/IconPool",
+	"./sapvbi"
+], function(IconPool) {
+	"use strict";
+
 /* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
 VBI.VisualObjects = function() {
-	"use strict";
 	// namespace constants....................................................//
 	VBI.EMHandle = 0; // handle edit mode
 	VBI.EMBox = 1; // box edit mode
@@ -2180,8 +2183,6 @@ VBI.VisualObjects = function() {
 		this.MatchIcon = function(iiconVal) {
 			var iicon = {};
 			if (iiconVal) {
-				jQuery.sap.require("sap.ui.core.IconPool");
-				sap.ui.core.IconPool.insertFontFaceStyle();
 				switch (iiconVal) {
 					case "A8":
 						iicon.i = "\ue078";
@@ -2220,7 +2221,7 @@ VBI.VisualObjects = function() {
 						if (iiconVal.charCodeAt(0) > 255) {
 							iicon.i = iiconVal;
 						} else {
-							var icInfo = sap.ui.core.IconPool.getIconInfo(iiconVal);
+							var icInfo = IconPool.getIconInfo(iiconVal);
 							if (icInfo) {
 								iicon.i = icInfo.content;
 								iicon.f = icInfo.fontFamily;
@@ -5452,8 +5453,6 @@ VBI.VisualObjects = function() {
 
 	VBI.VisualObjects.HeatMap = function() {
 		this.load = function(dat, ctx) {
-			jQuery.sap.require("sap.ui.vbm.lib.sapheatmap");
-
 			// call prototype...................................................//
 			Object.getPrototypeOf(this).load.call(this, dat, ctx);
 
@@ -6568,3 +6567,5 @@ VBI.VisualObjects = function() {
 	// return the visual object...............................................//
 	return visualobjects;
 };
+
+});

package/src/sap/ui/vbm/lib/sapvoutils.js

@@ -1,21 +1,20 @@
-// ...........................................................................//
-// VisualObjects namespace...................................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// VisualObjects namespace
 // Author: Ulrich Roegelein
+// visual objects are the items that can be placed in a scene
+// they support full databinding to the visual business datacontext
+// bindable functions for VOS
 
-// ...........................................................................//
-// visual objects are the items that can be placed in a scene................//
-// they support full databinding to the visual business datacontext..........//
-// ...........................................................................//
-
-// jQuery.sap.declare("VBI.VisualObjects.Object");
-
-// ...........................................................................//
-// bindable functions for VOS................................................//
+sap.ui.define(["./sapvbi"]
+, function() {
+	"use strict";
 
 /* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
 VBI.Utilities.SceneBindDesignSpotBoxSize = function(ocb) {
-	"use strict";
 	var scene = this.m_Scene;
 
 	// only when the scale is changeable......................................//
@@ -71,7 +70,6 @@ VBI.Utilities.SceneBindDesignSpotBoxSize = function(ocb) {
 };
 
 VBI.Utilities.SceneBindDesignBoxBoxSize = function(keepratio, ocb) {
-	"use strict";
 	var scene = this.m_Scene;
 
 	// only when the scale is changeable................................//
@@ -129,7 +127,6 @@ VBI.Utilities.SceneBindDesignBoxBoxSize = function(keepratio, ocb) {
 };
 
 VBI.Utilities.SceneBindMeterRadiusDesignBoxSize = function(ocb) {
-	"use strict";
 	// determine a meter dimensioned radius...................................//
 	var scene = this.m_Scene;
 	if (ocb.m_Design) {
@@ -166,7 +163,6 @@ VBI.Utilities.SceneBindMeterRadiusDesignBoxSize = function(ocb) {
 };
 
 VBI.Utilities.SceneBindRadiusDesignBoxSize = function(ocb) {
-	"use strict";
 	// determines a pixel size radius.........................................//
 	var scene = this.m_Scene;
 	if (ocb.m_Design) {
@@ -198,7 +194,6 @@ VBI.Utilities.SceneBindRadiusDesignBoxSize = function(ocb) {
 };
 
 VBI.Utilities.SceneBindPosArrayDesignBoxSize = function(ocb) {
-	"use strict";
 	var scene = this.m_Scene;
 	if (ocb.m_Design) {
 		// determine the new point information.................................//
@@ -289,7 +284,6 @@ VBI.Utilities.SceneBindPosArrayDesignBoxSize = function(ocb) {
 };
 
 VBI.Utilities.BackupFont = function(dc) {
-	"use strict";
 	dc.m_BackupFont = [];
 
 	dc.m_BackupFont.m_font = dc.m_font = dc.font;
@@ -300,7 +294,6 @@ VBI.Utilities.BackupFont = function(dc) {
 };
 
 VBI.Utilities.RestoreFont = function(dc) {
-	"use strict";
 	dc.m_font = dc.font = dc.m_BackupFont.m_font;
 	dc.fillStyle = dc.m_BackupFont.m_fillStyle;
 	dc.strokeStyle = dc.m_BackupFont.m_strokeStyle;
@@ -309,7 +302,6 @@ VBI.Utilities.RestoreFont = function(dc) {
 };
 
 VBI.Utilities.SetTextAttributes = function(dc, newFont, newFillStyle, newStrokeStyle, newAlign, newTextBaseline) {
-	"use strict";
 	if ((newFont != undefined) && (dc.m_font != newFont)) {
 		dc.m_font = dc.font = newFont;
 	}
@@ -327,14 +319,12 @@ VBI.Utilities.SetTextAttributes = function(dc, newFont, newFillStyle, newStrokeS
 };
 
 VBI.Utilities.SetFont = function(dc, newFont) {
-	"use strict";
 	if ((newFont != undefined) && (dc.m_font != newFont)) {
 		dc.m_font = dc.font = newFont;
 	}
 };
 
 VBI.DnDInfo = function() {
-	"use strict";
 	var dndInfo = {}; // create the object
 	dndInfo.m_datasource = null;
 	dndInfo.m_boundtype = null;
@@ -410,7 +400,6 @@ VBI.DnDInfo = function() {
 // vo properties.............................................................//
 
 VBI.NodeProperty = function(dat, name, pnp, ctx) {
-	"use strict";
 	// a datanode can be bound or not.........................................//
 	// in both cases a data node is referenced................................//
 	var path = null;
@@ -446,7 +435,7 @@ VBI.NodeProperty = function(dat, name, pnp, ctx) {
 	namespaces.splice(-1, 1);
 	namespaces.push(entries[0]);
 	entries[0] = namespaces.join("::");
-	
+
 	// store the data source path...//
 	this.m_NPath = entries;
 	// store the original data path.//
@@ -592,7 +581,6 @@ VBI.NodeProperty = function(dat, name, pnp, ctx) {
 // bindable attribute object.................................................//
 
 VBI.AttributeProperty = function(dat, name, pnp, ctx, def) {
-	"use strict";
 	var val;
 
 	// store a default value..................................................//
@@ -928,3 +916,5 @@ VBI.AttributeProperty = function(dat, name, pnp, ctx, def) {
 
 	return this;
 };
+
+});

package/src/sap/ui/vbm/lib/sapwindow.js

@@ -1,13 +1,17 @@
-// ...........................................................................//
-// this module does the window handling......................................//
+/*
+ * ! SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
 
+// this module does the window handling
 // Author: Ulrich Roegelein
+// the scene manager manages the scene instances in a component context
 
-// ...........................................................................//
-// the scene manager manages the scene instances in a component context......//
+sap.ui.define(["./sapvbi"]
+, function() {
+	"use strict";
 
 VBI.Windows = function() {
-	"use strict";
 	/* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
 	var windows = {};
 	windows.vbiclass = "Windows";
@@ -242,8 +246,6 @@ VBI.Windows = function() {
 // Window object.............................................................//
 
 VBI.Window = function() {
-	"use strict";
-
 	this.vbiclass = "Window";
 	this.m_ID = ""; // id of window
 	this.m_Caption = ""; // caption of window
@@ -417,8 +419,6 @@ VBI.Window = function() {
 // callout window............................................................//
 
 VBI.CalloutWindow = function() {
-	"use strict";
-
 	var callout = new VBI.Window();
 
 	// the callout object.....................................................//
@@ -705,8 +705,6 @@ VBI.CalloutWindow = function() {
 // legend window ............................................................//
 
 VBI.LegendWindow = function() {
-	"use strict";
-
 	var legend = new VBI.Window();
 
 // the legend object.....................................................//
@@ -938,7 +936,7 @@ VBI.LegendWindow = function() {
 			row.id = legend.getId(nJ, 'content-tablerow');
 			row.setAttribute("role", sap.ui.core.AccessibleRole.Row);
 			row.setAttribute("tabindex", "-1");
-			
+
 			var cell_0 = row.insertCell(0);
 			cell_0.setAttribute("role", sap.ui.core.AccessibleRole.GridCell);
 			cell_0.setAttribute("tabindex", "-1");
@@ -1213,3 +1211,5 @@ VBI.LegendWindow = function() {
 
 	return legend;
 };
+
+});

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

@@ -8,8 +8,10 @@
  */
 sap.ui.define([
 	"sap/ui/core/Core",
-	"sap/ui/core/library"
-], function(Core, Lib) {
+	"sap/m/library",
+	"sap/ui/core/library",
+	"sap/ui/unified/library"
+], function() {
 	"use strict";
 
 	/**
@@ -18,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.1
 	 * @public
 	 */
 
@@ -26,16 +28,9 @@ sap.ui.define([
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name: "sap.ui.vbm",
-		dependencies: [
-			"sap.ui.core"
-			// Also use of sap.ui.commons.RichTooltip and sap.ui.unified.Menu,
-			// but usage depends on application.
-			// Thus we load those dependencies only on demand with jQuery.sap.require!
-		],
 		types: [
 			"sap.ui.vbm.ClusterInfoType", "sap.ui.vbm.SemanticType"
 		],
-		interfaces: [],
 		controls: [
 			"sap.ui.vbm.AnalyticMap", "sap.ui.vbm.GeoMap", "sap.ui.vbm.VBI", "sap.ui.vbm.Cluster", "sap.ui.vbm.Viewport"
 		],
@@ -48,29 +43,31 @@ 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.93.1"
+		version: "1.96.1"
 	});
 
-	jQuery.sap.registerModuleShims({
-		"sap/ui/vbm/adapter3d/thirdparty/three": {
-			amd: true,
-			exports: "THREE"
-		},
-		"sap/ui/vbm/adapter3d/thirdparty/ColladaLoader": {
-			exports: "THREE.ColladaLoader",
-			deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
-		},
-		"sap/ui/vbm/adapter3d/thirdparty/OrbitControls": {
-			exports: "THREE.OrbitControls",
-			deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
-		},
-		"sap/ui/vbm/adapter3d/thirdparty/DecalGeometry": {
-			exports: "DecalGeometry",
-			deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
-		},
-		"sap/ui/vbm/adapter3d/thirdparty/html2canvas": {
-			amd: true,
-			exports: "html2canvas"
+	sap.ui.loader.config({
+		shim: {
+			"sap/ui/vbm/adapter3d/thirdparty/three": {
+				exports: "THREE",
+				amd: true
+			},
+			"sap/ui/vbm/adapter3d/thirdparty/ColladaLoader": {
+				exports: "THREE.ColladaLoader",
+				deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
+			},
+			"sap/ui/vbm/adapter3d/thirdparty/OrbitControls": {
+				exports: "THREE.OrbitControls",
+				deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
+			},
+			"sap/ui/vbm/adapter3d/thirdparty/DecalGeometry": {
+				exports: "DecalGeometry",
+				deps: ["sap/ui/vbm/adapter3d/thirdparty/three"]
+			},
+			"sap/ui/vbm/adapter3d/thirdparty/html2canvas": {
+				exports: "html2canvas",
+				amd: true
+			}
 		}
 	});