@sapui5/sap.ui.vbm 1.135.0 → 1.136.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 +6 -6
- package/src/sap/ui/vbm/Adapter3D.js +1 -1
- package/src/sap/ui/vbm/AnalyticMap.js +21 -10
- package/src/sap/ui/vbm/ClusterBase.js +4 -1
- package/src/sap/ui/vbm/GeoJsonLayer.js +6 -2
- package/src/sap/ui/vbm/Spot.js +3 -1
- package/src/sap/ui/vbm/Viewport.js +1 -1
- package/src/sap/ui/vbm/VoBase.js +10 -4
- package/src/sap/ui/vbm/adapter3d/ColladaBounds.js +1 -1
- package/src/sap/ui/vbm/adapter3d/DragDropHandler.js +1 -1
- package/src/sap/ui/vbm/adapter3d/ModelHandler.js +1 -1
- package/src/sap/ui/vbm/adapter3d/ObjectFactory.js +1 -1
- package/src/sap/ui/vbm/adapter3d/PolygonHandler.js +1 -1
- package/src/sap/ui/vbm/adapter3d/RectangleTracker.js +1 -1
- package/src/sap/ui/vbm/adapter3d/SceneBuilder.js +1 -1
- package/src/sap/ui/vbm/adapter3d/VBIJSONParser.js +1 -1
- package/src/sap/ui/vbm/library.js +2 -2
- package/src/sap/ui/vbm/vector/MapRenderer.js +1 -1
- package/src/sap/ui/vbm/vector/PayloadGenerator.js +1 -1
- package/src/sap/ui/vbm/vector/RectangularSelection.js +1 -1
- package/src/sap/ui/vbm/vector/VBITransformer.js +75 -70
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.136.0</version>
|
|
7
7
|
|
|
8
8
|
<documentation>SAP UI library: sap.ui.vbm</documentation>
|
|
9
9
|
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
25
25
|
* @param {object} [mSettings] initial settings for the new object
|
|
26
26
|
* @author SAP SE
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.136.0
|
|
28
28
|
* @extends sap.ui.core.Element
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -274,16 +274,16 @@ sap.ui.define([
|
|
|
274
274
|
for (const MapProvider in MapProviders) {
|
|
275
275
|
if (MapProviders.hasOwnProperty(MapProvider)) {
|
|
276
276
|
let Provider = MapProviders[MapProvider];
|
|
277
|
-
if (Provider.name == currRefMap && Provider.type == "
|
|
277
|
+
if (Provider.name == currRefMap && Provider.type == "V") {
|
|
278
278
|
return true;
|
|
279
|
-
} else if (Provider.name == currRefMap && (Provider.type == "
|
|
279
|
+
} else if (Provider.name == currRefMap && (Provider.type == "")) {
|
|
280
280
|
return false;
|
|
281
281
|
}
|
|
282
282
|
}
|
|
283
283
|
}
|
|
284
|
-
} else if (MapProviders.name == currRefMap && MapProviders.type == "
|
|
284
|
+
} else if (MapProviders.name == currRefMap && MapProviders.type == "V") {
|
|
285
285
|
return true;
|
|
286
|
-
} else if (MapProviders.name == currRefMap && (MapProviders.type == "
|
|
286
|
+
} else if (MapProviders.name == currRefMap && (MapProviders.type == "")) {
|
|
287
287
|
return false;
|
|
288
288
|
}
|
|
289
289
|
}
|
|
@@ -291,7 +291,7 @@ sap.ui.define([
|
|
|
291
291
|
var mapLayerStack = obj?.SAPVB?.Scenes?.Merge?.SceneGeo?.refMapLayerStack
|
|
292
292
|
if (mapLayerStack) {
|
|
293
293
|
const provider = this._mapConfiguration.MapProvider.find(provider => provider.name === mapLayerStack);
|
|
294
|
-
return provider.type === "
|
|
294
|
+
return provider.type === "V" ? true : false;
|
|
295
295
|
}
|
|
296
296
|
}
|
|
297
297
|
}
|
|
@@ -47,7 +47,7 @@ sap.ui.define([
|
|
|
47
47
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
48
48
|
* @param {object} [mSettings] initial settings for the new object
|
|
49
49
|
* @author SAP SE
|
|
50
|
-
* @version 1.
|
|
50
|
+
* @version 1.136.0
|
|
51
51
|
* @extends sap.ui.core.Element
|
|
52
52
|
* @constructor
|
|
53
53
|
* @public
|
|
@@ -106,13 +106,23 @@ sap.ui.define([
|
|
|
106
106
|
// on abap systems the GeoJSON is requested from this handler................//
|
|
107
107
|
AnalyticMap.DefaultABAPGeoJSONURL = "/sap/bc/vbi/geojson/L0.json";
|
|
108
108
|
AnalyticMap.DefaultGeoJSONURL = "media/analyticmap/L0.json";
|
|
109
|
-
AnalyticMap.DefaultRegionColor = (Parameters && Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG")) ? Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG") : "rgb(213,218,221)";
|
|
110
|
-
AnalyticMap.DefaultRegionColorBorder = (Parameters && Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBorder")) ? Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBorder") : "rgb(255,255,255)";
|
|
111
109
|
AnalyticMap.DefaultRegionSelectColor = "RHLSA(0;1;1;1)"; // no change!
|
|
112
110
|
AnalyticMap.DefaultHotDeltaColor = "RHLSA(0;1;1;1.0)"; // default regions should not be hot
|
|
113
|
-
AnalyticMap.AltBorderColor = (Parameters && Parameters.get("_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor")) ? Parameters.get("_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor") : "#676767";
|
|
114
111
|
// reduce opacity to 60%
|
|
115
|
-
var nonSelectOpacity
|
|
112
|
+
var nonSelectOpacity = "0.6";
|
|
113
|
+
let values = Parameters.get({
|
|
114
|
+
name: [
|
|
115
|
+
"_sap_ui_vbm_shared_ChoroplethRegionBG",
|
|
116
|
+
"_sap_ui_vbm_shared_ChoroplethRegionBorder",
|
|
117
|
+
"_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor",
|
|
118
|
+
"_sap_ui_vbm_shared_ChartDataPointNotSelectedBackgroundOpacity"
|
|
119
|
+
] });
|
|
120
|
+
|
|
121
|
+
AnalyticMap.DefaultRegionColor = values?values["_sap_ui_vbm_shared_ChoroplethRegionBG"] : "rgb(213,218,221)";
|
|
122
|
+
AnalyticMap.DefaultRegionColorBorder = values?values["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : "rgb(255,255,255)";
|
|
123
|
+
AnalyticMap.AltBorderColor = values?values["_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor"] : "#676767";
|
|
124
|
+
nonSelectOpacity = values?values["_sap_ui_vbm_shared_ChartDataPointNotSelectedBackgroundOpacity"] : "0.6";
|
|
125
|
+
|
|
116
126
|
AnalyticMap.DefaultRegionNonSelectColor = "RHLSA(0;1;1;" + nonSelectOpacity + ")";
|
|
117
127
|
|
|
118
128
|
// ...........................................................................//
|
|
@@ -976,13 +986,14 @@ sap.ui.define([
|
|
|
976
986
|
AnalyticMap.prototype.applyTheming = function(aRegions) {
|
|
977
987
|
if (Parameters) { // only if theming parameters are available
|
|
978
988
|
var sColC = AnalyticMap.DefaultRegionColor;
|
|
979
|
-
if (Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG") != undefined) {
|
|
980
|
-
sColC = AnalyticMap.DefaultRegionColor = Parameters.get("_sap_ui_vbm_shared_ChoroplethRegionBG");
|
|
981
|
-
}
|
|
982
989
|
var sColCB = AnalyticMap.DefaultRegionColorBorder;
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
990
|
+
let oColValues = Parameters.get({
|
|
991
|
+
name: [
|
|
992
|
+
"_sap_ui_vbm_shared_ChoroplethRegionBG",
|
|
993
|
+
"_sap_ui_vbm_shared_ChoroplethRegionBorder"
|
|
994
|
+
] });
|
|
995
|
+
sColC = AnalyticMap.DefaultRegionColor = oColValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBG"] : AnalyticMap.DefaultRegionColor;
|
|
996
|
+
sColCB = AnalyticMap.DefaultRegionColorBorder = oColValues? oColValues["_sap_ui_vbm_shared_ChoroplethRegionBorder"] : AnalyticMap.DefaultRegionColorBorder;
|
|
986
997
|
if (this.getPlugin()) { // plug-in mode -> make sure color format matches plugin requirements
|
|
987
998
|
sColC = window.VBI.Utilities.String2VBColor(sColC);
|
|
988
999
|
sColCB = window.VBI.Utilities.String2VBColor(sColCB);
|
|
@@ -219,7 +219,10 @@ sap.ui.define([
|
|
|
219
219
|
// do something for initialization...
|
|
220
220
|
this.mVizObjMap = {};
|
|
221
221
|
this.mContObjMap = {};
|
|
222
|
-
var sDefaultFontFamily = Parameters.get(
|
|
222
|
+
var sDefaultFontFamily = Parameters.get({
|
|
223
|
+
name: "sapUiFontFamily"
|
|
224
|
+
});
|
|
225
|
+
|
|
223
226
|
this.setProperty("textSettings", {
|
|
224
227
|
textcolor: "#000000",
|
|
225
228
|
textfont: (sDefaultFontFamily) ? sDefaultFontFamily : "Arial, Helvetica, sans-serif",
|
|
@@ -465,11 +465,13 @@ sap.ui.define([
|
|
|
465
465
|
var oTemp, aResult = [];
|
|
466
466
|
|
|
467
467
|
// Polygones
|
|
468
|
+
var oTempBorder = Parameters.get({
|
|
469
|
+
name: "_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor" });
|
|
468
470
|
oTemp = {
|
|
469
471
|
id: this.getId() + "_Polys",
|
|
470
472
|
type: "{00100000-2012-0004-B001-F311DE491C77}", // Area
|
|
471
473
|
hotDeltaColor: "RHLSA(0;1;1;1.5)", // increase opacity by 50%
|
|
472
|
-
altBorderDeltaColor:
|
|
474
|
+
altBorderDeltaColor: oTempBorder ? oTempBorder : "#666"
|
|
473
475
|
};
|
|
474
476
|
// the data source name is equivalent to the controls id..................//
|
|
475
477
|
oTemp.datasource = oTemp.id;
|
|
@@ -481,11 +483,13 @@ sap.ui.define([
|
|
|
481
483
|
aResult.push(oTemp);
|
|
482
484
|
|
|
483
485
|
// Lines
|
|
486
|
+
var oTempBorderLines = Parameters.get({
|
|
487
|
+
name: "_sap_ui_vbm_shared_ChartDataPointBorderHoverSelectedColor" });
|
|
484
488
|
oTemp = {
|
|
485
489
|
id: this.getId() + "_Lines",
|
|
486
490
|
type: "{00100000-2012-0004-B001-C46BD7336A1A}", // Route
|
|
487
491
|
hotDeltaColor: "RHLSA(0;1;1;1.5)", // increase opacity by 50%
|
|
488
|
-
altBorderDeltaColor:
|
|
492
|
+
altBorderDeltaColor: oTempBorderLines ? oTempBorderLines : "#666"
|
|
489
493
|
};
|
|
490
494
|
// the data source name is equivalent to the controls id..................//
|
|
491
495
|
oTemp.datasource = oTemp.id;
|
package/src/sap/ui/vbm/Spot.js
CHANGED
|
@@ -190,7 +190,9 @@ sap.ui.define([
|
|
|
190
190
|
// set control specific property defaults
|
|
191
191
|
// explicitly set properties will still be applied later!
|
|
192
192
|
this.mProperties.contentColor = "#000000";
|
|
193
|
-
|
|
193
|
+
var contentSize = Parameters.get({
|
|
194
|
+
name: "sapMFontMediumSize" });
|
|
195
|
+
this.mProperties.contentSize = contentSize ? contentSize : null;
|
|
194
196
|
};
|
|
195
197
|
|
|
196
198
|
// Implement function defined in VoBase
|
package/src/sap/ui/vbm/VoBase.js
CHANGED
|
@@ -335,10 +335,16 @@ sap.ui.define([
|
|
|
335
335
|
// // do something for initialization...
|
|
336
336
|
// };
|
|
337
337
|
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
338
|
+
var colorParams = Parameters.get({
|
|
339
|
+
name: ["_sap_ui_vbm_shared_ChartBad",
|
|
340
|
+
"_sap_ui_vbm_shared_ChartCritical",
|
|
341
|
+
"_sap_ui_vbm_shared_ChartGood",
|
|
342
|
+
"_sap_ui_vbm_shared_ChartNeutral"] });
|
|
343
|
+
|
|
344
|
+
VoBase.prototype.DefaultColorBad = colorParams? colorParams["_sap_ui_vbm_shared_ChartBad"] : "rgb(211, 32, 48)";
|
|
345
|
+
VoBase.prototype.DefaultColorCritical = colorParams? colorParams["_sap_ui_vbm_shared_ChartCritical"] : "rgb(225, 123, 36)";
|
|
346
|
+
VoBase.prototype.DefaultColorGood = colorParams? colorParams["_sap_ui_vbm_shared_ChartGood"] : "rgb(97, 166, 86)";
|
|
347
|
+
VoBase.prototype.DefaultColorNeutral = colorParams? colorParams["_sap_ui_vbm_shared_ChartNeutral"] : "rgb(132, 143, 148)";
|
|
342
348
|
|
|
343
349
|
// VO Interface implementation ..............................................//
|
|
344
350
|
|
|
@@ -22,7 +22,7 @@ sap.ui.define([
|
|
|
22
22
|
*
|
|
23
23
|
* @private
|
|
24
24
|
* @author SAP SE
|
|
25
|
-
* @version 1.
|
|
25
|
+
* @version 1.136.0
|
|
26
26
|
* @alias sap.ui.vbm.adapter3d.ColladaBounds
|
|
27
27
|
*/
|
|
28
28
|
var ColladaBounds = BaseObject.extend("sap.ui.vbm.adapter3d.ColladaBounds", /** @lends sap.ui.vbm.adapter3d.ColladaBounds.prototype */ {
|
|
@@ -83,7 +83,7 @@ sap.ui.define([
|
|
|
83
83
|
*
|
|
84
84
|
* @private
|
|
85
85
|
* @author SAP SE
|
|
86
|
-
* @version 1.
|
|
86
|
+
* @version 1.136.0
|
|
87
87
|
* @alias sap.ui.vbm.adapter3d.DragDropHandler
|
|
88
88
|
*/
|
|
89
89
|
var DragDropHandler = BaseObject.extend("sap.ui.vbm.adapter3d.DragDropHandler", /** @lends sap.ui.vbm.adapter3d.DragDropHandler.prototype */ {
|
|
@@ -29,7 +29,7 @@ sap.ui.define([
|
|
|
29
29
|
*
|
|
30
30
|
* @private
|
|
31
31
|
* @author SAP SE
|
|
32
|
-
* @version 1.
|
|
32
|
+
* @version 1.136.0
|
|
33
33
|
* @alias sap.ui.vbm.adapter3d.ModelHandler
|
|
34
34
|
*/
|
|
35
35
|
var ModelHandler = BaseObject.extend("sap.ui.vbm.adapter3d.ModelHandler", /** @lends sap.ui.vbm.adapter3d.ModelHandler.prototype */ {
|
|
@@ -377,7 +377,7 @@ sap.ui.define([
|
|
|
377
377
|
*
|
|
378
378
|
* @private
|
|
379
379
|
* @author SAP SE
|
|
380
|
-
* @version 1.
|
|
380
|
+
* @version 1.136.0
|
|
381
381
|
* @alias sap.ui.vbm.adapter3d.ObjectFactory
|
|
382
382
|
*/
|
|
383
383
|
var ObjectFactory = BaseObject.extend("sap.ui.vbm.adapter3d.ObjectFactory", /** @lends sap.ui.vbm.adapter3d.ObjectFactory.prototype */ {});
|
|
@@ -32,7 +32,7 @@ sap.ui.define([
|
|
|
32
32
|
*
|
|
33
33
|
* @private
|
|
34
34
|
* @author SAP SE
|
|
35
|
-
* @version 1.
|
|
35
|
+
* @version 1.136.0
|
|
36
36
|
* @alias sap.ui.vbm.adapter3d.PolygonHandler
|
|
37
37
|
*/
|
|
38
38
|
var PolygonHandler = BaseObject.extend("sap.ui.vbm.adapter3d.PolygonHandler", /** @lends sap.ui.vbm.adapter3d.PolygonHandler.prototype */ {
|
|
@@ -39,7 +39,7 @@ sap.ui.define([
|
|
|
39
39
|
*
|
|
40
40
|
* @private
|
|
41
41
|
* @author SAP SE
|
|
42
|
-
* @version 1.
|
|
42
|
+
* @version 1.136.0
|
|
43
43
|
* @alias sap.ui.vbm.adapter3d.RectangleTracker
|
|
44
44
|
*/
|
|
45
45
|
var RectangleTracker = BaseObject.extend("sap.ui.vbm.adapter3d.RectangleTracker", /** @lends sap.ui.vbm.adapter3d.RectangleTracker.prototype */ {
|
|
@@ -47,7 +47,7 @@ sap.ui.define([
|
|
|
47
47
|
*
|
|
48
48
|
* @private
|
|
49
49
|
* @author SAP SE
|
|
50
|
-
* @version 1.
|
|
50
|
+
* @version 1.136.0
|
|
51
51
|
* @alias sap.ui.vbm.adapter3d.SceneBuilder
|
|
52
52
|
*/
|
|
53
53
|
var SceneBuilder = BaseObject.extend("sap.ui.vbm.adapter3d.SceneBuilder", /** @lends sap.ui.vbm.adapter3d.SceneBuilder.prototype */ {
|
|
@@ -56,7 +56,7 @@ sap.ui.define([
|
|
|
56
56
|
*
|
|
57
57
|
* @private
|
|
58
58
|
* @author SAP SE
|
|
59
|
-
* @version 1.
|
|
59
|
+
* @version 1.136.0
|
|
60
60
|
* @alias sap.ui.vbm.adapter3d.VBIJSONParser
|
|
61
61
|
*/
|
|
62
62
|
var VBIJSONParser = BaseObject.extend("sap.ui.vbm.adapter3d.VBIJSONParser", /** @lends sap.ui.vbm.adapter3d.VBIJSONParser.prototype */ {
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
* @namespace
|
|
21
21
|
* @alias sap.ui.vbm
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.
|
|
23
|
+
* @version 1.136.0
|
|
24
24
|
* @public
|
|
25
25
|
*/
|
|
26
26
|
|
|
@@ -45,7 +45,7 @@ sap.ui.define([
|
|
|
45
45
|
"sap.ui.vbm.ClusterBase", "sap.ui.vbm.ClusterTree", "sap.ui.vbm.ClusterGrid", "sap.ui.vbm.ClusterDistance", "sap.ui.vbm.Heatmap",
|
|
46
46
|
"sap.ui.vbm.HeatPoint", "sap.ui.vbm.ClusterContainer", "sap.ui.vbm.Adapter", "sap.ui.vbm.Adapter3D"
|
|
47
47
|
],
|
|
48
|
-
version: "1.
|
|
48
|
+
version: "1.136.0"
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
sap.ui.loader.config({
|
|
@@ -141,7 +141,7 @@ sap.ui.define([
|
|
|
141
141
|
if (marker.properties.Icon) {
|
|
142
142
|
// Create child element for the SAP icon (icon overlay)
|
|
143
143
|
const child_el = VectorUtils.createIconElement(marker.properties.Icon);
|
|
144
|
-
child_el = '__mapspot' + spotid++;
|
|
144
|
+
child_el.id = '__mapspot' + spotid++;
|
|
145
145
|
// Append the icon inside the marker
|
|
146
146
|
el.appendChild(child_el);
|
|
147
147
|
}
|
|
@@ -95,7 +95,7 @@ sap.ui.define([
|
|
|
95
95
|
VBI.mapFlags.scaleVisible = obj.SAPVB.Scenes.Set.SceneGeo.scaleVisible ? JSON.parse(obj.SAPVB.Scenes.Set.SceneGeo.scaleVisible) : true;
|
|
96
96
|
|
|
97
97
|
VBI.mapFlags.navControlVisible = obj.SAPVB.Scenes.Set.SceneGeo.navControlVisible ? JSON.parse(obj.SAPVB.Scenes.Set.SceneGeo.navControlVisible) : true;
|
|
98
|
-
|
|
98
|
+
|
|
99
99
|
if (obj.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement) {
|
|
100
100
|
let navigationDisablement = obj.SAPVB.Scenes.Set.SceneGeo.NavigationDisablement;
|
|
101
101
|
VBI.mapFlags.moveDisable = navigationDisablement.move ? JSON.parse(navigationDisablement.move) : true;
|
|
@@ -176,7 +176,7 @@ sap.ui.define([
|
|
|
176
176
|
for (const MapProvider in MapProvidersArray) {
|
|
177
177
|
if (MapProvidersArray.hasOwnProperty(MapProvider)) {
|
|
178
178
|
let Provider = MapProvidersArray[MapProvider];
|
|
179
|
-
if (Provider.name == currRefMap && Provider.type == "
|
|
179
|
+
if (Provider.name == currRefMap && Provider.type == "V") {
|
|
180
180
|
mapProvider = {
|
|
181
181
|
"type": "MapProvider",
|
|
182
182
|
"provider": Provider.Source[0].url,
|
|
@@ -451,17 +451,20 @@ sap.ui.define([
|
|
|
451
451
|
else {
|
|
452
452
|
let currSpot = spots.E;
|
|
453
453
|
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
454
|
+
if (currSpot) {
|
|
455
|
+
|
|
456
|
+
for (const index in featureCollection) {
|
|
457
|
+
if (featureCollection[index].properties.Key == currSpot.K) {
|
|
458
|
+
// ind_del = featureCollection[index].id;
|
|
459
|
+
ind_del = index;
|
|
460
|
+
}
|
|
461
|
+
else {
|
|
462
|
+
console.log("error");
|
|
463
|
+
}
|
|
461
464
|
}
|
|
462
|
-
}
|
|
463
465
|
|
|
464
|
-
|
|
466
|
+
featureCollection.splice(ind_del, 1);
|
|
467
|
+
}
|
|
465
468
|
}
|
|
466
469
|
}
|
|
467
470
|
|
|
@@ -490,17 +493,19 @@ sap.ui.define([
|
|
|
490
493
|
else {
|
|
491
494
|
|
|
492
495
|
let currRoute = routes.E;
|
|
496
|
+
if (currRoute) {
|
|
493
497
|
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
498
|
+
for (const index in featureCollection) {
|
|
499
|
+
if (featureCollection[index].properties.Key == currRoute.K) {
|
|
500
|
+
ind_del = [index];
|
|
501
|
+
}
|
|
502
|
+
else {
|
|
503
|
+
console.log("error");
|
|
504
|
+
}
|
|
500
505
|
}
|
|
501
|
-
}
|
|
502
506
|
|
|
503
|
-
|
|
507
|
+
featureCollection.splice(ind_del, 1);
|
|
508
|
+
}
|
|
504
509
|
}
|
|
505
510
|
}
|
|
506
511
|
VBI.VBITransformer._processAutomation = function (Menus, data) {
|
|
@@ -697,68 +702,68 @@ sap.ui.define([
|
|
|
697
702
|
}
|
|
698
703
|
}
|
|
699
704
|
|
|
700
|
-
else {
|
|
701
|
-
if (obj.SAPVB.Data.Remove) {
|
|
702
|
-
|
|
703
|
-
let del = obj.SAPVB.Data.Remove;
|
|
704
|
-
|
|
705
|
-
if (Array.isArray(del)) {
|
|
706
|
-
for (const vo in del) {
|
|
707
|
-
if (del.hasOwnProperty(vo)) {
|
|
708
|
-
let currItm = del[vo];
|
|
709
|
-
// N->E->[]
|
|
710
|
-
switch (currItm.name) {
|
|
711
|
-
case "Spo ts":
|
|
712
|
-
VBI.VBITransformer._deleteSpotsData(currItm.N);
|
|
713
|
-
case "Links":
|
|
714
|
-
VBI.VBITransformer._deleteRoutesData(currItm.N);
|
|
715
|
-
break;
|
|
716
|
-
default:
|
|
717
705
|
|
|
718
|
-
|
|
706
|
+
if (obj.SAPVB.Data.Remove) {
|
|
707
|
+
|
|
708
|
+
let del = obj.SAPVB.Data.Remove;
|
|
709
|
+
|
|
710
|
+
if (Array.isArray(del)) {
|
|
711
|
+
for (const vo in del) {
|
|
712
|
+
if (del.hasOwnProperty(vo)) {
|
|
713
|
+
let currItm = del[vo];
|
|
714
|
+
// N->E->[]
|
|
715
|
+
switch (currItm.name) {
|
|
716
|
+
case "Spots":
|
|
717
|
+
VBI.VBITransformer._deleteSpotsData(currItm.N);
|
|
718
|
+
case "Links":
|
|
719
|
+
VBI.VBITransformer._deleteRoutesData(currItm.N);
|
|
720
|
+
break;
|
|
721
|
+
default:
|
|
722
|
+
|
|
719
723
|
}
|
|
720
724
|
}
|
|
721
725
|
}
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
741
|
-
|
|
726
|
+
}
|
|
727
|
+
else {
|
|
728
|
+
if (obj.SAPVB.Data.Remove.N) {
|
|
729
|
+
// E or A within each array object. ***************
|
|
730
|
+
let D = obj.SAPVB.Data.Remove.N;
|
|
731
|
+
// let C = obj.SAPVB.Data.Set.A;
|
|
732
|
+
if (Array.isArray(D)) {
|
|
733
|
+
for (const item in D) {
|
|
734
|
+
if (D.hasOwnProperty(item)) {
|
|
735
|
+
let currVO = D[item];
|
|
736
|
+
switch (currVO.name) {
|
|
737
|
+
case "Spots":
|
|
738
|
+
VBI.VBITransformer._deleteSpotsData(currVO);
|
|
739
|
+
break;
|
|
740
|
+
case "Links":
|
|
741
|
+
VBI.VBITransformer._deleteRoutesData(currVO);
|
|
742
|
+
break;
|
|
743
|
+
|
|
744
|
+
default:
|
|
745
|
+
|
|
742
746
|
}
|
|
743
747
|
}
|
|
744
|
-
} else {
|
|
745
|
-
switch (D.name) {
|
|
746
|
-
case "Spots":
|
|
747
|
-
VBI.VBITransformer._deleteSpotsData(D);
|
|
748
|
-
break;
|
|
749
|
-
case "Links":
|
|
750
|
-
VBI.VBITransformer._deleteRoutesData(D);
|
|
751
|
-
break;
|
|
752
|
-
|
|
753
|
-
default:
|
|
754
|
-
// code block
|
|
755
|
-
}
|
|
756
748
|
}
|
|
757
|
-
}
|
|
749
|
+
} else {
|
|
750
|
+
switch (D.name) {
|
|
751
|
+
case "Spots":
|
|
752
|
+
VBI.VBITransformer._deleteSpotsData(D);
|
|
753
|
+
break;
|
|
754
|
+
case "Links":
|
|
755
|
+
VBI.VBITransformer._deleteRoutesData(D);
|
|
756
|
+
break;
|
|
758
757
|
|
|
758
|
+
default:
|
|
759
|
+
// code block
|
|
760
|
+
}
|
|
761
|
+
}
|
|
759
762
|
}
|
|
763
|
+
|
|
760
764
|
}
|
|
761
765
|
}
|
|
766
|
+
|
|
762
767
|
}
|
|
763
768
|
|
|
764
769
|
// Get the datatypes
|