@syncfusion/ej2-maps 19.4.56 → 20.1.47
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/CHANGELOG.md +13 -1
- 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 +79 -46
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +79 -46
- 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/data-label.js +1 -1
- package/src/maps/layers/legend.js +1 -1
- package/src/maps/layers/marker.js +4 -4
- package/src/maps/model/export-image.js +5 -6
- package/src/maps/model/export-pdf.js +6 -8
- package/src/maps/model/print.js +22 -2
- package/src/maps/model/theme.js +4 -4
- package/src/maps/user-interaction/annotation.js +1 -1
- package/src/maps/user-interaction/tooltip.d.ts +2 -1
- package/src/maps/user-interaction/tooltip.js +17 -9
- package/src/maps/user-interaction/zoom.js +10 -10
- package/src/maps/utils/enum.d.ts +5 -1
- package/src/maps/utils/helper.d.ts +1 -1
- package/src/maps/utils/helper.js +9 -2
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version :
|
|
3
|
+
* version : 20.1.47
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
|
|
5
5
|
* Use of this code is subject to the terms of our license.
|
|
6
6
|
* A copy of the current license can be obtained at any time by e-mailing
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-maps@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-maps@
|
|
3
|
+
"_id": "@syncfusion/ej2-maps@16.37.2",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-aGcgrJMiXZD4Fn3dqBUbLHHIpV4Rl6EzYL4XUKDohYLRM7aWMclbVfBg7S1eSGE0vh5g6uB67RVflkiB3Jd0Lw==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-maps",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-maps",
|
|
24
24
|
"/@syncfusion/ej2-vue-maps"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "http://nexus.syncfusion.com/repository/ej2-
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-maps/-/ej2-maps-16.37.2.tgz",
|
|
27
|
+
"_shasum": "58f1d0ca618711f1acab653b009fd39983923c45",
|
|
28
28
|
"_spec": "@syncfusion/ej2-maps@*",
|
|
29
29
|
"_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
},
|
|
36
36
|
"bundleDependencies": false,
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@syncfusion/ej2-base": "~
|
|
39
|
-
"@syncfusion/ej2-buttons": "~
|
|
40
|
-
"@syncfusion/ej2-compression": "~
|
|
41
|
-
"@syncfusion/ej2-data": "~
|
|
42
|
-
"@syncfusion/ej2-file-utils": "~
|
|
43
|
-
"@syncfusion/ej2-pdf-export": "~
|
|
44
|
-
"@syncfusion/ej2-svg-base": "~
|
|
38
|
+
"@syncfusion/ej2-base": "~20.1.47",
|
|
39
|
+
"@syncfusion/ej2-buttons": "~20.1.47",
|
|
40
|
+
"@syncfusion/ej2-compression": "~20.1.47",
|
|
41
|
+
"@syncfusion/ej2-data": "~20.1.47",
|
|
42
|
+
"@syncfusion/ej2-file-utils": "~20.1.47",
|
|
43
|
+
"@syncfusion/ej2-pdf-export": "~20.1.47",
|
|
44
|
+
"@syncfusion/ej2-svg-base": "~20.1.47"
|
|
45
45
|
},
|
|
46
46
|
"deprecated": false,
|
|
47
47
|
"description": "The Maps component is used to visualize the geographical data and represent the statistical data of a particular geographical area on earth with user interactivity, and provides various customizing options",
|
|
@@ -80,6 +80,6 @@
|
|
|
80
80
|
"url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
|
|
81
81
|
},
|
|
82
82
|
"typings": "index.d.ts",
|
|
83
|
-
"version": "
|
|
83
|
+
"version": "20.1.47",
|
|
84
84
|
"sideEffects": false
|
|
85
85
|
}
|
|
@@ -256,7 +256,7 @@ var DataLabel = /** @class */ (function () {
|
|
|
256
256
|
_this.value[index] = { rightWidth: xpositionEnds, leftWidth: xpositionStart, heightTop: start, heightBottom: end };
|
|
257
257
|
var labelElement;
|
|
258
258
|
if (eventargs_1.template !== '') {
|
|
259
|
-
templateFn = getTemplateFunction(eventargs_1.template);
|
|
259
|
+
templateFn = getTemplateFunction(eventargs_1.template, _this.maps);
|
|
260
260
|
var templateElement = templateFn ? templateFn(!isNullOrUndefined(datasrcObj) ?
|
|
261
261
|
datasrcObj : shapeData['properties'], _this.maps, eventargs_1.template, _this.maps.element.id + '_LabelTemplate', false) : document.createElement('div');
|
|
262
262
|
templateElement.innerHTML = !templateFn ? eventargs_1.template : '';
|
|
@@ -1303,7 +1303,7 @@ var Legend = /** @class */ (function () {
|
|
|
1303
1303
|
data[_this.maps.legendSettings.showLegendPath];
|
|
1304
1304
|
if (marker.visible && showLegend && (!isNullOrUndefined(data['latitude'])) && (!isNullOrUndefined(data['longitude']))) {
|
|
1305
1305
|
if (marker.template) {
|
|
1306
|
-
templateFn = getTemplateFunction(marker.template);
|
|
1306
|
+
templateFn = getTemplateFunction(marker.template, _this.maps);
|
|
1307
1307
|
var templateElement = templateFn(_this.maps);
|
|
1308
1308
|
var markerEle = isNullOrUndefined(templateElement.childElementCount) ? templateElement[0] :
|
|
1309
1309
|
templateElement;
|
|
@@ -53,10 +53,10 @@ var Marker = /** @class */ (function () {
|
|
|
53
53
|
eventArgs = markerShapeChoose(eventArgs, data);
|
|
54
54
|
var lng = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
|
|
55
55
|
Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
|
|
56
|
-
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) :
|
|
56
|
+
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) : null;
|
|
57
57
|
var lat = (!isNullOrUndefined(markerSettings.latitudeValuePath)) ?
|
|
58
58
|
Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
|
|
59
|
-
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) :
|
|
59
|
+
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) : null;
|
|
60
60
|
var offset = markerSettings.offset;
|
|
61
61
|
if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(lng) && !isNullOrUndefined(lat)) {
|
|
62
62
|
var markerID = _this.maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
@@ -101,7 +101,7 @@ var Marker = /** @class */ (function () {
|
|
|
101
101
|
_this.maps.renderReactTemplates();
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
if (markerTemplateEle.childElementCount === (
|
|
104
|
+
if (markerTemplateEle.childElementCount === (markerDataLength - markerCount - nullCount) && getElementByID(_this.maps.element.id + '_Secondary_Element')) {
|
|
105
105
|
getElementByID(_this.maps.element.id + '_Secondary_Element').appendChild(markerTemplateEle);
|
|
106
106
|
if (_this.maps.checkInitialRender) {
|
|
107
107
|
if (currentLayer.markerClusterSettings.allowClustering) {
|
|
@@ -354,7 +354,7 @@ var Marker = /** @class */ (function () {
|
|
|
354
354
|
if ((target.indexOf('_cluster_') > -1)) {
|
|
355
355
|
var isClusterSame = false;
|
|
356
356
|
var clusterElement = document.getElementById(target.indexOf('_datalabel_') > -1 ? target.split('_datalabel_')[0] : target);
|
|
357
|
-
var indexes = clusterElement.innerHTML.split(',').map(Number);
|
|
357
|
+
var indexes = layer.markerClusterSettings.shape === 'Balloon' ? clusterElement.children[0].innerHTML.split(',').map(Number) : clusterElement.innerHTML.split(',').map(Number);
|
|
358
358
|
collection_1 = [];
|
|
359
359
|
for (var _i = 0, indexes_1 = indexes; _i < indexes_1.length; _i++) {
|
|
360
360
|
var i = indexes_1[_i];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
2
2
|
import { createElement, Browser, isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
3
|
-
import { triggerDownload, getElementByID
|
|
3
|
+
import { triggerDownload, getElementByID } from '../utils/helper';
|
|
4
4
|
/**
|
|
5
5
|
* This module enables the export to Image functionality in Maps control.
|
|
6
6
|
*
|
|
@@ -38,7 +38,6 @@ var ImageExport = /** @class */ (function () {
|
|
|
38
38
|
var isDownload = !(Browser.userAgent.toString().indexOf('HeadlessChrome') > -1);
|
|
39
39
|
var toolbarEle = document.getElementById(_this.control.element.id + '_ToolBar');
|
|
40
40
|
var svgParent = document.getElementById(_this.control.element.id + '_Tile_SVG_Parent');
|
|
41
|
-
var tileParent = document.getElementById(_this.control.element.id + '_tile_parent');
|
|
42
41
|
var svgDataElement;
|
|
43
42
|
var tileSvg;
|
|
44
43
|
var svgObject = getElementByID(_this.control.element.id + '_svg').cloneNode(true);
|
|
@@ -83,7 +82,6 @@ var ImageExport = /** @class */ (function () {
|
|
|
83
82
|
image_1.src = url;
|
|
84
83
|
}
|
|
85
84
|
else {
|
|
86
|
-
var extraSpace_1 = getClientElement(_this.control.element.id);
|
|
87
85
|
var imgxHttp = new XMLHttpRequest();
|
|
88
86
|
var imgTileLength_1 = _this.control.mapLayerPanel.tiles.length;
|
|
89
87
|
var _loop_1 = function (i) {
|
|
@@ -106,12 +104,13 @@ var ImageExport = /** @class */ (function () {
|
|
|
106
104
|
ctxt_1.clip();
|
|
107
105
|
}
|
|
108
106
|
else {
|
|
109
|
-
ctxt_1.setTransform(1, 0, 0, 1, parseFloat(svgParent.style.left),
|
|
107
|
+
ctxt_1.setTransform(1, 0, 0, 1, parseFloat(svgParent.style.left), parseFloat(svgParent.style.top));
|
|
110
108
|
}
|
|
111
109
|
}
|
|
112
110
|
else {
|
|
113
|
-
|
|
114
|
-
|
|
111
|
+
var tileParent = document.getElementById(_this.control.element.id + '_tile_parent');
|
|
112
|
+
ctxt_1.setTransform(1, 0, 0, 1, parseFloat(tile.style.left) + 10, parseFloat(tile.style.top) +
|
|
113
|
+
(parseFloat(tileParent.style.top)));
|
|
115
114
|
}
|
|
116
115
|
ctxt_1.drawImage(exportTileImg, 0, 0);
|
|
117
116
|
if (i === imgTileLength_1 + 1) {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
2
2
|
import { createElement, isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
3
3
|
import { PdfPageOrientation, PdfDocument, PdfBitmap } from '@syncfusion/ej2-pdf-export';
|
|
4
|
-
import { getClientElement } from '../utils/helper';
|
|
5
4
|
/**
|
|
6
5
|
* This module enables the export to PDF functionality in Maps control.
|
|
7
6
|
*
|
|
@@ -41,11 +40,10 @@ var PdfExport = /** @class */ (function () {
|
|
|
41
40
|
var svgParent = document.getElementById(_this.control.element.id + '_Tile_SVG_Parent');
|
|
42
41
|
var svgData;
|
|
43
42
|
var exportElement = _this.control.svgObject.cloneNode(true);
|
|
44
|
-
var tileParent = document.getElementById(_this.control.element.id + '_tile_parent');
|
|
45
43
|
var backgroundElement = exportElement.childNodes[0];
|
|
46
44
|
var backgroundColor = backgroundElement.getAttribute('fill');
|
|
47
|
-
if ((_this.control.theme === 'Tailwind' || _this.control.theme === 'TailwindDark' || _this.control.theme === 'Bootstrap5' || _this.control.theme === 'Bootstrap5Dark'
|
|
48
|
-
&& (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
|
|
45
|
+
if ((_this.control.theme === 'Tailwind' || _this.control.theme === 'TailwindDark' || _this.control.theme === 'Bootstrap5' || _this.control.theme === 'Bootstrap5Dark'
|
|
46
|
+
|| _this.control.theme === 'Fluent' || _this.control.theme === 'FluentDark') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
|
|
49
47
|
exportElement.childNodes[0].setAttribute('fill', 'rgba(255,255,255, 1)');
|
|
50
48
|
}
|
|
51
49
|
var url = window.URL.createObjectURL(new Blob(type === 'SVG' ? [svgData] :
|
|
@@ -74,7 +72,6 @@ var PdfExport = /** @class */ (function () {
|
|
|
74
72
|
image.src = url;
|
|
75
73
|
}
|
|
76
74
|
else {
|
|
77
|
-
var extraSpace_1 = getClientElement(_this.control.element.id);
|
|
78
75
|
var xHttp = new XMLHttpRequest();
|
|
79
76
|
var tileLength_1 = _this.control.mapLayerPanel.tiles.length;
|
|
80
77
|
var _loop_1 = function (i) {
|
|
@@ -97,12 +94,13 @@ var PdfExport = /** @class */ (function () {
|
|
|
97
94
|
ctx.clip();
|
|
98
95
|
}
|
|
99
96
|
else {
|
|
100
|
-
ctx.setTransform(1, 0, 0, 1, parseFloat(svgParent.style.left),
|
|
97
|
+
ctx.setTransform(1, 0, 0, 1, parseFloat(svgParent.style.left), parseFloat(svgParent.style.top));
|
|
101
98
|
}
|
|
102
99
|
}
|
|
103
100
|
else {
|
|
104
|
-
|
|
105
|
-
|
|
101
|
+
var tileParent = document.getElementById(_this.control.element.id + '_tile_parent');
|
|
102
|
+
ctx.setTransform(1, 0, 0, 1, parseFloat(tile.style.left) + 10, parseFloat(tile.style.top) +
|
|
103
|
+
(parseFloat(tileParent.style.top)));
|
|
106
104
|
}
|
|
107
105
|
ctx.drawImage(tileImg, 0, 0);
|
|
108
106
|
if (i === tileLength_1 + 1) {
|
package/src/maps/model/print.js
CHANGED
|
@@ -47,7 +47,27 @@ var Print = /** @class */ (function () {
|
|
|
47
47
|
Print.prototype.getHTMLContent = function (elements) {
|
|
48
48
|
var elementRect = getClientElement(this.control.element.id);
|
|
49
49
|
var div = createElement('div');
|
|
50
|
-
|
|
50
|
+
var divElement = this.control.element.cloneNode(true);
|
|
51
|
+
if (this.control.isTileMap) {
|
|
52
|
+
for (var i = 0; i < divElement.childElementCount; i++) {
|
|
53
|
+
if (divElement.children[i].id === this.control.element.id + '_tile_parent') {
|
|
54
|
+
divElement.children[i].style.removeProperty('height');
|
|
55
|
+
divElement.children[i].style.removeProperty('width');
|
|
56
|
+
divElement.children[i].style.removeProperty('top');
|
|
57
|
+
divElement.children[i].style.removeProperty('left');
|
|
58
|
+
divElement.children[i].style.removeProperty('right');
|
|
59
|
+
divElement.children[i].style.removeProperty('overflow');
|
|
60
|
+
var svgElement = document.getElementById(this.control.element.id + '_Tile_SVG_Parent');
|
|
61
|
+
divElement.children[i].children[0].style.overflow = 'hidden';
|
|
62
|
+
divElement.children[i].children[0].style.position = 'absolute';
|
|
63
|
+
divElement.children[i].children[0].style.height = svgElement.style.height;
|
|
64
|
+
divElement.children[i].children[0].style.width = svgElement.style.width;
|
|
65
|
+
divElement.children[i].children[0].style.left = svgElement.style.left;
|
|
66
|
+
divElement.children[i].children[0].style.top = svgElement.style.top;
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
51
71
|
if (elements) {
|
|
52
72
|
if (elements instanceof Array) {
|
|
53
73
|
Array.prototype.forEach.call(elements, function (value) {
|
|
@@ -62,7 +82,7 @@ var Print = /** @class */ (function () {
|
|
|
62
82
|
}
|
|
63
83
|
}
|
|
64
84
|
else {
|
|
65
|
-
div.appendChild(
|
|
85
|
+
div.appendChild(divElement);
|
|
66
86
|
}
|
|
67
87
|
return div;
|
|
68
88
|
};
|
package/src/maps/model/theme.js
CHANGED
|
@@ -183,11 +183,11 @@ export function getShapeColor(theme) {
|
|
|
183
183
|
themePalette = ['#5ECB9B', '#A860F1', '#EBA844', '#557EF7', '#E9599B',
|
|
184
184
|
'#BFC529', '#3BC6CF', '#7A68EC', '#74B706', '#EA6266'];
|
|
185
185
|
break;
|
|
186
|
-
case '
|
|
186
|
+
case 'fluent':
|
|
187
187
|
themePalette = ['#614570', '#4C6FB1', '#CC6952', '#3F579A', '#4EA09B',
|
|
188
188
|
'#6E7A89', '#D4515C', '#E6AF5D', '#639751', '#9D4D69'];
|
|
189
189
|
break;
|
|
190
|
-
case '
|
|
190
|
+
case 'fluentdark':
|
|
191
191
|
themePalette = ['#8AB113', '#2A72D5', '#43B786', '#584EC6', '#E85F9C',
|
|
192
192
|
'#6E7A89', '#EA6266', '#EBA844', '#26BC7A', '#BC4870'];
|
|
193
193
|
break;
|
|
@@ -476,7 +476,7 @@ export function getThemeStyle(theme) {
|
|
|
476
476
|
shapeFill: '#495057'
|
|
477
477
|
};
|
|
478
478
|
break;
|
|
479
|
-
case '
|
|
479
|
+
case 'fluent':
|
|
480
480
|
style = {
|
|
481
481
|
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
482
482
|
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
@@ -499,7 +499,7 @@ export function getThemeStyle(theme) {
|
|
|
499
499
|
shapeFill: '#F3F2F1'
|
|
500
500
|
};
|
|
501
501
|
break;
|
|
502
|
-
case '
|
|
502
|
+
case 'fluentdark':
|
|
503
503
|
style = {
|
|
504
504
|
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
505
505
|
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
@@ -53,7 +53,7 @@ var Annotations = /** @class */ (function () {
|
|
|
53
53
|
if (argsData.cancel) {
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
|
-
templateFn = getTemplateFunction(argsData.content);
|
|
56
|
+
templateFn = getTemplateFunction(argsData.content, _this.map);
|
|
57
57
|
if (templateFn && templateFn(_this.map, _this.map, argsData.content, _this.map.element.id + '_ContentTemplate_' + annotationIndex).length) {
|
|
58
58
|
templateElement = Array.prototype.slice.call(templateFn(_this.map, _this.map, argsData.content, _this.map.element.id + '_ContentTemplate_' + annotationIndex));
|
|
59
59
|
var length_1 = templateElement.length;
|
|
@@ -27,7 +27,8 @@ export declare class MapsTooltip {
|
|
|
27
27
|
private setTooltipContent;
|
|
28
28
|
private formatter;
|
|
29
29
|
mouseUpHandler(e: PointerEvent): void;
|
|
30
|
-
removeTooltip():
|
|
30
|
+
removeTooltip(): boolean;
|
|
31
|
+
private clearTooltip;
|
|
31
32
|
/**
|
|
32
33
|
* To bind events for tooltip module
|
|
33
34
|
*/
|
|
@@ -228,6 +228,10 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
228
228
|
fill: tooltipArgs.fill || _this.maps.themeStyle.tooltipFillColor
|
|
229
229
|
});
|
|
230
230
|
}
|
|
231
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
232
|
+
if (_this.maps.isVue || _this.maps.isVue3) {
|
|
233
|
+
_this.svgTooltip.controlInstance = _this.maps;
|
|
234
|
+
}
|
|
231
235
|
_this.svgTooltip.opacity = _this.maps.themeStyle.tooltipFillOpacity || _this.svgTooltip.opacity;
|
|
232
236
|
_this.svgTooltip.appendTo(tooltipEle);
|
|
233
237
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -241,9 +245,7 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
241
245
|
}
|
|
242
246
|
}
|
|
243
247
|
else {
|
|
244
|
-
_this.
|
|
245
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
246
|
-
_this.maps.clearTemplate();
|
|
248
|
+
_this.clearTooltip();
|
|
247
249
|
}
|
|
248
250
|
});
|
|
249
251
|
if (this.svgTooltip) {
|
|
@@ -258,9 +260,7 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
258
260
|
});
|
|
259
261
|
}
|
|
260
262
|
else {
|
|
261
|
-
this.
|
|
262
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
263
|
-
this.maps.clearTemplate();
|
|
263
|
+
this.clearTooltip();
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
266
|
else {
|
|
@@ -270,9 +270,7 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
270
270
|
this.maps.notify(click, this);
|
|
271
271
|
}
|
|
272
272
|
else {
|
|
273
|
-
this.
|
|
274
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
275
|
-
this.maps.clearTemplate();
|
|
273
|
+
this.clearTooltip();
|
|
276
274
|
}
|
|
277
275
|
}
|
|
278
276
|
};
|
|
@@ -318,8 +316,18 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
318
316
|
}
|
|
319
317
|
};
|
|
320
318
|
MapsTooltip.prototype.removeTooltip = function () {
|
|
319
|
+
var isTooltipRemoved = false;
|
|
321
320
|
if (document.getElementsByClassName('EJ2-maps-Tooltip').length > 0) {
|
|
322
321
|
remove(document.getElementsByClassName('EJ2-maps-Tooltip')[0]);
|
|
322
|
+
isTooltipRemoved = true;
|
|
323
|
+
}
|
|
324
|
+
return isTooltipRemoved;
|
|
325
|
+
};
|
|
326
|
+
MapsTooltip.prototype.clearTooltip = function () {
|
|
327
|
+
var isTooltipRemoved = this.removeTooltip();
|
|
328
|
+
if (isTooltipRemoved) {
|
|
329
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
330
|
+
this.maps.clearTemplate();
|
|
323
331
|
}
|
|
324
332
|
};
|
|
325
333
|
// eslint-disable-next-line valid-jsdoc
|
|
@@ -545,10 +545,10 @@ var Zoom = /** @class */ (function () {
|
|
|
545
545
|
}
|
|
546
546
|
var lati = (!isNullOrUndefined(markerSettings.latitudeValuePath)) ?
|
|
547
547
|
Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
|
|
548
|
-
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? data['Latitude'] :
|
|
548
|
+
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? data['Latitude'] : null;
|
|
549
549
|
var long = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
|
|
550
550
|
Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
|
|
551
|
-
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? data['Longitude'] :
|
|
551
|
+
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? data['Longitude'] : null;
|
|
552
552
|
var offset = markerSettings.offset;
|
|
553
553
|
if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(long) && !isNullOrUndefined(lati)) {
|
|
554
554
|
var markerID = _this.maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
@@ -568,10 +568,10 @@ var Zoom = /** @class */ (function () {
|
|
|
568
568
|
nullCount += (!isNaN(lati) && !isNaN(long)) ? 0 : 1;
|
|
569
569
|
markerTemplateCounts += (eventArgs.cancel) ? 1 : 0;
|
|
570
570
|
markerCounts += (eventArgs.cancel) ? 1 : 0;
|
|
571
|
-
_this.maps.markerNullCount = (
|
|
572
|
-
? _this.maps.markerNullCount : _this.maps.markerNullCount
|
|
571
|
+
_this.maps.markerNullCount = (isNullOrUndefined(lati) || isNullOrUndefined(long))
|
|
572
|
+
? _this.maps.markerNullCount + 1 : _this.maps.markerNullCount;
|
|
573
573
|
var markerDataLength = markerDatas.length - _this.maps.markerNullCount;
|
|
574
|
-
if (markerSVGObject.childElementCount === (
|
|
574
|
+
if (markerSVGObject.childElementCount === (markerDataLength - markerTemplateCounts - nullCount) && (type !== 'Template')) {
|
|
575
575
|
layerElement.appendChild(markerSVGObject);
|
|
576
576
|
if (currentLayers.markerClusterSettings.allowClustering) {
|
|
577
577
|
_this.maps.svgObject.appendChild(markerSVGObject);
|
|
@@ -579,7 +579,7 @@ var Zoom = /** @class */ (function () {
|
|
|
579
579
|
clusterTemplate(currentLayers, markerSVGObject, _this.maps, layerIndex, markerSVGObject, layerElement, true, true);
|
|
580
580
|
}
|
|
581
581
|
}
|
|
582
|
-
if (markerTemplateElements.childElementCount === (
|
|
582
|
+
if (markerTemplateElements.childElementCount === (markerDataLength - markerCounts - nullCount) && getElementByID(_this.maps.element.id + '_Secondary_Element')) {
|
|
583
583
|
getElementByID(_this.maps.element.id + '_Secondary_Element').appendChild(markerTemplateElements);
|
|
584
584
|
if (scale >= 1) {
|
|
585
585
|
if (currentLayers.markerClusterSettings.allowClustering) {
|
|
@@ -1027,7 +1027,7 @@ var Zoom = /** @class */ (function () {
|
|
|
1027
1027
|
var map = this.maps;
|
|
1028
1028
|
this.toolBarGroup = map.renderer.createGroup({
|
|
1029
1029
|
id: map.element.id + '_Zooming_KitCollection',
|
|
1030
|
-
opacity: map.theme.toLowerCase() === '
|
|
1030
|
+
opacity: map.theme.toLowerCase() === 'fluentdark' ? 0.6 : 0.3
|
|
1031
1031
|
});
|
|
1032
1032
|
var kitHeight = 16;
|
|
1033
1033
|
var kitWidth = 16;
|
|
@@ -1437,14 +1437,14 @@ var Zoom = /** @class */ (function () {
|
|
|
1437
1437
|
if (document.getElementById(map.element.id + '_Zooming_ToolBar_Pan_Group')) {
|
|
1438
1438
|
if (!this.maps.zoomSettings.enablePanning) {
|
|
1439
1439
|
if (target.id.indexOf('_Zooming_ToolBar') > -1 || target.id.indexOf('_Zooming_Rect') > -1) {
|
|
1440
|
-
getElementByID(map.element.id + '_Zooming_ToolBar_Pan_Rect').setAttribute('opacity', map.theme.toLowerCase() === '
|
|
1441
|
-
getElementByID(map.element.id + '_Zooming_ToolBar_Pan').setAttribute('opacity', map.theme.toLowerCase() === '
|
|
1440
|
+
getElementByID(map.element.id + '_Zooming_ToolBar_Pan_Rect').setAttribute('opacity', map.theme.toLowerCase() === 'fluentdark' ? '0.6' : '0.3');
|
|
1441
|
+
getElementByID(map.element.id + '_Zooming_ToolBar_Pan').setAttribute('opacity', map.theme.toLowerCase() === 'fluentdark' ? '0.6' : '0.3');
|
|
1442
1442
|
}
|
|
1443
1443
|
}
|
|
1444
1444
|
}
|
|
1445
1445
|
}
|
|
1446
1446
|
else {
|
|
1447
|
-
getElementByID(map.element.id + '_Zooming_KitCollection').setAttribute('opacity', map.theme.toLowerCase() === '
|
|
1447
|
+
getElementByID(map.element.id + '_Zooming_KitCollection').setAttribute('opacity', map.theme.toLowerCase() === 'fluentdark' ? '0.6' : '0.3');
|
|
1448
1448
|
if (!this.maps.zoomSettings.enablePanning && document.getElementById(map.element.id + '_Zooming_ToolBar_Pan_Group')) {
|
|
1449
1449
|
getElementByID(map.element.id + '_Zooming_ToolBar_Pan_Rect').setAttribute('opacity', '1');
|
|
1450
1450
|
getElementByID(map.element.id + '_Zooming_ToolBar_Pan').setAttribute('opacity', '1');
|
package/src/maps/utils/enum.d.ts
CHANGED
|
@@ -40,7 +40,11 @@ export declare type MapsTheme =
|
|
|
40
40
|
/** Renders a map with Bootstrap5 theme. */
|
|
41
41
|
'Bootstrap5' |
|
|
42
42
|
/** Render a map with Bootstrap5 dark theme. */
|
|
43
|
-
'Bootstrap5Dark'
|
|
43
|
+
'Bootstrap5Dark' |
|
|
44
|
+
/** Renders a map with Fluent theme. */
|
|
45
|
+
'Fluent' |
|
|
46
|
+
/** Render a map with Fluent dark theme. */
|
|
47
|
+
'FluentDark';
|
|
44
48
|
/**
|
|
45
49
|
* Defines the position of the legend.
|
|
46
50
|
*/
|
|
@@ -841,7 +841,7 @@ export declare function Internalize(maps: Maps, value: number): string;
|
|
|
841
841
|
* @returns {Function} - Returns the function
|
|
842
842
|
* @private
|
|
843
843
|
*/
|
|
844
|
-
export declare function getTemplateFunction(template: string): any;
|
|
844
|
+
export declare function getTemplateFunction(template: string, maps: Maps): any;
|
|
845
845
|
/**
|
|
846
846
|
* Function to get element from id.
|
|
847
847
|
*
|
package/src/maps/utils/helper.js
CHANGED
|
@@ -1276,7 +1276,7 @@ export function marker(eventArgs, markerSettings, markerData, dataIndex, locatio
|
|
|
1276
1276
|
*/
|
|
1277
1277
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1278
1278
|
export function markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, markerTemplate, location, transPoint, scale, offset, maps) {
|
|
1279
|
-
templateFn = getTemplateFunction(eventArgs.template);
|
|
1279
|
+
templateFn = getTemplateFunction(eventArgs.template, maps);
|
|
1280
1280
|
if (templateFn && (templateFn(data, maps, eventArgs.template, maps.element.id + '_MarkerTemplate' + markerIndex, false).length)) {
|
|
1281
1281
|
var templateElement = templateFn(data, maps, eventArgs.template, maps.element.id + '_MarkerTemplate' + markerIndex, false);
|
|
1282
1282
|
var markerElement = convertElement(templateElement, markerID, data, markerIndex, maps);
|
|
@@ -2312,7 +2312,7 @@ export function Internalize(maps, value) {
|
|
|
2312
2312
|
* @private
|
|
2313
2313
|
*/
|
|
2314
2314
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
2315
|
-
export function getTemplateFunction(template) {
|
|
2315
|
+
export function getTemplateFunction(template, maps) {
|
|
2316
2316
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
2317
2317
|
var templateFn = null;
|
|
2318
2318
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -2321,6 +2321,9 @@ export function getTemplateFunction(template) {
|
|
|
2321
2321
|
if (document.querySelectorAll(template).length) {
|
|
2322
2322
|
templateFn = templateComplier(document.querySelector(template).innerHTML.trim());
|
|
2323
2323
|
}
|
|
2324
|
+
else if (maps.isVue || maps.isVue3) {
|
|
2325
|
+
templateFn = templateComplier(template);
|
|
2326
|
+
}
|
|
2324
2327
|
}
|
|
2325
2328
|
catch (e) {
|
|
2326
2329
|
templateFn = templateComplier(template);
|
|
@@ -2725,6 +2728,7 @@ export function createTooltip(id, text, top, left, fontSize) {
|
|
|
2725
2728
|
'left:' + left.toString() + 'px;' +
|
|
2726
2729
|
'color: #000000; ' +
|
|
2727
2730
|
'background:' + '#FFFFFF' + ';' +
|
|
2731
|
+
'z-index: 2;' +
|
|
2728
2732
|
'position:absolute;border:1px solid #707070;font-size:' + fontSize + ';border-radius:2px;';
|
|
2729
2733
|
if (!tooltip) {
|
|
2730
2734
|
tooltip = createElement('div', {
|
|
@@ -2926,6 +2930,9 @@ export function changeBorderWidth(element, index, scale, maps) {
|
|
|
2926
2930
|
currentStroke = (isNullOrUndefined(borderWidth) ? 0 : borderWidth);
|
|
2927
2931
|
}
|
|
2928
2932
|
}
|
|
2933
|
+
else {
|
|
2934
|
+
currentStroke = (isNullOrUndefined(borderWidth) ? 0 : borderWidth);
|
|
2935
|
+
}
|
|
2929
2936
|
}
|
|
2930
2937
|
else {
|
|
2931
2938
|
currentStroke = (isNullOrUndefined(borderWidth) ? 0 : borderWidth);
|