@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/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
|
/* global VBI */// declare unusual global vars for ESLint/SAPUI5 validation
|
|
@@ -10,13 +10,45 @@ sap.ui.define([
|
|
|
10
10
|
"sap/ui/core/RenderManager",
|
|
11
11
|
"jquery.sap.global",
|
|
12
12
|
"sap/base/Log",
|
|
13
|
+
"./library",
|
|
14
|
+
"./VBIRenderer",
|
|
13
15
|
"./lib/sapvbi",
|
|
14
|
-
"./
|
|
15
|
-
|
|
16
|
+
"./lib/saputilities", // utility functions
|
|
17
|
+
"./lib/sapvbicontext", // control context
|
|
18
|
+
"./lib/sapdataprovider", // data provider
|
|
19
|
+
"./lib/sapresources", // resources
|
|
20
|
+
"./lib/sapgeomath", // geo math functions
|
|
21
|
+
"./lib/sapmaplayer",
|
|
22
|
+
"./lib/sapmapprovider",
|
|
23
|
+
"./lib/sapmapmanager", // map support
|
|
24
|
+
"./lib/sapvoutils",
|
|
25
|
+
"./lib/sapvobase", // visual objects base and vo implementation
|
|
26
|
+
"./lib/sapevents", // event subscription
|
|
27
|
+
"./lib/saplabels", // labels
|
|
28
|
+
"./lib/sappositioning", // GetPosFrom/// and co
|
|
29
|
+
"./lib/sapscene", // scene handling, scenes
|
|
30
|
+
"./lib/sapwindow", // window handling, detail and so on
|
|
31
|
+
"./lib/sapactions", // actions handling, framework event subscription
|
|
32
|
+
"./lib/sapautomations",
|
|
33
|
+
"./lib/sapgeolocation",
|
|
34
|
+
"./lib/sapgeotool", // geo tools for VBI namespace
|
|
35
|
+
"./lib/sapscale",
|
|
36
|
+
"./lib/sapnavigation",
|
|
37
|
+
"./lib/sapvbmenu", // context menu
|
|
38
|
+
"./lib/sapprojection", // map projection (mercator, linear)
|
|
39
|
+
"./lib/sapvbcluster", // VO clustering
|
|
40
|
+
"./lib/sapparsing", // expression evaluation
|
|
41
|
+
"./lib/sapconfig",
|
|
42
|
+
"./lib/saplassotrack",
|
|
43
|
+
"./lib/saprecttrack",
|
|
44
|
+
"./lib/sapheatmap"
|
|
45
|
+
], function(Control, RenderManager, jQuery, Log, library, VBIRenderer) {
|
|
16
46
|
"use strict";
|
|
17
47
|
|
|
18
48
|
var thisModule = "sap.ui.vbm.VBI";
|
|
19
49
|
|
|
50
|
+
VBI.Utilities.GetTransparentImage();
|
|
51
|
+
|
|
20
52
|
/**
|
|
21
53
|
* Constructor for a new VBI.
|
|
22
54
|
*
|
|
@@ -872,13 +904,13 @@ sap.ui.define([
|
|
|
872
904
|
|
|
873
905
|
/**
|
|
874
906
|
* Retrieve information on a specific cluster object.
|
|
875
|
-
*
|
|
876
|
-
* Type :
|
|
907
|
+
*
|
|
908
|
+
* Type :
|
|
877
909
|
* <ul>
|
|
878
|
-
* <li>0 : contained VOs</li>
|
|
879
|
-
* <li>1 : child clusters (tree clustering only)</li>
|
|
880
|
-
* <li>2 : parent Node (tree clustering only)</li>
|
|
881
|
-
* <li>10 : Information on Node</li>
|
|
910
|
+
* <li>0 : contained VOs</li>
|
|
911
|
+
* <li>1 : child clusters (tree clustering only)</li>
|
|
912
|
+
* <li>2 : parent Node (tree clustering only)</li>
|
|
913
|
+
* <li>10 : Information on Node</li>
|
|
882
914
|
* <li>11 : Edges of the Voronoi Area (tree clustering only, not merged with rectangle)</li>
|
|
883
915
|
* </ul>
|
|
884
916
|
*
|
|
@@ -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([
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
*
|
|
25
25
|
* @public
|
|
26
26
|
* @author SAP SE
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.96.2
|
|
28
28
|
* @extends sap.ui.core.Control
|
|
29
29
|
* @alias sap.ui.vbm.Viewport
|
|
30
30
|
*/
|
|
@@ -177,6 +177,7 @@ sap.ui.define([
|
|
|
177
177
|
this._bbox = new THREE.Box3(); // scene bounding box
|
|
178
178
|
|
|
179
179
|
this._cameraController = new OrbitControls(this._camera, this._renderer.domElement);
|
|
180
|
+
this._cameraController.listenToKeyEvents(this._renderer.domElement);
|
|
180
181
|
this._cameraController.addEventListener("end", this._cameraEnd.bind(this));
|
|
181
182
|
this._cameraController.addEventListener("change", this._cameraUpdate.bind(this));
|
|
182
183
|
this._cameraController.update();
|
|
@@ -489,7 +490,7 @@ sap.ui.define([
|
|
|
489
490
|
box.union(_box);
|
|
490
491
|
}
|
|
491
492
|
}
|
|
492
|
-
|
|
493
|
+
|
|
493
494
|
var children = object.children;
|
|
494
495
|
for (i = 0; i < children.length; ++i) {
|
|
495
496
|
calcBBox(children[i], box);
|
|
@@ -506,7 +507,7 @@ sap.ui.define([
|
|
|
506
507
|
}
|
|
507
508
|
return this._bbox;
|
|
508
509
|
};
|
|
509
|
-
|
|
510
|
+
|
|
510
511
|
// debug: visualize scene bounding box & sphere
|
|
511
512
|
// var sceneBox, sceneSphere;
|
|
512
513
|
|
|
@@ -569,13 +570,13 @@ sap.ui.define([
|
|
|
569
570
|
// private, update OrbitControls -> adjust target point so it's always on the ground (XZ) plane to ensure zoom is always works in a same way
|
|
570
571
|
Viewport.prototype._updateController = function() {
|
|
571
572
|
var dir = this._cameraController.target.clone().sub(this._camera.position).normalize();
|
|
572
|
-
var normal = new THREE.Vector3(0, this._camera.position.y > 0 ? 1 : -1, 0);
|
|
573
|
+
var normal = new THREE.Vector3(0, this._camera.position.y > 0 ? 1 : -1, 0);
|
|
573
574
|
var plane = new THREE.Plane(normal), target = new THREE.Vector3();
|
|
574
575
|
var ray = new THREE.Ray(this._camera.position, dir);
|
|
575
576
|
// adjust only if intersection exists
|
|
576
577
|
if (ray.intersectPlane(plane, target)) {
|
|
577
578
|
// when camera is almost on XZ plane, intersection point could be very far or very close
|
|
578
|
-
// setting it straight as camera target makes navigation unusable, as either
|
|
579
|
+
// setting it straight as camera target makes navigation unusable, as either
|
|
579
580
|
// small mouse movements results in huge move of camera in space (when intersection is far away)
|
|
580
581
|
// or huge mouse movements result in bearly visible camera move in space (when intersection point is too close)
|
|
581
582
|
// so don't update camera target in those extreme cases
|
|
@@ -1,15 +1,16 @@
|
|
|
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.VoAggregation.
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"./VoAbstract",
|
|
9
|
+
"sap/ui/unified/Menu",
|
|
9
10
|
"jquery.sap.global",
|
|
10
11
|
"sap/base/Log",
|
|
11
12
|
"./library"
|
|
12
|
-
], function(VoAbstract, jQuery, Log, library) {
|
|
13
|
+
], function(VoAbstract, Menu, jQuery, Log, library) {
|
|
13
14
|
"use strict";
|
|
14
15
|
|
|
15
16
|
/**
|
|
@@ -808,14 +809,11 @@ sap.ui.define([
|
|
|
808
809
|
event.Action.Params.Param[0]['#'], event.Action.Params.Param[1]['#']
|
|
809
810
|
];
|
|
810
811
|
|
|
811
|
-
// lazy load sap.ui.unified library for using the Menu
|
|
812
|
-
sap.ui.getCore().loadLibrary("sap.ui.unified");
|
|
813
|
-
|
|
814
812
|
if (this.oParent.mVBIContext.m_Menus) {
|
|
815
813
|
this.oParent.mVBIContext.m_Menus.deleteMenu("DynContextMenu");
|
|
816
814
|
}
|
|
817
815
|
// create an empty menu
|
|
818
|
-
var oMenuObject = new
|
|
816
|
+
var oMenuObject = new Menu();
|
|
819
817
|
oMenuObject.vbi_data = {};
|
|
820
818
|
oMenuObject.vbi_data.menuRef = "CTM";
|
|
821
819
|
oMenuObject.vbi_data.VBIName = "DynContextMenu";
|
package/src/sap/ui/vbm/VoBase.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 class sap.ui.vbm.adapter3d.ModelHandler
|
|
@@ -30,7 +30,7 @@ sap.ui.define([
|
|
|
30
30
|
*
|
|
31
31
|
* @private
|
|
32
32
|
* @author SAP SE
|
|
33
|
-
* @version 1.
|
|
33
|
+
* @version 1.96.2
|
|
34
34
|
* @alias sap.ui.vbm.adapter3d.ModelHandler
|
|
35
35
|
*/
|
|
36
36
|
var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
|
|
@@ -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 the base visual object.
|
|
@@ -378,7 +378,7 @@ sap.ui.define([
|
|
|
378
378
|
*
|
|
379
379
|
* @private
|
|
380
380
|
* @author SAP SE
|
|
381
|
-
* @version 1.
|
|
381
|
+
* @version 1.96.2
|
|
382
382
|
* @alias sap.ui.vbm.adapter3d.ObjectFactory
|
|
383
383
|
*/
|
|
384
384
|
var ObjectFactory = BaseObject.extend("sap.ui.vbm.adapter3d.ObjectFactory", /** @lends sap.ui.vbm.adapter3d.ObjectFactory.prototype */ {});
|
|
@@ -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.PolygonHandler
|
|
@@ -33,7 +33,7 @@ sap.ui.define([
|
|
|
33
33
|
*
|
|
34
34
|
* @private
|
|
35
35
|
* @author SAP SE
|
|
36
|
-
* @version 1.
|
|
36
|
+
* @version 1.96.2
|
|
37
37
|
* @alias sap.ui.vbm.adapter3d.PolygonHandler
|
|
38
38
|
*/
|
|
39
39
|
var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {
|