@syncfusion/ej2-maps 28.1.33 → 28.1.38
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/README.md +1 -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 +22 -18
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +23 -18
- 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 +8 -8
- package/src/maps/layers/layer-panel.js +1 -1
- package/src/maps/maps.js +1 -1
- package/src/maps/user-interaction/zoom.d.ts +4 -2
- package/src/maps/user-interaction/zoom.js +21 -16
|
@@ -6319,7 +6319,7 @@ class LayerPanel {
|
|
|
6319
6319
|
proxy.renderTileLayer(proxy, layer, layerIndex, bing);
|
|
6320
6320
|
this.mapObject.arrangeTemplate();
|
|
6321
6321
|
if (this.mapObject.zoomModule && (this.mapObject.previousScale !== this.mapObject.scale)) {
|
|
6322
|
-
this.mapObject.zoomModule.applyTransform(this.mapObject, true);
|
|
6322
|
+
this.mapObject.zoomModule.applyTransform(this.mapObject, false, true);
|
|
6323
6323
|
}
|
|
6324
6324
|
}
|
|
6325
6325
|
bubbleCalculation(bubbleSettings, range) {
|
|
@@ -8169,7 +8169,7 @@ let Maps = class Maps extends Component {
|
|
|
8169
8169
|
}
|
|
8170
8170
|
}
|
|
8171
8171
|
if (this.zoomModule && ((this.previousScale !== this.scale) || this.zoomNotApplied || this.isZoomByPosition)) {
|
|
8172
|
-
this.zoomModule.applyTransform(this, true);
|
|
8172
|
+
this.zoomModule.applyTransform(this, false, true);
|
|
8173
8173
|
}
|
|
8174
8174
|
}
|
|
8175
8175
|
}
|
|
@@ -15350,10 +15350,11 @@ class Zoom {
|
|
|
15350
15350
|
* @param {Point} position - Specifies the position.
|
|
15351
15351
|
* @param {number} newZoomFactor - Specifies the zoom factor.
|
|
15352
15352
|
* @param {string} type - Specifies the type.
|
|
15353
|
+
* @param {boolean} isMouseWheel - Indicates whether the zoom operation was triggered by the mouse wheel.
|
|
15353
15354
|
* @returns {void}
|
|
15354
15355
|
* @private
|
|
15355
15356
|
*/
|
|
15356
|
-
performZooming(position, newZoomFactor, type) {
|
|
15357
|
+
performZooming(position, newZoomFactor, type, isMouseWheel = false) {
|
|
15357
15358
|
const map = this.maps;
|
|
15358
15359
|
map.previousProjection = newZoomFactor <= 1.5 ? undefined : map.projectionType;
|
|
15359
15360
|
map.defaultState = false;
|
|
@@ -15412,7 +15413,7 @@ class Zoom {
|
|
|
15412
15413
|
map.scale = map.mapScaleValue = map.previousScale;
|
|
15413
15414
|
}
|
|
15414
15415
|
else {
|
|
15415
|
-
this.applyTransform(map);
|
|
15416
|
+
this.applyTransform(map, isMouseWheel);
|
|
15416
15417
|
}
|
|
15417
15418
|
}
|
|
15418
15419
|
else if ((map.isTileMap) && (newZoomFactor >= minZoom && newZoomFactor <= maxZoom)) {
|
|
@@ -15456,7 +15457,7 @@ class Zoom {
|
|
|
15456
15457
|
// element1 = element1;
|
|
15457
15458
|
// }
|
|
15458
15459
|
// }
|
|
15459
|
-
this.applyTransform(this.maps);
|
|
15460
|
+
this.applyTransform(this.maps, isMouseWheel);
|
|
15460
15461
|
if (document.getElementById(this.maps.element.id + '_LayerIndex_1')) {
|
|
15461
15462
|
document.getElementById(this.maps.element.id + '_LayerIndex_1').style.display = 'block';
|
|
15462
15463
|
}
|
|
@@ -15582,7 +15583,7 @@ class Zoom {
|
|
|
15582
15583
|
}
|
|
15583
15584
|
if (!isZoomCancelled) {
|
|
15584
15585
|
map.mapScaleValue = zoomCalculationFactor;
|
|
15585
|
-
this.applyTransform(map, true);
|
|
15586
|
+
this.applyTransform(map, false, true);
|
|
15586
15587
|
this.maps.zoomNotApplied = false;
|
|
15587
15588
|
this.zoomingRect = null;
|
|
15588
15589
|
}
|
|
@@ -15796,12 +15797,13 @@ class Zoom {
|
|
|
15796
15797
|
}
|
|
15797
15798
|
/**
|
|
15798
15799
|
* @param {Maps} maps - Specifies the Map control
|
|
15800
|
+
* @param {boolean} isMouseWheel - Indicates whether the zoom operation was triggered by the mouse wheel.
|
|
15799
15801
|
* @param {boolean} animate - Specifies the animation is available or not
|
|
15800
15802
|
* @param {boolean} isPanning - Specifies that it is panning or not
|
|
15801
15803
|
* @returns {void}
|
|
15802
15804
|
* @private
|
|
15803
15805
|
*/
|
|
15804
|
-
applyTransform(maps, animate, isPanning) {
|
|
15806
|
+
applyTransform(maps, isMouseWheel, animate, isPanning) {
|
|
15805
15807
|
let layerIndex;
|
|
15806
15808
|
this.templateCount = 0;
|
|
15807
15809
|
let markerStyle;
|
|
@@ -15892,8 +15894,10 @@ class Zoom {
|
|
|
15892
15894
|
}
|
|
15893
15895
|
if (((this.currentLayer.animationDuration > 0 || animationMode === 'Enable') || ((maps.layersCollection[0].animationDuration > 0 || animationMode === 'Enable') && this.currentLayer.type === 'SubLayer')) && !this.isPanModeEnabled) {
|
|
15894
15896
|
if (!maps.isTileMap) {
|
|
15895
|
-
markerStyle = 'visibility:hidden';
|
|
15896
|
-
|
|
15897
|
+
markerStyle = isMouseWheel ? markerStyle : 'visibility:hidden';
|
|
15898
|
+
if (!isNullOrUndefined(markerStyle)) {
|
|
15899
|
+
currentEle.style.cssText = markerStyle;
|
|
15900
|
+
}
|
|
15897
15901
|
}
|
|
15898
15902
|
}
|
|
15899
15903
|
});
|
|
@@ -16470,15 +16474,15 @@ class Zoom {
|
|
|
16470
16474
|
if (!panArgs.cancel) {
|
|
16471
16475
|
if (panningXDirection && panningYDirection) {
|
|
16472
16476
|
map.translatePoint = new Point(x, y);
|
|
16473
|
-
this.applyTransform(map, false, true);
|
|
16477
|
+
this.applyTransform(map, false, false, true);
|
|
16474
16478
|
}
|
|
16475
16479
|
else if (panningXDirection) {
|
|
16476
16480
|
map.translatePoint = new Point(x, map.translatePoint.y);
|
|
16477
|
-
this.applyTransform(map, false, true);
|
|
16481
|
+
this.applyTransform(map, false, false, true);
|
|
16478
16482
|
}
|
|
16479
16483
|
else if (panningYDirection) {
|
|
16480
16484
|
map.translatePoint = new Point(map.translatePoint.x, y);
|
|
16481
|
-
this.applyTransform(map, false, true);
|
|
16485
|
+
this.applyTransform(map, false, false, true);
|
|
16482
16486
|
}
|
|
16483
16487
|
}
|
|
16484
16488
|
this.maps.zoomNotApplied = false;
|
|
@@ -16507,7 +16511,7 @@ class Zoom {
|
|
|
16507
16511
|
};
|
|
16508
16512
|
map.trigger(pan, panArgs);
|
|
16509
16513
|
map.mapLayerPanel.generateTiles(map.tileZoomLevel, map.tileTranslatePoint, 'Pan');
|
|
16510
|
-
this.applyTransform(map, false, true);
|
|
16514
|
+
this.applyTransform(map, false, false, true);
|
|
16511
16515
|
map.translatePoint.x = (map.tileTranslatePoint.x - xDifference) / map.scale;
|
|
16512
16516
|
map.translatePoint.y = (map.tileTranslatePoint.y - yDifference) / map.scale;
|
|
16513
16517
|
}
|
|
@@ -16577,7 +16581,7 @@ class Zoom {
|
|
|
16577
16581
|
map.scale = map.previousScale;
|
|
16578
16582
|
}
|
|
16579
16583
|
else {
|
|
16580
|
-
this.applyTransform(map, true);
|
|
16584
|
+
this.applyTransform(map, false, true);
|
|
16581
16585
|
}
|
|
16582
16586
|
}
|
|
16583
16587
|
else if ((map.isTileMap) && ((zoomFactor >= minZoom && zoomFactor <= maxZoom) || map.isReset)) {
|
|
@@ -16614,7 +16618,7 @@ class Zoom {
|
|
|
16614
16618
|
map.mapLayerPanel.generateTiles(tileZoomFactor, map.tileTranslatePoint, type);
|
|
16615
16619
|
const animationDuration = this.maps.layersCollection[0].animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.maps.layersCollection[0].animationDuration;
|
|
16616
16620
|
setTimeout(() => {
|
|
16617
|
-
this.applyTransform(this.maps, true);
|
|
16621
|
+
this.applyTransform(this.maps, false, true);
|
|
16618
16622
|
if (document.getElementById(this.maps.element.id + '_LayerIndex_1')) {
|
|
16619
16623
|
document.getElementById(this.maps.element.id + '_LayerIndex_1').style.display = 'block';
|
|
16620
16624
|
}
|
|
@@ -17227,11 +17231,11 @@ class Zoom {
|
|
|
17227
17231
|
map.staticMapZoom = map.tileZoomLevel;
|
|
17228
17232
|
if (map.staticMapZoom > 0 && map.staticMapZoom < staticMaxZoomLevel) {
|
|
17229
17233
|
map.staticMapZoom += 1;
|
|
17230
|
-
this.performZooming(position, (value + delta), direction);
|
|
17234
|
+
this.performZooming(position, (value + delta), direction, true);
|
|
17231
17235
|
}
|
|
17232
17236
|
}
|
|
17233
17237
|
else {
|
|
17234
|
-
this.performZooming(position, (value + delta), direction);
|
|
17238
|
+
this.performZooming(position, (value + delta), direction, true);
|
|
17235
17239
|
}
|
|
17236
17240
|
}
|
|
17237
17241
|
else {
|
|
@@ -17245,7 +17249,7 @@ class Zoom {
|
|
|
17245
17249
|
if (map.staticMapZoom > 1 && map.staticMapZoom < staticMaxZoomLevel) {
|
|
17246
17250
|
map.staticMapZoom -= 1;
|
|
17247
17251
|
}
|
|
17248
|
-
this.performZooming(position, (value - delta), direction);
|
|
17252
|
+
this.performZooming(position, (value - delta), direction, true);
|
|
17249
17253
|
}
|
|
17250
17254
|
}
|
|
17251
17255
|
this.removeToolbarOpacity(map.mapScaleValue, (!this.maps.isDevice ? (!isNullOrUndefined(e.target) ? e.target['id'] :
|