@syncfusion/ej2-maps 22.2.8 → 23.1.36
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.min.js +2 -2
- 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 +75 -22
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +75 -22
- 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 +13 -13
- package/src/maps/layers/bubble.js +3 -3
- package/src/maps/layers/data-label.d.ts +1 -0
- package/src/maps/layers/data-label.js +32 -3
- package/src/maps/layers/layer-panel.js +7 -4
- package/src/maps/layers/marker.js +2 -2
- package/src/maps/maps.js +13 -2
- package/src/maps/model/base-model.d.ts +7 -0
- package/src/maps/model/base.d.ts +6 -0
- package/src/maps/model/base.js +3 -0
- package/src/maps/user-interaction/tooltip.js +6 -0
- package/src/maps/user-interaction/zoom.js +9 -9
- package/src/maps/utils/helper.js +5 -4
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version :
|
|
3
|
+
* version : 23.1.36
|
|
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.42.0",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-H3ZkM03G9U0zWAZBoQvjnZ9H5Ckvf8q/V98WcUVkOlblkD82V5Hh0P3Z8c+PtwBkI0rpGvgR5wtJv7QMN1lXUg==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-maps",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-maps",
|
|
24
24
|
"/@syncfusion/ej2-vue-maps"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "https://nexus.syncfusion.com/repository/ej2-
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "https://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-maps/-/ej2-maps-16.42.0.tgz",
|
|
27
|
+
"_shasum": "574fe0af0d6ba3dd6005d24a99ce878fa2c85c0b",
|
|
28
28
|
"_spec": "@syncfusion/ej2-maps@*",
|
|
29
|
-
"_where": "/jenkins/workspace/elease-
|
|
29
|
+
"_where": "/jenkins/workspace/elease-automation_release_23.1.1/packages/included",
|
|
30
30
|
"author": {
|
|
31
31
|
"name": "Syncfusion Inc."
|
|
32
32
|
},
|
|
@@ -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": "~23.1.36",
|
|
39
|
+
"@syncfusion/ej2-buttons": "~23.1.36",
|
|
40
|
+
"@syncfusion/ej2-compression": "~23.1.36",
|
|
41
|
+
"@syncfusion/ej2-data": "~23.1.36",
|
|
42
|
+
"@syncfusion/ej2-file-utils": "~23.1.36",
|
|
43
|
+
"@syncfusion/ej2-pdf-export": "~23.1.36",
|
|
44
|
+
"@syncfusion/ej2-svg-base": "~23.1.36"
|
|
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",
|
|
@@ -93,6 +93,6 @@
|
|
|
93
93
|
"url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
|
|
94
94
|
},
|
|
95
95
|
"typings": "index.d.ts",
|
|
96
|
-
"version": "
|
|
96
|
+
"version": "23.1.36",
|
|
97
97
|
"sideEffects": false
|
|
98
98
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ColorMapping, bubbleRendering } from '../index';
|
|
2
2
|
import { bubbleClick, bubbleMouseMove } from '../index';
|
|
3
|
-
import { isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
3
|
+
import { isNullOrUndefined, animationMode } from '@syncfusion/ej2-base';
|
|
4
4
|
import { CircleOption, MapLocation, findMidPointOfPolygon, Point, drawCircle, elementAnimate, getTranslate } from '../utils/helper';
|
|
5
5
|
import { RectOption, Rect, drawRectangle, checkPropertyPath, getZoomTranslate, getRatioOfBubble, maintainSelection, getValueFromObject } from '../utils/helper';
|
|
6
6
|
/**
|
|
@@ -151,7 +151,7 @@ var Bubble = /** @class */ (function () {
|
|
|
151
151
|
});
|
|
152
152
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
153
153
|
var translate;
|
|
154
|
-
var animate = layer.animationDuration !== 0 || isNullOrUndefined(_this.maps.zoomModule);
|
|
154
|
+
var animate = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(_this.maps.zoomModule);
|
|
155
155
|
if (_this.maps.zoomSettings.zoomFactor > 1 && !isNullOrUndefined(_this.maps.zoomModule) && !_this.maps.isTileMap) {
|
|
156
156
|
translate = getZoomTranslate(_this.maps, layer, animate);
|
|
157
157
|
}
|
|
@@ -172,7 +172,7 @@ var Bubble = /** @class */ (function () {
|
|
|
172
172
|
else {
|
|
173
173
|
radius = 0;
|
|
174
174
|
}
|
|
175
|
-
if (bubbleSettings.animationDuration > 0) {
|
|
175
|
+
if (bubbleSettings.animationDuration > 0 || animationMode === 'Enable') {
|
|
176
176
|
elementAnimate(bubbleElement, bubbleSettings.animationDelay, bubbleSettings.animationDuration, position, _this.maps, bubble, radius);
|
|
177
177
|
}
|
|
178
178
|
});
|
|
@@ -29,6 +29,7 @@ export declare class DataLabel {
|
|
|
29
29
|
* @private
|
|
30
30
|
*/
|
|
31
31
|
renderLabel(layer: LayerSettings, layerIndex: number, shape: any, layerData: any[], group: Element, labelTemplateElement: HTMLElement, index: number, intersect: any[]): void;
|
|
32
|
+
private datalabelAnimate;
|
|
32
33
|
private getPoint;
|
|
33
34
|
/**
|
|
34
35
|
* Get module name.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { findMidPointOfPolygon, Rect, filter, getTemplateFunction, getZoomTranslate, getTranslate, RectOption, convertElementFromLabel, Point, TextOption, renderTextElement, textTrim, measureText, Internalize } from '../utils/helper';
|
|
2
|
-
import { isNullOrUndefined } from '@syncfusion/ej2-base';
|
|
2
|
+
import { isNullOrUndefined, Animation, animationMode } from '@syncfusion/ej2-base';
|
|
3
3
|
import { dataLabelRendering } from '../model/constants';
|
|
4
4
|
import { Theme } from '../model/theme';
|
|
5
5
|
/**
|
|
@@ -64,6 +64,7 @@ var DataLabel = /** @class */ (function () {
|
|
|
64
64
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
65
65
|
var shapeData = shape;
|
|
66
66
|
var element;
|
|
67
|
+
var rect;
|
|
67
68
|
var text = '';
|
|
68
69
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
69
70
|
var datasrcObj;
|
|
@@ -87,7 +88,7 @@ var DataLabel = /** @class */ (function () {
|
|
|
87
88
|
layer.shapePropertyPath : [layer.shapePropertyPath]);
|
|
88
89
|
var propertyPath;
|
|
89
90
|
var isPoint = false;
|
|
90
|
-
var animate = layer.animationDuration !== 0 || isNullOrUndefined(this.maps.zoomModule);
|
|
91
|
+
var animate = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(this.maps.zoomModule);
|
|
91
92
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
92
93
|
var translate = (this.maps.isTileMap) ? new Object() : ((this.maps.zoomSettings.zoomFactor > 1 &&
|
|
93
94
|
!isNullOrUndefined(this.maps.zoomModule)) ? getZoomTranslate(this.maps, layer, animate) :
|
|
@@ -346,11 +347,13 @@ var DataLabel = /** @class */ (function () {
|
|
|
346
347
|
}
|
|
347
348
|
border.opacity = isNullOrUndefined(border.opacity) ? opacity : border.opacity;
|
|
348
349
|
var rectOptions = new RectOption(_this.maps.element.id + '_LayerIndex_' + layerIndex + '_shapeIndex_' + index + '_rectIndex_' + index, fill, border, opacity, new Rect((x + labelArgs.offsetX), (y + labelArgs.offsetY), textSize['width'], textSize['height']), rx, ry);
|
|
349
|
-
|
|
350
|
+
rect = _this.maps.renderer.drawRectangle(rectOptions);
|
|
351
|
+
rect.setAttribute('visibility', layer.dataLabelSettings.animationDuration > 0 || animationMode === 'Enable' ? 'hidden' : 'visibile');
|
|
350
352
|
group.appendChild(rect);
|
|
351
353
|
}
|
|
352
354
|
}
|
|
353
355
|
element = renderTextElement(options, style, style.color || _this.maps.themeStyle.dataLabelFontColor, group);
|
|
356
|
+
element.setAttribute('visibility', layer.dataLabelSettings.animationDuration > 0 || animationMode === 'Enable' ? 'hidden' : 'visibile');
|
|
354
357
|
if (zoomLabelsPosition && scaleZoomValue > 1 && !_this.maps.zoomNotApplied) {
|
|
355
358
|
element.setAttribute('transform', 'translate( ' + ((location['x'] + labelArgs.offsetX)) + ' '
|
|
356
359
|
+ (((location['y'] + labelArgs.offsetY))) + ' )');
|
|
@@ -376,9 +379,35 @@ var DataLabel = /** @class */ (function () {
|
|
|
376
379
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
377
380
|
_this.maps.renderReactTemplates();
|
|
378
381
|
}
|
|
382
|
+
if (layer.dataLabelSettings.animationDuration > 0 || animationMode === 'Enable') {
|
|
383
|
+
if (!isNullOrUndefined(element)) {
|
|
384
|
+
_this.datalabelAnimate(element, dataLabelSettings.animationDuration, style.opacity, false);
|
|
385
|
+
if (!isNullOrUndefined(rect)) {
|
|
386
|
+
_this.datalabelAnimate(rect, dataLabelSettings.animationDuration, dataLabelSettings.opacity, true);
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
}
|
|
379
390
|
});
|
|
380
391
|
}
|
|
381
392
|
};
|
|
393
|
+
DataLabel.prototype.datalabelAnimate = function (element, duration, opacity, isRect) {
|
|
394
|
+
var height = 0;
|
|
395
|
+
new Animation({}).animate(element, {
|
|
396
|
+
duration: (duration === 0 && animationMode === 'Enable') ? 1000 : duration,
|
|
397
|
+
delay: 0,
|
|
398
|
+
progress: function (args) {
|
|
399
|
+
if (args.timeStamp > args.delay) {
|
|
400
|
+
height = ((args.timeStamp - args.delay) / args.duration);
|
|
401
|
+
element.setAttribute('style', 'user-select: none; visibility: visible;');
|
|
402
|
+
element.setAttribute(isRect ? 'fill-opacity' : 'opacity', (opacity * height).toString());
|
|
403
|
+
}
|
|
404
|
+
},
|
|
405
|
+
end: function (model) {
|
|
406
|
+
element.style.visibility = 'visible';
|
|
407
|
+
element.setAttribute(isRect ? 'fill-opacity' : 'opacity', opacity.toString());
|
|
408
|
+
}
|
|
409
|
+
});
|
|
410
|
+
};
|
|
382
411
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
383
412
|
DataLabel.prototype.getPoint = function (shapes, points) {
|
|
384
413
|
if (shapes['type'] === 'MultiLineString') {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable no-case-declarations */
|
|
2
|
-
import { isNullOrUndefined, extend, createElement, Fetch } from '@syncfusion/ej2-base';
|
|
2
|
+
import { isNullOrUndefined, extend, createElement, Fetch, animationMode } from '@syncfusion/ej2-base';
|
|
3
3
|
import { getShapeColor } from '../model/theme';
|
|
4
4
|
import { GeoLocation, isCustomPath, convertGeoToPoint, Point, PathOption, Size, removeElement } from '../utils/helper';
|
|
5
5
|
import { getElementByID, maintainSelection, getValueFromObject } from '../utils/helper';
|
|
@@ -975,7 +975,8 @@ var LayerPanel = /** @class */ (function () {
|
|
|
975
975
|
var childNode;
|
|
976
976
|
this.mapObject.translateType = 'layer';
|
|
977
977
|
if (!isNullOrUndefined(this.mapObject.baseMapRectBounds)) {
|
|
978
|
-
var duration = this.currentLayer.animationDuration
|
|
978
|
+
var duration = animationMode === 'Disable' ? 0 : (this.currentLayer.animationDuration === 0 && animationMode === 'Enable') ?
|
|
979
|
+
1000 : this.currentLayer.animationDuration;
|
|
979
980
|
var animate = duration !== 0 || isNullOrUndefined(this.mapObject.zoomModule);
|
|
980
981
|
this.mapObject.baseTranslatePoint = this.mapObject.zoomTranslatePoint;
|
|
981
982
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1234,7 +1235,8 @@ var LayerPanel = /** @class */ (function () {
|
|
|
1234
1235
|
var timeOut;
|
|
1235
1236
|
if (!isNullOrUndefined(type) && type !== 'Pan') {
|
|
1236
1237
|
this.tileAnimation(type, x, y);
|
|
1237
|
-
timeOut = this.mapObject.layersCollection[0].animationDuration
|
|
1238
|
+
timeOut = animationMode === 'Disable' ? 0 : (this.mapObject.layersCollection[0].animationDuration === 0 &&
|
|
1239
|
+
animationMode === 'Enable') ? 1000 : this.mapObject.layersCollection[0].animationDuration;
|
|
1238
1240
|
}
|
|
1239
1241
|
else {
|
|
1240
1242
|
timeOut = 0;
|
|
@@ -1369,7 +1371,8 @@ var LayerPanel = /** @class */ (function () {
|
|
|
1369
1371
|
scaleValue = zoomType.indexOf('ZoomOut') === 0 ? '0.5' : '0.2';
|
|
1370
1372
|
}
|
|
1371
1373
|
if (!isNullOrUndefined(animatedTiles)) {
|
|
1372
|
-
animatedTiles.style.transition = this.mapObject.layersCollection[0].animationDuration
|
|
1374
|
+
animatedTiles.style.transition = animationMode === 'Disable' ? '0ms' : (this.mapObject.layersCollection[0].animationDuration === 0
|
|
1375
|
+
&& animationMode === 'Enable') ? '1000ms' : this.mapObject.layersCollection[0].animationDuration + 'ms';
|
|
1373
1376
|
animatedTiles.style.transform = 'translate(' + translateX + 'px, ' + translateY + 'px) scale(' + scaleValue + ')';
|
|
1374
1377
|
}
|
|
1375
1378
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { markerRendering, convertTileLatLongToPoint, MapLocation, markerDragStart } from '../index';
|
|
2
2
|
import { markerClick, markerMouseMove, markerClusterClick, markerClusterMouseMove } from '../index';
|
|
3
|
-
import { isNullOrUndefined, createElement } from '@syncfusion/ej2-base';
|
|
3
|
+
import { isNullOrUndefined, createElement, animationMode } from '@syncfusion/ej2-base';
|
|
4
4
|
import { getTranslate, convertGeoToPoint, clusterTemplate, marker, markerTemplate, getZoomTranslate } from '../utils/helper';
|
|
5
5
|
import { getElementByID, mergeSeparateCluster, clusterSeparate, removeElement, getElement, markerColorChoose, markerShapeChoose, calculateZoomLevel, compareZoomFactor, getValueFromObject } from '../utils/helper';
|
|
6
6
|
/**
|
|
@@ -62,7 +62,7 @@ var Marker = /** @class */ (function () {
|
|
|
62
62
|
var markerID = maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
63
63
|
+ markerIndex + '_dataIndex_' + dataIndex;
|
|
64
64
|
var location_1 = (maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(lng, lat), factor, maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, currentLayer, maps);
|
|
65
|
-
var animate = currentLayer.animationDuration !== 0 || isNullOrUndefined(maps.zoomModule);
|
|
65
|
+
var animate = (currentLayer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(maps.zoomModule);
|
|
66
66
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
67
67
|
var translate = (maps.isTileMap) ? (currentLayer.type === 'SubLayer' && isNullOrUndefined(maps.zoomModule)) ? location_1 = convertTileLatLongToPoint(new MapLocation(lng, lat), maps.tileZoomLevel, maps.tileTranslatePoint, true) : new Object() :
|
|
68
68
|
!isNullOrUndefined(maps.zoomModule) && maps.zoomSettings.zoomFactor > 1 ?
|
package/src/maps/maps.js
CHANGED
|
@@ -340,7 +340,18 @@ var Maps = /** @class */ (function (_super) {
|
|
|
340
340
|
this.serverProcess['request']++;
|
|
341
341
|
var fetchApiModule = new Fetch(localAjax.dataOptions, localAjax.type, localAjax.contentType);
|
|
342
342
|
fetchApiModule.onSuccess = function (args) {
|
|
343
|
-
|
|
343
|
+
if (!isNullOrUndefined(args.type) && args.type === 'application/octet-stream') {
|
|
344
|
+
var reader_1 = new FileReader();
|
|
345
|
+
var map_1 = _this;
|
|
346
|
+
reader_1.onload = function (data) {
|
|
347
|
+
args = JSON.parse(reader_1.result.toString());
|
|
348
|
+
map_1.processResponseJsonData('Fetch', args, layer, type);
|
|
349
|
+
};
|
|
350
|
+
reader_1.readAsText(args);
|
|
351
|
+
}
|
|
352
|
+
else {
|
|
353
|
+
_this.processResponseJsonData('Fetch', args, layer, type);
|
|
354
|
+
}
|
|
344
355
|
};
|
|
345
356
|
fetchApiModule.send(localAjax.sendData);
|
|
346
357
|
};
|
|
@@ -1336,7 +1347,7 @@ var Maps = /** @class */ (function (_super) {
|
|
|
1336
1347
|
if (e.type.indexOf('touch') !== -1 && e.changedTouches) {
|
|
1337
1348
|
this.mouseDownEvent = { x: e.changedTouches[0].pageX, y: e.changedTouches[0].pageY };
|
|
1338
1349
|
}
|
|
1339
|
-
if (this.isDevice) {
|
|
1350
|
+
if (this.isDevice && !isNullOrUndefined(this.mapsTooltipModule)) {
|
|
1340
1351
|
this.mapsTooltipModule.renderTooltip(e);
|
|
1341
1352
|
}
|
|
1342
1353
|
var rect = this.element.getBoundingClientRect();
|
|
@@ -1535,6 +1535,13 @@ export interface DataLabelSettingsModel {
|
|
|
1535
1535
|
*/
|
|
1536
1536
|
template?: string | Function;
|
|
1537
1537
|
|
|
1538
|
+
/**
|
|
1539
|
+
* Gets and sets the duration time for animating the data label.
|
|
1540
|
+
*
|
|
1541
|
+
* @default 0
|
|
1542
|
+
*/
|
|
1543
|
+
animationDuration?: number;
|
|
1544
|
+
|
|
1538
1545
|
}
|
|
1539
1546
|
|
|
1540
1547
|
/**
|
package/src/maps/model/base.d.ts
CHANGED
|
@@ -1332,6 +1332,12 @@ export declare class DataLabelSettings extends ChildProperty<DataLabelSettings>
|
|
|
1332
1332
|
* @aspType string
|
|
1333
1333
|
*/
|
|
1334
1334
|
template: string | Function;
|
|
1335
|
+
/**
|
|
1336
|
+
* Gets and sets the duration time for animating the data label.
|
|
1337
|
+
*
|
|
1338
|
+
* @default 0
|
|
1339
|
+
*/
|
|
1340
|
+
animationDuration: number;
|
|
1335
1341
|
}
|
|
1336
1342
|
/**
|
|
1337
1343
|
* Gets or sets the options to customize the shapes in the maps.
|
package/src/maps/model/base.js
CHANGED
|
@@ -923,6 +923,9 @@ var DataLabelSettings = /** @class */ (function (_super) {
|
|
|
923
923
|
__decorate([
|
|
924
924
|
Property('')
|
|
925
925
|
], DataLabelSettings.prototype, "template", void 0);
|
|
926
|
+
__decorate([
|
|
927
|
+
Property(0)
|
|
928
|
+
], DataLabelSettings.prototype, "animationDuration", void 0);
|
|
926
929
|
return DataLabelSettings;
|
|
927
930
|
}(ChildProperty));
|
|
928
931
|
export { DataLabelSettings };
|
|
@@ -40,6 +40,12 @@ var MapsTooltip = /** @class */ (function () {
|
|
|
40
40
|
clearTimeout(this.clearTimeout);
|
|
41
41
|
this.clearTimeout = setTimeout(this.removeTooltip.bind(this), 2000);
|
|
42
42
|
}
|
|
43
|
+
if (target.id.indexOf(this.maps.element.id) === -1) {
|
|
44
|
+
var ancestor = target.closest('.' + this.maps.element.id + '_marker_template_element');
|
|
45
|
+
if (!isNullOrUndefined(ancestor) && ancestor.id.indexOf('_MarkerIndex_') > -1) {
|
|
46
|
+
target = ancestor;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
43
49
|
var option;
|
|
44
50
|
var currentData = '';
|
|
45
51
|
var targetId = target.id;
|
|
@@ -3,7 +3,7 @@ import { RectOption, createTooltip, calculateScale, getTouchCenter, getTouches,
|
|
|
3
3
|
import { MapLocation, zoomAnimate, smoothTranslate, measureText, textTrim, clusterTemplate, marker } from '../utils/helper';
|
|
4
4
|
import { markerTemplate, removeElement, getElement, clusterSeparate, markerColorChoose } from '../utils/helper';
|
|
5
5
|
import { markerShapeChoose } from '../utils/helper';
|
|
6
|
-
import { isNullOrUndefined, EventHandler, Browser, remove, createElement } from '@syncfusion/ej2-base';
|
|
6
|
+
import { isNullOrUndefined, EventHandler, Browser, remove, createElement, animationMode } from '@syncfusion/ej2-base';
|
|
7
7
|
import { changeBorderWidth, markerRendering } from '../index';
|
|
8
8
|
import { pan } from '../model/constants';
|
|
9
9
|
import { getValueFromObject } from '../utils/helper';
|
|
@@ -154,7 +154,7 @@ var Zoom = /** @class */ (function () {
|
|
|
154
154
|
this.markerLineAnimation(map);
|
|
155
155
|
map.mapLayerPanel.generateTiles(newZoomFactor, map.tileTranslatePoint, type + 'wheel', null, position);
|
|
156
156
|
var element1 = document.getElementById(this.maps.element.id + '_tiles');
|
|
157
|
-
var animationDuration = this.maps.layersCollection[0].animationDuration;
|
|
157
|
+
var animationDuration = this.maps.layersCollection[0].animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.maps.layersCollection[0].animationDuration;
|
|
158
158
|
setTimeout(function () {
|
|
159
159
|
// if (type === 'ZoomOut') {
|
|
160
160
|
// element1.removeChild(element1.children[element1.childElementCount - 1]);
|
|
@@ -416,7 +416,7 @@ var Zoom = /** @class */ (function () {
|
|
|
416
416
|
* @returns {void}
|
|
417
417
|
*/
|
|
418
418
|
Zoom.prototype.animateTransform = function (element, animate, x, y, scale) {
|
|
419
|
-
var duration = this.currentLayer.animationDuration;
|
|
419
|
+
var duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
|
|
420
420
|
if (!animate || duration === 0 || this.maps.isTileMap) {
|
|
421
421
|
element.setAttribute('transform', 'scale(' + (scale) + ') translate( ' + x + ' ' + y + ' )');
|
|
422
422
|
return;
|
|
@@ -485,7 +485,7 @@ var Zoom = /** @class */ (function () {
|
|
|
485
485
|
var layerIndex_1 = parseInt(currentEle.childNodes[k]['id'].split('_LayerIndex_')[1].split('_')[0], 10);
|
|
486
486
|
var dataIndex = parseInt(currentEle.childNodes[k]['id'].split('_dataIndex_')[1].split('_')[0], 10);
|
|
487
487
|
var markerIndex = parseInt(currentEle.childNodes[k]['id'].split('_MarkerIndex_')[1].split('_')[0], 10);
|
|
488
|
-
markerAnimation = this.currentLayer.markerSettings[markerIndex].animationDuration > 0;
|
|
488
|
+
markerAnimation = this.currentLayer.markerSettings[markerIndex].animationDuration > 0 || animationMode === 'Enable';
|
|
489
489
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
490
490
|
var markerSelectionValues = this.currentLayer.markerSettings[markerIndex].dataSource[dataIndex];
|
|
491
491
|
for (var x_1 = 0; x_1 < this.currentLayer.markerSettings[markerIndex].initialMarkerSelection.length; x_1++) {
|
|
@@ -496,7 +496,7 @@ var Zoom = /** @class */ (function () {
|
|
|
496
496
|
maps.markerSelection(this.currentLayer.markerSettings[markerIndex].selectionSettings, maps, currentEle.children[k], this.currentLayer.markerSettings[markerIndex].dataSource[dataIndex]);
|
|
497
497
|
}
|
|
498
498
|
}
|
|
499
|
-
if ((this.currentLayer.animationDuration > 0 || (maps.layersCollection[0].animationDuration > 0 && this.currentLayer.type === 'SubLayer')) && !this.isPanning) {
|
|
499
|
+
if (((this.currentLayer.animationDuration > 0 || animationMode === 'Enable') || ((maps.layersCollection[0].animationDuration > 0 || animationMode === 'Enable') && this.currentLayer.type === 'SubLayer')) && !this.isPanning) {
|
|
500
500
|
if (maps.isTileMap) {
|
|
501
501
|
var groupElement = document.querySelector('.GroupElement');
|
|
502
502
|
if (groupElement && !(document.querySelector('.ClusterGroupElement')) && markerAnimation) {
|
|
@@ -557,7 +557,7 @@ var Zoom = /** @class */ (function () {
|
|
|
557
557
|
var centerY = bubbleCollection['center']['y'];
|
|
558
558
|
var currentX = ((centerX + x) * scale);
|
|
559
559
|
var currentY = ((centerY + y) * scale);
|
|
560
|
-
var duration = this.currentLayer.animationDuration;
|
|
560
|
+
var duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
|
|
561
561
|
if (!animate || duration === 0) {
|
|
562
562
|
childElement.setAttribute('transform', 'translate( ' + currentX + ' ' + currentY + ' )');
|
|
563
563
|
}
|
|
@@ -757,7 +757,7 @@ var Zoom = /** @class */ (function () {
|
|
|
757
757
|
if (element.id.indexOf('_LabelIndex_') > -1) {
|
|
758
758
|
labelIndex = parseFloat(element.id.split('_LabelIndex_')[1].split('_')[0]);
|
|
759
759
|
}
|
|
760
|
-
var duration = this.currentLayer.animationDuration;
|
|
760
|
+
var duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
|
|
761
761
|
for (var l = 0; l < labelCollection.length; l++) {
|
|
762
762
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
763
763
|
var label = labelCollection[l];
|
|
@@ -904,7 +904,7 @@ var Zoom = /** @class */ (function () {
|
|
|
904
904
|
Number(getValueFromObject(marker.dataSource[dataIndex], marker.latitudeValuePath)) :
|
|
905
905
|
!isNullOrUndefined(marker.dataSource[dataIndex]['latitude']) ? parseFloat(marker.dataSource[dataIndex]['latitude']) :
|
|
906
906
|
!isNullOrUndefined(marker.dataSource[dataIndex]['Latitude']) ? parseFloat(marker.dataSource[dataIndex]['Latitude']) : 0;
|
|
907
|
-
var duration = this.currentLayer.animationDuration;
|
|
907
|
+
var duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
|
|
908
908
|
var location_2 = (this.maps.isTileMap) ? convertTileLatLongToPoint(new Point(lng, lat), this.maps.tileZoomLevel, this.maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, layer, this.maps);
|
|
909
909
|
if (this.maps.isTileMap) {
|
|
910
910
|
if (type === 'Template') {
|
|
@@ -1167,7 +1167,7 @@ var Zoom = /** @class */ (function () {
|
|
|
1167
1167
|
this.markerLineAnimation(map);
|
|
1168
1168
|
map.mapLayerPanel.generateTiles(tileZoomFactor, map.tileTranslatePoint, type);
|
|
1169
1169
|
var element1 = document.getElementById(this.maps.element.id + '_tiles');
|
|
1170
|
-
var animationDuration = this.maps.layersCollection[0].animationDuration;
|
|
1170
|
+
var animationDuration = this.maps.layersCollection[0].animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.maps.layersCollection[0].animationDuration;
|
|
1171
1171
|
setTimeout(function () {
|
|
1172
1172
|
if (type === 'ZoomOut' || type === 'Reset') {
|
|
1173
1173
|
// element1.removeChild(element1.children[element1.childElementCount - 1]);
|
package/src/maps/utils/helper.js
CHANGED
|
@@ -16,7 +16,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
16
16
|
* Helper functions for maps control
|
|
17
17
|
*/
|
|
18
18
|
import { createElement, isNullOrUndefined, remove, compile as templateComplier, merge, SanitizeHtmlHelper } from '@syncfusion/ej2-base';
|
|
19
|
-
import { Animation } from '@syncfusion/ej2-base';
|
|
19
|
+
import { Animation, animationMode } from '@syncfusion/ej2-base';
|
|
20
20
|
import { SvgRenderer } from '@syncfusion/ej2-svg-base';
|
|
21
21
|
import { itemSelection } from '../../index';
|
|
22
22
|
import { animationComplete } from '../index';
|
|
@@ -701,7 +701,7 @@ export function renderTextElement(option, style, color, parent, isMinus) {
|
|
|
701
701
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
702
702
|
export function convertElement(element, markerId, data, index, mapObj) {
|
|
703
703
|
var childElement = createElement('div', {
|
|
704
|
-
id: markerId
|
|
704
|
+
id: markerId, className: mapObj.element.id + '_marker_template_element'
|
|
705
705
|
});
|
|
706
706
|
childElement.style.cssText = 'position: absolute;pointer-events: auto;';
|
|
707
707
|
var elementLength = element.length;
|
|
@@ -1294,7 +1294,7 @@ export function marker(eventArgs, markerSettings, markerData, dataIndex, locatio
|
|
|
1294
1294
|
markerCollection.appendChild(ele);
|
|
1295
1295
|
var element = (markerData.length - 1) === dataIndex ? 'marker' : null;
|
|
1296
1296
|
var markerPoint = new Point(x, y);
|
|
1297
|
-
if (markerSettings.animationDuration > 0) {
|
|
1297
|
+
if (markerSettings.animationDuration > 0 || animationMode === 'Enable') {
|
|
1298
1298
|
elementAnimate(ele, markerSettings.animationDelay, markerSettings.animationDuration, markerPoint, maps, element);
|
|
1299
1299
|
}
|
|
1300
1300
|
return markerCollection;
|
|
@@ -2653,7 +2653,7 @@ export function elementAnimate(element, delay, duration, point, maps, ele, radiu
|
|
|
2653
2653
|
var height = 0;
|
|
2654
2654
|
var transform = element.getAttribute('transform') || '';
|
|
2655
2655
|
new Animation({}).animate(element, {
|
|
2656
|
-
duration: duration,
|
|
2656
|
+
duration: (duration === 0 && animationMode === 'Enable') ? 1000 : duration,
|
|
2657
2657
|
delay: delay,
|
|
2658
2658
|
progress: function (args) {
|
|
2659
2659
|
if (args.timeStamp > args.delay) {
|
|
@@ -3244,6 +3244,7 @@ export function animate(element, delay, duration, process, end) {
|
|
|
3244
3244
|
// eslint-disable-next-line prefer-const
|
|
3245
3245
|
var clearAnimation;
|
|
3246
3246
|
var markerStyle = 'visibility:visible';
|
|
3247
|
+
duration = animationMode === "Disable" ? 0 : duration;
|
|
3247
3248
|
var startAnimation = function (timestamp) {
|
|
3248
3249
|
if (!start) {
|
|
3249
3250
|
start = timestamp;
|