@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
package/src/maps/maps.d.ts
CHANGED
|
@@ -233,56 +233,48 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
233
233
|
* Triggers when the map is on load.
|
|
234
234
|
*
|
|
235
235
|
* @event load
|
|
236
|
-
* @blazorProperty 'OnLoad'
|
|
237
236
|
*/
|
|
238
237
|
load: EmitType<ILoadEventArgs>;
|
|
239
238
|
/**
|
|
240
239
|
* Triggers before the print gets started.
|
|
241
240
|
*
|
|
242
241
|
* @event beforePrint
|
|
243
|
-
* @blazorProperty 'OnPrint'
|
|
244
242
|
*/
|
|
245
243
|
beforePrint: EmitType<IPrintEventArgs>;
|
|
246
244
|
/**
|
|
247
245
|
* Triggers after the maps gets rendered.
|
|
248
246
|
*
|
|
249
247
|
* @event loaded
|
|
250
|
-
* @blazorProperty 'Loaded'
|
|
251
248
|
*/
|
|
252
249
|
loaded: EmitType<ILoadedEventArgs>;
|
|
253
250
|
/**
|
|
254
251
|
* Triggers when clicking an element in maps.
|
|
255
252
|
*
|
|
256
253
|
* @event click
|
|
257
|
-
* @blazorProperty 'OnClick'
|
|
258
254
|
*/
|
|
259
255
|
click: EmitType<IMouseEventArgs>;
|
|
260
256
|
/**
|
|
261
257
|
* Triggers when performing the double click operation on an element in maps.
|
|
262
258
|
*
|
|
263
259
|
* @event doubleClick
|
|
264
|
-
* @blazorProperty 'OnDoubleClick'
|
|
265
260
|
*/
|
|
266
261
|
doubleClick: EmitType<IMouseEventArgs>;
|
|
267
262
|
/**
|
|
268
263
|
* Triggers when performing the right click operation on an element in maps.
|
|
269
264
|
*
|
|
270
265
|
* @event rightClick
|
|
271
|
-
* @blazorProperty 'OnRightClick'
|
|
272
266
|
*/
|
|
273
267
|
rightClick: EmitType<IMouseEventArgs>;
|
|
274
268
|
/**
|
|
275
269
|
* Triggers when resizing the maps.
|
|
276
270
|
*
|
|
277
271
|
* @event resize
|
|
278
|
-
* @blazorProperty 'Resizing'
|
|
279
272
|
*/
|
|
280
273
|
resize: EmitType<IResizeEventArgs>;
|
|
281
274
|
/**
|
|
282
275
|
* Triggers before the maps tooltip gets rendered.
|
|
283
276
|
*
|
|
284
277
|
* @event tooltipRender
|
|
285
|
-
* @blazorProperty 'TooltipRendering'
|
|
286
278
|
*/
|
|
287
279
|
tooltipRender: EmitType<ITooltipRenderEventArgs>;
|
|
288
280
|
/**
|
|
@@ -290,7 +282,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
290
282
|
*
|
|
291
283
|
* @event legendRendering
|
|
292
284
|
|
|
293
|
-
* @blazorProperty 'LegendRendering'
|
|
294
285
|
*/
|
|
295
286
|
legendRendering: EmitType<ILegendRenderingEventArgs>;
|
|
296
287
|
/**
|
|
@@ -298,56 +289,48 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
298
289
|
*
|
|
299
290
|
|
|
300
291
|
* @event tooltipRenderComplete
|
|
301
|
-
* @blazorProperty 'TooltipRenderComplete'
|
|
302
292
|
*/
|
|
303
293
|
tooltipRenderComplete: EmitType<ITooltipRenderCompleteEventArgs>;
|
|
304
294
|
/**
|
|
305
295
|
* Triggers when clicking a shape in maps.
|
|
306
296
|
*
|
|
307
297
|
* @event shapeSelected
|
|
308
|
-
* @blazorProperty 'ShapeSelected'
|
|
309
298
|
*/
|
|
310
299
|
shapeSelected: EmitType<IShapeSelectedEventArgs>;
|
|
311
300
|
/**
|
|
312
301
|
* Triggers when clicking the shape on maps and before the selection is applied.
|
|
313
302
|
*
|
|
314
303
|
* @event itemSelection
|
|
315
|
-
* @blazorProperty 'OnItemSelect'
|
|
316
304
|
*/
|
|
317
305
|
itemSelection: EmitType<ISelectionEventArgs>;
|
|
318
306
|
/**
|
|
319
307
|
* Trigger when mouse move on the shape in maps and before the shape gets highlighted.
|
|
320
308
|
*
|
|
321
309
|
* @event itemHighlight
|
|
322
|
-
* @blazorProperty 'OnItemHighlight'
|
|
323
310
|
*/
|
|
324
311
|
itemHighlight: EmitType<ISelectionEventArgs>;
|
|
325
312
|
/**
|
|
326
313
|
* Triggers when mouse move on the shape in maps and before the shape gets highlighted.
|
|
327
314
|
*
|
|
328
315
|
* @event shapeHighlight
|
|
329
|
-
* @blazorProperty 'ShapeHighlighted'
|
|
330
316
|
*/
|
|
331
317
|
shapeHighlight: EmitType<IShapeSelectedEventArgs>;
|
|
332
318
|
/**
|
|
333
319
|
* Triggers before the maps layer gets rendered.
|
|
334
320
|
*
|
|
335
321
|
* @event layerRendering
|
|
336
|
-
* @blazorProperty 'LayerRendering'
|
|
337
322
|
*/
|
|
338
323
|
layerRendering: EmitType<ILayerRenderingEventArgs>;
|
|
339
324
|
/**
|
|
340
325
|
* Triggers before the maps shape gets rendered.
|
|
341
326
|
*
|
|
342
327
|
* @event shapeRendering
|
|
343
|
-
* @blazorProperty 'ShapeRendering'
|
|
344
328
|
*/
|
|
345
329
|
shapeRendering: EmitType<IShapeRenderingEventArgs>;
|
|
346
330
|
/**
|
|
347
331
|
* Triggers before the maps marker gets rendered.
|
|
348
332
|
*
|
|
349
333
|
* @event markerRendering
|
|
350
|
-
* @blazorProperty 'MarkerRendering'
|
|
351
334
|
*/
|
|
352
335
|
markerRendering: EmitType<IMarkerRenderingEventArgs>;
|
|
353
336
|
/**
|
|
@@ -360,7 +343,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
360
343
|
* Triggers when clicking on the maps marker element.
|
|
361
344
|
*
|
|
362
345
|
* @event markerClick
|
|
363
|
-
* @blazorProperty 'OnMarkerClick'
|
|
364
346
|
*/
|
|
365
347
|
markerClick: EmitType<IMarkerClickEventArgs>;
|
|
366
348
|
/**
|
|
@@ -379,63 +361,54 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
379
361
|
* Triggers when moving the mouse over the marker element in maps.
|
|
380
362
|
*
|
|
381
363
|
* @event markerMouseMove
|
|
382
|
-
* @blazorProperty 'OnMarkerMouseMove'
|
|
383
364
|
*/
|
|
384
365
|
markerMouseMove: EmitType<IMarkerMoveEventArgs>;
|
|
385
366
|
/**
|
|
386
367
|
* Triggers before the data-label gets rendered.
|
|
387
368
|
*
|
|
388
369
|
* @event dataLabelRendering
|
|
389
|
-
* @blazorProperty 'DataLabelRendering'
|
|
390
370
|
*/
|
|
391
371
|
dataLabelRendering: EmitType<ILabelRenderingEventArgs>;
|
|
392
372
|
/**
|
|
393
373
|
* Triggers before the bubble element gets rendered on the map.
|
|
394
374
|
*
|
|
395
375
|
* @event bubbleRendering
|
|
396
|
-
* @blazorProperty 'BubbleRendering'
|
|
397
376
|
*/
|
|
398
377
|
bubbleRendering: EmitType<IBubbleRenderingEventArgs>;
|
|
399
378
|
/**
|
|
400
379
|
* Triggers when performing the click operation on the bubble element in maps.
|
|
401
380
|
*
|
|
402
381
|
* @event bubbleClick
|
|
403
|
-
* @blazorProperty 'OnBubbleClick'
|
|
404
382
|
*/
|
|
405
383
|
bubbleClick: EmitType<IBubbleClickEventArgs>;
|
|
406
384
|
/**
|
|
407
385
|
* Triggers when hovering the mouse on the bubble element in maps.
|
|
408
386
|
*
|
|
409
387
|
* @event bubbleMouseMove
|
|
410
|
-
* @blazorProperty 'OnBubbleMouseMove'
|
|
411
388
|
*/
|
|
412
389
|
bubbleMouseMove: EmitType<IBubbleMoveEventArgs>;
|
|
413
390
|
/**
|
|
414
391
|
* Triggers after the animation completed in the maps component.
|
|
415
392
|
*
|
|
416
393
|
* @event animationComplete
|
|
417
|
-
* @blazorProperty 'AnimationCompleted'
|
|
418
394
|
*/
|
|
419
395
|
animationComplete: EmitType<IAnimationCompleteEventArgs>;
|
|
420
396
|
/**
|
|
421
397
|
* Triggers before rendering the annotation in maps.
|
|
422
398
|
*
|
|
423
399
|
* @event annotationRendering
|
|
424
|
-
* @blazorProperty 'AnnotationRendering'
|
|
425
400
|
*/
|
|
426
401
|
annotationRendering: EmitType<IAnnotationRenderingEventArgs>;
|
|
427
402
|
/**
|
|
428
403
|
* Triggers before the zoom operations in the maps such as zoom in and zoom out.
|
|
429
404
|
*
|
|
430
405
|
* @event zoom
|
|
431
|
-
* @blazorProperty 'OnZoom'
|
|
432
406
|
*/
|
|
433
407
|
zoom: EmitType<IMapZoomEventArgs>;
|
|
434
408
|
/**
|
|
435
409
|
* Triggers before performing the panning operation.
|
|
436
410
|
*
|
|
437
411
|
* @event pan
|
|
438
|
-
* @blazorProperty 'OnPan'
|
|
439
412
|
*/
|
|
440
413
|
pan: EmitType<IMapPanEventArgs>;
|
|
441
414
|
/**
|
|
@@ -628,8 +601,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
628
601
|
mouseDownEvent: Object;
|
|
629
602
|
mouseClickEvent: Object;
|
|
630
603
|
/** @private */
|
|
631
|
-
isBlazor: boolean;
|
|
632
|
-
/** @private */
|
|
633
604
|
shapeSelectionClass: Element;
|
|
634
605
|
/** @private */
|
|
635
606
|
selectedElementId: string[];
|
|
@@ -711,6 +682,7 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
711
682
|
* @returns {void}
|
|
712
683
|
*/
|
|
713
684
|
protected preRender(): void;
|
|
685
|
+
private renderElements;
|
|
714
686
|
/**
|
|
715
687
|
* To Initialize the control rendering.
|
|
716
688
|
*
|
|
@@ -753,13 +725,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
753
725
|
* @private
|
|
754
726
|
*/
|
|
755
727
|
markerInitialSelection(layerIndex: number, markerIndex: number, markerSettings: MarkerSettingsModel, latitude: number, longitude: number): void;
|
|
756
|
-
/**
|
|
757
|
-
* To append blazor templates
|
|
758
|
-
*
|
|
759
|
-
* @returns {void}
|
|
760
|
-
* @private
|
|
761
|
-
*/
|
|
762
|
-
blazorTemplates(): void;
|
|
763
728
|
/**
|
|
764
729
|
* Render the map area border
|
|
765
730
|
*
|
|
@@ -848,7 +813,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
848
813
|
* This method is used to perform the operations when a click operation is performed on maps.
|
|
849
814
|
*
|
|
850
815
|
* @param {PointerEvent} e - Specifies the pointer event on maps.
|
|
851
|
-
* @blazorProperty 'PerformClick'
|
|
852
816
|
*/
|
|
853
817
|
mapsOnClick(e: PointerEvent): void;
|
|
854
818
|
private getClickLocation;
|
|
@@ -877,7 +841,6 @@ export declare class Maps extends Component<HTMLElement> implements INotifyPrope
|
|
|
877
841
|
* This method is used to perform operations when performing the double click operation on maps.
|
|
878
842
|
*
|
|
879
843
|
* @param {PointerEvent} e - Specifies the pointer event.
|
|
880
|
-
* @blazorProperty 'PerformDoubleClick'
|
|
881
844
|
*/
|
|
882
845
|
mapsOnDoubleClick(e: PointerEvent): void;
|
|
883
846
|
/**
|
package/src/maps/maps.js
CHANGED
|
@@ -27,8 +27,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
27
27
|
*/
|
|
28
28
|
import { Component, NotifyPropertyChanges, Property, Ajax } from '@syncfusion/ej2-base';
|
|
29
29
|
import { EventHandler, Browser, isNullOrUndefined, createElement, setValue, extend } from '@syncfusion/ej2-base';
|
|
30
|
-
import { Event, remove, L10n, Collection, Internationalization, Complex
|
|
31
|
-
import { updateBlazorTemplate, resetBlazorTemplate } from '@syncfusion/ej2-base';
|
|
30
|
+
import { Event, remove, L10n, Collection, Internationalization, Complex } from '@syncfusion/ej2-base';
|
|
32
31
|
import { SvgRenderer } from '@syncfusion/ej2-svg-base';
|
|
33
32
|
import { Size, createSvg, Point, removeElement, triggerShapeEvent, showTooltip, checkShapeDataFields, getMousePosition } from './utils/helper';
|
|
34
33
|
import { getElement, removeClass, getTranslate, triggerItemSelectionEvent, mergeSeparateCluster, customizeStyle } from './utils/helper';
|
|
@@ -215,20 +214,14 @@ var Maps = /** @class */ (function (_super) {
|
|
|
215
214
|
*/
|
|
216
215
|
Maps.prototype.preRender = function () {
|
|
217
216
|
this.isDevice = Browser.isDevice;
|
|
218
|
-
this.isBlazor = isBlazor();
|
|
219
217
|
this.initPrivateVariable();
|
|
220
218
|
this.allowServerDataBinding = false;
|
|
221
219
|
this.unWireEVents();
|
|
222
220
|
this.wireEVents();
|
|
223
221
|
this.setCulture();
|
|
224
222
|
};
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
*
|
|
228
|
-
* @returns {void}
|
|
229
|
-
*/
|
|
230
|
-
Maps.prototype.render = function () {
|
|
231
|
-
this.trigger(load, this.isBlazor ? {} : { maps: this });
|
|
223
|
+
Maps.prototype.renderElements = function () {
|
|
224
|
+
this.trigger(load, { maps: this });
|
|
232
225
|
this.createSVG();
|
|
233
226
|
this.findBaseAndSubLayers();
|
|
234
227
|
this.createSecondaryElement();
|
|
@@ -240,6 +233,14 @@ var Maps = /** @class */ (function (_super) {
|
|
|
240
233
|
this.processRequestJsonData();
|
|
241
234
|
this.renderComplete();
|
|
242
235
|
};
|
|
236
|
+
/**
|
|
237
|
+
* To Initialize the control rendering.
|
|
238
|
+
*
|
|
239
|
+
* @returns {void}
|
|
240
|
+
*/
|
|
241
|
+
Maps.prototype.render = function () {
|
|
242
|
+
this.renderElements();
|
|
243
|
+
};
|
|
243
244
|
Maps.prototype.processRequestJsonData = function () {
|
|
244
245
|
var _this = this;
|
|
245
246
|
var length = this.layersCollection.length - 1;
|
|
@@ -252,7 +253,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
252
253
|
if (layer.shapeData instanceof DataManager) {
|
|
253
254
|
_this.serverProcess['request']++;
|
|
254
255
|
dataModule = layer.shapeData;
|
|
255
|
-
queryModule = layer.query instanceof Query ? layer.query :
|
|
256
|
+
queryModule = layer.query instanceof Query ? layer.query : new Query();
|
|
256
257
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
257
258
|
var dataManager = dataModule.executeQuery(queryModule);
|
|
258
259
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -268,7 +269,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
268
269
|
if (layer.dataSource instanceof DataManager) {
|
|
269
270
|
_this.serverProcess['request']++;
|
|
270
271
|
dataModule = layer.dataSource;
|
|
271
|
-
queryModule = layer.query instanceof Query ? layer.query :
|
|
272
|
+
queryModule = layer.query instanceof Query ? layer.query : new Query();
|
|
272
273
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
273
274
|
var dataManager = dataModule.executeQuery(queryModule);
|
|
274
275
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -282,8 +283,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
282
283
|
if (layer.markerSettings[i].dataSource instanceof DataManager) {
|
|
283
284
|
_this.serverProcess['request']++;
|
|
284
285
|
dataModule = layer.markerSettings[i].dataSource;
|
|
285
|
-
queryModule = layer.markerSettings[i].query instanceof Query ? layer.markerSettings[i].query :
|
|
286
|
-
(new Query().requiresCount()) : new Query();
|
|
286
|
+
queryModule = layer.markerSettings[i].query instanceof Query ? layer.markerSettings[i].query : new Query();
|
|
287
287
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
288
288
|
var dataManager = dataModule.executeQuery(queryModule);
|
|
289
289
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -302,8 +302,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
302
302
|
if (layer.bubbleSettings[i].dataSource instanceof DataManager) {
|
|
303
303
|
_this.serverProcess['request']++;
|
|
304
304
|
dataModule = layer.bubbleSettings[i].dataSource;
|
|
305
|
-
queryModule = layer.bubbleSettings[i].query instanceof Query ? layer.bubbleSettings[i].query :
|
|
306
|
-
(new Query().requiresCount()) : new Query();
|
|
305
|
+
queryModule = layer.bubbleSettings[i].query instanceof Query ? layer.bubbleSettings[i].query : new Query();
|
|
307
306
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
308
307
|
var dataManager = dataModule.executeQuery(queryModule);
|
|
309
308
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -465,7 +464,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
465
464
|
tileElement1.style.left = left + 'px';
|
|
466
465
|
}
|
|
467
466
|
this.arrangeTemplate();
|
|
468
|
-
var blazor = this.isBlazor ? this.blazorTemplates() : null;
|
|
469
467
|
if (this.annotationsModule) {
|
|
470
468
|
if (this.width !== '0px' && this.height !== '0px' && this.width !== '0%' && this.height !== '0%') {
|
|
471
469
|
this.annotationsModule.renderAnnotationElements();
|
|
@@ -478,7 +476,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
478
476
|
}
|
|
479
477
|
}
|
|
480
478
|
this.zoomingChange();
|
|
481
|
-
this.trigger(loaded,
|
|
479
|
+
this.trigger(loaded, { maps: this, isResized: this.isResize });
|
|
482
480
|
this.isResize = false;
|
|
483
481
|
};
|
|
484
482
|
/**
|
|
@@ -544,37 +542,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
544
542
|
}
|
|
545
543
|
}
|
|
546
544
|
};
|
|
547
|
-
/**
|
|
548
|
-
* To append blazor templates
|
|
549
|
-
*
|
|
550
|
-
* @returns {void}
|
|
551
|
-
* @private
|
|
552
|
-
*/
|
|
553
|
-
Maps.prototype.blazorTemplates = function () {
|
|
554
|
-
var _this = this;
|
|
555
|
-
for (var i = 0; i < this.layers.length; i++) {
|
|
556
|
-
var markerLength = this.layers[i].markerSettings.length - 1;
|
|
557
|
-
if (markerLength >= 0) {
|
|
558
|
-
if (this.layers[i].dataLabelSettings.visible || this.layers[i].markerSettings[markerLength].template) {
|
|
559
|
-
updateBlazorTemplate(this.element.id + '_LabelTemplate', 'LabelTemplate', this.layers[i].dataLabelSettings);
|
|
560
|
-
for (var j = 0; j < this.layers[i].markerSettings.length; j++) {
|
|
561
|
-
var markerRendered = function () {
|
|
562
|
-
for (var x = 0; x < _this.layers.length; x++) {
|
|
563
|
-
var markerTemplateEle = document.getElementById(_this.element.id + '_LayerIndex_' + x + '_Markers_Template_Group');
|
|
564
|
-
if (!isNullOrUndefined(markerTemplateEle)) {
|
|
565
|
-
for (var z = 0; z < markerTemplateEle.childElementCount; z++) {
|
|
566
|
-
var markerTemplate = markerTemplateEle.childNodes[z];
|
|
567
|
-
markerTemplate['style']['transform'] = 'translate(-50%, -50%)';
|
|
568
|
-
}
|
|
569
|
-
}
|
|
570
|
-
}
|
|
571
|
-
};
|
|
572
|
-
updateBlazorTemplate(this.element.id + '_MarkerTemplate' + j, 'MarkerTemplate', this.layers[i].markerSettings[j], undefined, markerRendered);
|
|
573
|
-
}
|
|
574
|
-
}
|
|
575
|
-
}
|
|
576
|
-
}
|
|
577
|
-
};
|
|
578
545
|
/**
|
|
579
546
|
* Render the map area border
|
|
580
547
|
*
|
|
@@ -851,12 +818,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
851
818
|
* @returns {void}
|
|
852
819
|
*/
|
|
853
820
|
Maps.prototype.createSVG = function () {
|
|
854
|
-
resetBlazorTemplate(this.element.id + '_LabelTemplate', 'LabelTemplate');
|
|
855
|
-
for (var i = 0; i < this.layers.length; i++) {
|
|
856
|
-
for (var j = 0; j < this.layers[i].markerSettings.length; j++) {
|
|
857
|
-
resetBlazorTemplate(this.element.id + '_MarkerTemplate' + j, 'MarkerTemplate');
|
|
858
|
-
}
|
|
859
|
-
}
|
|
860
821
|
this.removeSvg();
|
|
861
822
|
createSvg(this);
|
|
862
823
|
};
|
|
@@ -866,9 +827,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
866
827
|
* @returns {void}
|
|
867
828
|
*/
|
|
868
829
|
Maps.prototype.removeSvg = function () {
|
|
869
|
-
for (var i = 0; i < this.annotations.length; i++) {
|
|
870
|
-
resetBlazorTemplate(this.element.id + '_ContentTemplate_' + i, 'ContentTemplate');
|
|
871
|
-
}
|
|
872
830
|
removeElement(this.element.id + '_Secondary_Element');
|
|
873
831
|
removeElement(this.element.id + '_tile_parent');
|
|
874
832
|
removeElement(this.element.id + '_tiles');
|
|
@@ -946,7 +904,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
946
904
|
* This method is used to perform the operations when a click operation is performed on maps.
|
|
947
905
|
*
|
|
948
906
|
* @param {PointerEvent} e - Specifies the pointer event on maps.
|
|
949
|
-
* @blazorProperty 'PerformClick'
|
|
950
907
|
*/
|
|
951
908
|
Maps.prototype.mapsOnClick = function (e) {
|
|
952
909
|
var _this = this;
|
|
@@ -1098,7 +1055,9 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1098
1055
|
}
|
|
1099
1056
|
}
|
|
1100
1057
|
this.notify(Browser.touchEndEvent, e);
|
|
1101
|
-
e.
|
|
1058
|
+
if (e.cancelable) {
|
|
1059
|
+
e.preventDefault();
|
|
1060
|
+
}
|
|
1102
1061
|
return false;
|
|
1103
1062
|
};
|
|
1104
1063
|
/**
|
|
@@ -1150,7 +1109,6 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1150
1109
|
* This method is used to perform operations when performing the double click operation on maps.
|
|
1151
1110
|
*
|
|
1152
1111
|
* @param {PointerEvent} e - Specifies the pointer event.
|
|
1153
|
-
* @blazorProperty 'PerformDoubleClick'
|
|
1154
1112
|
*/
|
|
1155
1113
|
Maps.prototype.mapsOnDoubleClick = function (e) {
|
|
1156
1114
|
this.notify('dblclick', e);
|
|
@@ -1176,9 +1134,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1176
1134
|
}
|
|
1177
1135
|
var doubleClickArgs = { cancel: false, name: doubleClick, x: e.clientX, y: e.clientY,
|
|
1178
1136
|
target: targetId, latitude: latitude, longitude: longitude, isShapeSelected: null };
|
|
1179
|
-
|
|
1180
|
-
target: targetId, latitude: latitude, longitude: longitude, isShapeSelected: null };
|
|
1181
|
-
this.trigger('doubleClick', this.isBlazor ? doubleClickBlazorArgs : doubleClickArgs);
|
|
1137
|
+
this.trigger('doubleClick', doubleClickArgs);
|
|
1182
1138
|
}
|
|
1183
1139
|
};
|
|
1184
1140
|
/**
|
|
@@ -1282,7 +1238,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1282
1238
|
name: resize,
|
|
1283
1239
|
previousSize: this.availableSize,
|
|
1284
1240
|
currentSize: new Size(0, 0),
|
|
1285
|
-
maps:
|
|
1241
|
+
maps: this
|
|
1286
1242
|
};
|
|
1287
1243
|
if (this.resizeTo) {
|
|
1288
1244
|
clearTimeout(this.resizeTo);
|
|
@@ -1556,7 +1512,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1556
1512
|
this.zoomNotApplied = true;
|
|
1557
1513
|
this.scaleOfGivenLocation = calculateZoomLevel(minLatitude, maxLatitude, minLongitude, maxLongitude, this.mapAreaRect.width, this.mapAreaRect.height, this);
|
|
1558
1514
|
var zoomArgs = {
|
|
1559
|
-
cancel: false, name: 'zoom', type: zoomIn, maps:
|
|
1515
|
+
cancel: false, name: 'zoom', type: zoomIn, maps: this,
|
|
1560
1516
|
tileTranslatePoint: {}, translatePoint: {},
|
|
1561
1517
|
tileZoomLevel: this.isTileMap ? { previous: this.tileZoomLevel, current: this.scaleOfGivenLocation } : {},
|
|
1562
1518
|
scale: !this.isTileMap ? { previous: this.scale, current: this.scaleOfGivenLocation } :
|
|
@@ -1706,19 +1662,21 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1706
1662
|
render = true;
|
|
1707
1663
|
break;
|
|
1708
1664
|
case 'zoomSettings':
|
|
1709
|
-
if (
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1718
|
-
|
|
1719
|
-
|
|
1720
|
-
|
|
1721
|
-
|
|
1665
|
+
if (!isNullOrUndefined(oldProp.zoomSettings)) {
|
|
1666
|
+
if (newProp.zoomSettings.zoomFactor !== oldProp.zoomSettings.zoomFactor) {
|
|
1667
|
+
render = false;
|
|
1668
|
+
}
|
|
1669
|
+
else if (newProp.zoomSettings.shouldZoomInitially !== oldProp.zoomSettings.shouldZoomInitially) {
|
|
1670
|
+
this.zoomSettings.zoomFactor = 1;
|
|
1671
|
+
render = true;
|
|
1672
|
+
}
|
|
1673
|
+
else if (newProp.zoomSettings.enable !== oldProp.zoomSettings.enable) {
|
|
1674
|
+
this.zoomSettings.zoomFactor = 1;
|
|
1675
|
+
render = true;
|
|
1676
|
+
}
|
|
1677
|
+
else {
|
|
1678
|
+
render = true;
|
|
1679
|
+
}
|
|
1722
1680
|
}
|
|
1723
1681
|
break;
|
|
1724
1682
|
case 'locale':
|
|
@@ -1731,12 +1689,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1731
1689
|
if (newProp.layers && isMarker) {
|
|
1732
1690
|
removeElement(this.element.id + '_Markers_Group');
|
|
1733
1691
|
if (this.isTileMap) {
|
|
1734
|
-
|
|
1735
|
-
this.render();
|
|
1736
|
-
}
|
|
1737
|
-
else {
|
|
1738
|
-
this.mapLayerPanel.renderTileLayer(this.mapLayerPanel, this.layers['currentFactor'], (this.layers.length - 1));
|
|
1739
|
-
}
|
|
1692
|
+
this.mapLayerPanel.renderTileLayer(this.mapLayerPanel, this.layers['currentFactor'], (this.layers.length - 1));
|
|
1740
1693
|
}
|
|
1741
1694
|
else {
|
|
1742
1695
|
this.render();
|
|
@@ -1747,7 +1700,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1747
1700
|
}
|
|
1748
1701
|
else {
|
|
1749
1702
|
this.createSVG();
|
|
1750
|
-
this.
|
|
1703
|
+
this.renderElements();
|
|
1751
1704
|
}
|
|
1752
1705
|
}
|
|
1753
1706
|
};
|
|
@@ -375,7 +375,6 @@ export interface ColorMappingSettingsModel {
|
|
|
375
375
|
*
|
|
376
376
|
* @aspDefaultValueIgnore
|
|
377
377
|
* @default null
|
|
378
|
-
* @isBlazorNullableType true
|
|
379
378
|
*/
|
|
380
379
|
from?: number;
|
|
381
380
|
|
|
@@ -384,7 +383,6 @@ export interface ColorMappingSettingsModel {
|
|
|
384
383
|
*
|
|
385
384
|
* @aspDefaultValueIgnore
|
|
386
385
|
* @default null
|
|
387
|
-
* @isBlazorNullableType true
|
|
388
386
|
*/
|
|
389
387
|
to?: number;
|
|
390
388
|
|
|
@@ -834,7 +832,6 @@ export interface ZoomSettingsModel {
|
|
|
834
832
|
* Sets and gets the orientation of the zoom toolbar.
|
|
835
833
|
*
|
|
836
834
|
* @default Horizontal
|
|
837
|
-
* @blazorProperty 'ToolbarOrientation'
|
|
838
835
|
*/
|
|
839
836
|
toolBarOrientation?: Orientation;
|
|
840
837
|
|
|
@@ -883,7 +880,6 @@ export interface ZoomSettingsModel {
|
|
|
883
880
|
* Enables or disables the double click zooming in maps.
|
|
884
881
|
*
|
|
885
882
|
* @default false
|
|
886
|
-
* @blazorProperty 'ZoomOnDoubleClick'
|
|
887
883
|
*/
|
|
888
884
|
doubleClickZoom?: boolean;
|
|
889
885
|
|
|
@@ -1142,7 +1138,6 @@ export interface LegendSettingsModel {
|
|
|
1142
1138
|
* Sets and gets the path for the legend from the data source to be shown.
|
|
1143
1139
|
*
|
|
1144
1140
|
* @default null
|
|
1145
|
-
* @blazorProperty 'LegendPath'
|
|
1146
1141
|
*/
|
|
1147
1142
|
showLegendPath?: string;
|
|
1148
1143
|
|
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
|
/**
|
|
@@ -987,7 +983,6 @@ export declare class LegendSettings extends ChildProperty<LegendSettings> {
|
|
|
987
983
|
* Sets and gets the path for the legend from the data source to be shown.
|
|
988
984
|
*
|
|
989
985
|
* @default null
|
|
990
|
-
* @blazorProperty 'LegendPath'
|
|
991
986
|
*/
|
|
992
987
|
showLegendPath: string;
|
|
993
988
|
/**
|
|
@@ -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
|
}
|
package/src/maps/model/theme.js
CHANGED
|
@@ -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,14 @@ 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;
|
|
179
186
|
default:
|
|
180
187
|
themePalette = ['#B5E485', '#7BC1E8', '#DF819C', '#EC9B79', '#78D0D3',
|
|
181
188
|
'#D6D572', '#9178E3', '#A1E5B4', '#87A4B4', '#E4C16C'];
|
|
@@ -413,6 +420,52 @@ export function getThemeStyle(theme) {
|
|
|
413
420
|
shapeFill: '#374151'
|
|
414
421
|
};
|
|
415
422
|
break;
|
|
423
|
+
case 'bootstrap5':
|
|
424
|
+
style = {
|
|
425
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
426
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
427
|
+
titleFontColor: '#212529',
|
|
428
|
+
subTitleFontColor: '#212529',
|
|
429
|
+
legendTitleFontColor: '#212529',
|
|
430
|
+
legendTextColor: '#212529',
|
|
431
|
+
dataLabelFontColor: '#212529',
|
|
432
|
+
tooltipFontColor: '#F9FAFB',
|
|
433
|
+
tooltipFillColor: '#212529',
|
|
434
|
+
zoomFillColor: '#6C757D',
|
|
435
|
+
fontFamily: 'Helvetica Neue',
|
|
436
|
+
titleFontSize: '14px',
|
|
437
|
+
legendFontSize: '12px',
|
|
438
|
+
tooltipFillOpacity: 1,
|
|
439
|
+
tooltipTextOpacity: 1,
|
|
440
|
+
labelFontFamily: 'Helvetica Neue',
|
|
441
|
+
titleFontWeight: 'normal',
|
|
442
|
+
zoomSelectionColor: '#343A40',
|
|
443
|
+
shapeFill: '#E9ECEF'
|
|
444
|
+
};
|
|
445
|
+
break;
|
|
446
|
+
case 'bootstrap5dark':
|
|
447
|
+
style = {
|
|
448
|
+
backgroundColor: 'rgba(255,255,255, 0.0)',
|
|
449
|
+
areaBackgroundColor: 'rgba(255,255,255, 0.0)',
|
|
450
|
+
titleFontColor: '#FFFFFF',
|
|
451
|
+
subTitleFontColor: '#FFFFFF',
|
|
452
|
+
legendTitleFontColor: '#FFFFFF',
|
|
453
|
+
legendTextColor: '#FFFFFF',
|
|
454
|
+
dataLabelFontColor: '#FFFFFF',
|
|
455
|
+
tooltipFontColor: '#212529',
|
|
456
|
+
tooltipFillColor: '#E9ECEF',
|
|
457
|
+
zoomFillColor: '#B5BABE',
|
|
458
|
+
fontFamily: 'Helvetica Neue',
|
|
459
|
+
titleFontSize: '14px',
|
|
460
|
+
legendFontSize: '12px',
|
|
461
|
+
tooltipFillOpacity: 1,
|
|
462
|
+
tooltipTextOpacity: 1,
|
|
463
|
+
labelFontFamily: 'Helvetica Neue',
|
|
464
|
+
titleFontWeight: 'normal',
|
|
465
|
+
zoomSelectionColor: '#DEE2E6',
|
|
466
|
+
shapeFill: '#495057'
|
|
467
|
+
};
|
|
468
|
+
break;
|
|
416
469
|
default:
|
|
417
470
|
style = {
|
|
418
471
|
backgroundColor: '#FFFFFF',
|