@sapui5/sap.ui.vbm 1.84.6 → 1.84.9
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 +5 -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 +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 +3 -3
- 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 +8 -3
- 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 +26 -15
- package/src/sap/ui/vbm/adapter3d/ObjectFactory.js +2 -2
- package/src/sap/ui/vbm/adapter3d/PolygonHandler.js +32 -26
- package/src/sap/ui/vbm/adapter3d/SceneBuilder.js +30 -17
- 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/lib/sapscene.js +18 -12
- 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/lib/sapvobase.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_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.84.
|
|
6
|
+
<version>1.84.9</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
|
|
@@ -21,13 +21,12 @@ sap.ui.define([
|
|
|
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 object
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @version 1.84.
|
|
24
|
+
* @version 1.84.9
|
|
25
25
|
* @extends sap.ui.core.Element
|
|
26
26
|
* @constructor
|
|
27
27
|
* @public
|
|
28
28
|
* @alias sap.ui.vbm.Adapter
|
|
29
29
|
* @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
|
|
30
|
-
* @experimental Since 1.48.0 This class is experimental and might be modified or removed in future versions.
|
|
31
30
|
*/
|
|
32
31
|
var Adapter = Element.extend("sap.ui.vbm.Adapter", /** @lends sap.ui.vbm.Adapter.prototype */ {
|
|
33
32
|
metadata: {
|
|
@@ -101,6 +100,32 @@ sap.ui.define([
|
|
|
101
100
|
"start",
|
|
102
101
|
"tooltip"];
|
|
103
102
|
|
|
103
|
+
this._areaProperties = [
|
|
104
|
+
"key", //K: VoBase
|
|
105
|
+
"color", //C: Area, OBJECT_BASE_DATA->FILL_COLOR
|
|
106
|
+
"colorBorder", //D/CB: Area, OBJECT_BASE_DATA->BORDER_COLOR
|
|
107
|
+
"posarray", //H, PM (multipart) /P: Area, AREA_EXTENSION->BORDER_POINTS
|
|
108
|
+
"selectColor", //SC: OBJECT_BASE_DATA->SELECT_COLOR
|
|
109
|
+
"dragdata", //DD: VoAggregation, OBJECT_BASE_DATA->DRAG_DATA
|
|
110
|
+
"VB:s", //VB:s: elected, OBJECT_BASE_DATA->SELECTED
|
|
111
|
+
"VB:c", //H/VB:c: VoAggregation (changeable) OBJECT_BASE_DATA->CHANGEABLE
|
|
112
|
+
"hotScale", //HS: VoAggregation
|
|
113
|
+
"hotDeltaColor", //HC/HDC: VoAggregation, OBJECT_BASE_DATA->HOT_COLOR
|
|
114
|
+
"borderDash", //BD: Area
|
|
115
|
+
"selectColor", //SC: VoAggregation
|
|
116
|
+
"fxdir", //FD: VoAggregation
|
|
117
|
+
"fxsize", //FS: VoAggregation
|
|
118
|
+
"entity", //ET: VoAggregation
|
|
119
|
+
"labelBgColor", //LC/LBC: VoAggregation
|
|
120
|
+
"labelBorderColor", //LBBC: VoAggregation
|
|
121
|
+
"labelPos", //LP: VoAggregation
|
|
122
|
+
"labelText", //LT: VoAggregation
|
|
123
|
+
"labelArrow", //??VOBase
|
|
124
|
+
"label", //L
|
|
125
|
+
"labelAlignment", //"LA"
|
|
126
|
+
"tooltip" //B/TT: VoAggregation
|
|
127
|
+
];
|
|
128
|
+
|
|
104
129
|
// Allowed Spot properties
|
|
105
130
|
this._spotProperties = [
|
|
106
131
|
"alignment",
|
|
@@ -473,6 +498,7 @@ sap.ui.define([
|
|
|
473
498
|
* "Set": [
|
|
474
499
|
* { "name": "Spots", "type": "N", ....},
|
|
475
500
|
* { "name": "Links", "type": "N", ....},
|
|
501
|
+
* { "name": "Areas", "type": "N", ....},
|
|
476
502
|
* ]
|
|
477
503
|
* }
|
|
478
504
|
*
|
|
@@ -482,6 +508,7 @@ sap.ui.define([
|
|
|
482
508
|
* "N": [
|
|
483
509
|
* { "name": "Spots", ... },
|
|
484
510
|
* { "name": "Links", ... },
|
|
511
|
+
* { "name": "Areas", ... },
|
|
485
512
|
* ]
|
|
486
513
|
* }
|
|
487
514
|
* }
|
|
@@ -780,13 +807,18 @@ sap.ui.define([
|
|
|
780
807
|
processDragAndDrop();
|
|
781
808
|
break;
|
|
782
809
|
case "{00100000-2012-0004-B001-F311DE491C77}": // Area
|
|
810
|
+
processProperties(this._areaProperties, this._propsAnomalies);
|
|
811
|
+
voTemplate = new sap.ui.vbm.Area(settings);
|
|
812
|
+
voAggregation = new sap.ui.vbm.Areas(this._ui5Id(definition.id));
|
|
813
|
+
processDragAndDrop();
|
|
814
|
+
break;
|
|
815
|
+
case "{00100000-2014-0004-BDA8-87B904609063}": // "ExtArea" GUID??? from sapvobase
|
|
816
|
+
case "{00100000-2014-0004-B001-9F1B43BE944A}": // "ExtLink" GUID??? from sapvobase
|
|
783
817
|
case "{00100000-2013-0004-B001-7EB3CCC039C4}": // Circle
|
|
784
818
|
case "{00100000-2013-0004-B001-686F01B57873}": // Geo Circle
|
|
785
819
|
case "{00100000-2012-0004-B001-BFED458C3076}": // Box
|
|
786
820
|
case "{00100000-2012-0004-B001-383477EA1DEB}": // Pie Chart
|
|
787
821
|
case "{388951f5-a66b-4423-a5ad-e0ee13c2246f}": // Decal
|
|
788
|
-
case "ExtLink": // GUID???
|
|
789
|
-
case "ExtArea": // GUID???
|
|
790
822
|
default:
|
|
791
823
|
log.debug("unsupported VO type: " + definition.type);
|
|
792
824
|
return;
|
|
@@ -910,6 +942,9 @@ sap.ui.define([
|
|
|
910
942
|
case "Drop":
|
|
911
943
|
this._event = "drop";
|
|
912
944
|
break;
|
|
945
|
+
case "CreateComplete":
|
|
946
|
+
this._event = "createComplete";
|
|
947
|
+
break;
|
|
913
948
|
case "Select":
|
|
914
949
|
this._event = "select";
|
|
915
950
|
break;
|
|
@@ -1466,12 +1501,15 @@ sap.ui.define([
|
|
|
1466
1501
|
}
|
|
1467
1502
|
if (oEventData.Action && oEventData.Action.object) {
|
|
1468
1503
|
// Whatever back-end refers to as Links, they are referred to as Routes by Geomap
|
|
1469
|
-
|
|
1470
|
-
|
|
1504
|
+
var routeName = "Route", linkName = "Link";
|
|
1505
|
+
var actionObjects = [oEventData.Action.object];
|
|
1506
|
+
if (oEventData.Action.object === routeName) {
|
|
1507
|
+
actionObjects.push(linkName);
|
|
1508
|
+
oEventData.Action.object = linkName;
|
|
1471
1509
|
}
|
|
1472
1510
|
|
|
1473
1511
|
var oAction = sap.ui.vbm.findInArray(this._actions, function(action) {
|
|
1474
|
-
return
|
|
1512
|
+
return (actionObjects.indexOf(action.refVO) != -1) && oEventData.Action.name.toLowerCase() === action.refEvent.toLowerCase();
|
|
1475
1513
|
});
|
|
1476
1514
|
|
|
1477
1515
|
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.84.
|
|
45
|
+
* @version 1.84.9
|
|
46
46
|
* @extends sap.ui.core.Element
|
|
47
47
|
* @constructor
|
|
48
48
|
* @public
|
|
@@ -247,7 +247,10 @@ sap.ui.define([
|
|
|
247
247
|
this._parser = null;
|
|
248
248
|
}
|
|
249
249
|
|
|
250
|
+
this._detail = null;
|
|
250
251
|
this._context = null;
|
|
252
|
+
this._raycaster = null;
|
|
253
|
+
this._hoverInstance = null;
|
|
251
254
|
|
|
252
255
|
if (basePrototype.exit) {
|
|
253
256
|
basePrototype.exit.call(this);
|
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
|
@@ -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.
|
|
@@ -119,7 +119,7 @@ sap.ui.define([
|
|
|
119
119
|
clusterVos: {
|
|
120
120
|
type: "sap.ui.core.Control",
|
|
121
121
|
multiple: true,
|
|
122
|
-
|
|
122
|
+
visibility: "hidden",
|
|
123
123
|
singularName: "clusterVo"
|
|
124
124
|
},
|
|
125
125
|
/**
|
|
@@ -128,7 +128,7 @@ sap.ui.define([
|
|
|
128
128
|
clusterContainers: {
|
|
129
129
|
type: "sap.ui.vbm.ClusterContainer",
|
|
130
130
|
multiple: true,
|
|
131
|
-
|
|
131
|
+
visibility: "hidden",
|
|
132
132
|
singularName: "clusterContainer"
|
|
133
133
|
}
|
|
134
134
|
|
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.
|
|
@@ -1054,7 +1054,8 @@ sap.ui.define([
|
|
|
1054
1054
|
case "click":
|
|
1055
1055
|
// fire the click..................................................//
|
|
1056
1056
|
this.fireClick({
|
|
1057
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1057
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1058
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1058
1059
|
});
|
|
1059
1060
|
break;
|
|
1060
1061
|
case "contextMenu":
|
|
@@ -1069,7 +1070,8 @@ sap.ui.define([
|
|
|
1069
1070
|
case "drop":
|
|
1070
1071
|
// fire the drop..................................................//
|
|
1071
1072
|
this.fireDrop({
|
|
1072
|
-
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#']
|
|
1073
|
+
pos: datEvent.Action.AddActionProperties.AddActionProperty[0]['#'],
|
|
1074
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1073
1075
|
});
|
|
1074
1076
|
break;
|
|
1075
1077
|
case "zoomChanged":
|
|
@@ -1080,7 +1082,8 @@ sap.ui.define([
|
|
|
1080
1082
|
viewportBB: {
|
|
1081
1083
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1082
1084
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1083
|
-
}
|
|
1085
|
+
},
|
|
1086
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1084
1087
|
});
|
|
1085
1088
|
break;
|
|
1086
1089
|
case "centerChanged":
|
|
@@ -1091,7 +1094,8 @@ sap.ui.define([
|
|
|
1091
1094
|
viewportBB: {
|
|
1092
1095
|
upperLeft: datEvent.Action.Params.Param[3]['#'],
|
|
1093
1096
|
lowerRight: datEvent.Action.Params.Param[4]['#']
|
|
1094
|
-
}
|
|
1097
|
+
},
|
|
1098
|
+
data: datEvent //include VBI data to the UI5 event payload
|
|
1095
1099
|
});
|
|
1096
1100
|
break;
|
|
1097
1101
|
case "select":
|
|
@@ -1117,6 +1121,12 @@ sap.ui.define([
|
|
|
1117
1121
|
this.mIACreateCB = null;
|
|
1118
1122
|
throw exc;
|
|
1119
1123
|
}
|
|
1124
|
+
} else {
|
|
1125
|
+
// If interactive editing was triggered indirectly (e.g. via vbiJSON load) then fire event
|
|
1126
|
+
datEvent.Action.name = "CreateComplete";
|
|
1127
|
+
//include VBI data to the UI5 event payload
|
|
1128
|
+
this.fireEvent("createComplete", {data: datEvent}, true);
|
|
1129
|
+
e.preventDefault();
|
|
1120
1130
|
}
|
|
1121
1131
|
break;
|
|
1122
1132
|
case "keydown":
|
|
@@ -2222,4 +2232,4 @@ sap.ui.define([
|
|
|
2222
2232
|
|
|
2223
2233
|
return GeoMap;
|
|
2224
2234
|
|
|
2225
|
-
}, /* bExport= */true);
|
|
2235
|
+
}, /* 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
|
@@ -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([
|
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
*
|
|
26
26
|
* @public
|
|
27
27
|
* @author SAP SE
|
|
28
|
-
* @version 1.84.
|
|
28
|
+
* @version 1.84.9
|
|
29
29
|
* @extends sap.ui.core.Control
|
|
30
30
|
* @alias sap.ui.vbm.Viewport
|
|
31
31
|
*/
|
|
@@ -190,9 +190,14 @@ sap.ui.define([
|
|
|
190
190
|
}
|
|
191
191
|
this._stopRenderLoop();
|
|
192
192
|
|
|
193
|
+
this._cameraController.dispose();
|
|
194
|
+
this._cameraController = null;
|
|
195
|
+
|
|
196
|
+
this._renderer.dispose();
|
|
197
|
+
this._renderer = null;
|
|
198
|
+
|
|
193
199
|
this._scene = null;
|
|
194
200
|
this._camera = null;
|
|
195
|
-
this._renderer = null;
|
|
196
201
|
|
|
197
202
|
if (basePrototype.exit) {
|
|
198
203
|
basePrototype.exit.call(this);
|