@sapui5/sap.ui.vbm 1.130.1 → 1.132.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 +63 -6
- package/src/sap/ui/vbm/Adapter3D.js +1 -1
- package/src/sap/ui/vbm/AnalyticMap.js +1 -1
- package/src/sap/ui/vbm/VBI.js +43 -36
- package/src/sap/ui/vbm/VBIRenderer.js +7 -1
- package/src/sap/ui/vbm/Viewport.js +1 -1
- 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/i18n/messagebundle_ar.properties +1 -1
- package/src/sap/ui/vbm/i18n/messagebundle_en_US_saptrc.properties +23 -23
- package/src/sap/ui/vbm/lib/sapscene.js +3 -3
- package/src/sap/ui/vbm/lib/sapvbmenu.js +14 -3
- package/src/sap/ui/vbm/library.js +2 -2
- package/src/sap/ui/vbm/themes/base/img/Pin_images.json +33 -1
- package/src/sap/ui/vbm/vector/LassoSelection.js +201 -0
- package/src/sap/ui/vbm/vector/MapRenderer.js +885 -0
- package/src/sap/ui/vbm/vector/PayloadGenerator.js +290 -0
- package/src/sap/ui/vbm/vector/RectangularSelection.js +119 -0
- package/src/sap/ui/vbm/vector/VBITransformer.js +867 -0
- package/src/sap/ui/vbm/vector/VectorUtils.js +470 -0
- package/src/sap/ui/vbm/vector/thirdparty/MaplibreStyles.js +733 -0
- package/src/sap/ui/vbm/vector/thirdparty/maplibre.css +682 -0
- package/src/sap/ui/vbm/vector/thirdparty/maplibregl.js +37950 -0
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.132.0</version>
|
|
7
7
|
|
|
8
8
|
<documentation>SAP UI library: sap.ui.vbm</documentation>
|
|
9
9
|
|
|
@@ -7,7 +7,9 @@ sap.ui.define([
|
|
|
7
7
|
"sap/ui/core/Element",
|
|
8
8
|
"jquery.sap.global",
|
|
9
9
|
"sap/base/Log",
|
|
10
|
-
"./library"
|
|
10
|
+
"./library",
|
|
11
|
+
"./vector/VBITransformer",
|
|
12
|
+
"./vector/MapRenderer",
|
|
11
13
|
], function(Element, jQuery, Log, library) {
|
|
12
14
|
"use strict";
|
|
13
15
|
|
|
@@ -22,7 +24,7 @@ sap.ui.define([
|
|
|
22
24
|
* @param {string} [sId] id for the new control, generated automatically if no id is given
|
|
23
25
|
* @param {object} [mSettings] initial settings for the new object
|
|
24
26
|
* @author SAP SE
|
|
25
|
-
* @version 1.
|
|
27
|
+
* @version 1.132.0
|
|
26
28
|
* @extends sap.ui.core.Element
|
|
27
29
|
* @constructor
|
|
28
30
|
* @public
|
|
@@ -251,6 +253,51 @@ sap.ui.define([
|
|
|
251
253
|
return this;
|
|
252
254
|
};
|
|
253
255
|
|
|
256
|
+
|
|
257
|
+
/**
|
|
258
|
+
* Processes the MapProviders section of the VBI JSON
|
|
259
|
+
*
|
|
260
|
+
* @param {object} MapProviders and Scenes section of VBI JSON. <br/>
|
|
261
|
+
* @returns {bool} True if map type is vector, false otherwise
|
|
262
|
+
* @private
|
|
263
|
+
*/
|
|
264
|
+
|
|
265
|
+
Adapter.prototype._verifyMapType = function(obj) {
|
|
266
|
+
var currRefMap = "DEFAULT";
|
|
267
|
+
if (obj?.SAPVB?.Scenes?.Set) {
|
|
268
|
+
if (obj?.SAPVB?.Scenes?.Set?.SceneGeo?.refMapLayerStack) {
|
|
269
|
+
currRefMap = obj.SAPVB.Scenes.Set.SceneGeo.refMapLayerStack;
|
|
270
|
+
}
|
|
271
|
+
if (obj?.SAPVB?.MapProviders?.Set?.MapProvider) {
|
|
272
|
+
let MapProviders = obj.SAPVB.MapProviders.Set.MapProvider;
|
|
273
|
+
if (Array.isArray(MapProviders)) {
|
|
274
|
+
for (const MapProvider in MapProviders) {
|
|
275
|
+
if (MapProviders.hasOwnProperty(MapProvider)) {
|
|
276
|
+
let Provider = MapProviders[MapProvider];
|
|
277
|
+
if (Provider.name == currRefMap && Provider.type == "vector") {
|
|
278
|
+
return true;
|
|
279
|
+
} else if (Provider.name == currRefMap && (Provider.type == "raster" || Provider.type == "")) {
|
|
280
|
+
return false;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
} else if (MapProviders.name == currRefMap && MapProviders.type == "vector") {
|
|
285
|
+
return true;
|
|
286
|
+
} else if (MapProviders.name == currRefMap && (MapProviders.type == "raster" || MapProviders.type == "")) {
|
|
287
|
+
return false;
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
} else if (obj?.SAPVB?.Scenes?.Merge) {
|
|
291
|
+
var mapLayerStack = obj?.SAPVB?.Scenes?.Merge?.SceneGeo?.refMapLayerStack
|
|
292
|
+
if (mapLayerStack) {
|
|
293
|
+
const provider = this._mapConfiguration.MapProvider.find(provider => provider.name === mapLayerStack);
|
|
294
|
+
return provider.type === "vector" ? true : false;
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
|
|
300
|
+
|
|
254
301
|
/**
|
|
255
302
|
* Parses and process sections of the VBI JSON and loads them into JSON Model bound to the GeoMap
|
|
256
303
|
*
|
|
@@ -280,6 +327,13 @@ sap.ui.define([
|
|
|
280
327
|
Log.debug("invalid object supplied for load", "", thisModule);
|
|
281
328
|
return this;
|
|
282
329
|
}
|
|
330
|
+
// Verifying the map type vector or raster
|
|
331
|
+
if (this._verifyMapType(obj)) {
|
|
332
|
+
VBI.VBITransformer.parseVBI(obj); // exit for vector processing
|
|
333
|
+
}
|
|
334
|
+
if (VBI.VBITransformer.getVectorFlag() == true) {
|
|
335
|
+
VBI.VBITransformer.parseVBI(obj); // exit for vector processing for subsequent loads - No data to distinguish
|
|
336
|
+
}
|
|
283
337
|
if (obj.SAPVB.Config) {
|
|
284
338
|
this._processConfiguration(obj.SAPVB.Config);
|
|
285
339
|
}
|
|
@@ -294,9 +348,12 @@ sap.ui.define([
|
|
|
294
348
|
this._processClusters(obj.SAPVB.Clustering);
|
|
295
349
|
}
|
|
296
350
|
|
|
351
|
+
if (VBI.VBITransformer.getVectorFlag() == true) {
|
|
352
|
+
VBI.MapRenderer.setAdapter(this);
|
|
353
|
+
}
|
|
297
354
|
return (obj.SAPVB.MapProviders ? this._processMapProviders(obj.SAPVB.MapProviders)
|
|
298
355
|
: Promise.resolve()).then(function() {
|
|
299
|
-
if (obj.SAPVB.MapLayerStacks) {
|
|
356
|
+
if (obj.SAPVB.MapLayerStacks && VBI.VBITransformer.getVectorFlag() == false) {
|
|
300
357
|
this._processMapLayerStacks(obj.SAPVB.MapLayerStacks);
|
|
301
358
|
}
|
|
302
359
|
|
|
@@ -312,11 +369,11 @@ sap.ui.define([
|
|
|
312
369
|
this._processActions(obj.SAPVB.Actions);
|
|
313
370
|
}
|
|
314
371
|
|
|
315
|
-
if (obj.SAPVB.Automation && obj.SAPVB.Automation.Call) {
|
|
372
|
+
if (obj.SAPVB.Automation && obj.SAPVB.Automation.Call && VBI.VBITransformer.getVectorFlag() == false) {
|
|
316
373
|
this._processAutomation(obj.SAPVB.Automation, obj.SAPVB.Menus);
|
|
317
374
|
}
|
|
318
375
|
|
|
319
|
-
if (obj.SAPVB.Windows) {
|
|
376
|
+
if (obj.SAPVB.Windows && VBI.VBITransformer.getVectorFlag() == false) {
|
|
320
377
|
this._processDetailWindows(obj);
|
|
321
378
|
}
|
|
322
379
|
}.bind(this));
|
|
@@ -874,7 +931,7 @@ sap.ui.define([
|
|
|
874
931
|
oMap.addVo(voAggregation);
|
|
875
932
|
}.bind(this));
|
|
876
933
|
} else if (oScenes.Merge && oScenes.Merge.SceneGeo
|
|
877
|
-
&& oScenes.Merge.SceneGeo.refMapLayerStack) {
|
|
934
|
+
&& oScenes.Merge.SceneGeo.refMapLayerStack && VBI.VBITransformer.getVectorFlag() == false) {
|
|
878
935
|
this._map().setRefMapLayerStack(oScenes.Merge.SceneGeo.refMapLayerStack);
|
|
879
936
|
}
|
|
880
937
|
return this;
|
|
@@ -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.132.0
|
|
51
51
|
* @extends sap.ui.core.Element
|
|
52
52
|
* @constructor
|
|
53
53
|
* @public
|
|
@@ -290,7 +290,7 @@ sap.ui.define([
|
|
|
290
290
|
xhr.open("GET", sPathGeoJSON, false); // set 'false' to make it synchronous
|
|
291
291
|
xhr.send();
|
|
292
292
|
|
|
293
|
-
if (xhr.status === 200
|
|
293
|
+
if (xhr.status === 200) {
|
|
294
294
|
oData = JSON.parse(xhr.responseText);
|
|
295
295
|
} else {
|
|
296
296
|
// Handle error
|
package/src/sap/ui/vbm/VBI.js
CHANGED
|
@@ -40,8 +40,10 @@ sap.ui.define([
|
|
|
40
40
|
"./lib/sapconfig",
|
|
41
41
|
"./lib/saplassotrack",
|
|
42
42
|
"./lib/saprecttrack",
|
|
43
|
-
"./lib/sapheatmap"
|
|
44
|
-
|
|
43
|
+
"./lib/sapheatmap",
|
|
44
|
+
"./vector/VBITransformer",
|
|
45
|
+
"./vector/MapRenderer",
|
|
46
|
+
], function(Control, RenderManager, jQuery, Log, library, VBIRenderer,VBITransformer) {
|
|
45
47
|
"use strict";
|
|
46
48
|
|
|
47
49
|
var thisModule = "sap.ui.vbm.VBI";
|
|
@@ -1010,48 +1012,53 @@ sap.ui.define([
|
|
|
1010
1012
|
|
|
1011
1013
|
VBI1.prototype.onAfterRendering = function() {
|
|
1012
1014
|
|
|
1013
|
-
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1015
|
+
if (VBI.VBITransformer.getVectorFlag() == false) {
|
|
1016
|
+
// when there is preserved content restore it.............................//
|
|
1017
|
+
if (this.$oldContent.length > 0) {
|
|
1018
|
+
// insert preserved control DOM content
|
|
1019
|
+
this.$().append(this.$oldContent);
|
|
1020
|
+
}
|
|
1018
1021
|
|
|
1019
|
-
|
|
1020
|
-
|
|
1021
|
-
|
|
1022
|
-
|
|
1023
|
-
|
|
1022
|
+
// process the load queue.................................................//
|
|
1023
|
+
if (this.m_aLoadQueue) {
|
|
1024
|
+
var nJ;
|
|
1025
|
+
for (nJ = 0; nJ < this.m_aLoadQueue.length; ++nJ) {
|
|
1026
|
+
this.load(this.m_aLoadQueue[nJ]);
|
|
1027
|
+
}
|
|
1028
|
+
this.m_aLoadQueue = null;
|
|
1024
1029
|
}
|
|
1025
|
-
this.m_aLoadQueue = null;
|
|
1026
|
-
}
|
|
1027
1030
|
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1031
|
+
if (this.resizeID == "" && this.mVBIContext.GetMainScene()) {
|
|
1032
|
+
this.resize();
|
|
1033
|
+
this.resizeID = sap.ui.core.ResizeHandler.register(this, this.resize);
|
|
1034
|
+
}
|
|
1032
1035
|
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1036
|
+
// do a new adjust of DOM placed elements.................................//
|
|
1037
|
+
// the function should do nothing if nothing needs to be done.............//
|
|
1038
|
+
var l_vbiId = this.getId();
|
|
1039
|
+
if (this.mVBIContext.m_Windows) {
|
|
1040
|
+
this.mVBIContext.m_Windows.Awake(l_vbiId);
|
|
1041
|
+
}
|
|
1039
1042
|
|
|
1040
|
-
|
|
1041
|
-
|
|
1042
|
-
|
|
1043
|
-
|
|
1044
|
-
|
|
1045
|
-
|
|
1046
|
-
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
|
|
1043
|
+
// move elements from hidden area to there final location
|
|
1044
|
+
var aElems = jQuery(this.getDomRef()).children(".vbi-hidden").children();
|
|
1045
|
+
for (var i = 0, oEntry; i < aElems.length; ++i) {
|
|
1046
|
+
oEntry = aElems[i];
|
|
1047
|
+
// Note: We cannot use a jQuery selector, since it fails with the artifical ID for cluster objects
|
|
1048
|
+
// jQuery("#" + oEntry.attributes.getNamedItem("data").nodeValue).append(oEntry.firstChild);
|
|
1049
|
+
var oDomref = document.getElementById(oEntry.attributes.getNamedItem("data").nodeValue);
|
|
1050
|
+
if (oDomref) {
|
|
1051
|
+
if (oEntry.firstChild) {
|
|
1052
|
+
oDomref.appendChild(oEntry.firstChild);
|
|
1053
|
+
}
|
|
1054
|
+
oEntry.parentNode.removeChild(oEntry);
|
|
1050
1055
|
}
|
|
1051
|
-
oEntry.parentNode.removeChild(oEntry);
|
|
1052
|
-
}
|
|
1053
1056
|
|
|
1057
|
+
}
|
|
1058
|
+
} else {
|
|
1059
|
+
VBI.MapRenderer.renderMap();
|
|
1054
1060
|
}
|
|
1061
|
+
|
|
1055
1062
|
};
|
|
1056
1063
|
|
|
1057
1064
|
VBI1.prototype.onBeforeRendering = function() {
|
|
@@ -13,6 +13,7 @@ sap.ui.define(function() {
|
|
|
13
13
|
apiVersion: 2 // Semantic Rendering
|
|
14
14
|
};
|
|
15
15
|
|
|
16
|
+
VBIRenderer.oControlId = "";
|
|
16
17
|
/**
|
|
17
18
|
* Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
|
|
18
19
|
*
|
|
@@ -48,7 +49,8 @@ sap.ui.define(function() {
|
|
|
48
49
|
oRm.openEnd();
|
|
49
50
|
|
|
50
51
|
var id = oControl.getId();
|
|
51
|
-
|
|
52
|
+
VBIRenderer.oControlId = id;
|
|
53
|
+
|
|
52
54
|
if (oControl.getPlugin()) {
|
|
53
55
|
|
|
54
56
|
if (oControl.$oldContent.length === 0) {
|
|
@@ -110,6 +112,10 @@ sap.ui.define(function() {
|
|
|
110
112
|
}
|
|
111
113
|
};
|
|
112
114
|
|
|
115
|
+
VBIRenderer.getId = function() {
|
|
116
|
+
return VBIRenderer.oControlId;
|
|
117
|
+
}
|
|
118
|
+
|
|
113
119
|
return VBIRenderer;
|
|
114
120
|
|
|
115
121
|
}, /* bExport= */true);
|
|
@@ -22,7 +22,7 @@ sap.ui.define([
|
|
|
22
22
|
*
|
|
23
23
|
* @private
|
|
24
24
|
* @author SAP SE
|
|
25
|
-
* @version 1.
|
|
25
|
+
* @version 1.132.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.132.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.132.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.132.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.132.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.132.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.132.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.132.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 */ {
|
|
@@ -4,7 +4,7 @@ NAVCTL_TITLE_ZOOM=\u062A\u0643\u0628\u064A\u0631 {0}
|
|
|
4
4
|
NAVCTL_TITLE_MOVE_UP=\u062A\u062D\u0631\u064A\u0643 \u0644\u0623\u0639\u0644\u0649
|
|
5
5
|
NAVCTL_TITLE_MOVE_DOWN=\u062A\u062D\u0631\u064A\u0643 \u0644\u0623\u0633\u0641\u0644
|
|
6
6
|
NAVCTL_TITLE_MOVE_LEFT=\u0627\u0644\u0627\u0646\u062A\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u064A\u0645\u064A\u0646
|
|
7
|
-
NAVCTL_TITLE_MOVE_RIGHT=\u0627\u0644\u0627\u0646\u062A\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u064A\
|
|
7
|
+
NAVCTL_TITLE_MOVE_RIGHT=\u0627\u0644\u0627\u0646\u062A\u0642\u0627\u0644 \u0625\u0644\u0649 \u0627\u0644\u064A\u0645\u064A\u0646
|
|
8
8
|
WINDOW_CLOSE=\u0625\u063A\u0644\u0627\u0642
|
|
9
9
|
LEGEND_COLLAPSE=\u0637\u064A
|
|
10
10
|
LEGEND_EXPAND=\u062A\u0648\u0633\u064A\u0639
|
|
@@ -1,28 +1,28 @@
|
|
|
1
1
|
|
|
2
|
-
NAVCTL_TITLE_MOVE=
|
|
3
|
-
NAVCTL_TITLE_ZOOM=
|
|
4
|
-
NAVCTL_TITLE_MOVE_UP=
|
|
5
|
-
NAVCTL_TITLE_MOVE_DOWN=
|
|
6
|
-
NAVCTL_TITLE_MOVE_LEFT=
|
|
7
|
-
NAVCTL_TITLE_MOVE_RIGHT=
|
|
8
|
-
WINDOW_CLOSE=
|
|
9
|
-
LEGEND_COLLAPSE=
|
|
10
|
-
LEGEND_EXPAND=
|
|
11
|
-
CAPTION_LEGEND=
|
|
2
|
+
NAVCTL_TITLE_MOVE=970/69gkzkdj6OaR6IEeRg_Double-click to return to start position
|
|
3
|
+
NAVCTL_TITLE_ZOOM=BihGfsldx1AOxxTRxnOc2A_Zoom {0}
|
|
4
|
+
NAVCTL_TITLE_MOVE_UP=sBGfHpJN1US/+w19T9TrEA_Move Up
|
|
5
|
+
NAVCTL_TITLE_MOVE_DOWN=EgEN3ozMG5ix9G/JIgo7Ew_Move Down
|
|
6
|
+
NAVCTL_TITLE_MOVE_LEFT=t4DfFmHFqa06hM6fp/rnlg_Move Left
|
|
7
|
+
NAVCTL_TITLE_MOVE_RIGHT=ChseCQWrpiKnkOMpYgTB0A_Move Right
|
|
8
|
+
WINDOW_CLOSE=NvNXt+Dni3zr+OIQoGQy6g_Close
|
|
9
|
+
LEGEND_COLLAPSE=Yim/keZQzOF2cxfEdEQ56A_Collapse
|
|
10
|
+
LEGEND_EXPAND=3c6HMI1fgHX/S63bC+16+w_Expand
|
|
11
|
+
CAPTION_LEGEND=KtbTQvnhPQFzFf7zcjqaNw_Legend
|
|
12
12
|
|
|
13
|
-
GEOMAP_INVALID_CENTER_POSITION=
|
|
14
|
-
GEOMAP_INVALID_ZOOM_LEVEL=
|
|
13
|
+
GEOMAP_INVALID_CENTER_POSITION=R8Ad0kUscG7KSrY6j5OhJA_Invalid center position given
|
|
14
|
+
GEOMAP_INVALID_ZOOM_LEVEL=SPIIRdu0m+Q8Ieqj790+rA_Invalid zoom level given
|
|
15
15
|
|
|
16
|
-
CONTAINERBASE_FULLSCREEN=
|
|
17
|
-
CONTAINERBASE_SETTINGS
|
|
18
|
-
CONTAINERBASE_MENU=
|
|
19
|
-
CONTAINERBASE_SELECTION=
|
|
20
|
-
CONTAINERBASE_MENU_RECT=
|
|
21
|
-
CONTAINERBASE_MENU_LASSO
|
|
22
|
-
CONTAINERBASE_MENU_SINGLE=
|
|
16
|
+
CONTAINERBASE_FULLSCREEN=l92Y4q9p+urWIT2+sAKZfA_Full Screen
|
|
17
|
+
CONTAINERBASE_SETTINGS=+M9V7u3bfMIdfiukOgZHJA_Settings
|
|
18
|
+
CONTAINERBASE_MENU=IdZ9EmX+P3tVtICpu7kzDw_Menu
|
|
19
|
+
CONTAINERBASE_SELECTION=E314dAx1Fv7fscTpa9bdfw_Selection Mode
|
|
20
|
+
CONTAINERBASE_MENU_RECT=wIeLGRVNQxAhJB3EevbJzg_Rectangular Selection
|
|
21
|
+
CONTAINERBASE_MENU_LASSO=FBwPDfuk0U5enzDROggvZA_Lasso Selection
|
|
22
|
+
CONTAINERBASE_MENU_SINGLE=t6hkbrNBJkMGNFS8nrdT7Q_Single Selection
|
|
23
23
|
|
|
24
24
|
|
|
25
|
-
MAPCONTAINER_ZOOMIN=
|
|
26
|
-
MAPCONTAINER_ZOOMOUT=
|
|
27
|
-
MAPCONTAINER_HOME=
|
|
28
|
-
MAPCONTAINER_RECT_ZOOM
|
|
25
|
+
MAPCONTAINER_ZOOMIN=36demzd2ZEdd6KJNnhlroA_Zoom In
|
|
26
|
+
MAPCONTAINER_ZOOMOUT=TMXZHw75FiMOLMLog73qww_Zoom Out
|
|
27
|
+
MAPCONTAINER_HOME=jGKXlprGCAFO5Tol2tls/Q_Home
|
|
28
|
+
MAPCONTAINER_RECT_ZOOM=YIbGeSk7RnurJHo1VeHxPA_Rectangular Zoom
|
|
@@ -3385,10 +3385,10 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
|
|
|
3385
3385
|
|
|
3386
3386
|
//IE corner case, DOM elements which were removed from DOM tree lost their relative hierarchy
|
|
3387
3387
|
//so everything in this case have to be recreated!
|
|
3388
|
-
if (!scene.m_Div.children || !scene.m_Div.children.length) {
|
|
3388
|
+
if (!scene.m_Div.children || !scene.m_Div.children.length || scene.m_Div == null) {
|
|
3389
3389
|
scene.m_awakeFrame = {
|
|
3390
3390
|
pos: scene.GetCenterPos(),
|
|
3391
|
-
lod: scene.GetCurrentZoomlevel()};
|
|
3391
|
+
lod: scene.GetCurrentZoomlevel()};
|
|
3392
3392
|
} else {
|
|
3393
3393
|
// when the scenes div's parent is still the place holder, then.....//
|
|
3394
3394
|
// everything is still fine and we can return.......................//
|
|
@@ -3397,7 +3397,7 @@ VBI.GeoScene = function(target, mapmanager, maplayerstack) {
|
|
|
3397
3397
|
}
|
|
3398
3398
|
// the scenes div is already but the parent is no longer the........//
|
|
3399
3399
|
// placeholder. In this case we add again the div as a child element//
|
|
3400
|
-
|
|
3400
|
+
scene.m_Target.appendChild(scene.m_Div);
|
|
3401
3401
|
|
|
3402
3402
|
if (scene.m_bNavControlVisible && scene.m_NavControl) {
|
|
3403
3403
|
// scene.m_NavControl.Awake( scene, target );
|
|
@@ -10,8 +10,9 @@
|
|
|
10
10
|
sap.ui.define([
|
|
11
11
|
"sap/ui/unified/Menu",
|
|
12
12
|
"sap/ui/unified/MenuItem",
|
|
13
|
+
"sap/ui/vbm/vector/PayloadGenerator",
|
|
13
14
|
"./sapvbi"
|
|
14
|
-
], function(Menu, MenuItem) {
|
|
15
|
+
], function(Menu, MenuItem, PayloadGenerator) {
|
|
15
16
|
"use strict";
|
|
16
17
|
|
|
17
18
|
VBI.Menus = function() {
|
|
@@ -34,7 +35,10 @@ VBI.Menus = function() {
|
|
|
34
35
|
oMenuObject.vbi_data = {};
|
|
35
36
|
oMenuObject.vbi_data.menuRef = dat.id;
|
|
36
37
|
oMenuObject.vbi_data.VBIName = dat.name;
|
|
37
|
-
|
|
38
|
+
if (VBI.vectorFlag == true) {
|
|
39
|
+
oMenuObject.vbi_data.object = ctx.object;
|
|
40
|
+
oMenuObject.vbi_data.instance = ctx.instance;
|
|
41
|
+
};
|
|
38
42
|
oMenuObject.attachItemSelect(function(e) {
|
|
39
43
|
var retval = {};
|
|
40
44
|
retval.refid = e.mParameters.item.vbi_data.refid;
|
|
@@ -162,6 +166,13 @@ VBI.Menus = function() {
|
|
|
162
166
|
|
|
163
167
|
menus.OnSelected = function(retval) {
|
|
164
168
|
var refObj = retval.menu.vbi_data.object;
|
|
169
|
+
if (VBI.vectorFlag == true) {
|
|
170
|
+
if (_adapter._actions) {
|
|
171
|
+
var m_name = "FCODE_SELECT";
|
|
172
|
+
var refid = retval.refid;
|
|
173
|
+
PayloadGenerator.fcodeSelect(m_name, refid, refObj, retval.menu.vbi_data.instance);
|
|
174
|
+
}
|
|
175
|
+
} else {
|
|
165
176
|
if (retval.refid == undefined) {
|
|
166
177
|
return;
|
|
167
178
|
}
|
|
@@ -176,7 +187,7 @@ VBI.Menus = function() {
|
|
|
176
187
|
}
|
|
177
188
|
}
|
|
178
189
|
};
|
|
179
|
-
|
|
190
|
+
}
|
|
180
191
|
return menus;
|
|
181
192
|
};
|
|
182
193
|
|
|
@@ -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.132.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.132.0"
|
|
49
49
|
});
|
|
50
50
|
|
|
51
51
|
sap.ui.loader.config({
|