@sapui5/sap.ui.vbm 1.130.0 → 1.131.0

package/package.json

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

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

@@ -7,7 +7,9 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"jquery.sap.global",
 	"sap/base/Log",
-	"./library"
+	"./library",
+	"./vector/VBITransformer",
+	"./vector/MapRenderer",
 ], function(Element, jQuery, Log, library) {
 	"use strict";
 
@@ -22,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.130.0
+	 * @version 1.131.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -251,6 +253,47 @@ sap.ui.define([
 		return this;
 	};
 
+
+	/**
+	 * Processes the MapProviders section of the VBI JSON
+	 *
+	 * @param {object} MapProviders and Scenes section of VBI JSON. <br/>
+	 * @returns {bool} True if map type is vector, false otherwise
+	 * @private
+	 */
+
+	Adapter.prototype._verifyMapType = function(obj) {
+		var currRefMap = "DEFAULT";
+		if (obj?.SAPVB?.Scenes?.Set) {
+			if (obj?.SAPVB?.Scenes?.Set?.SceneGeo?.refMapLayerStack) {
+				currRefMap = obj.SAPVB.Scenes.Set.SceneGeo.refMapLayerStack;
+			}
+			if (obj?.SAPVB?.MapProviders?.Set?.MapProvider) {
+				let MapProviders = obj.SAPVB.MapProviders.Set.MapProvider;
+				if (Array.isArray(MapProviders)) {
+					for (const MapProvider in MapProviders) {
+						if (MapProviders.hasOwnProperty(MapProvider)) {
+							let Provider = MapProviders[MapProvider];
+							if (Provider.name == currRefMap && Provider.type == "vector") {
+								return true;
+							} else if (Provider.name == currRefMap && (Provider.type == "raster" || Provider.type == "")) {
+								return false;
+							}
+						}
+					}
+				} else if (MapProviders.name == currRefMap && MapProviders.type == "vector") {
+						return true;
+					} else if (MapProviders.name == currRefMap && (MapProviders.type == "raster" || MapProviders.type == "")) {
+						return false;
+					}
+			}
+		} else if (obj?.SAPVB?.Scenes?.Merge) {
+			// Verify map type when map layer stack is switched
+		}
+	}
+
+
+
 	/**
 	 * Parses and process sections of the VBI JSON and loads them into JSON Model bound to the GeoMap
 	 *
@@ -280,6 +323,13 @@ sap.ui.define([
 			Log.debug("invalid object supplied for load", "", thisModule);
 			return this;
 		}
+		// Verifying the map type vector or raster
+		if (this._verifyMapType(obj)) {
+			VBI.VBITransformer.parseVBI(obj);		// exit for vector processing
+		}	
+		if (VBI.VBITransformer.getVectorFlag() == true) {
+			VBI.VBITransformer.parseVBI(obj);		// exit for vector processing for subsequent loads - No data to distinguish
+		}
 		if (obj.SAPVB.Config) {
 			this._processConfiguration(obj.SAPVB.Config);
 		}
@@ -294,6 +344,7 @@ sap.ui.define([
 			this._processClusters(obj.SAPVB.Clustering);
 		}
 
+		VBI.MapRenderer.setAdapter(this);
 		return (obj.SAPVB.MapProviders ? this._processMapProviders(obj.SAPVB.MapProviders)
 			: Promise.resolve()).then(function() {
 				if (obj.SAPVB.MapLayerStacks) {

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.130.0
+	 * @version 1.131.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public

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

@@ -40,8 +40,10 @@ sap.ui.define([
 	"./lib/sapconfig",
 	"./lib/saplassotrack",
 	"./lib/saprecttrack",
-	"./lib/sapheatmap"
-], function(Control, RenderManager, jQuery, Log, library, VBIRenderer) {
+	"./lib/sapheatmap",
+	"./vector/VBITransformer",
+	"./vector/MapRenderer",
+], function(Control, RenderManager, jQuery, Log, library, VBIRenderer,VBITransformer) {
 	"use strict";
 
 	var thisModule = "sap.ui.vbm.VBI";
@@ -1010,48 +1012,53 @@ sap.ui.define([
 
 	VBI1.prototype.onAfterRendering = function() {
 
-		// when there is preserved content restore it.............................//
-		if (this.$oldContent.length > 0) {
-			// insert preserved control DOM content
-			this.$().append(this.$oldContent);
-		}
+		if (VBI.VBITransformer.getVectorFlag() == false) {
+			// when there is preserved content restore it.............................//
+			if (this.$oldContent.length > 0) {
+				// insert preserved control DOM content
+				this.$().append(this.$oldContent);
+			}
 
-		// process the load queue.................................................//
-		if (this.m_aLoadQueue) {
-			var nJ;
-			for (nJ = 0; nJ < this.m_aLoadQueue.length; ++nJ) {
-				this.load(this.m_aLoadQueue[nJ]);
+			// process the load queue.................................................//
+			if (this.m_aLoadQueue) {
+				var nJ;
+				for (nJ = 0; nJ < this.m_aLoadQueue.length; ++nJ) {
+					this.load(this.m_aLoadQueue[nJ]);
+				}
+				this.m_aLoadQueue = null;
 			}
-			this.m_aLoadQueue = null;
-		}
 
-		if (this.resizeID == "" && this.mVBIContext.GetMainScene()) {
-			this.resize();
-			this.resizeID = sap.ui.core.ResizeHandler.register(this, this.resize);
-		}
+			if (this.resizeID == "" && this.mVBIContext.GetMainScene()) {
+				this.resize();
+				this.resizeID = sap.ui.core.ResizeHandler.register(this, this.resize);
+			}
 
-		// do a new adjust of DOM placed elements.................................//
-		// the function should do nothing if nothing needs to be done.............//
-		var l_vbiId = this.getId();
-		if (this.mVBIContext.m_Windows) {
-			this.mVBIContext.m_Windows.Awake(l_vbiId);
-		}
+			// do a new adjust of DOM placed elements.................................//
+			// the function should do nothing if nothing needs to be done.............//
+			var l_vbiId = this.getId();
+			if (this.mVBIContext.m_Windows) {
+				this.mVBIContext.m_Windows.Awake(l_vbiId);
+			}
 
-		// move elements from hidden area to there final location
-		var aElems = jQuery(this.getDomRef()).children(".vbi-hidden").children();
-		for (var i = 0, oEntry; i < aElems.length; ++i) {
-			oEntry = aElems[i];
-			// Note: We cannot use a jQuery selector, since it fails with the artifical ID for cluster objects
-			// jQuery("#" + oEntry.attributes.getNamedItem("data").nodeValue).append(oEntry.firstChild);
-			var oDomref = document.getElementById(oEntry.attributes.getNamedItem("data").nodeValue);
-			if (oDomref) {
-				if (oEntry.firstChild) {
-					oDomref.appendChild(oEntry.firstChild);
+			// move elements from hidden area to there final location
+			var aElems = jQuery(this.getDomRef()).children(".vbi-hidden").children();
+			for (var i = 0, oEntry; i < aElems.length; ++i) {
+				oEntry = aElems[i];
+				// Note: We cannot use a jQuery selector, since it fails with the artifical ID for cluster objects
+				// jQuery("#" + oEntry.attributes.getNamedItem("data").nodeValue).append(oEntry.firstChild);
+				var oDomref = document.getElementById(oEntry.attributes.getNamedItem("data").nodeValue);
+				if (oDomref) {
+					if (oEntry.firstChild) {
+						oDomref.appendChild(oEntry.firstChild);
+					}
+					oEntry.parentNode.removeChild(oEntry);
 				}
-				oEntry.parentNode.removeChild(oEntry);
-			}
 
+			}
+		} else {
+			VBI.MapRenderer.renderMap();
 		}
+		
 	};
 
 	VBI1.prototype.onBeforeRendering = function() {

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

@@ -13,6 +13,7 @@ sap.ui.define(function() {
 		apiVersion: 2		// Semantic Rendering
 	};
 
+	VBIRenderer.oControlId = "";
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 * 
@@ -48,7 +49,8 @@ sap.ui.define(function() {
 		oRm.openEnd();
 
 		var id = oControl.getId();
-		
+		VBIRenderer.oControlId = id;
+
 		if (oControl.getPlugin()) {
 
 			if (oControl.$oldContent.length === 0) {
@@ -110,6 +112,10 @@ sap.ui.define(function() {
 		} 
 	};
 
+	VBIRenderer.getId = function() {
+		return VBIRenderer.oControlId;
+	} 
+
 	return VBIRenderer;
 
 }, /* bExport= */true);

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.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.130.0
+		 * @version 1.131.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.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.0
 	 * @alias sap.ui.vbm.adapter3d.RectangleTracker
 	 */
 	var RectangleTracker = BaseObject.extend("sap.ui.vbm.adapter3d.RectangleTracker", /** @lends sap.ui.vbm.adapter3d.RectangleTracker.prototype */ {

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.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.130.0
+	 * @version 1.131.0
 	 * @public
 	 */
 
@@ -45,7 +45,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.130.0"
+		version: "1.131.0"
 	});
 
 	sap.ui.loader.config({