@sapui5/sap.ui.vbm 1.96.4 → 1.96.6

package/package.json

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

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.96.4
+	 * @version 1.96.6
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -247,7 +247,10 @@ sap.ui.define([
 			this._parser = null;
 		}
 
+		this._detail = null;
 		this._context = null;
+		this._raycaster = null;
+		this._hoverInstance = null;
 
 		if (basePrototype.exit) {
 			basePrototype.exit.call(this);

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

@@ -326,7 +326,13 @@ sap.ui.define([
 			}
 
 			// get the name of the fragment........................................//
-			tt = (f.properties && f.properties.name) ? f.properties.name : "";
+			if (f.properties && f.properties.name) {
+				tt = f.properties.name;
+			} else if (f.properties && f.properties.NAME) {
+				tt = f.properties.NAME;
+			} else {
+				tt = "";
+			}
 			this.mNames[f.id2] = tt;
 			this.mRegionProps[f.id2] = f.properties;
 

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

@@ -125,7 +125,7 @@ sap.ui.define([
 				clusterVos: {
 					type: "sap.ui.core.Control",
 					multiple: true,
-					visiblity: "hidden",
+					visibility: "hidden",
 					singularName: "clusterVo"
 				},
 				/**
@@ -134,7 +134,7 @@ sap.ui.define([
 				clusterContainers: {
 					type: "sap.ui.vbm.ClusterContainer",
 					multiple: true,
-					visiblity: "hidden",
+					visibility: "hidden",
 					singularName: "clusterContainer"
 				}
 

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */
@@ -190,9 +190,14 @@ sap.ui.define([
 		}
 		this._stopRenderLoop();
 
+		this._cameraController.dispose();
+		this._cameraController = null;
+
+		this._renderer.dispose();
+		this._renderer = null;
+
 		this._scene = null;
 		this._camera = null;
-		this._renderer = null;
 
 		if (basePrototype.exit) {
 			basePrototype.exit.call(this);

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

@@ -30,9 +30,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @alias sap.ui.vbm.adapter3d.ModelHandler
-	 */	
+	 */
 	var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
 
 		constructor: function(resources, textures, scene, root) {
@@ -95,11 +95,14 @@ sap.ui.define([
 		this._textures = null;
 		this._scene = null;
 		this._root = null;
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
-		this._meshes.forEach(function(mesh) {
-			mesh.objects3D.forEach(function(object) {
-				this._deleteObject3D(object);
+		this._meshes.forEach(function(array) {
+			array.forEach(function(item) {
+				item.objects3D.forEach(function(object) {
+					this._deleteObject3D(object);
+				}, this);
 			}, this);
 		}, this);
 
@@ -109,15 +112,23 @@ sap.ui.define([
 				subRef(instance.texture);
 			}
 		});
-		
+
 		// destroy models
 		this._models.forEach(function(model, resource) {
 			this._deleteModel(model);
 		}, this);
 
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._instances.clear();
+		this._instances = null;
+
 		this._models.clear();
+		this._models = null;
+
+		this._glTFLoader = null;
+		this._colladaLoader = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -147,7 +158,7 @@ sap.ui.define([
 	 * @param {object} instance Model instance.
 	 * @public
 	 */
-	ModelHandler.prototype.updateInstance = function(instance) { 
+	ModelHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), update = false, hot = this._hotInstance && this._hotInstance === instance;
 		if (data) {
 			var normalized = Utilities.toBoolean(instance.normalize);
@@ -186,7 +197,7 @@ sap.ui.define([
 				}
 				update = true;
 			}
-			
+
 			// when model normalization changed -> update model properties -> reset instance model matrices
 			if (propertyChanged(instance, ["normalize", "model"])) {
 				this._updateModel(data.model, normalized);
@@ -218,9 +229,9 @@ sap.ui.define([
 			if (data.matrices.length === 0) {
 				var world = this._root.matrixWorld.clone(); // start from the _root
 				world.multiply(data.world); // apply instance world matrix
-				
+
 				// if instance normalized -> apply normalized model root matrix as otherwise (non normalized case) model root has identity matrix
-				if (normalized) { 
+				if (normalized) {
 					world.multiply(data.model.normalized.world);
 				}
 				// apply individual mesh matrices from the model at last
@@ -254,7 +265,7 @@ sap.ui.define([
 			this._instances.delete(instance);
 			this._removeInstanceFromMesh(data);
 			instance._last = {}; // reset all LRU variables at once
-			
+
 			if (data.model) {
 				subRef(data.model); // model can be null if removing 'broken' instance
 			}
@@ -429,7 +440,7 @@ sap.ui.define([
 	ModelHandler.prototype._postprocess = function(model, content) {
 		// mirror on Z axis entire collada root which is effectively the same as collada processing with baking transformations and inverting Z coordinates in ActiveX
 		model.scene.scale.set(1,1,-1);
-		
+
 		var meshes = [], materials = new Set(), marked = "_sapUsed";
 		// collect meshes only + calculate world matrix, mark used materials & maps
 		model.scene.traverse(function(object) {
@@ -559,7 +570,7 @@ sap.ui.define([
 			// remove instanced mesh from scene
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			// geometries are shared -> cannot dispose
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // materials are cloned -> can be disposed, maps are shared -> don't touch, cannot be disposes
@@ -583,7 +594,7 @@ sap.ui.define([
 			// target has to be added to _root to mimic original model and must have same world matrix as original model
 			// so we calculate world matrix for target which will be under _root and not under _scene as instance mesh
 			var world = data.world.clone(); // use instance world as starting point
-			if (data.model.normalized) { 
+			if (data.model.normalized) {
 				world.multiply(data.model.normalized.world);
 			}
 			world.multiply(data.model.root.children[0].matrixWorld);

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

@@ -378,7 +378,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @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,9 +33,9 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @alias sap.ui.vbm.adapter3d.PolygonHandler
-	 */	
+	 */
 	var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {
 
 		constructor: function(root) {
@@ -98,7 +98,7 @@ sap.ui.define([
 	PolygonHandler.prototype.destroy = function() {
 		// Reset references to shared objects.
 		this._root = null;
-		this._instances.clear();
+		this._hotInstance = null;
 
 		// destroy 'meta' meshes
 		this._meshes.forEach(function(key, array) {
@@ -113,10 +113,16 @@ sap.ui.define([
 				this._deleteObject3D(border.object3D);
 			}, this);
 		}, this);
-		
+
 		// clear
+		this._instances.clear();
+		this._instances = null;
+
 		this._meshes.clear();
+		this._meshes = null;
+
 		this._borders.clear();
+		this._borders = null;
 
 		BaseObject.prototype.destroy.call(this);
 	};
@@ -136,11 +142,11 @@ sap.ui.define([
 
 	/**
 	 * Adds polygon instance to polygon handler.
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.addInstance = function(instance) { 
+	PolygonHandler.prototype.addInstance = function(instance) {
 		this._instances.set(instance, {
 			instance : instance,
 			indices: [],
@@ -160,11 +166,11 @@ sap.ui.define([
 
 	/**
 	 * Updates polygon instance in polygon handler
-	 * 
+	 *
 	 * @param {object} instance Polygon instance.
 	 * @public
 	 */
-	PolygonHandler.prototype.updateInstance = function(instance) { 
+	PolygonHandler.prototype.updateInstance = function(instance) {
 		var data = this._instances.get(instance), updateMesh = false, updateBorder = false;
 		if (data) {
 			// position, rotation, scale [mandatory attributes] when change -> recalculate matrix
@@ -187,7 +193,7 @@ sap.ui.define([
 			}
 
 			// if any property which affects polygon color changed -> check if polygon color actually changed
-			// then update polygon color and remove polygon from current 'meta' mesh if it exists 
+			// then update polygon color and remove polygon from current 'meta' mesh if it exists
 			// and put it into another 'meta' mesh according to polygon updated color
 			// color, selectColor, VB:s [mandatory attributes]
 			if (propertyChanged(instance, ["color", "selectColor", "VB:s"])) {
@@ -328,13 +334,13 @@ sap.ui.define([
 					// create 3 or 2 groups, depends on where hot instance geometry is within 'meta' mesh geometry
 					geometry.addGroup(range.start, data.indices.length, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + data.indices.length < geometry.index.count) {
 						geometry.addGroup(range.start + data.indices.length, geometry.index.count - range.start - data.indices.length, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 			if (data.border) { // apply hover on polygon border geometry
 				material = data.border.material;
@@ -364,13 +370,13 @@ sap.ui.define([
 					var vertexCount = data.lines.length/3;
 					geometry.addGroup(range.start, vertexCount, 1); // use hot material with index #1
 
-					if (range.start !== 0) { 
+					if (range.start !== 0) {
 						geometry.addGroup(0, range.start, 0); // use original material with index #0
 					}
 					if (range.start + vertexCount < positions.count) {
 						geometry.addGroup(range.start + vertexCount, positions.count - range.start - vertexCount, 0); // use original material with index #0
 					}
-				} 
+				}
 			}
 		} else {
 			Log.error("Unable to find polygon instance data", "", thisModule);
@@ -429,7 +435,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' meshes requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' mesh has been recreated.
 	 * @private
 	 */
@@ -440,11 +446,11 @@ sap.ui.define([
 			for (var i = 0; i < array.length;) {
 				if (array[i].dirty) {
 					var j, instance, base, indices = [], vertices = [], normals = [], data = array[i];
-					
+
 					this._deleteObject3D(data.object3D);
 					data.object3D = null;
 					data.hitInfo.length = 0; // erase hitInfo
-	
+
 					data.instances.forEach(function(range, key) {
 						instance = key; // to access instance outside forEach
 
@@ -480,24 +486,24 @@ sap.ui.define([
 
 					if (indices.length) {
 						var geometry = new THREE.BufferGeometry();
-					
+
 						geometry.setIndex(indices);
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.setAttribute("normal", new THREE.Float32BufferAttribute(normals, 3));
 						geometry.computeBoundingBox(); // needed for ray casting
 						geometry.computeBoundingSphere(); // needed for ray casting
-						
+
 						var material = createMaterial(true);
 						material.color.copy(instance.color.rgb);
 						material.opacity = instance.color.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.Mesh(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(0); // put it to layer #0 to enable raycasting
 						this._root.add(data.object3D);
-	
+
 						data.object3D._instanceHitTest = this._instanceHitTest.bind(data); // helper function to return instance based on hit test info
 						data.triangleCount = indices.length/3; // update triangle count on full rebuild
 					}
@@ -528,7 +534,7 @@ sap.ui.define([
 
 	/**
 	 * Updates 'meta' borders requested for rebuild by combining geometry of all instances with the same color into one mesh.
-	 * 
+	 *
 	 * @returns {boolean} True if hot instance 'meta' border has been recreated.
 	 * @private
 	 */
@@ -566,13 +572,13 @@ sap.ui.define([
 						var geometry = new THREE.BufferGeometry();
 						geometry.setAttribute("position", new THREE.Float32BufferAttribute(vertices, 3));
 						geometry.computeBoundingBox();
-		
+
 						var material = createLineMaterial();
 						material.color.copy(instance.colorBorder.rgb);
 						material.opacity = instance.colorBorder.opacity;
 						material.transparent = material.opacity < 1;
 						material.needsUpdate = true;
-		
+
 						data.object3D = new THREE.LineSegments(geometry, material);
 						data.object3D.matrixAutoUpdate = false;
 						data.object3D.layers.set(1); // put it to layer #1 to disable hit test
@@ -740,10 +746,10 @@ sap.ui.define([
 		if (object) {
 			if (object.parent) {
 				object.parent.remove(object);
-			}			
+			}
 			if (object.geometry) {
 				object.geometry.dispose();
-			}		
+			}
 			Utilities.toArray(object.material).forEach(function(material) {
 				material.dispose(); // no maps to dispose
 			});

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -104,9 +104,11 @@ sap.ui.define([
 		this._scene = null;
 		this._viewport = null;
 		this._context = null;
+		this._hotInstance = null;
+
 
 		if (this._box4) {
-			this._box.dispose();
+			this._box4.dispose();
 		}
 		if (this._box6) {
 			this._box6.dispose();
@@ -122,15 +124,22 @@ sap.ui.define([
 			this._decalHelper.material.dispose();
 			this._decalHelper.geometry.dispose();
 			this._scene.remove(this._decalHelper);
+			this._decalHelper = null;
 		}
 
 		this._polygonHandler.destroy();
+		this._polygonHandler = null;
+
 		this._modelHandler.destroy();
+		this._modelHandler = null;
 
 		this._textures.forEach(function(texture) {
 			texture.dispose();
 		});
 
+		this._targets.clear();
+		this._targets = null;
+
 		BaseObject.prototype.destroy.call(this);
 	};
 

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @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/lib/sapscene.js

@@ -3358,7 +3358,7 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
 		}
 		var sCopyright = scene.m_MapLayerStack.GetCopyright();
 		if (sCopyright) {
-			scene.m_DivCopyright.innerHTML = jQuery.sap.encodeHTML(sCopyright);
+			scene.m_DivCopyright.innerHTML = sCopyright;
 		} else {
 			scene.m_DivCopyright.style.paddingRight = 0;
 			scene.m_DivCopyright.style.paddingLeft = 0;

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

@@ -1892,6 +1892,11 @@ VBI.Utilities.AssembleCopyrightString = function(Copyright, CopyrightLink, Copyr
 	var regex3 = /\{LINK\|([^\}]+)\}/;
 
 	if (Copyright) {
+		if (!CopyrightLink && !CopyrightImage) {
+			Copyright = jQuery.sap.encodeHTML(Copyright);
+		}
+		CopyrightLink   = CopyrightLink ? jQuery.sap.encodeHTML(CopyrightLink):CopyrightLink;
+		CopyrightImage  = CopyrightImage ? jQuery.sap.encodeHTML(CopyrightImage):CopyrightImage;
 		var tmp = Copyright.replace(regex1, "<a href='" + CopyrightLink + "'><img src='" + CopyrightImage + "' width='10' height='10' border='none'></a>");
 		tmp = tmp.replace(regex2, "<img src='" + CopyrightImage + "' width='10' height='10' border='none' >");
 		return tmp.replace(regex3, "<a  href='" + CopyrightLink + "'>$1</a>");

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.96.4
+	 * @version 1.96.6
 	 * @public
 	 */
 
@@ -43,7 +43,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.96.4"
+		version: "1.96.6"
 	});
 
 	sap.ui.loader.config({

package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/AnalyticMap.less

@@ -0,0 +1,4 @@
+
+.sapUiVbmAnalyticMap {
+	background-color: @sapUiBaseBG;
+}

package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/VBI.less

@@ -0,0 +1,96 @@
+
+.vbi-detail {
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-closebutton
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-content
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail-phone
+{
+	background-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-arrow.vbi-detail-left
+{
+	border-right-color: @sapUiBaseBG;
+}
+
+.vbi-detail > .vbi-detail-header
+{
+   font-size: @sapUiFontHeader4Size;
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor; 
+}
+
+.vbi-detail-header-phone
+{
+   font-family: @sapUiFontHeaderFamily;
+   font-weight: @sapUiFontHeaderWeight;
+   color: @sapTextColor;
+}
+
+.vbi-legend {
+	box-shadow: lighten(@sapUiContentForegroundColor, 20%) 0rem 0rem 0.9rem 0.0625rem;
+	font-family: @sapUiFontFamily;
+	background-color: @sapUiBaseBG;
+	color: @sapTextColor;
+}
+
+.vbi-legend > .vbi-legend-header
+{
+   font-size: @sapMFontMediumSize;
+}
+
+.vbi-legend-button-col:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-col:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-button-exp:hover
+{
+	background-color: @sapUiHighlight;
+}
+
+.vbi-legend-button-exp:active
+{
+	background-color: darken(@sapUiHighlight, 20%);
+}
+
+.vbi-legend-table
+{
+	font-size: @sapMFontSmallSize;
+}
+
+.vbi-legend-table-click
+{
+	tr:hover {
+		background-color: @sapUiHighlight;
+	};
+	tr:active {
+		background-color: darken(@sapUiHighlight, 20%);
+	};
+}
+
+.vbi-legend-content-celltext
+{
+	color: @sapUiChartLegendLabelFontColor;
+}
+
+.vbi-legend-content-celldiv-square
+{
+	border-color: @sapUiContentForegroundColor;
+}

package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/library.source.less

@@ -6,3 +6,6 @@
 @import "../base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_fiori_3_hcb/base.less";
 @import "../../../../../sap/ui/core/themes/sap_fiori_3_hcb/global.less";
+
+@import "AnalyticMap.less";
+@import "VBI.less";