@sapui5/sap.ui.vbm 1.98.0 → 1.101.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vbm",
-  "version": "1.98.0",
+  "version": "1.101.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.98.0</version>
+	<version>1.101.0</version>
 
 	<documentation>SAP UI library: sap.ui.vbm</documentation>
 
@@ -36,6 +36,13 @@
 			<exclude name="sap.ui.vbm.js." />
 			<exclude name="sap.ui.vbm.lib." />
 		</jscoverage>
+
+		<packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
+			<all-in-one>
+				<exclude name="sap/ui/vbm/adapter3d/thirdparty/" />
+			</all-in-one>
+		</packaging>
+
 		<documentation xmlns="http://www.sap.com/ui5/buildext/documentation"
 			indexUrl="../../../../test-resources/sap/ui/vbm/demokit/docuindex.json"
 			resolve="lib"

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

@@ -22,7 +22,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.98.0
+	 * @version 1.101.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -965,7 +965,14 @@ sap.ui.define([
 				this._handler = this._adapter._getKeyboardHandler(this.name);
 				break;
 			default:
-				return false;
+				if (this.refEvent && this.name) {
+					//register for event on map that we don't explicitly handle using its legacy name as its refevent name is unlikely to propagate
+					Log.info("No UI5 event found to attach action to. Falling through to default vbi event handling.", this.name, thisModule);
+					this._event = this.name;
+				} else {
+					Log.error("Action invalid. No refEvent or name supplied.", this, thisModule);
+					return false;
+				}
 		}
 		this._target.attachEvent(this._event, this._handler, this._listener);
 		this._target.invalidate(); // neccessary evil, to force recreation of VO on VBI level, otherwise VO on GeoMap level updated but not on VBI level
@@ -1503,6 +1510,14 @@ sap.ui.define([
 			var oParameters = event.getParameters();
 			var oEventData = oParameters.data ? oParameters.data : oParameters;
 
+			//If no event object then fire submit with original data
+			if (oEventData.Action && !oEventData.Action.object) {
+				this.fireSubmit({
+					data: JSON.stringify(oEventData)
+				});
+				return;
+			}
+
 			if (oEventData.Action.object.startsWith(this._map().getId())) {
 				oEventData.Action.object = oEventData.Action.object.substr(this._map().getId().length + 1)
 			}
@@ -1624,7 +1639,7 @@ sap.ui.define([
 						}
 					}, this);
 
-					 this.fireSubmit({
+					this.fireSubmit({
 						data: JSON.stringify(oEventData)
 					});
 				}

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	"./adapter3d/thirdparty/three",
 	"sap/base/Log",
 	"jquery.sap.global",
-	"./library"	
+	"./library"
 ], function(Element, Observer, Menu, MenuItem, Popover, Viewport, ObjectFactory, Parser, SceneBuilder, Utilities, HBox, VBox, Link, Button, Text, Image, THREE, Log, jQuery, library) {
 	"use strict";
 
@@ -41,7 +41,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.98.0
+	 * @version 1.101.0
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -153,7 +153,7 @@ sap.ui.define([
 					this.toAdd.clear();
 					this.toUpdate.clear();
 					this.toRemove.clear();
-				}		
+				}
 			},
 
 			// Each queue contains a list of scenes to add, update or remove.
@@ -216,7 +216,7 @@ sap.ui.define([
 			anchor: undefined, // anchor DOM element to display responsive popover
 			pending: undefined // pending popover, if viewport has not been rendered yet
 		};
-		
+
 		this._raycaster = new THREE.Raycaster();
 	};
 
@@ -384,7 +384,7 @@ sap.ui.define([
 			that._context.voQueues.clear();
 			that._context.sceneQueues.clear();
 			that._context.windowQueues.clear();
-			
+
 			// scene has changed -> adjust camera clipping planes
 			that._viewport._resetBBox();
 			that._viewport._updateCamera();
@@ -720,6 +720,13 @@ sap.ui.define([
 	};
 
 	Adapter3D.prototype._genericEventHandler = function(name, event) {
+		// special handling section for hardcoded keys
+		// 'h' button pressed -> change camera to 'home' (initial) view
+		if (event.keyCode == 72) {
+			this._viewport.applyCameraHome(false); // no fly-to animation needed here
+			return;
+		}
+
 		var instance = event.instance;
 		var groupId = instance ? instance.voGroup.id : event.voGroupId;
 		var actionDefinition = sap.ui.vbm.findInArray(this._context.actions, function(action) { return action.refVO === groupId && action.refEvent === name; });
@@ -741,40 +748,32 @@ sap.ui.define([
 			};
 
 			if (actionDefinition.name === "KEY_PRESS") {
-				// special handling for 'h' button pressed -> change camera to home view
-				if (event.keyCode == 72) { 
-					this._viewport.applyCameraHome(false); // no fly-to animation needed here
-					//this._sceneBuilder._polygonHandler._executeTest(); // TODO
+				if (["Shift", "Control", "Alt", "Meta"].indexOf(event.key) !== -1 || [16, 17, 18, 91].indexOf(event.code) !== -1) {
+					return;
+				} else {
+					param.push(
+						{
+							"name": "code",
+							"#": event.keyCode
+						},
+						{
+							"name": "shift",
+							"#": event.shiftKey
+						},
+						{
+							"name": "ctrl",
+							"#": event.ctrlKey
+						},
+						{
+							"name": "alt",
+							"#": event.altKey
+						},
+						{
+							"name": "meta",
+							"#": event.metaKey
+						}
+					);
 				}
-				if (event.key == "Shift" || event.code == 16 ||
-					event.key == "Control" || event.code == 17 ||
-					event.key == "Alt" || event.code == 18 ||
-					event.key == "Meta" || event.code == 91) {
-						return;
-					} else {
-						param.push(
-							{
-								"name": "code",
-								"#": event.keyCode
-							},
-							{
-								"name": "shift",
-								"#": event.shiftKey
-							},
-							{
-								"name": "ctrl",
-								"#": event.ctrlKey
-							},
-							{
-								"name": "alt",
-								"#": event.altKey
-							},
-							{
-								"name": "meta",
-								"#": event.metaKey
-							}
-						);
-					}
 			} else if (event && event.cursor) {
 				param.push(
 					{
@@ -821,22 +820,25 @@ sap.ui.define([
 			}
 
 			if (instance && name === "Click" && event.selectionChanges) {
+				var dataType = instance.voGroup.datasource, obj;
+				var keyAlias = Utilities.getAttributeAlias(this._context, dataType, instance.voGroup.keyAttributeName);
+
 				payload.Data = {
 					Merge: {
 						N: [
 							{
 								name: instance.voGroup.datasource,
 								E: event.selectionChanges.selected.map(function(instance) {
-										return {
-											K: instance ? instance.id : "",
-											"VB:s": "true"
-										};
-									}).concat(event.selectionChanges.deselected.map(function(instance) {
-										return {
-											K: instance ? instance.id : "",
-											"VB:s": "false"
-										};
-									}))
+									obj = {};
+									obj[keyAlias] = instance.id || "";
+									obj["VB:s"] = "true";
+									return obj;
+								}).concat(event.selectionChanges.deselected.map(function(instance) {
+									obj = {};
+									obj[keyAlias] = instance.id || "";
+									obj["VB:s"] = "false";
+									return obj;
+								}))
 							}
 						]
 					}
@@ -917,7 +919,7 @@ sap.ui.define([
 
 		if (instance !== this._hoverInstance) {
 			clearTimeout(this._hoverTimeOutId);
-			
+
 			this._hoverTimeOutId = setTimeout(function() {
 				this._propogateHoverChange(event);
 				this._hoverTimeOutId = undefined;
@@ -948,7 +950,7 @@ sap.ui.define([
 
 		var rect = this._viewport.getDomRef().getBoundingClientRect();
 		var normalizedXY = new THREE.Vector2(p.x / rect.width * 2 - 1, -p.y / rect.height * 2 + 1);
-		
+
 		this._raycaster.layers.set(0); // test objects from layer #0 only
 		this._raycaster.setFromCamera(normalizedXY, camera);
 		var intersects = this._raycaster.intersectObjects(scene.children, true);
@@ -961,7 +963,7 @@ sap.ui.define([
 				} else {
 					instance = info.object._sapInstance;
 				}
-	
+
 				return {
 					info: info,
 					point: info.point,

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @extends sap.ui.core.Control
 	 * @alias sap.ui.vbm.Viewport
 	 */

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.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.98.0
+	 * @version 1.101.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.98.0
+	 * @version 1.101.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/SceneBuilder.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @alias sap.ui.vbm.adapter3d.SceneBuilder
 	 */
 	var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
@@ -906,6 +906,7 @@ sap.ui.define([
 		material = material || new THREE.MeshPhongMaterial({
 			specular: 0x444444,
 			shininess: 0,
+			opacity: 0.99,
 			transparent: true,
 			depthTest: true,
 			depthWrite: false,
@@ -925,6 +926,7 @@ sap.ui.define([
 
 		var geometry = new THREE.DecalGeometry(target, origin, this._decalHelper.rotation, size);
 		instance.object3D = new THREE.Mesh(geometry, material);
+		instance.object3D.renderOrder = 100;
 		instance.object3D.matrixAutoUpdate = false;
 		instance.object3D.layers.set(1); // put it to layer #1 to disable hit test
 		this._scene.add(instance.object3D);

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

@@ -213,11 +213,11 @@ sap.ui.define([
 		var color = Utilities.toColor(source);
 		var selected = Utilities.toBoolean(instance["VB:s"]);
 
-		if (selected) { 			
+		if (selected) {
 			// if direct color -> override current, if delta color -> apply on top
 			var selectDelta = Utilities.isColorDelta(instance.selectColor);
 			var selectColor = selectDelta ? Utilities.toColorDelta(instance.selectColor) : Utilities.toColor(instance.selectColor);
-	
+
 			if (selectDelta) {
 				Utilities.applyDeltaHLS(color.rgb, selectColor.hls);
 				color.opacity = Utilities.clamp(color.opacity * selectColor.opacity, 0.0, 1.0);
@@ -230,7 +230,7 @@ sap.ui.define([
 			// if direct color -> override current, if delta color -> apply on top
 			var hotDelta = Utilities.isColorDelta(instance.hotDeltaColor);
 			var hotColor = hotDelta ? Utilities.toColorDelta(instance.hotDeltaColor) : Utilities.toColor(instance.hotDeltaColor);
-	
+
 			if (hotDelta) {
 				Utilities.applyDeltaHLS(color.rgb, hotColor.hls);
 				color.opacity = Utilities.clamp(color.opacity * hotColor.opacity, 0.0, 1.0);
@@ -305,7 +305,7 @@ sap.ui.define([
 					}
 					material.transparent = material.opacity < 1;
 				});
-			});	
+			});
 		});
 	};
 
@@ -350,7 +350,7 @@ sap.ui.define([
 	Utilities.getInstanceTransform = function(instance, position, rotation, scale, bbox) {
 		Utilities.toVector3(instance.pos, position);
 		Utilities.toVector3(instance.scale, scale);
-	
+
 		var rot = Utilities.toVector3(instance.rot);
 		rotation.set(degToRad(rot.x), degToRad(rot.y), degToRad(rot.z), "YXZ");
 
@@ -427,7 +427,7 @@ sap.ui.define([
 	Utilities.propertyAdded = function(instance, property) {
 		return instance[property] && !instance._last[property];
 	};
-	
+
 	Utilities.propertyRemoved = function(instance, property) {
 		return !instance[property] && instance._last[property];
 	};
@@ -458,7 +458,7 @@ sap.ui.define([
 	/**
 	 * Normalize the object. Implementation replicates Visual Business ActiveX implementation of object(s) normalization.
 	 * The node is centered and then scaled uniformly so that vertex coordinates fit into the 3D box defined as range [(-1, -1, -1), (+1, +1, +1)].
-	 * 
+	 *
 	 * @param {THREE.Object3D} root The node to normalize.
 	 * @param {THREE.Matrix4} [matrix] Copy transformation into matrix or apply to root directly.
 	 * @param {THREE.Box3} [bbox] Copy bounding box into it.
@@ -491,13 +491,13 @@ sap.ui.define([
 
 		if (bbox) {
 			bbox.copy(box);
-		}		
-		
+		}
+
 		var m1 = new Matrix4().makeScale(scaleFactor, scaleFactor, scaleFactor);
 		var m2 = new Matrix4().makeTranslation(-center.x, -center.y, -center.z);
 
 		root.updateMatrix(); // make sure local TM is up to date
-		
+
 		m1.multiply(m2);
 		m1.multiply(root.matrix);
 
@@ -510,7 +510,7 @@ sap.ui.define([
 
 	/**
 	 * Clone material(s). Material can be single object or array of materials.
-	 * 
+	 *
 	 * @param {THREE.Material|THREE.Material[]} material Material(s) to clone.
 	 * @return {THREE.Material|THREE.Material[]} Cloned material(s).
 	 */
@@ -526,5 +526,29 @@ sap.ui.define([
 		return material;
 	};
 
+	/**
+	* Function returns alias for the specified Attribute within DataType.
+	* Only top level data types are checked, nested data types are ignored.
+	*
+	* @param {object} context The Context which holds all definitions and populated data
+	* @param {string} dataType The DataType name for the given attribute
+	* @param {string} attribute The Attribute name
+	* @returns {string} String alias of an attribute or undefined if not found
+	*/
+	Utilities.getAttributeAlias = function(context, dataType, attribute) {
+		for (var i = 0; i < context.dataTypes.length; ++i) {
+			var type = context.dataTypes[i];
+			if (type.name === dataType) {
+				for (var j = 0; j < type.attributes.length; ++j) {
+					var attr = type.attributes[j];
+					if (attr.name === attribute) {
+						return attr.alias;
+					}
+				}
+			}
+		}
+		return undefined;
+	};
+
 	return Utilities;
 });

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

@@ -56,7 +56,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @alias sap.ui.vbm.adapter3d.VBIJSONParser
 	 */
 	var VBIJSONParser = BaseObject.extend("sap.ui.vbm.adapter3d.VBIJSONParser", /** @lends sap.ui.vbm.adapter3d.VBIJSONParser.prototype */ {