@syncfusion/ej2-maps 19.2.60 → 19.3.53
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/.eslintrc.json +1 -1
- package/CHANGELOG.md +10 -4
- package/README.md +3 -3
- package/dist/ej2-maps.umd.min.js +2 -2
- package/dist/ej2-maps.umd.min.js.map +1 -1
- package/dist/es6/ej2-maps.es2015.js +182 -393
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +182 -394
- package/dist/es6/ej2-maps.es5.js.map +1 -1
- package/dist/global/ej2-maps.min.js +2 -2
- package/dist/global/ej2-maps.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +12 -12
- package/src/maps/layers/bubble.js +3 -24
- package/src/maps/layers/data-label.js +5 -17
- package/src/maps/layers/layer-panel.js +0 -22
- package/src/maps/layers/legend.js +1 -1
- package/src/maps/layers/marker.js +0 -16
- package/src/maps/maps-model.d.ts +1 -28
- package/src/maps/maps.d.ts +1 -38
- package/src/maps/maps.js +39 -86
- package/src/maps/model/base-model.d.ts +0 -5
- package/src/maps/model/base.d.ts +0 -5
- package/src/maps/model/export-pdf.js +1 -1
- package/src/maps/model/theme.js +54 -1
- package/src/maps/user-interaction/annotation.js +3 -7
- package/src/maps/user-interaction/highlight.js +0 -13
- package/src/maps/user-interaction/selection.js +0 -13
- package/src/maps/user-interaction/tooltip.js +52 -122
- package/src/maps/user-interaction/zoom.js +19 -68
- package/src/maps/utils/enum.d.ts +5 -1
- package/src/maps/utils/helper.d.ts +1 -1
- package/src/maps/utils/helper.js +6 -6
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Ajax, Animation, Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, L10n, NotifyPropertyChanges, Property, compile, createElement, extend,
|
|
1
|
+
import { Ajax, Animation, Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, L10n, NotifyPropertyChanges, Property, compile, createElement, extend, isNullOrUndefined, merge, print, remove, setValue } from '@syncfusion/ej2-base';
|
|
2
2
|
import { SvgRenderer, Tooltip } from '@syncfusion/ej2-svg-base';
|
|
3
3
|
import { DataManager, Query } from '@syncfusion/ej2-data';
|
|
4
4
|
import { PdfBitmap, PdfDocument, PdfPageOrientation } from '@syncfusion/ej2-pdf-export';
|
|
@@ -571,7 +571,7 @@ function renderTextElement(option, style, color, parent, isMinus = false) {
|
|
|
571
571
|
'opacity': style.opacity,
|
|
572
572
|
'dominant-baseline': option.baseLine
|
|
573
573
|
};
|
|
574
|
-
const text = typeof option.text === 'string' ? option.text : isMinus ? option.text[option.text.length - 1] : option.text[0];
|
|
574
|
+
const text = typeof option.text === 'string' || typeof option.text === 'number' ? option.text : isMinus ? option.text[option.text.length - 1] : option.text[0];
|
|
575
575
|
let tspanElement;
|
|
576
576
|
const renderer = new SvgRenderer('');
|
|
577
577
|
let height;
|
|
@@ -1686,7 +1686,7 @@ function getRatioOfBubble(min, max, value, minValue, maxValue) {
|
|
|
1686
1686
|
* @returns {any} - Specifies the object
|
|
1687
1687
|
*/
|
|
1688
1688
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1689
|
-
function findMidPointOfPolygon(points, type) {
|
|
1689
|
+
function findMidPointOfPolygon(points, type, geometryType) {
|
|
1690
1690
|
if (!points.length) {
|
|
1691
1691
|
return null;
|
|
1692
1692
|
}
|
|
@@ -1701,14 +1701,14 @@ function findMidPointOfPolygon(points, type) {
|
|
|
1701
1701
|
let ySum = 0;
|
|
1702
1702
|
for (let i = min; i <= max - 1; i++) {
|
|
1703
1703
|
startX = points[i].x;
|
|
1704
|
-
startY = type === 'Mercator' ? points[i].y : -(points[i].y);
|
|
1704
|
+
startY = type === 'Mercator' || geometryType === 'Normal' ? points[i].y : -(points[i].y);
|
|
1705
1705
|
if (i === max - 1) {
|
|
1706
1706
|
startX1 = points[0].x;
|
|
1707
|
-
startY1 = type === 'Mercator' ? points[0].y : -(points[0].y);
|
|
1707
|
+
startY1 = type === 'Mercator' || geometryType === 'Normal' ? points[0].y : -(points[0].y);
|
|
1708
1708
|
}
|
|
1709
1709
|
else {
|
|
1710
1710
|
startX1 = points[i + 1].x;
|
|
1711
|
-
startY1 = type === 'Mercator' ? points[i + 1].y : -(points[i + 1].y);
|
|
1711
|
+
startY1 = type === 'Mercator' || geometryType === 'Normal' ? points[i + 1].y : -(points[i + 1].y);
|
|
1712
1712
|
}
|
|
1713
1713
|
sum = sum + Math.abs(((startX * startY1)) - (startX1 * startY));
|
|
1714
1714
|
xSum = xSum + Math.abs(((startX + startX1) * (((startX * startY1) - (startX1 * startY)))));
|
|
@@ -1729,7 +1729,7 @@ function findMidPointOfPolygon(points, type) {
|
|
|
1729
1729
|
let height = 0;
|
|
1730
1730
|
for (let i = min; i <= max - 1; i++) {
|
|
1731
1731
|
const point = points[i];
|
|
1732
|
-
point.y = type === 'Mercator' ? point.y : -(point.y);
|
|
1732
|
+
point.y = type === 'Mercator' || geometryType === 'Normal' ? point.y : -(point.y);
|
|
1733
1733
|
if (point.y > ySum) {
|
|
1734
1734
|
if (point.x < xSum && xSum - point.x < xSum - bottomMinPoint.x) {
|
|
1735
1735
|
bottomMinPoint = { x: point.x, y: point.y };
|
|
@@ -3303,7 +3303,6 @@ var BootstrapTheme;
|
|
|
3303
3303
|
* @param {MapsTheme} theme Specifies the theme of the maps
|
|
3304
3304
|
* @returns {string[]} Returns the shape color
|
|
3305
3305
|
*/
|
|
3306
|
-
// eslint-disable-next-line @typescript-eslint/no-namespace
|
|
3307
3306
|
function getShapeColor(theme) {
|
|
3308
3307
|
let themePalette;
|
|
3309
3308
|
switch (theme.toLowerCase()) {
|
|
@@ -3315,6 +3314,14 @@ function getShapeColor(theme) {
|
|
|
3315
3314
|
themePalette = ['#10B981', '#22D3EE', '#2DD4BF', '#4ADE80', '#8B5CF6',
|
|
3316
3315
|
'#E879F9', '#F472B6', '#F87171', '#F97316', '#FCD34D'];
|
|
3317
3316
|
break;
|
|
3317
|
+
case 'bootstrap5':
|
|
3318
|
+
themePalette = ['#262E0B', '#668E1F', '#AF6E10', '#862C0B', '#1F2D50',
|
|
3319
|
+
'#64680B', '#311508', '#4C4C81', '#0C7DA0', '#862C0B'];
|
|
3320
|
+
break;
|
|
3321
|
+
case 'bootstrap5dark':
|
|
3322
|
+
themePalette = ['#5ECB9B', '#A860F1', '#EBA844', '#557EF7', '#E9599B',
|
|
3323
|
+
'#BFC529', '#3BC6CF', '#7A68EC', '#74B706', '#EA6266'];
|
|
3324
|
+
break;
|
|
3318
3325
|
default:
|
|
3319
3326
|
themePalette = ['#B5E485', '#7BC1E8', '#DF819C', '#EC9B79', '#78D0D3',
|
|
3320
3327
|
'#D6D572', '#9178E3', '#A1E5B4', '#87A4B4', '#E4C16C'];
|
|
@@ -3552,6 +3559,52 @@ function getThemeStyle(theme) {
|
|
|
3552
3559
|
shapeFill: '#374151'
|
|
3553
3560
|
};
|
|
3554
3561
|
break;
|
|
3562
|
+
case 'bootstrap5':
|
|
3563
|
+
style = {
|
|
3564
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
3565
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
3566
|
+
titleFontColor: '#212529',
|
|
3567
|
+
subTitleFontColor: '#212529',
|
|
3568
|
+
legendTitleFontColor: '#212529',
|
|
3569
|
+
legendTextColor: '#212529',
|
|
3570
|
+
dataLabelFontColor: '#212529',
|
|
3571
|
+
tooltipFontColor: '#F9FAFB',
|
|
3572
|
+
tooltipFillColor: '#212529',
|
|
3573
|
+
zoomFillColor: '#6C757D',
|
|
3574
|
+
fontFamily: 'Helvetica Neue',
|
|
3575
|
+
titleFontSize: '14px',
|
|
3576
|
+
legendFontSize: '12px',
|
|
3577
|
+
tooltipFillOpacity: 1,
|
|
3578
|
+
tooltipTextOpacity: 1,
|
|
3579
|
+
labelFontFamily: 'Helvetica Neue',
|
|
3580
|
+
titleFontWeight: 'normal',
|
|
3581
|
+
zoomSelectionColor: '#343A40',
|
|
3582
|
+
shapeFill: '#E9ECEF'
|
|
3583
|
+
};
|
|
3584
|
+
break;
|
|
3585
|
+
case 'bootstrap5dark':
|
|
3586
|
+
style = {
|
|
3587
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
3588
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
3589
|
+
titleFontColor: '#FFFFFF',
|
|
3590
|
+
subTitleFontColor: '#FFFFFF',
|
|
3591
|
+
legendTitleFontColor: '#FFFFFF',
|
|
3592
|
+
legendTextColor: '#FFFFFF',
|
|
3593
|
+
dataLabelFontColor: '#FFFFFF',
|
|
3594
|
+
tooltipFontColor: '#212529',
|
|
3595
|
+
tooltipFillColor: '#E9ECEF',
|
|
3596
|
+
zoomFillColor: '#B5BABE',
|
|
3597
|
+
fontFamily: 'Helvetica Neue',
|
|
3598
|
+
titleFontSize: '14px',
|
|
3599
|
+
legendFontSize: '12px',
|
|
3600
|
+
tooltipFillOpacity: 1,
|
|
3601
|
+
tooltipTextOpacity: 1,
|
|
3602
|
+
labelFontFamily: 'Helvetica Neue',
|
|
3603
|
+
titleFontWeight: 'normal',
|
|
3604
|
+
zoomSelectionColor: '#DEE2E6',
|
|
3605
|
+
shapeFill: '#495057'
|
|
3606
|
+
};
|
|
3607
|
+
break;
|
|
3555
3608
|
default:
|
|
3556
3609
|
style = {
|
|
3557
3610
|
backgroundColor: '#FFFFFF',
|
|
@@ -4445,15 +4498,6 @@ __decorate$1([
|
|
|
4445
4498
|
Complex({ color: 'transparent', width: 1 }, Border)
|
|
4446
4499
|
], MapsAreaSettings.prototype, "border", void 0);
|
|
4447
4500
|
|
|
4448
|
-
var __rest = (undefined && undefined.__rest) || function (s, e) {
|
|
4449
|
-
var t = {};
|
|
4450
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4451
|
-
t[p] = s[p];
|
|
4452
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
4453
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
4454
|
-
t[p[i]] = s[p[i]];
|
|
4455
|
-
return t;
|
|
4456
|
-
};
|
|
4457
4501
|
/**
|
|
4458
4502
|
* Marker class
|
|
4459
4503
|
*/
|
|
@@ -4733,10 +4777,6 @@ class Marker {
|
|
|
4733
4777
|
longitude: options.data['longitude'] || options.data['Longitude'],
|
|
4734
4778
|
value: options.data['name']
|
|
4735
4779
|
};
|
|
4736
|
-
if (this.maps.isBlazor) {
|
|
4737
|
-
const { maps, marker: marker$$1 } = eventArgs, blazorEventArgs = __rest(eventArgs, ["maps", "marker"]);
|
|
4738
|
-
eventArgs = blazorEventArgs;
|
|
4739
|
-
}
|
|
4740
4780
|
this.maps.trigger(markerClick, eventArgs);
|
|
4741
4781
|
}
|
|
4742
4782
|
/**
|
|
@@ -4815,9 +4855,6 @@ class Marker {
|
|
|
4815
4855
|
collection = [];
|
|
4816
4856
|
for (const i of indexes) {
|
|
4817
4857
|
collection.push({ data: marker$$1.dataSource[i], index: i });
|
|
4818
|
-
if (this.maps.isBlazor) {
|
|
4819
|
-
marker$$1.dataSource[i]['text'] = '';
|
|
4820
|
-
}
|
|
4821
4858
|
markCollection.push(marker$$1.dataSource[i]);
|
|
4822
4859
|
}
|
|
4823
4860
|
isClusterSame = false;
|
|
@@ -5332,15 +5369,6 @@ class ColorMapping {
|
|
|
5332
5369
|
}
|
|
5333
5370
|
}
|
|
5334
5371
|
|
|
5335
|
-
var __rest$1 = (undefined && undefined.__rest) || function (s, e) {
|
|
5336
|
-
var t = {};
|
|
5337
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5338
|
-
t[p] = s[p];
|
|
5339
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
5340
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
5341
|
-
t[p[i]] = s[p[i]];
|
|
5342
|
-
return t;
|
|
5343
|
-
};
|
|
5344
5372
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
5345
5373
|
/* eslint-disable jsdoc/require-param */
|
|
5346
5374
|
/* eslint-disable no-case-declarations */
|
|
@@ -5555,10 +5583,6 @@ class LayerPanel {
|
|
|
5555
5583
|
cancel: false, name: layerRendering, index: layerIndex,
|
|
5556
5584
|
layer: layer, maps: this.mapObject, visible: layer.visible
|
|
5557
5585
|
};
|
|
5558
|
-
if (this.mapObject.isBlazor) {
|
|
5559
|
-
const { maps, layer } = eventArgs, blazorEventArgs = __rest$1(eventArgs, ["maps", "layer"]);
|
|
5560
|
-
eventArgs = blazorEventArgs;
|
|
5561
|
-
}
|
|
5562
5586
|
this.mapObject.trigger('layerRendering', eventArgs, (observedArgs) => {
|
|
5563
5587
|
if (!eventArgs.cancel && eventArgs.visible) {
|
|
5564
5588
|
if (layer.layerType !== 'Geometry') {
|
|
@@ -5593,11 +5617,6 @@ class LayerPanel {
|
|
|
5593
5617
|
bing.maxZoom = maxZoom;
|
|
5594
5618
|
}
|
|
5595
5619
|
proxy.mapObject['bingMap'] = bing;
|
|
5596
|
-
if (this.mapObject.isBlazor) {
|
|
5597
|
-
if (!isNullOrUndefined(markerGroupElement)) {
|
|
5598
|
-
removeElement(this.mapObject.element.id + '_Markers_Group');
|
|
5599
|
-
}
|
|
5600
|
-
}
|
|
5601
5620
|
proxy.renderTileLayer(proxy, layer, layerIndex, bing);
|
|
5602
5621
|
this.mapObject.arrangeTemplate();
|
|
5603
5622
|
};
|
|
@@ -5761,10 +5780,6 @@ class LayerPanel {
|
|
|
5761
5780
|
shape: shapeSettings, fill: fill,
|
|
5762
5781
|
border: { width: borderValue.width, color: borderValue.color, opacity: borderValue.opacity }
|
|
5763
5782
|
};
|
|
5764
|
-
if (this.mapObject.isBlazor) {
|
|
5765
|
-
const { maps } = eventArgs, blazorEventArgs = __rest$1(eventArgs, ["maps"]);
|
|
5766
|
-
eventArgs = blazorEventArgs;
|
|
5767
|
-
}
|
|
5768
5783
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
5769
5784
|
const shapeRenderingSuccess = (eventArgs) => {
|
|
5770
5785
|
let drawingType = !isNullOrUndefined(currentShapeData['_isMultiPolygon'])
|
|
@@ -6607,9 +6622,6 @@ class Annotations {
|
|
|
6607
6622
|
});
|
|
6608
6623
|
if (annotationGroup.childElementCount > 0 && !(isNullOrUndefined(getElementByID(secondaryID)))) {
|
|
6609
6624
|
getElementByID(secondaryID).appendChild(annotationGroup);
|
|
6610
|
-
for (let i = 0; i < this.map.annotations.length; i++) {
|
|
6611
|
-
updateBlazorTemplate(this.map.element.id + '_ContentTemplate_' + i, 'ContentTemplate', this.map.annotations[i]);
|
|
6612
|
-
}
|
|
6613
6625
|
}
|
|
6614
6626
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6615
6627
|
this.map.renderReactTemplates();
|
|
@@ -6638,10 +6650,9 @@ class Annotations {
|
|
|
6638
6650
|
if (argsData.cancel) {
|
|
6639
6651
|
return;
|
|
6640
6652
|
}
|
|
6641
|
-
const blazor = 'Blazor';
|
|
6642
6653
|
templateFn = getTemplateFunction(argsData.content);
|
|
6643
|
-
if (templateFn &&
|
|
6644
|
-
templateElement = Array.prototype.slice.call(templateFn(
|
|
6654
|
+
if (templateFn && templateFn(this.map, this.map, argsData.content, this.map.element.id + '_ContentTemplate_' + annotationIndex).length) {
|
|
6655
|
+
templateElement = Array.prototype.slice.call(templateFn(this.map, this.map, argsData.content, this.map.element.id + '_ContentTemplate_' + annotationIndex));
|
|
6645
6656
|
const length = templateElement.length;
|
|
6646
6657
|
for (let i = 0; i < length; i++) {
|
|
6647
6658
|
childElement.appendChild(templateElement[i]);
|
|
@@ -6884,20 +6895,14 @@ let Maps = class Maps extends Component {
|
|
|
6884
6895
|
*/
|
|
6885
6896
|
preRender() {
|
|
6886
6897
|
this.isDevice = Browser.isDevice;
|
|
6887
|
-
this.isBlazor = isBlazor();
|
|
6888
6898
|
this.initPrivateVariable();
|
|
6889
6899
|
this.allowServerDataBinding = false;
|
|
6890
6900
|
this.unWireEVents();
|
|
6891
6901
|
this.wireEVents();
|
|
6892
6902
|
this.setCulture();
|
|
6893
6903
|
}
|
|
6894
|
-
|
|
6895
|
-
|
|
6896
|
-
*
|
|
6897
|
-
* @returns {void}
|
|
6898
|
-
*/
|
|
6899
|
-
render() {
|
|
6900
|
-
this.trigger(load, this.isBlazor ? {} : { maps: this });
|
|
6904
|
+
renderElements() {
|
|
6905
|
+
this.trigger(load, { maps: this });
|
|
6901
6906
|
this.createSVG();
|
|
6902
6907
|
this.findBaseAndSubLayers();
|
|
6903
6908
|
this.createSecondaryElement();
|
|
@@ -6909,6 +6914,14 @@ let Maps = class Maps extends Component {
|
|
|
6909
6914
|
this.processRequestJsonData();
|
|
6910
6915
|
this.renderComplete();
|
|
6911
6916
|
}
|
|
6917
|
+
/**
|
|
6918
|
+
* To Initialize the control rendering.
|
|
6919
|
+
*
|
|
6920
|
+
* @returns {void}
|
|
6921
|
+
*/
|
|
6922
|
+
render() {
|
|
6923
|
+
this.renderElements();
|
|
6924
|
+
}
|
|
6912
6925
|
processRequestJsonData() {
|
|
6913
6926
|
const length = this.layersCollection.length - 1;
|
|
6914
6927
|
this.serverProcess = { request: 0, response: 0 };
|
|
@@ -6918,7 +6931,7 @@ let Maps = class Maps extends Component {
|
|
|
6918
6931
|
if (layer.shapeData instanceof DataManager) {
|
|
6919
6932
|
this.serverProcess['request']++;
|
|
6920
6933
|
dataModule = layer.shapeData;
|
|
6921
|
-
queryModule = layer.query instanceof Query ? layer.query :
|
|
6934
|
+
queryModule = layer.query instanceof Query ? layer.query : new Query();
|
|
6922
6935
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6923
6936
|
const dataManager = dataModule.executeQuery(queryModule);
|
|
6924
6937
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -6934,7 +6947,7 @@ let Maps = class Maps extends Component {
|
|
|
6934
6947
|
if (layer.dataSource instanceof DataManager) {
|
|
6935
6948
|
this.serverProcess['request']++;
|
|
6936
6949
|
dataModule = layer.dataSource;
|
|
6937
|
-
queryModule = layer.query instanceof Query ? layer.query :
|
|
6950
|
+
queryModule = layer.query instanceof Query ? layer.query : new Query();
|
|
6938
6951
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6939
6952
|
const dataManager = dataModule.executeQuery(queryModule);
|
|
6940
6953
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -6948,8 +6961,7 @@ let Maps = class Maps extends Component {
|
|
|
6948
6961
|
if (layer.markerSettings[i].dataSource instanceof DataManager) {
|
|
6949
6962
|
this.serverProcess['request']++;
|
|
6950
6963
|
dataModule = layer.markerSettings[i].dataSource;
|
|
6951
|
-
queryModule = layer.markerSettings[i].query instanceof Query ? layer.markerSettings[i].query :
|
|
6952
|
-
(new Query().requiresCount()) : new Query();
|
|
6964
|
+
queryModule = layer.markerSettings[i].query instanceof Query ? layer.markerSettings[i].query : new Query();
|
|
6953
6965
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6954
6966
|
const dataManager = dataModule.executeQuery(queryModule);
|
|
6955
6967
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -6965,8 +6977,7 @@ let Maps = class Maps extends Component {
|
|
|
6965
6977
|
if (layer.bubbleSettings[i].dataSource instanceof DataManager) {
|
|
6966
6978
|
this.serverProcess['request']++;
|
|
6967
6979
|
dataModule = layer.bubbleSettings[i].dataSource;
|
|
6968
|
-
queryModule = layer.bubbleSettings[i].query instanceof Query ? layer.bubbleSettings[i].query :
|
|
6969
|
-
(new Query().requiresCount()) : new Query();
|
|
6980
|
+
queryModule = layer.bubbleSettings[i].query instanceof Query ? layer.bubbleSettings[i].query : new Query();
|
|
6970
6981
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6971
6982
|
const dataManager = dataModule.executeQuery(queryModule);
|
|
6972
6983
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -7124,7 +7135,6 @@ let Maps = class Maps extends Component {
|
|
|
7124
7135
|
tileElement1.style.left = left + 'px';
|
|
7125
7136
|
}
|
|
7126
7137
|
this.arrangeTemplate();
|
|
7127
|
-
const blazor = this.isBlazor ? this.blazorTemplates() : null;
|
|
7128
7138
|
if (this.annotationsModule) {
|
|
7129
7139
|
if (this.width !== '0px' && this.height !== '0px' && this.width !== '0%' && this.height !== '0%') {
|
|
7130
7140
|
this.annotationsModule.renderAnnotationElements();
|
|
@@ -7137,7 +7147,7 @@ let Maps = class Maps extends Component {
|
|
|
7137
7147
|
}
|
|
7138
7148
|
}
|
|
7139
7149
|
this.zoomingChange();
|
|
7140
|
-
this.trigger(loaded,
|
|
7150
|
+
this.trigger(loaded, { maps: this, isResized: this.isResize });
|
|
7141
7151
|
this.isResize = false;
|
|
7142
7152
|
}
|
|
7143
7153
|
/**
|
|
@@ -7203,36 +7213,6 @@ let Maps = class Maps extends Component {
|
|
|
7203
7213
|
}
|
|
7204
7214
|
}
|
|
7205
7215
|
}
|
|
7206
|
-
/**
|
|
7207
|
-
* To append blazor templates
|
|
7208
|
-
*
|
|
7209
|
-
* @returns {void}
|
|
7210
|
-
* @private
|
|
7211
|
-
*/
|
|
7212
|
-
blazorTemplates() {
|
|
7213
|
-
for (let i = 0; i < this.layers.length; i++) {
|
|
7214
|
-
const markerLength = this.layers[i].markerSettings.length - 1;
|
|
7215
|
-
if (markerLength >= 0) {
|
|
7216
|
-
if (this.layers[i].dataLabelSettings.visible || this.layers[i].markerSettings[markerLength].template) {
|
|
7217
|
-
updateBlazorTemplate(this.element.id + '_LabelTemplate', 'LabelTemplate', this.layers[i].dataLabelSettings);
|
|
7218
|
-
for (let j = 0; j < this.layers[i].markerSettings.length; j++) {
|
|
7219
|
-
const markerRendered = () => {
|
|
7220
|
-
for (let x = 0; x < this.layers.length; x++) {
|
|
7221
|
-
const markerTemplateEle = document.getElementById(this.element.id + '_LayerIndex_' + x + '_Markers_Template_Group');
|
|
7222
|
-
if (!isNullOrUndefined(markerTemplateEle)) {
|
|
7223
|
-
for (let z = 0; z < markerTemplateEle.childElementCount; z++) {
|
|
7224
|
-
const markerTemplate$$1 = markerTemplateEle.childNodes[z];
|
|
7225
|
-
markerTemplate$$1['style']['transform'] = 'translate(-50%, -50%)';
|
|
7226
|
-
}
|
|
7227
|
-
}
|
|
7228
|
-
}
|
|
7229
|
-
};
|
|
7230
|
-
updateBlazorTemplate(this.element.id + '_MarkerTemplate' + j, 'MarkerTemplate', this.layers[i].markerSettings[j], undefined, markerRendered);
|
|
7231
|
-
}
|
|
7232
|
-
}
|
|
7233
|
-
}
|
|
7234
|
-
}
|
|
7235
|
-
}
|
|
7236
7216
|
/**
|
|
7237
7217
|
* Render the map area border
|
|
7238
7218
|
*
|
|
@@ -7508,12 +7488,6 @@ let Maps = class Maps extends Component {
|
|
|
7508
7488
|
* @returns {void}
|
|
7509
7489
|
*/
|
|
7510
7490
|
createSVG() {
|
|
7511
|
-
resetBlazorTemplate(this.element.id + '_LabelTemplate', 'LabelTemplate');
|
|
7512
|
-
for (let i = 0; i < this.layers.length; i++) {
|
|
7513
|
-
for (let j = 0; j < this.layers[i].markerSettings.length; j++) {
|
|
7514
|
-
resetBlazorTemplate(this.element.id + '_MarkerTemplate' + j, 'MarkerTemplate');
|
|
7515
|
-
}
|
|
7516
|
-
}
|
|
7517
7491
|
this.removeSvg();
|
|
7518
7492
|
createSvg(this);
|
|
7519
7493
|
}
|
|
@@ -7523,9 +7497,6 @@ let Maps = class Maps extends Component {
|
|
|
7523
7497
|
* @returns {void}
|
|
7524
7498
|
*/
|
|
7525
7499
|
removeSvg() {
|
|
7526
|
-
for (let i = 0; i < this.annotations.length; i++) {
|
|
7527
|
-
resetBlazorTemplate(this.element.id + '_ContentTemplate_' + i, 'ContentTemplate');
|
|
7528
|
-
}
|
|
7529
7500
|
removeElement(this.element.id + '_Secondary_Element');
|
|
7530
7501
|
removeElement(this.element.id + '_tile_parent');
|
|
7531
7502
|
removeElement(this.element.id + '_tiles');
|
|
@@ -7603,7 +7574,6 @@ let Maps = class Maps extends Component {
|
|
|
7603
7574
|
* This method is used to perform the operations when a click operation is performed on maps.
|
|
7604
7575
|
*
|
|
7605
7576
|
* @param {PointerEvent} e - Specifies the pointer event on maps.
|
|
7606
|
-
* @blazorProperty 'PerformClick'
|
|
7607
7577
|
*/
|
|
7608
7578
|
mapsOnClick(e) {
|
|
7609
7579
|
const targetEle = e.target;
|
|
@@ -7754,7 +7724,9 @@ let Maps = class Maps extends Component {
|
|
|
7754
7724
|
}
|
|
7755
7725
|
}
|
|
7756
7726
|
this.notify(Browser.touchEndEvent, e);
|
|
7757
|
-
e.
|
|
7727
|
+
if (e.cancelable) {
|
|
7728
|
+
e.preventDefault();
|
|
7729
|
+
}
|
|
7758
7730
|
return false;
|
|
7759
7731
|
}
|
|
7760
7732
|
/**
|
|
@@ -7802,7 +7774,6 @@ let Maps = class Maps extends Component {
|
|
|
7802
7774
|
* This method is used to perform operations when performing the double click operation on maps.
|
|
7803
7775
|
*
|
|
7804
7776
|
* @param {PointerEvent} e - Specifies the pointer event.
|
|
7805
|
-
* @blazorProperty 'PerformDoubleClick'
|
|
7806
7777
|
*/
|
|
7807
7778
|
mapsOnDoubleClick(e) {
|
|
7808
7779
|
this.notify('dblclick', e);
|
|
@@ -7828,9 +7799,7 @@ let Maps = class Maps extends Component {
|
|
|
7828
7799
|
}
|
|
7829
7800
|
const doubleClickArgs = { cancel: false, name: doubleClick, x: e.clientX, y: e.clientY,
|
|
7830
7801
|
target: targetId, latitude: latitude, longitude: longitude, isShapeSelected: null };
|
|
7831
|
-
|
|
7832
|
-
target: targetId, latitude: latitude, longitude: longitude, isShapeSelected: null };
|
|
7833
|
-
this.trigger('doubleClick', this.isBlazor ? doubleClickBlazorArgs : doubleClickArgs);
|
|
7802
|
+
this.trigger('doubleClick', doubleClickArgs);
|
|
7834
7803
|
}
|
|
7835
7804
|
}
|
|
7836
7805
|
/**
|
|
@@ -7925,7 +7894,7 @@ let Maps = class Maps extends Component {
|
|
|
7925
7894
|
name: resize,
|
|
7926
7895
|
previousSize: this.availableSize,
|
|
7927
7896
|
currentSize: new Size(0, 0),
|
|
7928
|
-
maps:
|
|
7897
|
+
maps: this
|
|
7929
7898
|
};
|
|
7930
7899
|
if (this.resizeTo) {
|
|
7931
7900
|
clearTimeout(this.resizeTo);
|
|
@@ -8197,7 +8166,7 @@ let Maps = class Maps extends Component {
|
|
|
8197
8166
|
this.zoomNotApplied = true;
|
|
8198
8167
|
this.scaleOfGivenLocation = calculateZoomLevel(minLatitude, maxLatitude, minLongitude, maxLongitude, this.mapAreaRect.width, this.mapAreaRect.height, this);
|
|
8199
8168
|
const zoomArgs = {
|
|
8200
|
-
cancel: false, name: 'zoom', type: zoomIn, maps:
|
|
8169
|
+
cancel: false, name: 'zoom', type: zoomIn, maps: this,
|
|
8201
8170
|
tileTranslatePoint: {}, translatePoint: {},
|
|
8202
8171
|
tileZoomLevel: this.isTileMap ? { previous: this.tileZoomLevel, current: this.scaleOfGivenLocation } : {},
|
|
8203
8172
|
scale: !this.isTileMap ? { previous: this.scale, current: this.scaleOfGivenLocation } :
|
|
@@ -8345,19 +8314,21 @@ let Maps = class Maps extends Component {
|
|
|
8345
8314
|
render = true;
|
|
8346
8315
|
break;
|
|
8347
8316
|
case 'zoomSettings':
|
|
8348
|
-
if (
|
|
8349
|
-
|
|
8350
|
-
|
|
8351
|
-
|
|
8352
|
-
|
|
8353
|
-
|
|
8354
|
-
|
|
8355
|
-
|
|
8356
|
-
|
|
8357
|
-
|
|
8358
|
-
|
|
8359
|
-
|
|
8360
|
-
|
|
8317
|
+
if (!isNullOrUndefined(oldProp.zoomSettings)) {
|
|
8318
|
+
if (newProp.zoomSettings.zoomFactor !== oldProp.zoomSettings.zoomFactor) {
|
|
8319
|
+
render = false;
|
|
8320
|
+
}
|
|
8321
|
+
else if (newProp.zoomSettings.shouldZoomInitially !== oldProp.zoomSettings.shouldZoomInitially) {
|
|
8322
|
+
this.zoomSettings.zoomFactor = 1;
|
|
8323
|
+
render = true;
|
|
8324
|
+
}
|
|
8325
|
+
else if (newProp.zoomSettings.enable !== oldProp.zoomSettings.enable) {
|
|
8326
|
+
this.zoomSettings.zoomFactor = 1;
|
|
8327
|
+
render = true;
|
|
8328
|
+
}
|
|
8329
|
+
else {
|
|
8330
|
+
render = true;
|
|
8331
|
+
}
|
|
8361
8332
|
}
|
|
8362
8333
|
break;
|
|
8363
8334
|
case 'locale':
|
|
@@ -8370,12 +8341,7 @@ let Maps = class Maps extends Component {
|
|
|
8370
8341
|
if (newProp.layers && isMarker) {
|
|
8371
8342
|
removeElement(this.element.id + '_Markers_Group');
|
|
8372
8343
|
if (this.isTileMap) {
|
|
8373
|
-
|
|
8374
|
-
this.render();
|
|
8375
|
-
}
|
|
8376
|
-
else {
|
|
8377
|
-
this.mapLayerPanel.renderTileLayer(this.mapLayerPanel, this.layers['currentFactor'], (this.layers.length - 1));
|
|
8378
|
-
}
|
|
8344
|
+
this.mapLayerPanel.renderTileLayer(this.mapLayerPanel, this.layers['currentFactor'], (this.layers.length - 1));
|
|
8379
8345
|
}
|
|
8380
8346
|
else {
|
|
8381
8347
|
this.render();
|
|
@@ -8386,7 +8352,7 @@ let Maps = class Maps extends Component {
|
|
|
8386
8352
|
}
|
|
8387
8353
|
else {
|
|
8388
8354
|
this.createSVG();
|
|
8389
|
-
this.
|
|
8355
|
+
this.renderElements();
|
|
8390
8356
|
}
|
|
8391
8357
|
}
|
|
8392
8358
|
}
|
|
@@ -8874,15 +8840,6 @@ Maps = __decorate([
|
|
|
8874
8840
|
NotifyPropertyChanges
|
|
8875
8841
|
], Maps);
|
|
8876
8842
|
|
|
8877
|
-
var __rest$2 = (undefined && undefined.__rest) || function (s, e) {
|
|
8878
|
-
var t = {};
|
|
8879
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
8880
|
-
t[p] = s[p];
|
|
8881
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
8882
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
8883
|
-
t[p[i]] = s[p[i]];
|
|
8884
|
-
return t;
|
|
8885
|
-
};
|
|
8886
8843
|
/**
|
|
8887
8844
|
* Bubble module class
|
|
8888
8845
|
*/
|
|
@@ -8979,14 +8936,14 @@ class Bubble {
|
|
|
8979
8936
|
width: bubbleSettings.border.width
|
|
8980
8937
|
};
|
|
8981
8938
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
8982
|
-
const center = findMidPointOfPolygon(shapePoints[midIndex], projectionType);
|
|
8939
|
+
const center = findMidPointOfPolygon(shapePoints[midIndex], projectionType, layer.geometryType);
|
|
8983
8940
|
if (bubbleSettings.visible) {
|
|
8984
8941
|
if (!isNullOrUndefined(center)) {
|
|
8985
8942
|
centerY = this.maps.projectionType === 'Mercator' ? center['y'] : (-center['y']);
|
|
8986
8943
|
eventArgs = {
|
|
8987
8944
|
cancel: false, name: bubbleRendering, border: bubbleBorder,
|
|
8988
8945
|
cx: center['x'], cy: centerY, data: shapeData, fill: bubbleColor,
|
|
8989
|
-
maps: this.maps
|
|
8946
|
+
maps: this.maps, radius: radius
|
|
8990
8947
|
};
|
|
8991
8948
|
}
|
|
8992
8949
|
else {
|
|
@@ -8995,17 +8952,13 @@ class Bubble {
|
|
|
8995
8952
|
eventArgs = {
|
|
8996
8953
|
cancel: false, name: bubbleRendering, border: bubbleBorder,
|
|
8997
8954
|
cx: shapePoints[shapePointsLength]['x'], cy: shapePoints[shapePointsLength]['y'],
|
|
8998
|
-
data: shapeData, fill: bubbleColor, maps: this.maps
|
|
8955
|
+
data: shapeData, fill: bubbleColor, maps: this.maps,
|
|
8999
8956
|
radius: radius
|
|
9000
8957
|
};
|
|
9001
8958
|
}
|
|
9002
8959
|
else {
|
|
9003
8960
|
return;
|
|
9004
8961
|
}
|
|
9005
|
-
if (this.maps.isBlazor) {
|
|
9006
|
-
const { maps } = eventArgs, blazorEventArgs = __rest$2(eventArgs, ["maps"]);
|
|
9007
|
-
eventArgs = blazorEventArgs;
|
|
9008
|
-
}
|
|
9009
8962
|
}
|
|
9010
8963
|
this.maps.trigger('bubbleRendering', eventArgs, (bubbleArgs) => {
|
|
9011
8964
|
if (eventArgs.cancel) {
|
|
@@ -9092,10 +9045,6 @@ class Bubble {
|
|
|
9092
9045
|
cancel: false, name: bubbleClick, data: data, maps: this.maps,
|
|
9093
9046
|
target: target, x: e.clientX, y: e.clientY
|
|
9094
9047
|
};
|
|
9095
|
-
if (this.maps.isBlazor) {
|
|
9096
|
-
const { maps } = eventArgs, blazorEventArgs = __rest$2(eventArgs, ["maps"]);
|
|
9097
|
-
eventArgs = blazorEventArgs;
|
|
9098
|
-
}
|
|
9099
9048
|
this.maps.trigger(bubbleClick, eventArgs);
|
|
9100
9049
|
}
|
|
9101
9050
|
/**
|
|
@@ -9139,10 +9088,6 @@ class Bubble {
|
|
|
9139
9088
|
cancel: false, name: bubbleMouseMove, data: data, maps: this.maps,
|
|
9140
9089
|
target: target, x: e.clientX, y: e.clientY
|
|
9141
9090
|
};
|
|
9142
|
-
if (this.maps.isBlazor) {
|
|
9143
|
-
const { maps } = eventArgs, blazorEventArgs = __rest$2(eventArgs, ["maps"]);
|
|
9144
|
-
eventArgs = blazorEventArgs;
|
|
9145
|
-
}
|
|
9146
9091
|
this.maps.trigger(bubbleMouseMove, eventArgs);
|
|
9147
9092
|
}
|
|
9148
9093
|
/**
|
|
@@ -9167,15 +9112,6 @@ class Bubble {
|
|
|
9167
9112
|
}
|
|
9168
9113
|
}
|
|
9169
9114
|
|
|
9170
|
-
var __rest$3 = (undefined && undefined.__rest) || function (s, e) {
|
|
9171
|
-
var t = {};
|
|
9172
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
9173
|
-
t[p] = s[p];
|
|
9174
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
9175
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
9176
|
-
t[p[i]] = s[p[i]];
|
|
9177
|
-
return t;
|
|
9178
|
-
};
|
|
9179
9115
|
/**
|
|
9180
9116
|
* DataLabel Module used to render the maps datalabel
|
|
9181
9117
|
*/
|
|
@@ -9347,7 +9283,7 @@ class DataLabel {
|
|
|
9347
9283
|
};
|
|
9348
9284
|
}
|
|
9349
9285
|
else {
|
|
9350
|
-
location = findMidPointOfPolygon(shapePoint[midIndex], projectionType);
|
|
9286
|
+
location = findMidPointOfPolygon(shapePoint[midIndex], projectionType, layer.geometryType);
|
|
9351
9287
|
}
|
|
9352
9288
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
9353
9289
|
const firstLevelMapLocation = location;
|
|
@@ -9368,7 +9304,7 @@ class DataLabel {
|
|
|
9368
9304
|
location['x'] = ((location['x'] + zoomTransPoint['x']) * scale);
|
|
9369
9305
|
location['y'] = ((location['y'] + zoomTransPoint['y']) * scale);
|
|
9370
9306
|
}
|
|
9371
|
-
location['y'] = (this.maps.projectionType === 'Mercator') ? location['y'] : (-location['y']);
|
|
9307
|
+
location['y'] = (this.maps.projectionType === 'Mercator') || layer.geometryType === 'Normal' ? location['y'] : (-location['y']);
|
|
9372
9308
|
if (!isNullOrUndefined(this.maps.format) && !isNaN(parseFloat(text))) {
|
|
9373
9309
|
if (this.maps.useGroupingSeparator) {
|
|
9374
9310
|
text = Internalize(this.maps, parseFloat(text));
|
|
@@ -9382,10 +9318,6 @@ class DataLabel {
|
|
|
9382
9318
|
width: dataLabel.border.width, opacity: dataLabel.border.opacity }, datalabel: dataLabel,
|
|
9383
9319
|
fill: dataLabel.fill, template: dataLabel.template, text: text
|
|
9384
9320
|
};
|
|
9385
|
-
if (this.maps.isBlazor) {
|
|
9386
|
-
const { maps, datalabel } = eventargs, blazorEventArgs = __rest$3(eventargs, ["maps", "datalabel"]);
|
|
9387
|
-
eventargs = blazorEventArgs;
|
|
9388
|
-
}
|
|
9389
9321
|
this.maps.trigger('dataLabelRendering', eventargs, (labelArgs) => {
|
|
9390
9322
|
if (eventargs.cancel) {
|
|
9391
9323
|
return;
|
|
@@ -9413,7 +9345,7 @@ class DataLabel {
|
|
|
9413
9345
|
if (!isPoint && position.length > 5 && (shapeData['geometry']['type'] !== 'MultiPolygon') &&
|
|
9414
9346
|
(shapeData['type'] !== 'MultiPolygon')) {
|
|
9415
9347
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
9416
|
-
const location1 = findMidPointOfPolygon(position, projectionType);
|
|
9348
|
+
const location1 = findMidPointOfPolygon(position, projectionType, layer.geometryType);
|
|
9417
9349
|
if (zoomLabelsPosition && scaleZoomValue > 1 && !this.maps.zoomNotApplied && eventargs.template === '') {
|
|
9418
9350
|
location1['x'] = ((this.maps.zoomLabelPositions[index]['location']['x'] + zoomTransPoint['x']) * scale);
|
|
9419
9351
|
location1['y'] = ((this.maps.zoomLabelPositions[index]['location']['y'] + zoomTransPoint['y']) * scale);
|
|
@@ -9440,7 +9372,8 @@ class DataLabel {
|
|
|
9440
9372
|
}
|
|
9441
9373
|
else {
|
|
9442
9374
|
if (dataLabelSettings.smartLabelMode === 'Trim') {
|
|
9443
|
-
|
|
9375
|
+
let textType = typeof text === 'number' ? text.toString() : text;
|
|
9376
|
+
trimmedLable = textTrim(width, textType, style);
|
|
9444
9377
|
elementSize = measureText(trimmedLable, style);
|
|
9445
9378
|
options = new TextOption(labelId, textLocation.x, textLocation.y, 'middle', trimmedLable, '', '');
|
|
9446
9379
|
}
|
|
@@ -10262,7 +10195,7 @@ class Legend {
|
|
|
10262
10195
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10263
10196
|
const collection = this.maps.legendModule.legendCollection;
|
|
10264
10197
|
let length;
|
|
10265
|
-
const multiSelectEnable = this.maps.layers[collection[0]['data'][0]['layerIndex']].selectionSettings.enableMultiSelect;
|
|
10198
|
+
const multiSelectEnable = !isNullOrUndefined(collection[0]['data'][0]['layerIndex']) ? this.maps.layers[collection[0]['data'][0]['layerIndex']].selectionSettings.enableMultiSelect : false;
|
|
10266
10199
|
let selectLength = 0;
|
|
10267
10200
|
let interactProcess = true;
|
|
10268
10201
|
const idIndex = parseFloat(targetElement.id.charAt(targetElement.id.length - 1));
|
|
@@ -11722,15 +11655,6 @@ class Legend {
|
|
|
11722
11655
|
}
|
|
11723
11656
|
}
|
|
11724
11657
|
|
|
11725
|
-
var __rest$4 = (undefined && undefined.__rest) || function (s, e) {
|
|
11726
|
-
var t = {};
|
|
11727
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
11728
|
-
t[p] = s[p];
|
|
11729
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
11730
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
11731
|
-
t[p[i]] = s[p[i]];
|
|
11732
|
-
return t;
|
|
11733
|
-
};
|
|
11734
11658
|
/**
|
|
11735
11659
|
* Highlight module class
|
|
11736
11660
|
*/
|
|
@@ -11894,10 +11818,6 @@ class Highlight {
|
|
|
11894
11818
|
data: data,
|
|
11895
11819
|
maps: this.maps
|
|
11896
11820
|
};
|
|
11897
|
-
if (this.maps.isBlazor) {
|
|
11898
|
-
const { shapeData, maps } = eventArgs, blazorEventArgs = __rest$4(eventArgs, ["shapeData", "maps"]);
|
|
11899
|
-
eventArgs = blazorEventArgs;
|
|
11900
|
-
}
|
|
11901
11821
|
this.maps.trigger(itemHighlight, eventArgs, () => {
|
|
11902
11822
|
eventArgs.border.opacity = isNullOrUndefined(this.highlightSettings.border.opacity) ? this.highlightSettings.opacity : this.highlightSettings.border.opacity;
|
|
11903
11823
|
this.highlightMap(targetEle, eventArgs);
|
|
@@ -11950,15 +11870,6 @@ class Highlight {
|
|
|
11950
11870
|
}
|
|
11951
11871
|
}
|
|
11952
11872
|
|
|
11953
|
-
var __rest$5 = (undefined && undefined.__rest) || function (s, e) {
|
|
11954
|
-
var t = {};
|
|
11955
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
11956
|
-
t[p] = s[p];
|
|
11957
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
11958
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
11959
|
-
t[p[i]] = s[p[i]];
|
|
11960
|
-
return t;
|
|
11961
|
-
};
|
|
11962
11873
|
/**
|
|
11963
11874
|
* Selection module class
|
|
11964
11875
|
*/
|
|
@@ -12096,10 +12007,6 @@ class Selection {
|
|
|
12096
12007
|
data: data,
|
|
12097
12008
|
maps: this.maps
|
|
12098
12009
|
};
|
|
12099
|
-
if (this.maps.isBlazor) {
|
|
12100
|
-
const { shapeData, maps } = eventArgs, blazorEventArgs = __rest$5(eventArgs, ["shapeData", "maps"]);
|
|
12101
|
-
eventArgs = blazorEventArgs;
|
|
12102
|
-
}
|
|
12103
12010
|
this.maps.trigger('itemSelection', eventArgs, (observedArgs) => {
|
|
12104
12011
|
eventArgs.border.opacity = isNullOrUndefined(this.selectionsettings.border.opacity) ? this.selectionsettings.opacity : this.selectionsettings.border.opacity;
|
|
12105
12012
|
if (!eventArgs.cancel) {
|
|
@@ -12413,131 +12320,62 @@ class MapsTooltip {
|
|
|
12413
12320
|
maps: this.maps,
|
|
12414
12321
|
element: target, eventArgs: e
|
|
12415
12322
|
};
|
|
12416
|
-
|
|
12417
|
-
|
|
12418
|
-
|
|
12419
|
-
|
|
12420
|
-
|
|
12421
|
-
|
|
12422
|
-
cancel
|
|
12423
|
-
|
|
12424
|
-
|
|
12425
|
-
|
|
12426
|
-
|
|
12427
|
-
|
|
12428
|
-
|
|
12429
|
-
|
|
12430
|
-
|
|
12431
|
-
|
|
12432
|
-
|
|
12433
|
-
|
|
12434
|
-
|
|
12435
|
-
|
|
12436
|
-
|
|
12437
|
-
}
|
|
12438
|
-
else {
|
|
12439
|
-
|
|
12440
|
-
}
|
|
12441
|
-
this.maps['isProtectedOnChange'] = true;
|
|
12442
|
-
if (blazorArgs.cancel) {
|
|
12443
|
-
this.svgTooltip = new Tooltip({
|
|
12444
|
-
enable: true,
|
|
12445
|
-
header: '',
|
|
12446
|
-
content: [currentData.toString()],
|
|
12447
|
-
shapes: [],
|
|
12448
|
-
location: tootipOption.location,
|
|
12449
|
-
palette: [markerFill],
|
|
12450
|
-
areaBounds: this.maps.mapAreaRect,
|
|
12451
|
-
textStyle: tooltipArgs.options['textStyle'],
|
|
12452
|
-
availableSize: this.maps.availableSize,
|
|
12453
|
-
fill: tooltipArgs.fill
|
|
12454
|
-
});
|
|
12455
|
-
}
|
|
12456
|
-
else {
|
|
12457
|
-
this.svgTooltip = new Tooltip({
|
|
12458
|
-
enable: true,
|
|
12459
|
-
header: '',
|
|
12460
|
-
content: [currentData.toString()],
|
|
12461
|
-
shapes: [],
|
|
12462
|
-
location: tootipOption.location,
|
|
12463
|
-
palette: [markerFill],
|
|
12464
|
-
areaBounds: this.maps.mapAreaRect,
|
|
12465
|
-
textStyle: blazorArgs.textStyle,
|
|
12466
|
-
availableSize: this.maps.availableSize,
|
|
12467
|
-
fill: blazorArgs.fill
|
|
12468
|
-
});
|
|
12469
|
-
}
|
|
12470
|
-
const tooltipElement = tooltipEle;
|
|
12471
|
-
this.svgTooltip.opacity = this.maps.themeStyle.tooltipFillOpacity || this.svgTooltip.opacity;
|
|
12472
|
-
this.svgTooltip.appendTo(tooltipElement);
|
|
12473
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12474
|
-
this.maps.renderReactTemplates();
|
|
12323
|
+
this.maps.trigger(tooltipRender, tooltipArgs, (args) => {
|
|
12324
|
+
if (!tooltipArgs.cancel && option.visible && !isNullOrUndefined(currentData) &&
|
|
12325
|
+
(targetId.indexOf('_cluster_') === -1 && targetId.indexOf('_dataLabel_') === -1)) {
|
|
12326
|
+
this.maps['isProtectedOnChange'] = true;
|
|
12327
|
+
tooltipArgs.options['textStyle']['color'] = tooltipArgs.options['textStyle']['color']
|
|
12328
|
+
|| this.maps.themeStyle.tooltipFontColor;
|
|
12329
|
+
if (tooltipArgs.cancel) {
|
|
12330
|
+
this.svgTooltip = new Tooltip({
|
|
12331
|
+
enable: true,
|
|
12332
|
+
header: '',
|
|
12333
|
+
data: option['data'],
|
|
12334
|
+
template: option['template'],
|
|
12335
|
+
content: [currentData.toString()],
|
|
12336
|
+
shapes: [],
|
|
12337
|
+
location: option['location'],
|
|
12338
|
+
palette: [markerFill],
|
|
12339
|
+
areaBounds: this.maps.mapAreaRect,
|
|
12340
|
+
textStyle: option['textStyle'],
|
|
12341
|
+
availableSize: this.maps.availableSize,
|
|
12342
|
+
fill: option.fill || this.maps.themeStyle.tooltipFillColor
|
|
12343
|
+
});
|
|
12475
12344
|
}
|
|
12476
12345
|
else {
|
|
12477
|
-
this.
|
|
12478
|
-
|
|
12479
|
-
|
|
12480
|
-
|
|
12481
|
-
|
|
12482
|
-
|
|
12483
|
-
|
|
12484
|
-
|
|
12485
|
-
|
|
12486
|
-
|
|
12487
|
-
|
|
12488
|
-
|
|
12489
|
-
|| this.maps.themeStyle.
|
|
12490
|
-
|
|
12491
|
-
this.svgTooltip = new Tooltip({
|
|
12492
|
-
enable: true,
|
|
12493
|
-
header: '',
|
|
12494
|
-
data: option['data'],
|
|
12495
|
-
template: option['template'],
|
|
12496
|
-
content: [currentData.toString()],
|
|
12497
|
-
shapes: [],
|
|
12498
|
-
location: option['location'],
|
|
12499
|
-
palette: [markerFill],
|
|
12500
|
-
areaBounds: this.maps.mapAreaRect,
|
|
12501
|
-
textStyle: option['textStyle'],
|
|
12502
|
-
availableSize: this.maps.availableSize,
|
|
12503
|
-
fill: option.fill || this.maps.themeStyle.tooltipFillColor
|
|
12504
|
-
});
|
|
12505
|
-
}
|
|
12506
|
-
else {
|
|
12507
|
-
this.svgTooltip = new Tooltip({
|
|
12508
|
-
enable: true,
|
|
12509
|
-
header: '',
|
|
12510
|
-
data: tooltipArgs.options['data'],
|
|
12511
|
-
template: tooltipArgs.options['template'],
|
|
12512
|
-
content: [currentData.toString()],
|
|
12513
|
-
shapes: [],
|
|
12514
|
-
location: tooltipArgs.options['location'],
|
|
12515
|
-
palette: [markerFill],
|
|
12516
|
-
areaBounds: this.maps.mapAreaRect,
|
|
12517
|
-
textStyle: tooltipArgs.options['textStyle'],
|
|
12518
|
-
availableSize: this.maps.availableSize,
|
|
12519
|
-
fill: tooltipArgs.fill || this.maps.themeStyle.tooltipFillColor
|
|
12520
|
-
});
|
|
12521
|
-
}
|
|
12522
|
-
this.svgTooltip.opacity = this.maps.themeStyle.tooltipFillOpacity || this.svgTooltip.opacity;
|
|
12523
|
-
this.svgTooltip.appendTo(tooltipEle);
|
|
12524
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12525
|
-
this.maps.renderReactTemplates();
|
|
12526
|
-
tooltipTemplateElement = document.getElementById(this.maps.element.id + '_mapsTooltip');
|
|
12527
|
-
if (tooltipTemplateElement !== null && tooltipTemplateElement.innerHTML.indexOf('href') !== -1
|
|
12528
|
-
&& tooltipTemplateElement.innerHTML.indexOf('</a>') !== -1) {
|
|
12529
|
-
let templateStyle = tooltipTemplateElement.getAttribute('style');
|
|
12530
|
-
templateStyle = templateStyle.replace('pointer-events: none;', 'position-events:all;');
|
|
12531
|
-
tooltipTemplateElement.setAttribute('style', templateStyle);
|
|
12532
|
-
}
|
|
12346
|
+
this.svgTooltip = new Tooltip({
|
|
12347
|
+
enable: true,
|
|
12348
|
+
header: '',
|
|
12349
|
+
data: tooltipArgs.options['data'],
|
|
12350
|
+
template: tooltipArgs.options['template'],
|
|
12351
|
+
content: [currentData.toString()],
|
|
12352
|
+
shapes: [],
|
|
12353
|
+
location: tooltipArgs.options['location'],
|
|
12354
|
+
palette: [markerFill],
|
|
12355
|
+
areaBounds: this.maps.mapAreaRect,
|
|
12356
|
+
textStyle: tooltipArgs.options['textStyle'],
|
|
12357
|
+
availableSize: this.maps.availableSize,
|
|
12358
|
+
fill: tooltipArgs.fill || this.maps.themeStyle.tooltipFillColor
|
|
12359
|
+
});
|
|
12533
12360
|
}
|
|
12534
|
-
|
|
12535
|
-
|
|
12536
|
-
|
|
12537
|
-
|
|
12361
|
+
this.svgTooltip.opacity = this.maps.themeStyle.tooltipFillOpacity || this.svgTooltip.opacity;
|
|
12362
|
+
this.svgTooltip.appendTo(tooltipEle);
|
|
12363
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12364
|
+
this.maps.renderReactTemplates();
|
|
12365
|
+
tooltipTemplateElement = document.getElementById(this.maps.element.id + '_mapsTooltip');
|
|
12366
|
+
if (tooltipTemplateElement !== null && tooltipTemplateElement.innerHTML.indexOf('href') !== -1
|
|
12367
|
+
&& tooltipTemplateElement.innerHTML.indexOf('</a>') !== -1) {
|
|
12368
|
+
let templateStyle = tooltipTemplateElement.getAttribute('style');
|
|
12369
|
+
templateStyle = templateStyle.replace('pointer-events: none;', 'position-events:all;');
|
|
12370
|
+
tooltipTemplateElement.setAttribute('style', templateStyle);
|
|
12538
12371
|
}
|
|
12539
|
-
}
|
|
12540
|
-
|
|
12372
|
+
}
|
|
12373
|
+
else {
|
|
12374
|
+
this.removeTooltip();
|
|
12375
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12376
|
+
this.maps.clearTemplate();
|
|
12377
|
+
}
|
|
12378
|
+
});
|
|
12541
12379
|
if (this.svgTooltip) {
|
|
12542
12380
|
this.maps.trigger('tooltipRenderComplete', {
|
|
12543
12381
|
cancel: false, name: 'tooltipRenderComplete', maps: this.maps, options: tooltipOption,
|
|
@@ -12667,15 +12505,6 @@ class MapsTooltip {
|
|
|
12667
12505
|
}
|
|
12668
12506
|
}
|
|
12669
12507
|
|
|
12670
|
-
var __rest$6 = (undefined && undefined.__rest) || function (s, e) {
|
|
12671
|
-
var t = {};
|
|
12672
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
12673
|
-
t[p] = s[p];
|
|
12674
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
12675
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
12676
|
-
t[p[i]] = s[p[i]];
|
|
12677
|
-
return t;
|
|
12678
|
-
};
|
|
12679
12508
|
/**
|
|
12680
12509
|
* Zoom module used to process the zoom for maps
|
|
12681
12510
|
*/
|
|
@@ -12799,14 +12628,14 @@ class Zoom {
|
|
|
12799
12628
|
let zoomArgs;
|
|
12800
12629
|
if (!map.isTileMap) {
|
|
12801
12630
|
zoomArgs = {
|
|
12802
|
-
cancel: false, name: 'zoom', type: type, maps:
|
|
12631
|
+
cancel: false, name: 'zoom', type: type, maps: map,
|
|
12803
12632
|
tileTranslatePoint: {}, translatePoint: { previous: map.previousPoint, current: map.translatePoint },
|
|
12804
12633
|
tileZoomLevel: {}, scale: { previous: map.previousScale, current: map.scale }
|
|
12805
12634
|
};
|
|
12806
12635
|
}
|
|
12807
12636
|
else {
|
|
12808
12637
|
zoomArgs = {
|
|
12809
|
-
cancel: false, name: 'zoom', type: type, maps:
|
|
12638
|
+
cancel: false, name: 'zoom', type: type, maps: map,
|
|
12810
12639
|
tileTranslatePoint: { previous: prevTilePoint, current: map.tileTranslatePoint }, translatePoint: { previous: map.previousPoint, current: map.translatePoint },
|
|
12811
12640
|
tileZoomLevel: { previous: prevLevel, current: map.tileZoomLevel }, scale: { previous: map.previousScale, current: map.scale }
|
|
12812
12641
|
};
|
|
@@ -13011,7 +12840,7 @@ class Zoom {
|
|
|
13011
12840
|
}
|
|
13012
12841
|
}
|
|
13013
12842
|
else if (currentEle.id.indexOf('_Markers_Group') > -1) {
|
|
13014
|
-
if (!this.isPanning
|
|
12843
|
+
if (!this.isPanning) {
|
|
13015
12844
|
this.markerTranslates(currentEle.childNodes[0], factor, x, y, scale, 'Marker', layerElement, animate$$1);
|
|
13016
12845
|
}
|
|
13017
12846
|
currentEle = layerElement.childNodes[j];
|
|
@@ -13130,7 +12959,6 @@ class Zoom {
|
|
|
13130
12959
|
}
|
|
13131
12960
|
}
|
|
13132
12961
|
this.maps.arrangeTemplate();
|
|
13133
|
-
const blazor = this.maps.isBlazor ? this.maps.blazorTemplates() : null;
|
|
13134
12962
|
}
|
|
13135
12963
|
if (!isNullOrUndefined(this.currentLayer)) {
|
|
13136
12964
|
if (!animate$$1 || this.currentLayer.animationDuration === 0) {
|
|
@@ -13183,18 +13011,6 @@ class Zoom {
|
|
|
13183
13011
|
};
|
|
13184
13012
|
eventArgs = markerShapeChoose(eventArgs, data);
|
|
13185
13013
|
eventArgs = markerColorChoose(eventArgs, data);
|
|
13186
|
-
if (this.maps.isBlazor) {
|
|
13187
|
-
const { maps, marker: marker$$1 } = eventArgs, blazorEventArgs = __rest$6(eventArgs, ["maps", "marker"]);
|
|
13188
|
-
eventArgs = blazorEventArgs;
|
|
13189
|
-
const latitudeValue = 'Latitude';
|
|
13190
|
-
const longitudeValue = 'Longitude';
|
|
13191
|
-
markerSettings.longitudeValuePath = !isNullOrUndefined(markerSettings.longitudeValuePath) ?
|
|
13192
|
-
markerSettings.longitudeValuePath : !isNullOrUndefined(data['Longitude']) ? longitudeValue :
|
|
13193
|
-
!isNullOrUndefined(data['longitude']) ? 'longitude' : null;
|
|
13194
|
-
markerSettings.latitudeValuePath = !isNullOrUndefined(markerSettings.latitudeValuePath) ?
|
|
13195
|
-
markerSettings.latitudeValuePath : !isNullOrUndefined(data['Latitude']) ? latitudeValue :
|
|
13196
|
-
!isNullOrUndefined(data['latitude']) ? 'latitude' : null;
|
|
13197
|
-
}
|
|
13198
13014
|
this.maps.trigger('markerRendering', eventArgs, (MarkerArgs) => {
|
|
13199
13015
|
if (markerSettings.shapeValuePath !== eventArgs.shapeValuePath) {
|
|
13200
13016
|
eventArgs = markerShapeChoose(eventArgs, data);
|
|
@@ -13208,22 +13024,6 @@ class Zoom {
|
|
|
13208
13024
|
const long = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
|
|
13209
13025
|
Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
|
|
13210
13026
|
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? data['Longitude'] : 0;
|
|
13211
|
-
if (this.maps.isBlazor) {
|
|
13212
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13213
|
-
const data1 = {};
|
|
13214
|
-
let j = 0;
|
|
13215
|
-
const text = [];
|
|
13216
|
-
for (let i = 0; i < Object.keys(data).length; i++) {
|
|
13217
|
-
if (Object.keys(data)[i].toLowerCase() !== 'text' && Object.keys(data)[i].toLowerCase() !== 'latitude'
|
|
13218
|
-
&& Object.keys(data)[i].toLowerCase() !== 'blazortemplateid' && Object.keys(data)[i].toLowerCase() !== 'longitude'
|
|
13219
|
-
&& Object.keys(data)[i].toLowerCase() !== 'name') {
|
|
13220
|
-
data1['text'] = text;
|
|
13221
|
-
text[j] = data[Object.keys(data)[i].toLowerCase()];
|
|
13222
|
-
j++;
|
|
13223
|
-
}
|
|
13224
|
-
}
|
|
13225
|
-
data['text'] = data1['text'];
|
|
13226
|
-
}
|
|
13227
13027
|
const offset = markerSettings.offset;
|
|
13228
13028
|
if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(long) && !isNullOrUndefined(lati)) {
|
|
13229
13029
|
const markerID = this.maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
@@ -13442,28 +13242,6 @@ class Zoom {
|
|
|
13442
13242
|
const layer = this.maps.layersCollection[layerIndex];
|
|
13443
13243
|
const marker$$1 = layer.markerSettings[markerIndex];
|
|
13444
13244
|
if (!isNullOrUndefined(marker$$1) && !isNullOrUndefined(marker$$1.dataSource) && !isNullOrUndefined(marker$$1.dataSource[dataIndex])) {
|
|
13445
|
-
if (this.maps.isBlazor) {
|
|
13446
|
-
marker$$1.longitudeValuePath = !isNullOrUndefined(marker$$1.longitudeValuePath) ?
|
|
13447
|
-
marker$$1.longitudeValuePath : !isNullOrUndefined(marker$$1.dataSource[dataIndex]['Longitude']) ? 'Longitude' :
|
|
13448
|
-
!isNullOrUndefined(marker$$1.dataSource[dataIndex]['longitude']) ? 'longitude' : null;
|
|
13449
|
-
marker$$1.latitudeValuePath = !isNullOrUndefined(marker$$1.latitudeValuePath) ?
|
|
13450
|
-
marker$$1.latitudeValuePath : !isNullOrUndefined(marker$$1.dataSource[dataIndex]['Latitude']) ? 'Latitude' :
|
|
13451
|
-
!isNullOrUndefined(marker$$1.dataSource[dataIndex]['latitude']) ? 'latitude' : null;
|
|
13452
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13453
|
-
const data1 = {};
|
|
13454
|
-
let j = 0;
|
|
13455
|
-
const text = [];
|
|
13456
|
-
for (let i = 0; i < Object.keys(marker$$1.dataSource[dataIndex]).length; i++) {
|
|
13457
|
-
if (Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase() !== 'text' && Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase() !== 'longitude'
|
|
13458
|
-
&& Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase() !== 'latitude' && Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase() !== 'blazortemplateid'
|
|
13459
|
-
&& Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase() !== 'name') {
|
|
13460
|
-
data1['text'] = text;
|
|
13461
|
-
text[j] = marker$$1.dataSource[dataIndex][Object.keys(marker$$1.dataSource[dataIndex])[i].toLowerCase()];
|
|
13462
|
-
j++;
|
|
13463
|
-
}
|
|
13464
|
-
}
|
|
13465
|
-
marker$$1.dataSource[dataIndex]['text'] = data1['text'];
|
|
13466
|
-
}
|
|
13467
13245
|
const lng = (!isNullOrUndefined(marker$$1.longitudeValuePath)) ?
|
|
13468
13246
|
Number(getValueFromObject(marker$$1.dataSource[dataIndex], marker$$1.longitudeValuePath)) :
|
|
13469
13247
|
!isNullOrUndefined(marker$$1.dataSource[dataIndex]['longitude']) ? parseFloat(marker$$1.dataSource[dataIndex]['longitude']) :
|
|
@@ -13501,9 +13279,20 @@ class Zoom {
|
|
|
13501
13279
|
}
|
|
13502
13280
|
else {
|
|
13503
13281
|
if (type === 'Template') {
|
|
13504
|
-
|
|
13505
|
-
|
|
13506
|
-
|
|
13282
|
+
if (duration > 0) {
|
|
13283
|
+
location.x = ((Math.abs(this.maps.baseMapRectBounds['min']['x'] - location.x)) * scale);
|
|
13284
|
+
location.y = ((Math.abs(this.maps.baseMapRectBounds['min']['y'] - location.y)) * scale);
|
|
13285
|
+
const layerOffset = getElementByID(this.maps.element.id + '_Layer_Collections').getBoundingClientRect();
|
|
13286
|
+
const elementOffset = element.parentElement.getBoundingClientRect();
|
|
13287
|
+
element.style.left = (((location.x) + (layerOffset.left - elementOffset.left)) + marker$$1.offset.x) + 'px';
|
|
13288
|
+
element.style.top = (((location.y) + (layerOffset.top - elementOffset.top)) + marker$$1.offset.y) + 'px';
|
|
13289
|
+
element.style.transform = 'translate(-50%, -50%)';
|
|
13290
|
+
}
|
|
13291
|
+
else {
|
|
13292
|
+
const elementOffset = element.getBoundingClientRect();
|
|
13293
|
+
element.style.left = ((location.x + x) * scale) + marker$$1.offset.x - this.maps.mapAreaRect.x - (elementOffset.width / 2) + 'px';
|
|
13294
|
+
element.style.top = ((location.y + y) * scale) + marker$$1.offset.y - this.maps.mapAreaRect.y - (elementOffset.height / 2) + 'px';
|
|
13295
|
+
}
|
|
13507
13296
|
}
|
|
13508
13297
|
else {
|
|
13509
13298
|
location.x = (((location.x + x) * scale) + marker$$1.offset.x);
|
|
@@ -13547,7 +13336,7 @@ class Zoom {
|
|
|
13547
13336
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13548
13337
|
const location = this.maps.getGeoLocation(this.maps.layersCollection.length - 1, mouseLocation['layerX'], mouseLocation['layerY']);
|
|
13549
13338
|
panArgs = {
|
|
13550
|
-
cancel: false, name: pan, maps:
|
|
13339
|
+
cancel: false, name: pan, maps: map,
|
|
13551
13340
|
tileTranslatePoint: {}, translatePoint: { previous: translatePoint, current: new Point(x, y) },
|
|
13552
13341
|
scale: map.scale, tileZoomLevel: map.tileZoomLevel, latitude: location['latitude'], longitude: location['longitude']
|
|
13553
13342
|
};
|
|
@@ -13584,7 +13373,7 @@ class Zoom {
|
|
|
13584
13373
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13585
13374
|
const location = this.maps.getTileGeoLocation(mouseLocation['layerX'], mouseLocation['layerY']);
|
|
13586
13375
|
panArgs = {
|
|
13587
|
-
cancel: false, name: pan, maps:
|
|
13376
|
+
cancel: false, name: pan, maps: map,
|
|
13588
13377
|
tileTranslatePoint: { previous: prevTilePoint, current: map.tileTranslatePoint },
|
|
13589
13378
|
translatePoint: { previous: translatePoint, current: map.translatePoint }, scale: map.scale,
|
|
13590
13379
|
tileZoomLevel: map.tileZoomLevel, latitude: location['latitude'], longitude: location['longitude']
|
|
@@ -14546,7 +14335,7 @@ class PdfExport {
|
|
|
14546
14335
|
const exportElement = this.control.svgObject.cloneNode(true);
|
|
14547
14336
|
const backgroundElement = exportElement.childNodes[0];
|
|
14548
14337
|
const backgroundColor = backgroundElement.getAttribute('fill');
|
|
14549
|
-
if ((this.control.theme === 'Tailwind' || this.control.theme === 'TailwindDark')
|
|
14338
|
+
if ((this.control.theme === 'Tailwind' || this.control.theme === 'TailwindDark' || this.control.theme === 'Bootstrap5' || this.control.theme === 'Bootstrap5Dark')
|
|
14550
14339
|
&& (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
|
|
14551
14340
|
exportElement.childNodes[0].setAttribute('fill', 'rgba(255,255,255, 1)');
|
|
14552
14341
|
}
|