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