@sapui5/sap.ui.vbm 1.93.1 → 1.97.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/sap/ui/vbm/.library +1 -1
- package/src/sap/ui/vbm/Adapter.js +18 -15
- package/src/sap/ui/vbm/Adapter3D.js +2 -3
- package/src/sap/ui/vbm/AnalyticMap.js +1 -2
- package/src/sap/ui/vbm/AnalyticMapRenderer.js +1 -2
- package/src/sap/ui/vbm/Area.js +1 -2
- package/src/sap/ui/vbm/Areas.js +8 -10
- package/src/sap/ui/vbm/Box.js +1 -2
- package/src/sap/ui/vbm/Boxes.js +1 -2
- package/src/sap/ui/vbm/Circle.js +1 -2
- package/src/sap/ui/vbm/Circles.js +1 -2
- package/src/sap/ui/vbm/Cluster.js +5 -5
- package/src/sap/ui/vbm/ClusterBase.js +5 -9
- package/src/sap/ui/vbm/ClusterContainer.js +1 -2
- package/src/sap/ui/vbm/ClusterDistance.js +1 -2
- package/src/sap/ui/vbm/ClusterGrid.js +1 -2
- package/src/sap/ui/vbm/ClusterRenderer.js +1 -3
- package/src/sap/ui/vbm/ClusterTree.js +1 -2
- package/src/sap/ui/vbm/Container.js +1 -2
- package/src/sap/ui/vbm/Containers.js +4 -7
- package/src/sap/ui/vbm/DragSource.js +1 -2
- package/src/sap/ui/vbm/DropTarget.js +1 -2
- package/src/sap/ui/vbm/Feature.js +1 -2
- package/src/sap/ui/vbm/FeatureCollection.js +1 -2
- package/src/sap/ui/vbm/GeoCircle.js +1 -2
- package/src/sap/ui/vbm/GeoCircles.js +1 -2
- package/src/sap/ui/vbm/GeoJsonLayer.js +10 -12
- package/src/sap/ui/vbm/GeoMap.js +4 -4
- package/src/sap/ui/vbm/GeoMapRenderer.js +1 -2
- package/src/sap/ui/vbm/HeatPoint.js +1 -2
- package/src/sap/ui/vbm/Heatmap.js +1 -2
- package/src/sap/ui/vbm/Legend.js +1 -2
- package/src/sap/ui/vbm/LegendItem.js +1 -2
- package/src/sap/ui/vbm/Pie.js +1 -2
- package/src/sap/ui/vbm/PieItem.js +1 -2
- package/src/sap/ui/vbm/Pies.js +1 -2
- package/src/sap/ui/vbm/Region.js +1 -2
- package/src/sap/ui/vbm/Resource.js +1 -2
- package/src/sap/ui/vbm/Route.js +1 -2
- package/src/sap/ui/vbm/Routes.js +1 -2
- package/src/sap/ui/vbm/Spot.js +1 -2
- package/src/sap/ui/vbm/Spots.js +1 -2
- package/src/sap/ui/vbm/VBI.js +41 -10
- package/src/sap/ui/vbm/VBIRenderer.js +1 -2
- package/src/sap/ui/vbm/Viewport.js +7 -7
- package/src/sap/ui/vbm/ViewportRenderer.js +1 -2
- package/src/sap/ui/vbm/VoAbstract.js +1 -2
- package/src/sap/ui/vbm/VoAggregation.js +4 -7
- package/src/sap/ui/vbm/VoBase.js +1 -2
- package/src/sap/ui/vbm/adapter3d/ModelHandler.js +2 -3
- package/src/sap/ui/vbm/adapter3d/ObjectFactory.js +2 -3
- package/src/sap/ui/vbm/adapter3d/PolygonHandler.js +2 -3
- package/src/sap/ui/vbm/adapter3d/SceneBuilder.js +269 -184
- package/src/sap/ui/vbm/adapter3d/Utilities.js +1 -2
- package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js +2 -3
- package/src/sap/ui/vbm/adapter3d/thirdparty/ColladaLoader.js +2267 -2509
- package/src/sap/ui/vbm/adapter3d/thirdparty/DecalGeometry.js +194 -266
- package/src/sap/ui/vbm/adapter3d/thirdparty/OrbitControls.js +1004 -700
- package/src/sap/ui/vbm/lib/sapactions.js +11 -9
- package/src/sap/ui/vbm/lib/sapautomations.js +11 -13
- package/src/sap/ui/vbm/lib/sapconfig.js +10 -3
- package/src/sap/ui/vbm/lib/sapdataprovider.js +10 -21
- package/src/sap/ui/vbm/lib/sapevents.js +10 -11
- package/src/sap/ui/vbm/lib/sapgeolocation.js +9 -3
- package/src/sap/ui/vbm/lib/sapgeomath.js +10 -4
- package/src/sap/ui/vbm/lib/sapgeotool.js +11 -3
- package/src/sap/ui/vbm/lib/sapheatmap.js +27 -25
- package/src/sap/ui/vbm/lib/saplabels.js +16 -11
- package/src/sap/ui/vbm/lib/saplassotrack.js +10 -5
- package/src/sap/ui/vbm/lib/sapmaplayer.js +12 -10
- package/src/sap/ui/vbm/lib/sapmapmanager.js +14 -5
- package/src/sap/ui/vbm/lib/sapmapprovider.js +10 -5
- package/src/sap/ui/vbm/lib/sapnavigation.js +10 -3
- package/src/sap/ui/vbm/lib/sapparsing.js +10 -1
- package/src/sap/ui/vbm/lib/sappositioning.js +11 -5
- package/src/sap/ui/vbm/lib/sapprojection.js +11 -5
- package/src/sap/ui/vbm/lib/saprecttrack.js +10 -5
- package/src/sap/ui/vbm/lib/sapresources.js +11 -6
- package/src/sap/ui/vbm/lib/sapscale.js +14 -5
- package/src/sap/ui/vbm/lib/sapscene.js +13 -12
- package/src/sap/ui/vbm/lib/saputilities.js +11 -84
- package/src/sap/ui/vbm/lib/sapvbcluster.js +13 -6
- package/src/sap/ui/vbm/lib/sapvbi.js +9 -41
- package/src/sap/ui/vbm/lib/sapvbicontext.js +10 -5
- package/src/sap/ui/vbm/lib/sapvbmenu.js +18 -13
- package/src/sap/ui/vbm/lib/sapvobase.js +16 -16
- package/src/sap/ui/vbm/lib/sapvoutils.js +13 -24
- package/src/sap/ui/vbm/lib/sapwindow.js +11 -12
- package/src/sap/ui/vbm/library.js +29 -33
- package/src/sap/ui/vbm/themes/base/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_hcw/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_belize_plus/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_bluecrystal/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_dark/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_fiori_3_hcw/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_hcb/library.source.less +1 -2
- package/src/sap/ui/vbm/themes/sap_horizon/library.source.less +1 -2
- package/ui5.yaml +6 -5
- package/src/sap/ui/vbm/adapter3d/thirdparty/html2canvas.js +0 -6
- package/src/sap/ui/vbm/themes/sap_mvi/empty.less +0 -0
package/package.json
CHANGED
package/src/sap/ui/vbm/.library
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<name>sap.ui.vbm</name>
|
|
4
4
|
<vendor>SAP SE</vendor>
|
|
5
5
|
<copyright>SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved</copyright>
|
|
6
|
-
<version>1.
|
|
6
|
+
<version>1.97.0</version>
|
|
7
7
|
|
|
8
8
|
<documentation>SAP UI library: sap.ui.vbm</documentation>
|
|
9
9
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides class sap.ui.vbm.Adapter
|
|
@@ -23,7 +22,7 @@ sap.ui.define([
|
|
|
23
22
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
24
23
|
* @param {object} [mSettings] initial settings for the new object
|
|
25
24
|
* @author SAP SE
|
|
26
|
-
* @version 1.
|
|
25
|
+
* @version 1.97.0
|
|
27
26
|
* @extends sap.ui.core.Element
|
|
28
27
|
* @constructor
|
|
29
28
|
* @public
|
|
@@ -1298,13 +1297,16 @@ sap.ui.define([
|
|
|
1298
1297
|
* @private
|
|
1299
1298
|
*/
|
|
1300
1299
|
Adapter.prototype._processDetailWindows = function(obj) {
|
|
1301
|
-
//No transformation needed for removal - pass it along to VBI as is.
|
|
1302
|
-
|
|
1303
1300
|
var oGeoMap = this._map();
|
|
1304
1301
|
var that = this;
|
|
1305
1302
|
|
|
1306
|
-
|
|
1307
|
-
if (obj.SAPVB.Windows.Set.
|
|
1303
|
+
// "Remove" and "Set" verbs supported only
|
|
1304
|
+
if (!obj.SAPVB.Windows.Set && !obj.SAPVB.Windows.Remove) {
|
|
1305
|
+
return this;
|
|
1306
|
+
}
|
|
1307
|
+
// No transformation needed for removal - pass it along to VBI as is.
|
|
1308
|
+
// Only delta supported for Windows - Set
|
|
1309
|
+
if (obj.SAPVB.Windows.Set && obj.SAPVB.Windows.Set.name) {
|
|
1308
1310
|
|
|
1309
1311
|
var findPredicate = function(prop, name) {
|
|
1310
1312
|
return function(d) {
|
|
@@ -1321,7 +1323,7 @@ sap.ui.define([
|
|
|
1321
1323
|
for (var sAttribute in wnd.Window) {
|
|
1322
1324
|
if (wnd.Window.hasOwnProperty(sAttribute)) {
|
|
1323
1325
|
if (sAttribute.endsWith(".bind")) {
|
|
1324
|
-
//Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
|
|
1326
|
+
// Only known bound attribute is pos - known to have a value like Spots.+hY+jTn2HueNpLoqrc5IAg==.GeoPosition
|
|
1325
1327
|
if (sAttribute.startsWith("pos")) {
|
|
1326
1328
|
var aParameters = wnd.Window[sAttribute].split(".");
|
|
1327
1329
|
if (aParameters[0] in oModelData) {
|
|
@@ -1345,7 +1347,7 @@ sap.ui.define([
|
|
|
1345
1347
|
|
|
1346
1348
|
obj.SAPVB.Windows.Set = aWindows;
|
|
1347
1349
|
|
|
1348
|
-
//Dereference VOs
|
|
1350
|
+
// Dereference VOs
|
|
1349
1351
|
if (obj.SAPVB.Scenes && obj.SAPVB.Scenes.Set && obj.SAPVB.Scenes.Set.name && obj.SAPVB.Scenes.Set.Scene && obj.SAPVB.Scenes.Set.Scene.VO) {
|
|
1350
1352
|
|
|
1351
1353
|
var aVOs = [].concat(obj.SAPVB.Scenes.Set.Scene.VO).map(function(v) {
|
|
@@ -1374,18 +1376,18 @@ sap.ui.define([
|
|
|
1374
1376
|
for (var sAttribute in v) {
|
|
1375
1377
|
if (v.hasOwnProperty(sAttribute)) {
|
|
1376
1378
|
if (sAttribute.endsWith(".bind")) {
|
|
1377
|
-
//Only known bound attribute is text - has values like DetailData.0.Column.1.Text
|
|
1379
|
+
// Only known bound attribute is text - has values like DetailData.0.Column.1.Text
|
|
1378
1380
|
var aParameters = v[sAttribute].split(".");
|
|
1379
1381
|
|
|
1380
1382
|
if (obj.SAPVB.Data && obj.SAPVB.Data.Set) {
|
|
1381
|
-
//Only Delta supported for Detail Window
|
|
1383
|
+
// Only Delta supported for Detail Window
|
|
1382
1384
|
[].concat(obj.SAPVB.Data.Set).forEach(dereferenceBoundAttributes(oVO, sAttribute, aParameters), this);
|
|
1383
1385
|
}
|
|
1384
1386
|
}
|
|
1385
1387
|
}
|
|
1386
1388
|
}
|
|
1387
1389
|
|
|
1388
|
-
//Process relevant actions
|
|
1390
|
+
// Process relevant actions
|
|
1389
1391
|
if (obj.SAPVB.Actions && obj.SAPVB.Actions.Set) {
|
|
1390
1392
|
[].concat(obj.SAPVB.Actions.Set).filter(function(a) { return a.Action.refVO === oVO.id; }).forEach(function(fa) {
|
|
1391
1393
|
that._attachHandler.call(oGeoMap, fa.Action.name, that._handler, that);
|
|
@@ -1394,12 +1396,13 @@ sap.ui.define([
|
|
|
1394
1396
|
|
|
1395
1397
|
return oVO;
|
|
1396
1398
|
}, this);
|
|
1397
|
-
|
|
1398
|
-
//delete obj.SAPVB["Actions"];
|
|
1399
|
+
// delete obj.SAPVB["Actions"];
|
|
1399
1400
|
obj.SAPVB.Scenes.Set.Scene.VO = aVOs;
|
|
1400
1401
|
}
|
|
1401
|
-
oGeoMap.load(obj);
|
|
1402
1402
|
}
|
|
1403
|
+
// pass it to VBI (this is hazardous as if payload contains something not related to Detail Windows in Scene,
|
|
1404
|
+
// VO or Data sections then it will be processed twice with unpredictable results)
|
|
1405
|
+
oGeoMap.load(obj);
|
|
1403
1406
|
return this;
|
|
1404
1407
|
};
|
|
1405
1408
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides class sap.ui.vbm.Adapter3D
|
|
@@ -42,7 +41,7 @@ sap.ui.define([
|
|
|
42
41
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
43
42
|
* @param {object} [mSettings] initial settings for the new object
|
|
44
43
|
* @author SAP SE
|
|
45
|
-
* @version 1.
|
|
44
|
+
* @version 1.97.0
|
|
46
45
|
* @extends sap.ui.core.Element
|
|
47
46
|
* @constructor
|
|
48
47
|
* @public
|
package/src/sap/ui/vbm/Area.js
CHANGED
package/src/sap/ui/vbm/Areas.js
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.Areas.
|
|
7
6
|
sap.ui.define([
|
|
8
7
|
"./VoAggregation",
|
|
8
|
+
"sap/ui/unified/Menu",
|
|
9
9
|
"sap/base/Log",
|
|
10
10
|
"./library"
|
|
11
|
-
], function(VoAggregation, Log, library) {
|
|
11
|
+
], function(VoAggregation, Menu, Log, library) {
|
|
12
12
|
"use strict";
|
|
13
13
|
|
|
14
14
|
var thisModule = "sap.ui.vbm.Areas";
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
* Constructor for a new Areas.
|
|
18
|
-
*
|
|
18
|
+
*
|
|
19
19
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
20
20
|
* @param {object} [mSettings] initial settings for the new control
|
|
21
21
|
* @class Type specific Visual Object aggregation for <i>Area</i> instances.
|
|
@@ -67,7 +67,7 @@ sap.ui.define([
|
|
|
67
67
|
*/
|
|
68
68
|
instance: {
|
|
69
69
|
type: "sap.ui.vbm.Area"
|
|
70
|
-
},
|
|
70
|
+
},
|
|
71
71
|
/**
|
|
72
72
|
* The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1 to point 2 has number
|
|
73
73
|
* 0
|
|
@@ -282,21 +282,19 @@ sap.ui.define([
|
|
|
282
282
|
if ((Area = this.findInstance(event.Action.instance))) {
|
|
283
283
|
var eventContext = {
|
|
284
284
|
data: event,
|
|
285
|
-
edge: parseInt(event.Action.Params.Param['2']['#'], 10)
|
|
285
|
+
edge: parseInt(event.Action.Params.Param['2']['#'], 10)
|
|
286
286
|
};
|
|
287
|
-
|
|
287
|
+
|
|
288
288
|
if (s == "edgeContextMenu") {
|
|
289
289
|
Area.mClickPos = [
|
|
290
290
|
event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
|
|
291
291
|
];
|
|
292
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
293
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
294
292
|
|
|
295
293
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
296
294
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
297
295
|
}
|
|
298
296
|
// create an empty menu
|
|
299
|
-
var oMenuObject = new
|
|
297
|
+
var oMenuObject = new Menu();
|
|
300
298
|
oMenuObject.vbi_data = {};
|
|
301
299
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
302
300
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
package/src/sap/ui/vbm/Box.js
CHANGED
package/src/sap/ui/vbm/Boxes.js
CHANGED
package/src/sap/ui/vbm/Circle.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.Cluster.
|
|
7
6
|
sap.ui.define([
|
|
8
7
|
"sap/ui/core/Control",
|
|
9
8
|
"jquery.sap.global",
|
|
10
|
-
"./library"
|
|
11
|
-
|
|
9
|
+
"./library",
|
|
10
|
+
"./ClusterRenderer"
|
|
11
|
+
], function(Control, jQuery, library, ClusterRenderer) {
|
|
12
12
|
"use strict";
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* Constructor for a new Cluster.
|
|
16
|
-
*
|
|
16
|
+
*
|
|
17
17
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
18
18
|
* @param {object} [mSettings] initial settings for the new control
|
|
19
19
|
* @class Cluster control to visualize clustered objects on a map. The Cluster control does not cluster anything itself, instead it only shows a
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.ClusterBase.
|
|
@@ -8,10 +7,11 @@ sap.ui.define([
|
|
|
8
7
|
"sap/ui/core/Element",
|
|
9
8
|
"sap/ui/core/theming/Parameters",
|
|
10
9
|
"./ClusterContainer",
|
|
10
|
+
"sap/ui/unified/Menu",
|
|
11
11
|
"jquery.sap.global",
|
|
12
12
|
"sap/base/Log",
|
|
13
13
|
"./library"
|
|
14
|
-
], function(Element, Parameters, ClusterContainer, jQuery, Log, library) {
|
|
14
|
+
], function(Element, Parameters, ClusterContainer, Menu, jQuery, Log, library) {
|
|
15
15
|
"use strict";
|
|
16
16
|
|
|
17
17
|
var thisModule = "sap.ui.vbm.ClusterBase";
|
|
@@ -390,14 +390,12 @@ sap.ui.define([
|
|
|
390
390
|
oVo.mClickPos = [
|
|
391
391
|
event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
|
|
392
392
|
];
|
|
393
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
394
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
395
393
|
|
|
396
394
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
397
395
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
398
396
|
}
|
|
399
397
|
// create an empty menu
|
|
400
|
-
var oMenuObject = new
|
|
398
|
+
var oMenuObject = new Menu();
|
|
401
399
|
oMenuObject.vbi_data = {};
|
|
402
400
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
403
401
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
|
@@ -543,15 +541,13 @@ sap.ui.define([
|
|
|
543
541
|
oCluster.mClickPos = [
|
|
544
542
|
oEvent.clientX - oMapDiv.offsetLeft, oEvent.clientY - oMapDiv.offsetTop
|
|
545
543
|
];
|
|
546
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
547
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
548
544
|
|
|
549
545
|
try {
|
|
550
546
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
551
547
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
552
548
|
}
|
|
553
549
|
// create an empty menu
|
|
554
|
-
var oMenuObject = new
|
|
550
|
+
var oMenuObject = new Menu();
|
|
555
551
|
oMenuObject.vbi_data = {};
|
|
556
552
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
557
553
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
sap.ui.define([
|
|
@@ -37,7 +36,6 @@ sap.ui.define([
|
|
|
37
36
|
|
|
38
37
|
var col = oControl.getColor();
|
|
39
38
|
var type = oControl.getType();
|
|
40
|
-
IconPool.insertFontFaceStyle();
|
|
41
39
|
var iiconVal = oControl.getIcon();
|
|
42
40
|
var icon, icInfo;
|
|
43
41
|
if (iiconVal) {
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.Containers.
|
|
7
6
|
sap.ui.define([
|
|
8
7
|
"./VoAggregation",
|
|
8
|
+
"sap/ui/unified/Menu",
|
|
9
9
|
"./library"
|
|
10
|
-
], function(VoAggregation, library) {
|
|
10
|
+
], function(VoAggregation, Menu, library) {
|
|
11
11
|
"use strict";
|
|
12
12
|
|
|
13
13
|
/**
|
|
@@ -214,15 +214,12 @@ sap.ui.define([
|
|
|
214
214
|
oContainer.mClickPos = [
|
|
215
215
|
oEvent.clientX - oMapDivRect.left, oEvent.clientY - oMapDivRect.top
|
|
216
216
|
];
|
|
217
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
218
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
219
|
-
|
|
220
217
|
try {
|
|
221
218
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
222
219
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
223
220
|
}
|
|
224
221
|
// create an empty menu
|
|
225
|
-
var oMenuObject = new
|
|
222
|
+
var oMenuObject = new Menu();
|
|
226
223
|
oMenuObject.vbi_data = {};
|
|
227
224
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
228
225
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.GeoJsonLayer.
|
|
7
6
|
sap.ui.define([
|
|
8
7
|
"sap/ui/core/Element",
|
|
9
8
|
"sap/ui/core/theming/Parameters",
|
|
9
|
+
"sap/ui/unified/Menu",
|
|
10
10
|
"jquery.sap.global",
|
|
11
11
|
"sap/base/Log",
|
|
12
12
|
"./library"
|
|
13
|
-
], function(Element, Parameters, jQuery, Log, library) {
|
|
13
|
+
], function(Element, Parameters, Menu, jQuery, Log, library) {
|
|
14
14
|
"use strict";
|
|
15
15
|
|
|
16
16
|
var thisModule = "sap.ui.vbm.GeoJsonLayer";
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
19
|
* Constructor for a new GeoJsonLayer.
|
|
20
|
-
*
|
|
20
|
+
*
|
|
21
21
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
22
22
|
* @param {object} [mSettings] initial settings for the new control
|
|
23
23
|
* @class GeoJsonLayer aggregation container. A GeoJsonLayer can render the content of an assigned GeoJSON. The naming is associated to the
|
|
@@ -158,7 +158,7 @@ sap.ui.define([
|
|
|
158
158
|
|
|
159
159
|
/**
|
|
160
160
|
* Add GeoJSON object to the layer
|
|
161
|
-
*
|
|
161
|
+
*
|
|
162
162
|
* @param {object} aData GeoJSON object or an array of those
|
|
163
163
|
* @returns {void}
|
|
164
164
|
* @public
|
|
@@ -726,7 +726,7 @@ sap.ui.define([
|
|
|
726
726
|
}
|
|
727
727
|
// if( this.mEventRegistry[ "drop" ] || this.isEventRegistered( "drop" ) )
|
|
728
728
|
// aActions.push( { "id": id + "3", "name": "drop", "refScene": "MainScene", "refVO": id, "refEvent": "Drop" } );
|
|
729
|
-
//
|
|
729
|
+
//
|
|
730
730
|
// if( this.mEventRegistry[ "edgeClick" ] || this.isEventRegistered( "edgeClick" ) )
|
|
731
731
|
// aActions.push( { "id": id + "7", "name": "edgeClick", "refScene": "MainScene", "refVO": id, "refEvent": "EdgeClick" });
|
|
732
732
|
// if( this.mEventRegistry[ "edgeContextMenu" ] || this.isEventRegistered( "edgeContextMenu" ) )
|
|
@@ -737,7 +737,7 @@ sap.ui.define([
|
|
|
737
737
|
|
|
738
738
|
/**
|
|
739
739
|
* Returns Properties for Features like name, bounding box, and midpoint
|
|
740
|
-
*
|
|
740
|
+
*
|
|
741
741
|
* @param {string[]} aFeatureIds Array of Feature Ids. The Feature Id must match the GeoJSON tag.
|
|
742
742
|
* @returns {array} Array of Feature Information Objects. Each object in the array has the properties BBox: Bounding Box for the Feature in format
|
|
743
743
|
* "lonMin;latMin;lonMax;latMax", Midpoint: Centerpoint for Feature in format "lon;lat", Name: Name of the Feature, and Properties: Array
|
|
@@ -777,14 +777,12 @@ sap.ui.define([
|
|
|
777
777
|
oOverlay.mClickPos = [
|
|
778
778
|
event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
|
|
779
779
|
];
|
|
780
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
781
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
782
780
|
|
|
783
781
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
784
782
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
785
783
|
}
|
|
786
784
|
// create an empty menu
|
|
787
|
-
var oMenuObject = new
|
|
785
|
+
var oMenuObject = new Menu();
|
|
788
786
|
oMenuObject.vbi_data = {};
|
|
789
787
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
790
788
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
|
@@ -812,7 +810,7 @@ sap.ui.define([
|
|
|
812
810
|
|
|
813
811
|
/**
|
|
814
812
|
* open a Detail Window
|
|
815
|
-
*
|
|
813
|
+
*
|
|
816
814
|
* @param {sap.ui.vbm.Feature} oFeature VO instance for which the Detail Window should be opened
|
|
817
815
|
* @param {object} oParams Parameter object
|
|
818
816
|
* @param {string} oParams.caption Text for Detail Window caption
|
|
@@ -835,7 +833,7 @@ sap.ui.define([
|
|
|
835
833
|
|
|
836
834
|
/**
|
|
837
835
|
* open the context menu
|
|
838
|
-
*
|
|
836
|
+
*
|
|
839
837
|
* @param {sap.ui.vbm.Feature} oFeature VO instance for which the Detail Window should be opened
|
|
840
838
|
* @param {object} oMenu the context menu to be opened
|
|
841
839
|
* @returns {void}
|
package/src/sap/ui/vbm/GeoMap.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* ! SAPUI5
|
|
3
|
-
* (c) Copyright 2009-2021 SAP SE. All rights reserved.
|
|
2
|
+
* ! SAP UI development toolkit for HTML5 (SAPUI5) (c) Copyright 2009-2012 SAP AG. All rights reserved
|
|
4
3
|
*/
|
|
5
4
|
|
|
6
5
|
// Provides control sap.ui.vbm.GeoMap.
|
|
@@ -8,8 +7,9 @@ sap.ui.define([
|
|
|
8
7
|
"./VBI",
|
|
9
8
|
"jquery.sap.global",
|
|
10
9
|
"sap/base/Log",
|
|
11
|
-
"./library"
|
|
12
|
-
|
|
10
|
+
"./library",
|
|
11
|
+
"./GeoMapRenderer"
|
|
12
|
+
], function(VBI, jQuery, Log, library, GeoMapRenderer) {
|
|
13
13
|
"use strict";
|
|
14
14
|
|
|
15
15
|
var thisModule = "sap.ui.vbm.GeoMap";
|
package/src/sap/ui/vbm/Legend.js
CHANGED
package/src/sap/ui/vbm/Pie.js
CHANGED