@sapui5/sap.ui.vbm 1.88.0 → 1.90.3
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 +46 -8
- package/src/sap/ui/vbm/Adapter3D.js +2 -2
- package/src/sap/ui/vbm/AnalyticMap.js +16 -18
- 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 +1 -1
- 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 +1 -1
- package/src/sap/ui/vbm/ClusterBase.js +1 -1
- 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 -1
- 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 +1 -1
- 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 +1 -1
- package/src/sap/ui/vbm/GeoMap.js +16 -6
- 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 +1 -1
- package/src/sap/ui/vbm/VBIRenderer.js +1 -1
- package/src/sap/ui/vbm/Viewport.js +4 -4
- 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 +1 -1
- 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 +15 -7
- 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/DecalGeometry.js +217 -225
- package/src/sap/ui/vbm/adapter3d/thirdparty/html2canvas.js +1 -1
- package/src/sap/ui/vbm/i18n/messagebundle_en_US_saprigi.properties +1 -1
- package/src/sap/ui/vbm/lib/sapmapmanager.js +38 -17
- package/src/sap/ui/vbm/lib/sapscene.js +1 -1
- package/src/sap/ui/vbm/lib/saputilities.js +7 -7
- package/src/sap/ui/vbm/lib/sapvbi.js +1 -1
- package/src/sap/ui/vbm/library.js +3 -3
- 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/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.90.3</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,13 +23,12 @@ 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.90.3
|
|
27
27
|
* @extends sap.ui.core.Element
|
|
28
28
|
* @constructor
|
|
29
29
|
* @public
|
|
30
30
|
* @alias sap.ui.vbm.Adapter
|
|
31
31
|
* @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
|
|
32
|
-
* @experimental Since 1.48.0 This class is experimental and might be modified or removed in future versions.
|
|
33
32
|
*/
|
|
34
33
|
var Adapter = Element.extend("sap.ui.vbm.Adapter", /** @lends sap.ui.vbm.Adapter.prototype */ {
|
|
35
34
|
metadata: {
|
|
@@ -103,6 +102,32 @@ sap.ui.define([
|
|
|
103
102
|
"start",
|
|
104
103
|
"tooltip"];
|
|
105
104
|
|
|
105
|
+
this._areaProperties = [
|
|
106
|
+
"key", //K: VoBase
|
|
107
|
+
"color", //C: Area, OBJECT_BASE_DATA->FILL_COLOR
|
|
108
|
+
"colorBorder", //D/CB: Area, OBJECT_BASE_DATA->BORDER_COLOR
|
|
109
|
+
"posarray", //H, PM (multipart) /P: Area, AREA_EXTENSION->BORDER_POINTS
|
|
110
|
+
"selectColor", //SC: OBJECT_BASE_DATA->SELECT_COLOR
|
|
111
|
+
"dragdata", //DD: VoAggregation, OBJECT_BASE_DATA->DRAG_DATA
|
|
112
|
+
"VB:s", //VB:s: elected, OBJECT_BASE_DATA->SELECTED
|
|
113
|
+
"VB:c", //H/VB:c: VoAggregation (changeable) OBJECT_BASE_DATA->CHANGEABLE
|
|
114
|
+
"hotScale", //HS: VoAggregation
|
|
115
|
+
"hotDeltaColor", //HC/HDC: VoAggregation, OBJECT_BASE_DATA->HOT_COLOR
|
|
116
|
+
"borderDash", //BD: Area
|
|
117
|
+
"selectColor", //SC: VoAggregation
|
|
118
|
+
"fxdir", //FD: VoAggregation
|
|
119
|
+
"fxsize", //FS: VoAggregation
|
|
120
|
+
"entity", //ET: VoAggregation
|
|
121
|
+
"labelBgColor", //LC/LBC: VoAggregation
|
|
122
|
+
"labelBorderColor", //LBBC: VoAggregation
|
|
123
|
+
"labelPos", //LP: VoAggregation
|
|
124
|
+
"labelText", //LT: VoAggregation
|
|
125
|
+
"labelArrow", //??VOBase
|
|
126
|
+
"label", //L
|
|
127
|
+
"labelAlignment", //"LA"
|
|
128
|
+
"tooltip" //B/TT: VoAggregation
|
|
129
|
+
];
|
|
130
|
+
|
|
106
131
|
// Allowed Spot properties
|
|
107
132
|
this._spotProperties = [
|
|
108
133
|
"alignment",
|
|
@@ -475,6 +500,7 @@ sap.ui.define([
|
|
|
475
500
|
* "Set": [
|
|
476
501
|
* { "name": "Spots", "type": "N", ....},
|
|
477
502
|
* { "name": "Links", "type": "N", ....},
|
|
503
|
+
* { "name": "Areas", "type": "N", ....},
|
|
478
504
|
* ]
|
|
479
505
|
* }
|
|
480
506
|
*
|
|
@@ -484,6 +510,7 @@ sap.ui.define([
|
|
|
484
510
|
* "N": [
|
|
485
511
|
* { "name": "Spots", ... },
|
|
486
512
|
* { "name": "Links", ... },
|
|
513
|
+
* { "name": "Areas", ... },
|
|
487
514
|
* ]
|
|
488
515
|
* }
|
|
489
516
|
* }
|
|
@@ -788,13 +815,18 @@ sap.ui.define([
|
|
|
788
815
|
processDragAndDrop();
|
|
789
816
|
break;
|
|
790
817
|
case "{00100000-2012-0004-B001-F311DE491C77}": // Area
|
|
818
|
+
processProperties(this._areaProperties, this._propsAnomalies);
|
|
819
|
+
voTemplate = new sap.ui.vbm.Area(settings);
|
|
820
|
+
voAggregation = new sap.ui.vbm.Areas(this._ui5Id(definition.id));
|
|
821
|
+
processDragAndDrop();
|
|
822
|
+
break;
|
|
823
|
+
case "{00100000-2014-0004-BDA8-87B904609063}": // "ExtArea" GUID??? from sapvobase
|
|
824
|
+
case "{00100000-2014-0004-B001-9F1B43BE944A}": // "ExtLink" GUID??? from sapvobase
|
|
791
825
|
case "{00100000-2013-0004-B001-7EB3CCC039C4}": // Circle
|
|
792
826
|
case "{00100000-2013-0004-B001-686F01B57873}": // Geo Circle
|
|
793
827
|
case "{00100000-2012-0004-B001-BFED458C3076}": // Box
|
|
794
828
|
case "{00100000-2012-0004-B001-383477EA1DEB}": // Pie Chart
|
|
795
829
|
case "{388951f5-a66b-4423-a5ad-e0ee13c2246f}": // Decal
|
|
796
|
-
case "ExtLink": // GUID???
|
|
797
|
-
case "ExtArea": // GUID???
|
|
798
830
|
default:
|
|
799
831
|
Log.debug("unsupported VO type", definition.type, thisModule);
|
|
800
832
|
return;
|
|
@@ -918,6 +950,9 @@ sap.ui.define([
|
|
|
918
950
|
case "Drop":
|
|
919
951
|
this._event = "drop";
|
|
920
952
|
break;
|
|
953
|
+
case "CreateComplete":
|
|
954
|
+
this._event = "createComplete";
|
|
955
|
+
break;
|
|
921
956
|
case "Select":
|
|
922
957
|
this._event = "select";
|
|
923
958
|
break;
|
|
@@ -1470,12 +1505,15 @@ sap.ui.define([
|
|
|
1470
1505
|
}
|
|
1471
1506
|
if (oEventData.Action && oEventData.Action.object) {
|
|
1472
1507
|
// Whatever back-end refers to as Links, they are referred to as Routes by Geomap
|
|
1473
|
-
|
|
1474
|
-
|
|
1508
|
+
var routeName = "Route", linkName = "Link";
|
|
1509
|
+
var actionObjects = [oEventData.Action.object];
|
|
1510
|
+
if (oEventData.Action.object === routeName) {
|
|
1511
|
+
actionObjects.push(linkName);
|
|
1512
|
+
oEventData.Action.object = linkName;
|
|
1475
1513
|
}
|
|
1476
1514
|
|
|
1477
1515
|
var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
|
|
1478
|
-
return
|
|
1516
|
+
return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
|
|
1479
1517
|
});
|
|
1480
1518
|
|
|
1481
1519
|
if (oAction) {
|
|
@@ -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.90.3
|
|
46
46
|
* @extends sap.ui.core.Element
|
|
47
47
|
* @constructor
|
|
48
48
|
* @public
|
|
@@ -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.AnalyticMap.
|
|
@@ -232,17 +232,18 @@ sap.ui.define([
|
|
|
232
232
|
var colC = this.mColC = AnalyticMap.DefaultRegionColor;
|
|
233
233
|
var colCB = this.mColCB = AnalyticMap.DefaultRegionColorBorder;
|
|
234
234
|
|
|
235
|
-
//
|
|
236
|
-
function
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
235
|
+
// helper function. returns {} as jQuery.extend can deep copy 'plain' objects only.
|
|
236
|
+
function _createRegion(id, array, type, color, colorBorder, tooltip, entity) {
|
|
237
|
+
var region = {};
|
|
238
|
+
region.K = id;
|
|
239
|
+
region.P = [];
|
|
240
|
+
region.T = tooltip;
|
|
241
|
+
region.C = color;
|
|
242
|
+
region.CB = colorBorder;
|
|
243
|
+
region.HDC = AnalyticMap.DefaultHotDeltaColor;
|
|
244
|
+
region.ACB = region.CB; // no alternative border color per default
|
|
245
|
+
region.G = entity;
|
|
246
|
+
region.S = "false"; // per default nothing selected
|
|
246
247
|
|
|
247
248
|
var str, area, areaParts;
|
|
248
249
|
for (var nI = 0, alen = array.length; nI < alen; ++nI) {
|
|
@@ -258,14 +259,11 @@ sap.ui.define([
|
|
|
258
259
|
}
|
|
259
260
|
areaParts.push(str);
|
|
260
261
|
}
|
|
261
|
-
|
|
262
|
+
region.P.push(areaParts);
|
|
262
263
|
}
|
|
264
|
+
return region;
|
|
263
265
|
}
|
|
264
266
|
|
|
265
|
-
// the constructor needs to be removed, when it is not removed the jquery.//
|
|
266
|
-
// cloning will not work..................................................//
|
|
267
|
-
delete Region.prototype.constructor;
|
|
268
|
-
|
|
269
267
|
// ........................................................................//
|
|
270
268
|
// load the geojson trying different location.............................//
|
|
271
269
|
// first the explicit path, second abap third the default.................//
|
|
@@ -420,7 +418,7 @@ sap.ui.define([
|
|
|
420
418
|
// ignore all other feature types!
|
|
421
419
|
continue;
|
|
422
420
|
}
|
|
423
|
-
E.push(
|
|
421
|
+
E.push(_createRegion(f.id2, mpa, f.geometry.type, colC, colCB, tt, f.id2));
|
|
424
422
|
|
|
425
423
|
// get surrounding box for all parts -> this needs to consider round world for optimized bounding box size!
|
|
426
424
|
this.mRegionBox[f.id2] = window.VBI.MathLib.GetSurroundingBox(xa);
|
package/src/sap/ui/vbm/Area.js
CHANGED
package/src/sap/ui/vbm/Areas.js
CHANGED
package/src/sap/ui/vbm/Box.js
CHANGED
package/src/sap/ui/vbm/Boxes.js
CHANGED
package/src/sap/ui/vbm/Circle.js
CHANGED
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.
|
|
@@ -1058,7 +1058,8 @@ sap.ui.define([
|
|
|
1058
1058
|
case "click":
|
|
1059
1059
|
// fire the click..................................................//
|
|
1060
1060
|
this.fireClick({
|
|
1061
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1061
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1062
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1062
1063
|
});
|
|
1063
1064
|
break;
|
|
1064
1065
|
case "contextMenu":
|
|
@@ -1073,7 +1074,8 @@ sap.ui.define([
|
|
|
1073
1074
|
case "drop":
|
|
1074
1075
|
// fire the drop..................................................//
|
|
1075
1076
|
this.fireDrop({
|
|
1076
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1077
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1078
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1077
1079
|
});
|
|
1078
1080
|
break;
|
|
1079
1081
|
case "zoomChanged":
|
|
@@ -1084,7 +1086,8 @@ sap.ui.define([
|
|
|
1084
1086
|
viewportBB: {
|
|
1085
1087
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1086
1088
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1087
|
-
}
|
|
1089
|
+
},
|
|
1090
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1088
1091
|
});
|
|
1089
1092
|
break;
|
|
1090
1093
|
case "centerChanged":
|
|
@@ -1095,7 +1098,8 @@ sap.ui.define([
|
|
|
1095
1098
|
viewportBB: {
|
|
1096
1099
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1097
1100
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1098
|
-
}
|
|
1101
|
+
},
|
|
1102
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1099
1103
|
});
|
|
1100
1104
|
break;
|
|
1101
1105
|
case "select":
|
|
@@ -1121,6 +1125,12 @@ sap.ui.define([
|
|
|
1121
1125
|
this.mIACreateCB = null;
|
|
1122
1126
|
throw exc;
|
|
1123
1127
|
}
|
|
1128
|
+
} else {
|
|
1129
|
+
// If interactive editing was triggered indirectly (e.g. via vbiJSON load) then fire event
|
|
1130
|
+
datEvent.Action.name = "CreateComplete";
|
|
1131
|
+
//include VBI data to the UI5 event payload
|
|
1132
|
+
this.fireEvent("createComplete", {data: datEvent}, true);
|
|
1133
|
+
e.preventDefault();
|
|
1124
1134
|
}
|
|
1125
1135
|
break;
|
|
1126
1136
|
case "keydown":
|
|
@@ -2226,4 +2236,4 @@ sap.ui.define([
|
|
|
2226
2236
|
|
|
2227
2237
|
return GeoMap;
|
|
2228
2238
|
|
|
2229
|
-
}, /* bExport= */true);
|
|
2239
|
+
}, /* bExport= */true);
|
package/src/sap/ui/vbm/Legend.js
CHANGED
package/src/sap/ui/vbm/Pie.js
CHANGED
package/src/sap/ui/vbm/Pies.js
CHANGED
package/src/sap/ui/vbm/Region.js
CHANGED
package/src/sap/ui/vbm/Route.js
CHANGED
package/src/sap/ui/vbm/Routes.js
CHANGED
package/src/sap/ui/vbm/Spot.js
CHANGED
package/src/sap/ui/vbm/Spots.js
CHANGED
package/src/sap/ui/vbm/VBI.js
CHANGED