@syncfusion/ej2-maps 19.3.44 → 19.4.42
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/.github/PULL_REQUEST_TEMPLATE/Bug.md +72 -0
- package/.github/PULL_REQUEST_TEMPLATE/Feature.md +49 -0
- package/CHANGELOG.md +36 -5
- package/README.md +4 -4
- 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 +655 -647
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +652 -645
- 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.d.ts +6 -0
- package/src/maps/layers/bubble.js +10 -25
- package/src/maps/layers/data-label.js +6 -17
- package/src/maps/layers/layer-panel.d.ts +2 -1
- package/src/maps/layers/layer-panel.js +86 -72
- package/src/maps/layers/legend.js +48 -19
- package/src/maps/layers/marker.js +2 -24
- package/src/maps/maps-model.d.ts +1 -28
- package/src/maps/maps.d.ts +5 -38
- package/src/maps/maps.js +80 -102
- package/src/maps/model/base-model.d.ts +7 -5
- package/src/maps/model/base.d.ts +6 -5
- package/src/maps/model/base.js +5 -2
- package/src/maps/model/export-pdf.js +1 -1
- package/src/maps/model/interface.d.ts +1 -3
- package/src/maps/model/theme.js +116 -6
- package/src/maps/user-interaction/annotation.js +3 -7
- package/src/maps/user-interaction/highlight.js +4 -17
- package/src/maps/user-interaction/selection.js +10 -22
- package/src/maps/user-interaction/tooltip.js +61 -125
- package/src/maps/user-interaction/zoom.d.ts +1 -0
- package/src/maps/user-interaction/zoom.js +92 -110
- package/src/maps/utils/enum.d.ts +8 -2
- package/src/maps/utils/helper.d.ts +5 -3
- package/src/maps/utils/helper.js +136 -104
package/src/maps/model/base.d.ts
CHANGED
|
@@ -348,7 +348,6 @@ export declare class ColorMappingSettings extends ChildProperty<ColorMappingSett
|
|
|
348
348
|
*
|
|
349
349
|
* @aspDefaultValueIgnore
|
|
350
350
|
* @default null
|
|
351
|
-
* @isBlazorNullableType true
|
|
352
351
|
*/
|
|
353
352
|
from: number;
|
|
354
353
|
/**
|
|
@@ -356,7 +355,6 @@ export declare class ColorMappingSettings extends ChildProperty<ColorMappingSett
|
|
|
356
355
|
*
|
|
357
356
|
* @aspDefaultValueIgnore
|
|
358
357
|
* @default null
|
|
359
|
-
* @isBlazorNullableType true
|
|
360
358
|
*/
|
|
361
359
|
to: number;
|
|
362
360
|
/**
|
|
@@ -729,7 +727,6 @@ export declare class ZoomSettings extends ChildProperty<ZoomSettings> {
|
|
|
729
727
|
* Sets and gets the orientation of the zoom toolbar.
|
|
730
728
|
*
|
|
731
729
|
* @default Horizontal
|
|
732
|
-
* @blazorProperty 'ToolbarOrientation'
|
|
733
730
|
*/
|
|
734
731
|
toolBarOrientation: Orientation;
|
|
735
732
|
/**
|
|
@@ -770,7 +767,6 @@ export declare class ZoomSettings extends ChildProperty<ZoomSettings> {
|
|
|
770
767
|
* Enables or disables the double click zooming in maps.
|
|
771
768
|
*
|
|
772
769
|
* @default false
|
|
773
|
-
* @blazorProperty 'ZoomOnDoubleClick'
|
|
774
770
|
*/
|
|
775
771
|
doubleClickZoom: boolean;
|
|
776
772
|
/**
|
|
@@ -849,6 +845,12 @@ export declare class ToggleLegendSettings extends ChildProperty<ToggleLegendSett
|
|
|
849
845
|
* Sets and gets the options to customize the legend of the maps.
|
|
850
846
|
*/
|
|
851
847
|
export declare class LegendSettings extends ChildProperty<LegendSettings> {
|
|
848
|
+
/**
|
|
849
|
+
* Enables or disables to render the legend item based on the shapes from the data source of markers.
|
|
850
|
+
*
|
|
851
|
+
* @default false
|
|
852
|
+
*/
|
|
853
|
+
useMarkerShape: boolean;
|
|
852
854
|
/**
|
|
853
855
|
* Enables or disables the toggle visibility for legend in maps.
|
|
854
856
|
*
|
|
@@ -987,7 +989,6 @@ export declare class LegendSettings extends ChildProperty<LegendSettings> {
|
|
|
987
989
|
* Sets and gets the path for the legend from the data source to be shown.
|
|
988
990
|
*
|
|
989
991
|
* @default null
|
|
990
|
-
* @blazorProperty 'LegendPath'
|
|
991
992
|
*/
|
|
992
993
|
showLegendPath: string;
|
|
993
994
|
/**
|
package/src/maps/model/base.js
CHANGED
|
@@ -655,6 +655,9 @@ var LegendSettings = /** @class */ (function (_super) {
|
|
|
655
655
|
function LegendSettings() {
|
|
656
656
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
657
657
|
}
|
|
658
|
+
__decorate([
|
|
659
|
+
Property(false)
|
|
660
|
+
], LegendSettings.prototype, "useMarkerShape", void 0);
|
|
658
661
|
__decorate([
|
|
659
662
|
Property(false)
|
|
660
663
|
], LegendSettings.prototype, "toggleVisibility", void 0);
|
|
@@ -707,7 +710,7 @@ var LegendSettings = /** @class */ (function (_super) {
|
|
|
707
710
|
Complex({}, CommonTitleSettings)
|
|
708
711
|
], LegendSettings.prototype, "title", void 0);
|
|
709
712
|
__decorate([
|
|
710
|
-
Complex(
|
|
713
|
+
Complex(Theme.legendTitleFont, Font)
|
|
711
714
|
], LegendSettings.prototype, "titleStyle", void 0);
|
|
712
715
|
__decorate([
|
|
713
716
|
Property('Bottom')
|
|
@@ -807,7 +810,7 @@ var ShapeSettings = /** @class */ (function (_super) {
|
|
|
807
810
|
Property(5)
|
|
808
811
|
], ShapeSettings.prototype, "circleRadius", void 0);
|
|
809
812
|
__decorate([
|
|
810
|
-
Complex({ width:
|
|
813
|
+
Complex({ width: null, color: '#000000' }, Border)
|
|
811
814
|
], ShapeSettings.prototype, "border", void 0);
|
|
812
815
|
__decorate([
|
|
813
816
|
Property('')
|
|
@@ -42,7 +42,7 @@ var PdfExport = /** @class */ (function () {
|
|
|
42
42
|
var exportElement = _this.control.svgObject.cloneNode(true);
|
|
43
43
|
var backgroundElement = exportElement.childNodes[0];
|
|
44
44
|
var backgroundColor = backgroundElement.getAttribute('fill');
|
|
45
|
-
if ((_this.control.theme === 'Tailwind' || _this.control.theme === 'TailwindDark')
|
|
45
|
+
if ((_this.control.theme === 'Tailwind' || _this.control.theme === 'TailwindDark' || _this.control.theme === 'Bootstrap5' || _this.control.theme === 'Bootstrap5Dark')
|
|
46
46
|
&& (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
|
|
47
47
|
exportElement.childNodes[0].setAttribute('fill', 'rgba(255,255,255, 1)');
|
|
48
48
|
}
|
|
@@ -109,9 +109,7 @@ export interface ITooltipRenderCompleteEventArgs extends IMapsEventArgs {
|
|
|
109
109
|
/**
|
|
110
110
|
* Specifies the event arguments for the resize event in maps.
|
|
111
111
|
*/
|
|
112
|
-
export interface IResizeEventArgs {
|
|
113
|
-
/** Defines the name of the event. */
|
|
114
|
-
name: string;
|
|
112
|
+
export interface IResizeEventArgs extends IMapsEventArgs {
|
|
115
113
|
/** Defines the previous size of the maps before the resize event. */
|
|
116
114
|
previousSize: Size;
|
|
117
115
|
/** Defines the current size of the maps after the resize event. */
|
package/src/maps/model/theme.js
CHANGED
|
@@ -26,15 +26,15 @@ export var Theme;
|
|
|
26
26
|
fontWeight: 'Regular',
|
|
27
27
|
color: null,
|
|
28
28
|
fontStyle: 'Regular',
|
|
29
|
-
fontFamily:
|
|
29
|
+
fontFamily: null
|
|
30
30
|
};
|
|
31
31
|
/** @private */
|
|
32
32
|
Theme.legendTitleFont = {
|
|
33
|
-
size: '
|
|
34
|
-
fontWeight: '
|
|
33
|
+
size: '12px',
|
|
34
|
+
fontWeight: 'Medium',
|
|
35
35
|
color: null,
|
|
36
|
-
fontStyle: '
|
|
37
|
-
fontFamily:
|
|
36
|
+
fontStyle: 'Medium',
|
|
37
|
+
fontFamily: null
|
|
38
38
|
};
|
|
39
39
|
/** @private */
|
|
40
40
|
Theme.legendLabelFont = {
|
|
@@ -164,7 +164,6 @@ export var BootstrapTheme;
|
|
|
164
164
|
* @param {MapsTheme} theme Specifies the theme of the maps
|
|
165
165
|
* @returns {string[]} Returns the shape color
|
|
166
166
|
*/
|
|
167
|
-
// eslint-disable-next-line @typescript-eslint/no-namespace
|
|
168
167
|
export function getShapeColor(theme) {
|
|
169
168
|
var themePalette;
|
|
170
169
|
switch (theme.toLowerCase()) {
|
|
@@ -176,6 +175,22 @@ export function getShapeColor(theme) {
|
|
|
176
175
|
themePalette = ['#10B981', '#22D3EE', '#2DD4BF', '#4ADE80', '#8B5CF6',
|
|
177
176
|
'#E879F9', '#F472B6', '#F87171', '#F97316', '#FCD34D'];
|
|
178
177
|
break;
|
|
178
|
+
case 'bootstrap5':
|
|
179
|
+
themePalette = ['#262E0B', '#668E1F', '#AF6E10', '#862C0B', '#1F2D50',
|
|
180
|
+
'#64680B', '#311508', '#4C4C81', '#0C7DA0', '#862C0B'];
|
|
181
|
+
break;
|
|
182
|
+
case 'bootstrap5dark':
|
|
183
|
+
themePalette = ['#5ECB9B', '#A860F1', '#EBA844', '#557EF7', '#E9599B',
|
|
184
|
+
'#BFC529', '#3BC6CF', '#7A68EC', '#74B706', '#EA6266'];
|
|
185
|
+
break;
|
|
186
|
+
case 'fluentui':
|
|
187
|
+
themePalette = ['#614570', '#4C6FB1', '#CC6952', '#3F579A', '#4EA09B',
|
|
188
|
+
'#6E7A89', '#D4515C', '#E6AF5D', '#639751', '#9D4D69'];
|
|
189
|
+
break;
|
|
190
|
+
case 'fluentuidark':
|
|
191
|
+
themePalette = ['#8AB113', '#2A72D5', '#43B786', '#584EC6', '#E85F9C',
|
|
192
|
+
'#6E7A89', '#EA6266', '#EBA844', '#26BC7A', '#BC4870'];
|
|
193
|
+
break;
|
|
179
194
|
default:
|
|
180
195
|
themePalette = ['#B5E485', '#7BC1E8', '#DF819C', '#EC9B79', '#78D0D3',
|
|
181
196
|
'#D6D572', '#9178E3', '#A1E5B4', '#87A4B4', '#E4C16C'];
|
|
@@ -321,6 +336,7 @@ export function getThemeStyle(theme) {
|
|
|
321
336
|
tooltipFillColor: '#363F4C',
|
|
322
337
|
zoomFillColor: '#FFFFFF',
|
|
323
338
|
labelFontFamily: 'Roboto, Noto, Sans-serif',
|
|
339
|
+
fontFamily: 'Roboto, Noto, Sans-serif',
|
|
324
340
|
titleFontWeight: 'Medium',
|
|
325
341
|
zoomSelectionColor: '#e61576',
|
|
326
342
|
shapeFill: '#A6A6A6'
|
|
@@ -338,6 +354,7 @@ export function getThemeStyle(theme) {
|
|
|
338
354
|
tooltipFontColor: '#000000',
|
|
339
355
|
tooltipFillColor: '#ffffff',
|
|
340
356
|
zoomFillColor: '#FFFFFF',
|
|
357
|
+
fontFamily: 'Roboto, Noto, Sans-serif',
|
|
341
358
|
labelFontFamily: 'Roboto, Noto, Sans-serif',
|
|
342
359
|
titleFontWeight: 'Medium',
|
|
343
360
|
zoomSelectionColor: '#e61576',
|
|
@@ -413,6 +430,98 @@ export function getThemeStyle(theme) {
|
|
|
413
430
|
shapeFill: '#374151'
|
|
414
431
|
};
|
|
415
432
|
break;
|
|
433
|
+
case 'bootstrap5':
|
|
434
|
+
style = {
|
|
435
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
436
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
437
|
+
titleFontColor: '#212529',
|
|
438
|
+
subTitleFontColor: '#212529',
|
|
439
|
+
legendTitleFontColor: '#212529',
|
|
440
|
+
legendTextColor: '#212529',
|
|
441
|
+
dataLabelFontColor: '#212529',
|
|
442
|
+
tooltipFontColor: '#F9FAFB',
|
|
443
|
+
tooltipFillColor: '#212529',
|
|
444
|
+
zoomFillColor: '#6C757D',
|
|
445
|
+
fontFamily: 'Helvetica Neue',
|
|
446
|
+
titleFontSize: '14px',
|
|
447
|
+
legendFontSize: '12px',
|
|
448
|
+
tooltipFillOpacity: 1,
|
|
449
|
+
tooltipTextOpacity: 1,
|
|
450
|
+
labelFontFamily: 'Helvetica Neue',
|
|
451
|
+
titleFontWeight: 'normal',
|
|
452
|
+
zoomSelectionColor: '#343A40',
|
|
453
|
+
shapeFill: '#E9ECEF'
|
|
454
|
+
};
|
|
455
|
+
break;
|
|
456
|
+
case 'bootstrap5dark':
|
|
457
|
+
style = {
|
|
458
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
459
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
460
|
+
titleFontColor: '#FFFFFF',
|
|
461
|
+
subTitleFontColor: '#FFFFFF',
|
|
462
|
+
legendTitleFontColor: '#FFFFFF',
|
|
463
|
+
legendTextColor: '#FFFFFF',
|
|
464
|
+
dataLabelFontColor: '#FFFFFF',
|
|
465
|
+
tooltipFontColor: '#212529',
|
|
466
|
+
tooltipFillColor: '#E9ECEF',
|
|
467
|
+
zoomFillColor: '#B5BABE',
|
|
468
|
+
fontFamily: 'Helvetica Neue',
|
|
469
|
+
titleFontSize: '14px',
|
|
470
|
+
legendFontSize: '12px',
|
|
471
|
+
tooltipFillOpacity: 1,
|
|
472
|
+
tooltipTextOpacity: 1,
|
|
473
|
+
labelFontFamily: 'Helvetica Neue',
|
|
474
|
+
titleFontWeight: 'normal',
|
|
475
|
+
zoomSelectionColor: '#DEE2E6',
|
|
476
|
+
shapeFill: '#495057'
|
|
477
|
+
};
|
|
478
|
+
break;
|
|
479
|
+
case 'fluentui':
|
|
480
|
+
style = {
|
|
481
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
482
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
483
|
+
titleFontColor: '#201F1E',
|
|
484
|
+
subTitleFontColor: '#201F1E',
|
|
485
|
+
legendTitleFontColor: '#201F1E',
|
|
486
|
+
legendTextColor: '#201F1E',
|
|
487
|
+
dataLabelFontColor: '#201F1E',
|
|
488
|
+
tooltipFontColor: '#323130',
|
|
489
|
+
tooltipFillColor: '#FFFFFF',
|
|
490
|
+
zoomFillColor: '#A19F9D',
|
|
491
|
+
fontFamily: 'Segoe UI',
|
|
492
|
+
titleFontSize: '14px',
|
|
493
|
+
legendFontSize: '12px',
|
|
494
|
+
tooltipFillOpacity: 1,
|
|
495
|
+
tooltipTextOpacity: 1,
|
|
496
|
+
labelFontFamily: 'Segoe UI',
|
|
497
|
+
titleFontWeight: '600',
|
|
498
|
+
zoomSelectionColor: '#323130',
|
|
499
|
+
shapeFill: '#F3F2F1'
|
|
500
|
+
};
|
|
501
|
+
break;
|
|
502
|
+
case 'fluentuidark':
|
|
503
|
+
style = {
|
|
504
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
505
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
506
|
+
titleFontColor: '#F3F2F1',
|
|
507
|
+
subTitleFontColor: '#F3F2F1',
|
|
508
|
+
legendTitleFontColor: '#F3F2F1',
|
|
509
|
+
legendTextColor: '#F3F2F1',
|
|
510
|
+
dataLabelFontColor: '#F3F2F1',
|
|
511
|
+
tooltipFontColor: '#F3F2F1',
|
|
512
|
+
tooltipFillColor: '#252423',
|
|
513
|
+
zoomFillColor: '#484644',
|
|
514
|
+
fontFamily: 'Segoe UI',
|
|
515
|
+
titleFontSize: '14px',
|
|
516
|
+
legendFontSize: '12px',
|
|
517
|
+
tooltipFillOpacity: 1,
|
|
518
|
+
tooltipTextOpacity: 1,
|
|
519
|
+
labelFontFamily: 'Segoe UI',
|
|
520
|
+
titleFontWeight: '600',
|
|
521
|
+
zoomSelectionColor: '#F3F2F1',
|
|
522
|
+
shapeFill: '#252423'
|
|
523
|
+
};
|
|
524
|
+
break;
|
|
416
525
|
default:
|
|
417
526
|
style = {
|
|
418
527
|
backgroundColor: '#FFFFFF',
|
|
@@ -426,6 +535,7 @@ export function getThemeStyle(theme) {
|
|
|
426
535
|
tooltipFillColor: '#000000',
|
|
427
536
|
zoomFillColor: '#737373',
|
|
428
537
|
labelFontFamily: 'Roboto, Noto, Sans-serif',
|
|
538
|
+
fontFamily: 'Roboto, Noto, Sans-serif',
|
|
429
539
|
titleFontWeight: 'Medium',
|
|
430
540
|
zoomSelectionColor: '#e61576',
|
|
431
541
|
shapeFill: '#A6A6A6'
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
2
2
|
/* eslint-disable jsdoc/require-param */
|
|
3
3
|
import { annotationRendering } from '../index';
|
|
4
|
-
import { createElement, isNullOrUndefined
|
|
4
|
+
import { createElement, isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
5
5
|
import { getTemplateFunction, getElementOffset, getElementByID } from '../utils/helper';
|
|
6
6
|
/**
|
|
7
7
|
* Represents the annotation elements for map.
|
|
@@ -24,9 +24,6 @@ var Annotations = /** @class */ (function () {
|
|
|
24
24
|
});
|
|
25
25
|
if (annotationGroup.childElementCount > 0 && !(isNullOrUndefined(getElementByID(secondaryID)))) {
|
|
26
26
|
getElementByID(secondaryID).appendChild(annotationGroup);
|
|
27
|
-
for (var i = 0; i < this.map.annotations.length; i++) {
|
|
28
|
-
updateBlazorTemplate(this.map.element.id + '_ContentTemplate_' + i, 'ContentTemplate', this.map.annotations[i]);
|
|
29
|
-
}
|
|
30
27
|
}
|
|
31
28
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
32
29
|
this.map.renderReactTemplates();
|
|
@@ -56,10 +53,9 @@ var Annotations = /** @class */ (function () {
|
|
|
56
53
|
if (argsData.cancel) {
|
|
57
54
|
return;
|
|
58
55
|
}
|
|
59
|
-
var blazor = 'Blazor';
|
|
60
56
|
templateFn = getTemplateFunction(argsData.content);
|
|
61
|
-
if (templateFn &&
|
|
62
|
-
templateElement = Array.prototype.slice.call(templateFn(
|
|
57
|
+
if (templateFn && templateFn(_this.map, _this.map, argsData.content, _this.map.element.id + '_ContentTemplate_' + annotationIndex).length) {
|
|
58
|
+
templateElement = Array.prototype.slice.call(templateFn(_this.map, _this.map, argsData.content, _this.map.element.id + '_ContentTemplate_' + annotationIndex));
|
|
63
59
|
var length_1 = templateElement.length;
|
|
64
60
|
for (var i = 0; i < length_1; i++) {
|
|
65
61
|
childElement.appendChild(templateElement[i]);
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
-
var t = {};
|
|
3
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
-
t[p] = s[p];
|
|
5
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
7
|
-
t[p[i]] = s[p[i]];
|
|
8
|
-
return t;
|
|
9
|
-
};
|
|
10
1
|
import { itemHighlight } from '../index';
|
|
11
2
|
import { Browser, isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
12
3
|
import { getElementsByClassName, getElement, removeClass, createStyle, customizeStyle, getTargetElement } from '../utils/helper';
|
|
@@ -158,14 +149,14 @@ var Highlight = /** @class */ (function () {
|
|
|
158
149
|
isMarkerSelect = this.maps.layers[layerIndex].markerSettings[marker].highlightSettings.enable;
|
|
159
150
|
}
|
|
160
151
|
var border = {
|
|
161
|
-
color: this.highlightSettings.border.color,
|
|
162
|
-
width: this.highlightSettings.border.width / (isMarkerSelect ? 1 : this.maps.scale),
|
|
152
|
+
color: (targetEle.parentElement.id.indexOf('LineString') === -1) ? this.highlightSettings.border.color : (this.highlightSettings.border.color || this.highlightSettings.fill),
|
|
153
|
+
width: (targetEle.parentElement.id.indexOf('LineString') === -1) ? (this.highlightSettings.border.width / (isMarkerSelect ? 1 : this.maps.scale)) : (this.highlightSettings.border.width / this.maps.scale),
|
|
163
154
|
opacity: this.highlightSettings.border.opacity
|
|
164
155
|
};
|
|
165
156
|
var eventArgs = {
|
|
166
157
|
opacity: this.highlightSettings.opacity,
|
|
167
|
-
fill: targetEle.id.indexOf('NavigationIndex') === -1 ? !isNullOrUndefined(this.highlightSettings.fill)
|
|
168
|
-
? this.highlightSettings.fill : targetEle.getAttribute('fill') : 'none',
|
|
158
|
+
fill: (targetEle.parentElement.id.indexOf('LineString') === -1) ? (targetEle.id.indexOf('NavigationIndex') === -1 ? !isNullOrUndefined(this.highlightSettings.fill)
|
|
159
|
+
? this.highlightSettings.fill : targetEle.getAttribute('fill') : 'none') : 'transparent',
|
|
169
160
|
border: border,
|
|
170
161
|
name: itemHighlight,
|
|
171
162
|
target: targetEle.id,
|
|
@@ -174,10 +165,6 @@ var Highlight = /** @class */ (function () {
|
|
|
174
165
|
data: data,
|
|
175
166
|
maps: this.maps
|
|
176
167
|
};
|
|
177
|
-
if (this.maps.isBlazor) {
|
|
178
|
-
var shapeData_1 = eventArgs.shapeData, maps = eventArgs.maps, blazorEventArgs = __rest(eventArgs, ["shapeData", "maps"]);
|
|
179
|
-
eventArgs = blazorEventArgs;
|
|
180
|
-
}
|
|
181
168
|
this.maps.trigger(itemHighlight, eventArgs, function () {
|
|
182
169
|
eventArgs.border.opacity = isNullOrUndefined(_this.highlightSettings.border.opacity) ? _this.highlightSettings.opacity : _this.highlightSettings.border.opacity;
|
|
183
170
|
_this.highlightMap(targetEle, eventArgs);
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
-
var t = {};
|
|
3
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
-
t[p] = s[p];
|
|
5
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
|
|
7
|
-
t[p[i]] = s[p[i]];
|
|
8
|
-
return t;
|
|
9
|
-
};
|
|
10
1
|
import { click, itemSelection } from '../index';
|
|
11
2
|
import { getElement, createStyle, customizeStyle, removeClass, getTargetElement, getElementByID } from '../utils/helper';
|
|
12
3
|
import { isNullOrUndefined, Browser } from '@syncfusion/ej2-base';
|
|
@@ -131,18 +122,19 @@ var Selection = /** @class */ (function () {
|
|
|
131
122
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
132
123
|
Selection.prototype.selectMap = function (targetElement, shapeData, data) {
|
|
133
124
|
var _this = this;
|
|
125
|
+
var layerIndex = parseInt(targetElement.id.split('_LayerIndex_')[1].split('_')[0], 10);
|
|
134
126
|
var parentElement;
|
|
135
127
|
var children;
|
|
136
128
|
var selectionClass;
|
|
137
129
|
var selectionsettings = this.selectionsettings;
|
|
138
130
|
var border = {
|
|
139
|
-
color: this.selectionsettings.border.color,
|
|
140
|
-
width: this.selectionsettings.border.width / (this.selectionType === 'Marker' ? 1 : this.maps.scale),
|
|
131
|
+
color: (targetElement.parentElement.id.indexOf('LineString') === -1) ? this.selectionsettings.border.color : (this.selectionsettings.border.color || this.selectionsettings.fill),
|
|
132
|
+
width: (targetElement.parentElement.id.indexOf('LineString') === -1) ? (this.selectionsettings.border.width / (this.selectionType === 'Marker' ? 1 : this.maps.scale)) : (this.selectionsettings.border.width / this.maps.scale),
|
|
141
133
|
opacity: this.selectionsettings.border.opacity
|
|
142
134
|
};
|
|
143
135
|
var eventArgs = {
|
|
144
136
|
opacity: this.selectionsettings.opacity,
|
|
145
|
-
fill: this.selectionType !== 'navigationline' ? this.selectionsettings.fill : 'none',
|
|
137
|
+
fill: (targetElement.parentElement.id.indexOf('LineString') === -1) ? (this.selectionType !== 'navigationline' ? this.selectionsettings.fill : 'none') : 'transparent',
|
|
146
138
|
border: border,
|
|
147
139
|
name: itemSelection,
|
|
148
140
|
target: targetElement.id,
|
|
@@ -151,10 +143,6 @@ var Selection = /** @class */ (function () {
|
|
|
151
143
|
data: data,
|
|
152
144
|
maps: this.maps
|
|
153
145
|
};
|
|
154
|
-
if (this.maps.isBlazor) {
|
|
155
|
-
var shapeData_1 = eventArgs.shapeData, maps = eventArgs.maps, blazorEventArgs = __rest(eventArgs, ["shapeData", "maps"]);
|
|
156
|
-
eventArgs = blazorEventArgs;
|
|
157
|
-
}
|
|
158
146
|
this.maps.trigger('itemSelection', eventArgs, function (observedArgs) {
|
|
159
147
|
eventArgs.border.opacity = isNullOrUndefined(_this.selectionsettings.border.opacity) ? _this.selectionsettings.opacity : _this.selectionsettings.border.opacity;
|
|
160
148
|
if (!eventArgs.cancel) {
|
|
@@ -169,9 +157,9 @@ var Selection = /** @class */ (function () {
|
|
|
169
157
|
}
|
|
170
158
|
if (targetElement.id.indexOf('NavigationIndex') > -1) {
|
|
171
159
|
var index = parseInt(targetElement.id.split('_NavigationIndex_')[1].split('_')[0], 10);
|
|
172
|
-
var
|
|
173
|
-
targetElement.setAttribute('stroke-width', _this.maps.layers[
|
|
174
|
-
targetElement.setAttribute('stroke', _this.maps.layers[
|
|
160
|
+
var layerIndex_1 = parseInt(targetElement.parentElement.id.split('_LayerIndex_')[1].split('_')[0], 10);
|
|
161
|
+
targetElement.setAttribute('stroke-width', _this.maps.layers[layerIndex_1].navigationLineSettings[index].width.toString());
|
|
162
|
+
targetElement.setAttribute('stroke', _this.maps.layers[layerIndex_1].navigationLineSettings[index].color);
|
|
175
163
|
}
|
|
176
164
|
}
|
|
177
165
|
else {
|
|
@@ -197,9 +185,9 @@ var Selection = /** @class */ (function () {
|
|
|
197
185
|
}
|
|
198
186
|
if (ele.id.indexOf('NavigationIndex') > -1) {
|
|
199
187
|
var index = parseInt(targetElement.id.split('_NavigationIndex_')[1].split('_')[0], 10);
|
|
200
|
-
var
|
|
201
|
-
ele.setAttribute('stroke-width', _this.maps.layers[
|
|
202
|
-
ele.setAttribute('stroke', _this.maps.layers[
|
|
188
|
+
var layerIndex_2 = parseInt(targetElement.parentElement.id.split('_LayerIndex_')[1].split('_')[0], 10);
|
|
189
|
+
ele.setAttribute('stroke-width', _this.maps.layers[layerIndex_2].navigationLineSettings[index].width.toString());
|
|
190
|
+
ele.setAttribute('stroke', _this.maps.layers[layerIndex_2].navigationLineSettings[index].color);
|
|
203
191
|
}
|
|
204
192
|
}
|
|
205
193
|
if (!getElement(_this.selectionType + 'selectionMap')) {
|
|
@@ -54,8 +54,6 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
54
54
|
if (istooltipRender) {
|
|
55
55
|
if (targetId.indexOf('_shapeIndex_') > -1) {
|
|
56
56
|
option = layer.tooltipSettings;
|
|
57
|
-
option.textStyle.fontFamily = this.maps.themeStyle.fontFamily || option.textStyle.fontFamily;
|
|
58
|
-
option.textStyle.opacity = this.maps.themeStyle.tooltipTextOpacity || option.textStyle.opacity;
|
|
59
57
|
var shape = parseInt(targetId.split('_shapeIndex_')[1].split('_')[0], 10);
|
|
60
58
|
if (isNullOrUndefined(layer.layerData) || isNullOrUndefined(layer.layerData[shape])) {
|
|
61
59
|
return;
|
|
@@ -172,9 +170,13 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
172
170
|
option.template = option.template[Object.keys(option.template)[0]];
|
|
173
171
|
}
|
|
174
172
|
templateData = this.setTooltipContent(option, templateData);
|
|
173
|
+
var tooltipTextStyle = {
|
|
174
|
+
color: option.textStyle.color, fontFamily: option.textStyle.fontFamily, fontStyle: option.textStyle.fontStyle,
|
|
175
|
+
fontWeight: option.textStyle.fontWeight, opacity: option.textStyle.opacity, size: option.textStyle.size
|
|
176
|
+
};
|
|
175
177
|
var tooltipOption = {
|
|
176
178
|
location: location, text: tooltipContent, data: templateData,
|
|
177
|
-
textStyle:
|
|
179
|
+
textStyle: tooltipTextStyle,
|
|
178
180
|
template: option.template
|
|
179
181
|
};
|
|
180
182
|
tooltipArgs = {
|
|
@@ -184,132 +186,66 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
184
186
|
maps: this.maps,
|
|
185
187
|
element: target, eventArgs: e
|
|
186
188
|
};
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
}
|
|
213
|
-
_this.maps['isProtectedOnChange'] = true;
|
|
214
|
-
if (blazorArgs_1.cancel) {
|
|
215
|
-
_this.svgTooltip = new Tooltip({
|
|
216
|
-
enable: true,
|
|
217
|
-
header: '',
|
|
218
|
-
content: [currentData.toString()],
|
|
219
|
-
shapes: [],
|
|
220
|
-
location: tootipOption_1.location,
|
|
221
|
-
palette: [markerFill],
|
|
222
|
-
areaBounds: _this.maps.mapAreaRect,
|
|
223
|
-
textStyle: tooltipArgs.options['textStyle'],
|
|
224
|
-
availableSize: _this.maps.availableSize,
|
|
225
|
-
fill: tooltipArgs.fill
|
|
226
|
-
});
|
|
227
|
-
}
|
|
228
|
-
else {
|
|
229
|
-
_this.svgTooltip = new Tooltip({
|
|
230
|
-
enable: true,
|
|
231
|
-
header: '',
|
|
232
|
-
content: [currentData.toString()],
|
|
233
|
-
shapes: [],
|
|
234
|
-
location: tootipOption_1.location,
|
|
235
|
-
palette: [markerFill],
|
|
236
|
-
areaBounds: _this.maps.mapAreaRect,
|
|
237
|
-
textStyle: blazorArgs_1.textStyle,
|
|
238
|
-
availableSize: _this.maps.availableSize,
|
|
239
|
-
fill: blazorArgs_1.fill
|
|
240
|
-
});
|
|
241
|
-
}
|
|
242
|
-
var tooltipElement = tooltipEle;
|
|
243
|
-
_this.svgTooltip.opacity = _this.maps.themeStyle.tooltipFillOpacity || _this.svgTooltip.opacity;
|
|
244
|
-
_this.svgTooltip.appendTo(tooltipElement);
|
|
245
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
246
|
-
_this.maps.renderReactTemplates();
|
|
189
|
+
this.maps.trigger(tooltipRender, tooltipArgs, function (args) {
|
|
190
|
+
if (!tooltipArgs.cancel && option.visible && !isNullOrUndefined(currentData) &&
|
|
191
|
+
(targetId.indexOf('_cluster_') === -1 && targetId.indexOf('_dataLabel_') === -1)) {
|
|
192
|
+
_this.maps['isProtectedOnChange'] = true;
|
|
193
|
+
tooltipArgs.options['textStyle']['color'] = tooltipArgs.options['textStyle']['color']
|
|
194
|
+
|| _this.maps.themeStyle.tooltipFontColor;
|
|
195
|
+
tooltipArgs.options['textStyle']['fontFamily'] = tooltipArgs.options['textStyle']['fontFamily']
|
|
196
|
+
|| _this.maps.themeStyle.fontFamily;
|
|
197
|
+
tooltipArgs.options['textStyle']['opacity'] = tooltipArgs.options['textStyle']['opacity']
|
|
198
|
+
|| _this.maps.themeStyle.tooltipTextOpacity;
|
|
199
|
+
if (tooltipArgs.cancel) {
|
|
200
|
+
_this.svgTooltip = new Tooltip({
|
|
201
|
+
enable: true,
|
|
202
|
+
header: '',
|
|
203
|
+
data: option['data'],
|
|
204
|
+
template: option['template'],
|
|
205
|
+
content: [currentData.toString()],
|
|
206
|
+
shapes: [],
|
|
207
|
+
location: option['location'],
|
|
208
|
+
palette: [markerFill],
|
|
209
|
+
areaBounds: _this.maps.mapAreaRect,
|
|
210
|
+
textStyle: option['textStyle'],
|
|
211
|
+
availableSize: _this.maps.availableSize,
|
|
212
|
+
fill: option.fill || _this.maps.themeStyle.tooltipFillColor
|
|
213
|
+
});
|
|
247
214
|
}
|
|
248
215
|
else {
|
|
249
|
-
_this.
|
|
250
|
-
|
|
251
|
-
|
|
216
|
+
_this.svgTooltip = new Tooltip({
|
|
217
|
+
enable: true,
|
|
218
|
+
header: '',
|
|
219
|
+
data: tooltipArgs.options['data'],
|
|
220
|
+
template: tooltipArgs.options['template'],
|
|
221
|
+
content: [currentData.toString()],
|
|
222
|
+
shapes: [],
|
|
223
|
+
location: tooltipArgs.options['location'],
|
|
224
|
+
palette: [markerFill],
|
|
225
|
+
areaBounds: _this.maps.mapAreaRect,
|
|
226
|
+
textStyle: tooltipArgs.options['textStyle'],
|
|
227
|
+
availableSize: _this.maps.availableSize,
|
|
228
|
+
fill: tooltipArgs.fill || _this.maps.themeStyle.tooltipFillColor
|
|
229
|
+
});
|
|
252
230
|
}
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
_this.svgTooltip = new Tooltip({
|
|
264
|
-
enable: true,
|
|
265
|
-
header: '',
|
|
266
|
-
data: option['data'],
|
|
267
|
-
template: option['template'],
|
|
268
|
-
content: [currentData.toString()],
|
|
269
|
-
shapes: [],
|
|
270
|
-
location: option['location'],
|
|
271
|
-
palette: [markerFill],
|
|
272
|
-
areaBounds: _this.maps.mapAreaRect,
|
|
273
|
-
textStyle: option['textStyle'],
|
|
274
|
-
availableSize: _this.maps.availableSize,
|
|
275
|
-
fill: option.fill || _this.maps.themeStyle.tooltipFillColor
|
|
276
|
-
});
|
|
277
|
-
}
|
|
278
|
-
else {
|
|
279
|
-
_this.svgTooltip = new Tooltip({
|
|
280
|
-
enable: true,
|
|
281
|
-
header: '',
|
|
282
|
-
data: tooltipArgs.options['data'],
|
|
283
|
-
template: tooltipArgs.options['template'],
|
|
284
|
-
content: [currentData.toString()],
|
|
285
|
-
shapes: [],
|
|
286
|
-
location: tooltipArgs.options['location'],
|
|
287
|
-
palette: [markerFill],
|
|
288
|
-
areaBounds: _this.maps.mapAreaRect,
|
|
289
|
-
textStyle: tooltipArgs.options['textStyle'],
|
|
290
|
-
availableSize: _this.maps.availableSize,
|
|
291
|
-
fill: tooltipArgs.fill || _this.maps.themeStyle.tooltipFillColor
|
|
292
|
-
});
|
|
293
|
-
}
|
|
294
|
-
_this.svgTooltip.opacity = _this.maps.themeStyle.tooltipFillOpacity || _this.svgTooltip.opacity;
|
|
295
|
-
_this.svgTooltip.appendTo(tooltipEle);
|
|
296
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
297
|
-
_this.maps.renderReactTemplates();
|
|
298
|
-
tooltipTemplateElement = document.getElementById(_this.maps.element.id + '_mapsTooltip');
|
|
299
|
-
if (tooltipTemplateElement !== null && tooltipTemplateElement.innerHTML.indexOf('href') !== -1
|
|
300
|
-
&& tooltipTemplateElement.innerHTML.indexOf('</a>') !== -1) {
|
|
301
|
-
var templateStyle = tooltipTemplateElement.getAttribute('style');
|
|
302
|
-
templateStyle = templateStyle.replace('pointer-events: none;', 'position-events:all;');
|
|
303
|
-
tooltipTemplateElement.setAttribute('style', templateStyle);
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
|
-
else {
|
|
307
|
-
_this.removeTooltip();
|
|
308
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
309
|
-
_this.maps.clearTemplate();
|
|
231
|
+
_this.svgTooltip.opacity = _this.maps.themeStyle.tooltipFillOpacity || _this.svgTooltip.opacity;
|
|
232
|
+
_this.svgTooltip.appendTo(tooltipEle);
|
|
233
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
234
|
+
_this.maps.renderReactTemplates();
|
|
235
|
+
tooltipTemplateElement = document.getElementById(_this.maps.element.id + '_mapsTooltip');
|
|
236
|
+
if (tooltipTemplateElement !== null && tooltipTemplateElement.innerHTML.indexOf('href') !== -1
|
|
237
|
+
&& tooltipTemplateElement.innerHTML.indexOf('</a>') !== -1) {
|
|
238
|
+
var templateStyle = tooltipTemplateElement.getAttribute('style');
|
|
239
|
+
templateStyle = templateStyle.replace('pointer-events: none;', 'position-events:all;');
|
|
240
|
+
tooltipTemplateElement.setAttribute('style', templateStyle);
|
|
310
241
|
}
|
|
311
|
-
}
|
|
312
|
-
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
_this.removeTooltip();
|
|
245
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
246
|
+
_this.maps.clearTemplate();
|
|
247
|
+
}
|
|
248
|
+
});
|
|
313
249
|
if (this.svgTooltip) {
|
|
314
250
|
this.maps.trigger('tooltipRenderComplete', {
|
|
315
251
|
cancel: false, name: 'tooltipRenderComplete', maps: this.maps, options: tooltipOption,
|
|
@@ -102,6 +102,7 @@ export declare class Zoom {
|
|
|
102
102
|
processTemplate(x: number, y: number, scale: number, maps: Maps): void;
|
|
103
103
|
private dataLabelTranslate;
|
|
104
104
|
private markerTranslate;
|
|
105
|
+
private markerLineAnimation;
|
|
105
106
|
panning(direction: PanDirection, xDifference: number, yDifference: number, mouseLocation?: PointerEvent | TouchEvent): void;
|
|
106
107
|
private toAlignSublayer;
|
|
107
108
|
toolBarZooming(zoomFactor: number, type: string): void;
|