@sapui5/sap.ui.vbm 1.84.9 → 1.84.12

package/package.json

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

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

@@ -21,7 +21,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.84.9
+	 * @version 1.84.12
 	 * @extends sap.ui.core.Element
 	 * @constructor
 	 * @public
@@ -573,7 +573,13 @@ sap.ui.define([
 					resolution		: provider.resolution,
 					retries			: provider.retries,
 					type			: provider.type,
-					Source 			: provider.Source ? [].concat(provider.Source).map(function(source) {
+					Header			: provider.Header ? [].concat(provider.Header).map(function(header) {
+						return {
+							name  : header.name,
+							value : header.value
+						};
+					}) : provider.Header,
+					Source			: provider.Source ? [].concat(provider.Source).map(function(source) {
 						return {
 							id	: source.id,
 							url	: source.url

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

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

@@ -321,7 +321,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/GeoMap.js

@@ -686,23 +686,22 @@ sap.ui.define([
 	 * @param {string} oMapConfiguration.MapProvider.minLOD Minimal supported Level Of Detail.
 	 * @param {string} oMapConfiguration.MapProvider.maxLOD Maximal supported Level Of Detail.
 	 * @param {string} oMapConfiguration.MapProvider.copyright Copyright Information to be shown with the map.
-	 * @param {array} oMapConfiguration.MapProvider.Source Array of source definitions. At least on Source has to be given. Multiple sources can be
-	 *        used for load distribution.
+	 * @param {array} oMapConfiguration.MapProvider.Header Array of HTTP headers definitions. Optional.
+	 * @param {string} oMapConfiguration.MapProvider.Header.name Name of the header.
+	 * @param {string} oMapConfiguration.MapProvider.Header.value Value of the header.
+	 * @param {array} oMapConfiguration.MapProvider.Source Array of source definitions. At least on Source has to be given. Multiple sources can be used for load distribution.
 	 * @param {string} oMapConfiguration.MapProvider.Source.id Source id.
-	 * @param {string} oMapConfiguration.MapProvider.Source.url Source URL for map tile service. URL includes place holders for variable informations
-	 *        set at runtime, e.g. {LOD}.
+	 * @param {string} oMapConfiguration.MapProvider.Source.url Source URL for map tile service. URL includes place holders for variable informations set at runtime, e.g. {LOD}.
 	 * @param {array} oMapConfiguration.MapLayerStacks Array of Map Layer Stacks
 	 * @param {string} oMapConfiguration.MapLayerStacks.name Name of Map Layer Stack. Use with the GeoMap refMapLayerStack property.
 	 * @param {string} oMapConfiguration.MapLayerStacks.previewPosition.latitude Latitude position to use when creating image tile
 	 * @param {string} oMapConfiguration.MapLayerStacks.previewPosition.longitude Longitude position to use when creating image tile
 	 * @param {string} oMapConfiguration.MapLayerStacks.previewPosition.lod Lod position to use when creating image tile
-	 * @param {array} oMapConfiguration.MapLayerStacks.MapLayer Array of Map Layers. Each Layer refers to a Map Proveride. Map Layers get overlayed in
-	 *        the given sequence.
+	 * @param {array} oMapConfiguration.MapLayerStacks.MapLayer Array of Map Layers. Each Layer refers to a Map Proveride. Map Layers get overlayed in the given sequence.
 	 * @param {string} oMapConfiguration.MapLayerStacks.MapLayer.name Name of Map Layer.
 	 * @param {string} oMapConfiguration.MapLayerStacks.MapLayer.refMapProvider Name of referenced Map Provider.
 	 * @param {string} oMapConfiguration.MapLayerStacks.MapLayer.opacity Opacity of Map Layer. Value range 0 to 1.
-	 * @param {sap.ui.core.CSSColor} oMapConfiguration.MapLayerStacks.colBkgnd Background color for Map Layer. Only meaningful if opacity is
-	 *        below 1.
+	 * @param {sap.ui.core.CSSColor} oMapConfiguration.MapLayerStacks.colBkgnd Background color for Map Layer. Only meaningful if opacity is below 1.
 	 * @returns {sap.ui.vbm.GeoMap} This allows method chaining
 	 * @public
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel

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

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

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

@@ -351,7 +351,7 @@ sap.ui.define([
 		var key = (name.indexOf(".") !== -1) ? name.split(".")[1] : name;
 		for (var nJ = 0, len = aVO.length; nJ < len; ++nJ) {
 			// get the control.....................................................//
-			if (aVO[nJ].sId === key || aVO[nJ].getKey() === key) {
+			if (aVO[nJ].getKey() === key) {
 				return aVO[nJ];
 			}
 		}

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.9
+	 * @version 1.84.12
 	 * @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.84.9
+	 * @version 1.84.12
 	 * @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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.9
+	 * @version 1.84.12
 	 * @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

@@ -50,7 +50,7 @@ function(jQuery, BaseObject, Utilities, PolygonHandler, ModelHandler, THREE, Dec
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.9
+	 * @version 1.84.12
 	 * @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

@@ -58,7 +58,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.84.9
+	 * @version 1.84.12
 	 * @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/sapdataprovider.js

@@ -993,7 +993,15 @@ VBI.DataProvider = function() {
 			if (type == A && (nJ + 1) == len) {
 				var ta;
 				if ((ta = curNodeType.GetTypeAttribute(parts[nJ], false))) {
-					return curElement.m_dataattributes[ta.m_nArrayIndex];
+					if (curElement) {
+						return curElement.m_dataattributes[ta.m_nArrayIndex];
+					}  else {
+						// no element specified, so we use the first one .............//
+						if (curNode.m_dataelements.length) {
+							curElement = curNode.m_dataelements[0];
+							return curElement.m_dataattributes[ta.m_nArrayIndex];
+						}
+					}
 				}
 			}
 

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

@@ -11,6 +11,7 @@ VBI.MapManager = (function() {
 	mapmanager.m_tileWidth = 256;
 	mapmanager.m_tileHeight = 256;
 	mapmanager.m_runningRequests = 0;
+	mapmanager.m_runningXhrRequests = 0;
 	mapmanager.m_limitRequests = 12;
 	mapmanager.m_requestQueue = [];
 	mapmanager.m_renderQueue = [];
@@ -19,13 +20,37 @@ VBI.MapManager = (function() {
 	mapmanager.m_renderJunksize = 100;
 	// image is loaded
 
+	/**
+	 * Increments and Decrements counters related to tile download connections
+	 *
+	 * @private
+	 * @param {Image} image - Image object to track counters agains 
+	 * @param {number} factor - A positive or negative integer to be added to the counter
+	 */
+	mapmanager._modifyReqCounters = function(image, factor) {
+		if (image.m_Headers) { // if headers presents -> this is xhr request 
+			mapmanager.m_runningXhrRequests += factor;
+		} else {
+			mapmanager.m_runningRequests += factor;
+		}
+		if (VBI.m_bTrace) {
+			VBI.Trace("Running Requests - Xhr: " + mapmanager.m_runningXhrRequests + ", src: " + mapmanager.m_runningRequests);
+		}
+	};
+
 	mapmanager.onAbort = function(event) {
 		var image = event.srcElement;
 
 		if (VBI.m_bTrace) {
 			VBI.Trace("onAbort " + image.src);
 		}
+
+		//decrement the counters
+		mapmanager._modifyReqCounters(image, -1);
+
+		//trigger more requests if there are some in the queue
 		mapmanager.CheckReqQueue();
+
 		// unlink the image from within the image chain
 		mapmanager.UnlinkImage(image);
 		mapmanager.CheckTmpCanvas(image.m_Target, image.m_nRequest, image.m_nLayersAbove);
@@ -35,7 +60,9 @@ VBI.MapManager = (function() {
 		if (VBI.m_bTrace) {
 			VBI.Trace("onFailedSend " + object.src);
 		}
-		mapmanager.m_runningRequests--;
+
+		//decrement the counters
+		mapmanager._modifyReqCounters(object, -1);
 		mapmanager.m_bRequestError = true;
 
 		if (!mapmanager.m_failedSendTimer) {
@@ -51,6 +78,9 @@ VBI.MapManager = (function() {
 		if (VBI.m_bTrace) {
 			VBI.Trace("onError " + image.src);
 		}
+
+		//decrement the counters
+		mapmanager._modifyReqCounters(image, -1);
 		mapmanager.CheckReqQueue();
 
 		var imageRender = null;
@@ -62,8 +92,10 @@ VBI.MapManager = (function() {
 		if (image.m_Prev == null && image.m_Next != null && image.m_Next.complete == true) {
 			imageRender = image.m_Next;
 		}
+
 		// unlink the image from within the image chain
 		mapmanager.UnlinkImage(image);
+
 		// when the image is the first in current and would be rendered
 		if (imageRender != null) {
 			mapmanager.m_renderQueue.push(imageRender);
@@ -81,9 +113,18 @@ VBI.MapManager = (function() {
 		if (!image.complete) { //skip odd onload event from IE where image is not loaded yet
 			return;
 		}
+
+		//If the request is xhr then we need to revoke the blob data url once loaded
+		if (image.m_Headers) {
+			(window.URL || window.webkitURL).revokeObjectURL(image.src);
+		}
+
 		if (VBI.m_bTrace) {
-			VBI.Trace("VBI.MapManager: onLoad  " + image.src);
+			VBI.Trace("VBI.MapManager: onLoad " + (image.m_Headers ? "(xhr) " : " ") + (image.m_Headers ? image.src2execute : image.src));
 		}
+
+		//decrement the counters
+		mapmanager._modifyReqCounters(image, -1);
 		mapmanager.CheckReqQueue();
 
 		var bChainComplete = true; // I for myself am complete as I am in onLoad.
@@ -111,7 +152,6 @@ VBI.MapManager = (function() {
 		clearInterval(mapmanager.m_failedSendTimer);
 		mapmanager.m_failedSendTimer = 0;
 		mapmanager.m_bRequestError = false;
-		mapmanager.m_runningRequests++;
 		mapmanager.CheckReqQueue();
 	};
 
@@ -124,7 +164,14 @@ VBI.MapManager = (function() {
 				mapmanager.CheckTmpCanvas(targetCanvas, image.m_nRequest, image.m_nLayersAbove);
 			} else {
 				try {
-					image.src = image.src2execute;
+					//Check for xhr object and resend if present, otherwise set image src
+					if (image.m_Headers) {
+						mapmanager._createHttpRequest(image);
+					} else {
+						mapmanager.m_bRequestError = false;
+						mapmanager._modifyReqCounters(image, 1);
+						image.src = image.src2execute;
+					}
 				} catch (e) {
 					mapmanager.m_requestQueue.unshift(image);
 					mapmanager.onFailedSend(image);
@@ -133,7 +180,6 @@ VBI.MapManager = (function() {
 			}
 		}
 		// no further request to be executed
-		mapmanager.m_runningRequests--;
 	};
 
 	mapmanager.RenderTiles = function() {
@@ -146,11 +192,14 @@ VBI.MapManager = (function() {
 
 	mapmanager.RenderTile = function(image) {
 		if (!image.bRendered) {
+
+			//get the target canvas reference from the image property and check whether rendering should be redirected to another canvas
 			var targetCanvas = image.m_Target;
 			if ((targetCanvas.m_CanvasRedirect != undefined) && (targetCanvas.m_CanvasRedirRequest == image.m_nRequest)) {
 				targetCanvas = targetCanvas.m_CanvasRedirect;
 			}
 
+			//If the canvas isn't connected to a scene then don't render
 			var currentScene = targetCanvas.m_Scene;
 			if (!currentScene) {
 				return;
@@ -162,16 +211,17 @@ VBI.MapManager = (function() {
 			targetCanvas.m_nAppliedRequest = Math.max(targetCanvas.m_nAppliedRequest, image.m_nRequest);
 			var context = targetCanvas.getContext('2d');
 
+			//Get the maximum number of tiles for the specified zoom level
 			var nMaxX = (1 << context.canvas.m_nCurrentLOD);
 
+			//Calculate whether current image is still visibile for the current canvas
 			var nCol = ((image.m_nReqX - context.canvas.m_nCurrentX) % nMaxX + nMaxX) % nMaxX; // double mod for neg.numbers
 			if (nMaxX < currentScene.m_nTilesX) {
 				nCol = image.m_nCol + image.m_nXOrigin - context.canvas.m_nCurrentX;
 			}
-
 			var nRow = image.m_nReqY - context.canvas.m_nCurrentY;
 
-			// unlink and return when image request is outdated
+			// unlink and return when image request is outdated / would not be visible
 			if (image.m_bOutdated || (nCol < 0) || (nRow < 0) || (nCol >= image.m_numCol) || (nRow >= image.m_numRow) || (image.m_nLOD != targetCanvas.m_nCurrentLOD || targetCanvas.m_bInvalid)) {
 				mapmanager.UnlinkImage(image);
 
@@ -193,10 +243,15 @@ VBI.MapManager = (function() {
 			targetCanvas.setPixelWidth(nWidth);
 			targetCanvas.setPixelHeight(nHeight);
 
+			//Calculate the current image/tile width relative to the canvas
 			var tilewidth = nWidth / currentScene.m_nTilesX;
 			var tileheight = nHeight / currentScene.m_nTilesY;
+
+			//Calculate the correct offset for this tile on the current canvas
 			var left = nCol * tilewidth;
 			var top = nRow * tileheight;
+
+			//Scale the image to canvas if required (e.g. smaller tile / static map image)
 			var picWidth = image.m_nXExpansion * tilewidth;
 			var picHeight = image.m_nYExpansion * tileheight;
 
@@ -206,6 +261,7 @@ VBI.MapManager = (function() {
 			while (imageTemp.m_Prev != null) {
 				imageTemp = imageTemp.m_Prev;
 			}
+
 			while (imageTemp != null && imageTemp.complete == true) {
 				// optional draw the image background into the canvas
 				if (imageTemp.m_FillStyle != null) {
@@ -217,7 +273,8 @@ VBI.MapManager = (function() {
 					context.fillRect(left, top, picWidth, picHeight);
 					context.fillStyle = tmpFillStyle;
 				}
-				// as soon as an image is rendererd set the parent of the next to null
+
+				//Draw the image to the canvas with the specified opacity
 				if (VBI.m_bTrace) {
 					VBI.Trace("RenderTile drawImage " + imageTemp.src);
 				}
@@ -226,6 +283,7 @@ VBI.MapManager = (function() {
 				context.drawImage(imageTemp, left, top, picWidth, picHeight);
 				imageTemp.bRendered = true;
 
+				// as soon as an image is rendererd set the parent of the next to null
 				if (imageTemp.m_Next != null) {
 					imageTemp.m_Next.m_Prev = null;
 				}
@@ -258,7 +316,7 @@ VBI.MapManager = (function() {
 	};
 
 	mapmanager.CheckTmpCanvas = function(targetCanvas, imgRequest, nTilesAbove) {
-
+		//tries to fill the hidden canvas with tiles before displaying it
 		if ((targetCanvas.m_nTilesBefSwitch != undefined) && (targetCanvas.m_nRequest == imgRequest) && !nTilesAbove) {
 			targetCanvas.m_nTilesBefSwitch--;
 			if (!targetCanvas.m_nTilesBefSwitch) {
@@ -267,6 +325,7 @@ VBI.MapManager = (function() {
 		}
 
 	};
+
 	// request the tiles
 	mapmanager.RequestTiles = function(targetCanvas, maplayerstack, x, y, nx, ny, leftOffset, topOffset, rightOffset, bottomOffset, lod, bclear) {
 		mapmanager.m_bRequestError = false;
@@ -288,6 +347,8 @@ VBI.MapManager = (function() {
 		}
 
 		var nCount = 0;
+
+		//Calculate XMax based on the YMax for a given ratio of X->Y for the current projection
 		var nYMax = (1 << lod);
 		var xyRatio = sc.m_Proj.m_nXYRatio;
 		var nXMax = nYMax * xyRatio;
@@ -313,6 +374,7 @@ VBI.MapManager = (function() {
 		var ni, nk, nYExpansion, nCurrentXExpansion = 1;
 		var yCorr = y;
 
+		//future: Adjust logic to account for m_bSingleBMP on maplayer level
 		if (maplayerstack.m_bSingleBMP) {
 			nk = 1;
 			yCorr = Math.max(0, y);
@@ -335,6 +397,7 @@ VBI.MapManager = (function() {
 					if (nReqX < 0) {
 						nReqX = nXMax + nReqX;
 					}
+
 					var nReqY = yCorr + topOffset + k;
 					if ((nReqY + nYExpansion) <= 0 || nReqY >= nYMax) {
 						if ((targetCanvas.m_nTilesBefSwitch != undefined) && (targetCanvas.m_nTilesBefSwitch > 0)) {
@@ -396,25 +459,28 @@ VBI.MapManager = (function() {
 						var url;
 
 						if (mapProv.m_bPosRequired) {
-							var leftupper = [
-								nReqX * fTileSize / xyRatio - 1, nReqY * fTileSize - 1
-							];
-							var rightlower = [
-								(nReqX + nCurrentXExpansion) * fTileSize / xyRatio - 1, (nReqY + nYExpansion) * fTileSize - 1
-							];
+							var leftupper = [nReqX * fTileSize / xyRatio - 1, nReqY * fTileSize - 1];
+							var rightlower = [(nReqX + nCurrentXExpansion) * fTileSize / xyRatio - 1, (nReqY + nYExpansion) * fTileSize - 1];
 							// VBI.Trace("Requesting "+nReqX+","+nReqY+" with Extension "+nCurrentXExpansion+". Coordinates :
 							// "+leftupper[0]+"-->"+rightlower[0]+","+rightlower[1]);
 							url = mapProv.CombineUrlWPos(nReqX, nReqY, lod, fTileSize, leftupper, rightlower, nCurrentXExpansion, nYExpansion, mapmanager.m_requestTileWidth, mapmanager.m_requestTileHeight);
 						} else {
 							url = mapProv.CombineUrl(nReqX, nReqY, lod);
 						}
+
 						image.onload = mapmanager.onLoad;
 						image.onerror = mapmanager.onError;
 						image.onabort = mapmanager.onAbort;
 
-						if ((mapmanager.m_runningRequests < mapmanager.m_limitRequests) && (!mapmanager.m_bRequestError)) {
-							mapmanager.m_runningRequests++;
+						//If the provider has headers defined, then we must use the HTTP Request approach
+						//as it is possible that the application provided an image via the URL callback, we check for a data url before proceeding with the HTTP Request creation 
+						if (mapProv.m_Headers && url.substring(0, 5).toLowerCase() != "data:") {
+							image.m_Headers = mapProv.m_Headers;
+							image.src2execute = url; //store the URL in case the request ends up being queued
+							mapmanager._createHttpRequest(image);
+						} else if ((mapmanager.m_runningRequests < mapmanager.m_limitRequests) && (!mapmanager.m_bRequestError)) { //The request is for a URL only or it is a data URL
 							try {
+								mapmanager._modifyReqCounters(image, 1);
 								image.src = url;
 							} catch (e) {
 								image.src2execute = url;
@@ -425,6 +491,7 @@ VBI.MapManager = (function() {
 							image.src2execute = url;
 							mapmanager.m_requestQueue.push(image);
 						}
+
 						image.m_nCount = nCount;
 
 						if (VBI.m_bTrace) {
@@ -466,7 +533,7 @@ VBI.MapManager = (function() {
 
 	mapmanager.GetPreviewImage = function(lon, lat, lod, maplayerstack, scene, callback) {
 		//extend layer configuration object with preview location object which is {lat, lon, lod}
-		if (!callback || !maplayerstack  || !lon || !lod || !lat || !scene ) { //check that parameters are valid
+		if (!callback || !maplayerstack || !lon || !lod || !lat || !scene) { //check that parameters are valid
 			return;
 		}
 
@@ -478,7 +545,7 @@ VBI.MapManager = (function() {
 		var xyRatio = scene.m_Proj.m_nXYRatio; //ratio from  current projection
 		var lodDistance = (1 << lod); //how many tiles on a particular lod?
 		var tileSize = 2.0 / lodDistance; //???
-		var lonlat = VBI.MathLib.DegToRad([parseFloat(lon),parseFloat(lat)]); //from degrees to radians
+		var lonlat = VBI.MathLib.DegToRad([parseFloat(lon), parseFloat(lat)]); //from degrees to radians
 		var uxy = [lodDistance * tileWidth, lodDistance * tileHeight]; //prepare conversion from lat,lon
 		scene.m_Proj.LonLatToUCS(lonlat, uxy); // to User Coordinate System (pixel space of a target lod)
 		var x = Math.floor(uxy[0] / tileWidth); // calculate X tile coordinate
@@ -527,7 +594,7 @@ VBI.MapManager = (function() {
 							var stretchY = canvas.height;
 
 							// Draw image based on measurments
-							context.drawImage(this.m_Images[i],clipPosX,clipPosY,clipWidth,clipHeight, offsetX,offsetY, stretchX, stretchY); //draw image to canvas
+							context.drawImage(this.m_Images[i], clipPosX, clipPosY, clipWidth, clipHeight, offsetX, offsetY, stretchX, stretchY); //draw image to canvas
 						}
 					}
 					var tileImages = new Image();
@@ -543,6 +610,11 @@ VBI.MapManager = (function() {
 				VBI.Trace("onLoad " + event.target.src);
 			}
 			var image = event.target;
+
+			//If the request was xhr then we need to revoke the blob data url once loaded
+			if (image.m_Headers) {
+				(window.URL || window.webkitURL).revokeObjectURL(image.src);
+			}
 			image.m_Context.compose();
 		};
 
@@ -589,12 +661,20 @@ VBI.MapManager = (function() {
 			if (layer.m_fOpacity) {
 				image.m_Opacity = layer.m_fOpacity;
 			}
+
 			image.onload = onImageLoad;
 			image.onabort = onImageAbort;
 			image.onerror = onImageError;
 
 			try {
-				image.src = url;
+				if (provider.m_Headers && url.substring(0, 5).toLowerCase() != "data:") {
+					//Handle requests that require headers
+					image.m_Headers = provider.m_Headers;
+					image.src2execute = url;
+					mapmanager._createHttpRequest(image, true);
+				} else {
+					image.src = url;
+				}
 			} catch (ex) {
 				if (VBI.m_bTrace) {
 					VBI.Trace("GetPreviewImage " + ex);
@@ -604,5 +684,93 @@ VBI.MapManager = (function() {
 			}
 		}
 	};
+
+	/**
+	 * Helper function used to create and manage HTTP request objects
+	 *
+	 * @private
+	 * @param {Image} image - Image object to use for request
+	 * @param {boolean} preview - True if image is requested for preview.
+	 */
+	mapmanager._createHttpRequest = function(image, preview) {
+		if (preview || mapmanager.m_runningXhrRequests < mapmanager.m_limitRequests) { // 'preview' images are not participated in requests limitation process
+			if (!preview) { // modify counter only if it is not a 'preview' image
+				mapmanager._modifyReqCounters(image, 1);
+			}
+			//Make a xhr request promise
+			var oXMLHttpRequest = (typeof window.sinon === "object" && window.sinon.xhr && window.sinon.xhr.XMLHttpRequest) ? window.sinon.xhr.XMLHttpRequest : XMLHttpRequest;
+			var xhr = new oXMLHttpRequest();
+			xhr.m_Image = image;
+
+			xhr.onerror = function(event) {
+				// onerror event caters for events such as CORS errors
+				if (this.m_Image && this.m_Image.onerror) {
+					this.m_Image.onerror({
+						srcElement: this.m_Image, // in case of a normal image
+						target: this.m_Image // in case of a 'preview' image
+					});
+				}
+				jQuery.sap.log.error("Download error: " + this.statusText);
+			}
+
+			if (!preview) { // skip for 'preview' images as they cannot be outdated
+				//If the mapmanager has decided the image is outdated then abort loading
+				xhr.onprogress = function(event) {
+					if (this.m_Image && this.m_Image.m_bOutdated) {
+						this.abort();
+						this.m_Image.onabort({
+							srcElement: this.m_Image
+						});
+						jQuery.sap.log.error("Download error: image outdated");
+					}
+				}
+			}
+
+			xhr.onload = function(event) {
+				// When file is loaded from a Cordova container the status equals 0
+				if (this.status === 200 || this.status === 0) {
+					var contentType = this.getResponseHeader("Content-Type");
+					if (contentType.split("/")[0] == "image") {
+						this.m_Image.src = (window.URL || window.webkitURL).createObjectURL(this.response);
+					} else {
+						this.m_Image.onerror({
+							srcElement: this.m_Image, // in case of a normal image
+							target: this.m_Image // in case of a 'preview' image
+						});
+						jQuery.sap.log.error("Download error: image response type expected. Recieved: " + contentType);
+					}
+				} else {
+					// onload event is also called in the case of status code 404 Not Found.
+					// This is why we have to check for the right status. If the status is not
+					// something that indicates success, we fire the fireItemFailed event.
+					if (preview) {
+						this.m_Image.onerror({
+							target: this.m_Image // in case of a 'preview' image
+						});
+					} else {
+						if (this.m_Image && !this.m_Image.m_bOutdated) {
+							mapmanager.m_requestQueue.push(this.m_Image);
+						}
+						mapmanager.onFailedSend(this.m_Image);
+					}
+					jQuery.sap.log.error("Download error: " + this.statusText);
+				}
+			};
+
+			xhr.open("GET", image.src2execute, true);
+
+			//Add headers array to the request
+			image.m_Headers.forEach(function(header) {
+				xhr.setRequestHeader(header.name, header.value);
+			});
+
+			xhr.responseType = "blob";
+			xhr.send(null);
+		} else {
+			mapmanager.m_requestQueue.push(image);
+			return;
+		}
+	};
+
 	return mapmanager;
 })();

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

@@ -22,14 +22,14 @@ VBI.MapProviders = function() {
 
 	mapproviders.load = function(dat, ctx) {
 		// load the json delta data............................................//
-		// todo: do more than only set
+		// future: do more than only set
 		if (dat.Set) {
 			var mp;
 
-			// todo: refine delta loading
+			// future: refine delta loading
 			mapproviders.clear();
 			// load the mapproviders............................................//
-			// todo: support specialized sets and removes.......................//
+			// future: support specialized sets and removes.......................//
 			if (dat.Set.MapProvider) {
 				if (jQuery.type(dat.Set.MapProvider) == 'object') {
 					mp = new VBI.MapProvider();
@@ -67,7 +67,7 @@ VBI.MapProviders = function() {
 // ...........................................................................//
 // MapProvider namespace.....................................................//
 
-VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, maxLOD, fillStyle, resolution, projection) {
+VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, maxLOD, fillStyle, resolution, projection, headers) {
 	"use strict";
 	var mapprovider = {};
 	mapprovider.vbiclass = "MapProvider";
@@ -83,6 +83,7 @@ VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, m
 	mapprovider.m_minLOD = typeof minLOD !== 'undefined' ? minLOD : 0;
 	mapprovider.m_nResolution = typeof resolution != 'undefined' ? resolution : 256;
 	mapprovider.m_nProjection = typeof projection != 'undefined' ? projection : 1;
+	mapprovider.m_Headers = headers; // Headers can be undefined
 
 	// set optional background style of map provider..........................//
 	if (fillStyle != null) {
@@ -140,7 +141,7 @@ VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, m
 
 	mapprovider.load = function(dat) {
 		// load dataprovider attributes........................................//
-		// todo: add additional attributes
+		// future: add additional attributes
 		if (dat.name) {
 			mapprovider.m_Name = dat.name;
 		}
@@ -178,6 +179,17 @@ VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, m
 				mapprovider.m_nProjection = 3;
 			}
 		}
+		if (dat.Header) {
+			[].concat(dat.Header).forEach(function(header) {
+				if (header.name) { // name must not be empty, while value can be empty (HTTP headers spec)
+					if (!mapprovider.m_Headers) {
+						mapprovider.m_Headers = [];
+					}
+					mapprovider.m_Headers.push(header);
+				}
+			});
+		}
+
 		var mapBase = dat.MapBase;
 		mapprovider.m_StdMapBase = mapprovider.addMapBase(-1, 1, 1, -1, 10);
 		if (dat.MapBase) {
@@ -217,8 +229,8 @@ VBI.MapProvider = function(name, description, copyright, tileX, tileY, minLOD, m
 
 		var nMax = 1 << lod;
 		// check levels......................................................//
-// if( x < 0 || ( y + yExpansion ) <= 0 || ( x >= nMax ) || ( y >= nYMax ) )
-// return null;
+		// if( x < 0 || ( y + yExpansion ) <= 0 || ( x >= nMax ) || ( y >= nYMax ) )
+		// return null;
 		// VBI.Trace("Org on lod "+lod+" : ["+(lu[0]).toFixed(7)+","+(lu[1]).toFixed(7)+"] - ["+(rl[0]).toFixed(7)+","+(rl[1]).toFixed(7)+"]");
 		var nRound = 10;
 		if (mapprovider.m_MapBase) {

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

@@ -1951,6 +1951,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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.vbm
 	 * @author SAP SE
-	 * @version 1.84.9
+	 * @version 1.84.12
 	 * @public
 	 */
 
@@ -47,7 +47,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.84.9"
+		version: "1.84.12"
 	});
 
 	jQuery.sap.registerModuleShims({