@syncfusion/ej2-maps 20.4.48 → 20.4.54

package/dist/es6/ej2-maps.es2015.js

@@ -1949,7 +1949,7 @@ function getTranslate(mapObject, layer, animate) {
         center = mapObject.zoomSettings.shouldZoomInitially
             && mapObject.markerZoomedState && !mapObject.zoomPersistence ? mapObject.markerZoomCenterPoint :
             mapObject.centerPosition;
-        if ((!isNullOrUndefined(centerLongitude) && !isNullOrUndefined(centerLatitude)) || checkMethodeZoom) {
+        if (((!isNullOrUndefined(centerLongitude) && centerLongitude !== 0) && (!isNullOrUndefined(centerLatitude) && centerLatitude !== 0)) || checkMethodeZoom) {
             const leftPosition = (((mapWidth + Math.abs(mapObject.mapAreaRect.width - mapWidth)) / 2) + mapObject.mapAreaRect.x) / factor;
             const topPosition = (((mapHeight + Math.abs(mapObject.mapAreaRect.height - mapHeight)) / 2) + mapObject.mapAreaRect.y) / factor;
             const point = checkMethodeZoom ? calculateCenterFromPixel(mapObject, layer) :
@@ -2133,7 +2133,7 @@ function getZoomTranslate(mapObject, layer, animate) {
     const factor = animate ? 1 : mapObject.mapScaleValue;
     const mapWidth = Math.abs(max['x'] - min['x']);
     const mapHeight = Math.abs(min['y'] - max['y']);
-    if ((!isNullOrUndefined(longitude) && !isNullOrUndefined(latitude)) || checkZoomMethod) {
+    if (((!isNullOrUndefined(longitude) && longitude !== 0) && (!isNullOrUndefined(latitude) && latitude !== 0)) || checkZoomMethod) {
         const topPosition = ((mapHeight + Math.abs(mapObject.mapAreaRect.height - mapHeight)) / 2) / factor;
         const leftPosition = ((mapWidth + Math.abs(mapObject.mapAreaRect.width - mapWidth)) / 2) / factor;
         const point = checkZoomMethod ? calculateCenterFromPixel(mapObject, layer) :
@@ -3182,7 +3182,7 @@ function compareZoomFactor(scaleFactor, maps) {
  * @param {Maps} maps - Specifies the instance of the maps
  * @returns {number} - Returns the scale factor
  */
-function calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeight, maps) {
+function calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeight, maps, isZoomToCoordinates) {
     let scaleFactor;
     const maxZoomFact = maps.zoomSettings.maxZoom;
     let applyMethodeZoom;
@@ -3195,9 +3195,7 @@ function calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeigh
     if (maps.zoomNotApplied && !maps.isTileMap) {
         const latiRatio = Math.abs((maps.baseMapBounds.latitude.max - maps.baseMapBounds.latitude.min) / (maxLat - minLat));
         const longiRatio = Math.abs((maps.baseMapBounds.longitude.max - maps.baseMapBounds.longitude.min) / (maxLong - minLong));
-        applyMethodeZoom = Math.min(latiRatio, longiRatio);
-        const minLocation = convertGeoToPoint(minLat, minLong, 1, maps.layersCollection[0], maps);
-        const maxLocation = convertGeoToPoint(maxLat, maxLong, 1, maps.layersCollection[0], maps);
+        applyMethodeZoom = isZoomToCoordinates ? (latiRatio + longiRatio) / 2 : Math.min(latiRatio, longiRatio);
     }
     const latRatio = (maxLatValue - minLatValue) / Math.PI;
     const lngDiff = maxLong - minLong;
@@ -3206,7 +3204,8 @@ function calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeigh
     const WORLD_PX_WIDTH = 256;
     const latZoom = (Math.log(mapHeight / WORLD_PX_HEIGHT / latRatio) / Math.LN2);
     const lngZoom = (Math.log(mapWidth / WORLD_PX_WIDTH / lngRatio) / Math.LN2);
-    const result = (maps.zoomNotApplied && !maps.isTileMap) ? applyMethodeZoom : Math.min(latZoom, lngZoom);
+    const result = (maps.zoomNotApplied && !maps.isTileMap) ? applyMethodeZoom :
+        isZoomToCoordinates && !maps.isTileMap ? (latZoom + lngZoom) / 2 : Math.min(latZoom, lngZoom);
     scaleFactor = Math.min(result, maxZoomFact);
     scaleFactor = maps.isTileMap || !maps.zoomNotApplied ? Math.floor(scaleFactor) : scaleFactor;
     if (!maps.isTileMap) {
@@ -4872,7 +4871,7 @@ class Marker {
                     }
                     let markerFactor;
                     if (this.maps.isTileMap || this.maps.baseMapRectBounds['min']['x'] === 0) {
-                        zoomLevel = calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeight, this.maps);
+                        zoomLevel = calculateZoomLevel(minLat, maxLat, minLong, maxLong, mapWidth, mapHeight, this.maps, false);
                         if (this.maps.isTileMap) {
                             markerFactor = isNullOrUndefined(this.maps.markerZoomFactor) ?
                                 zoomLevel : isNullOrUndefined(this.maps.mapScaleValue) ?
@@ -7495,7 +7494,6 @@ let Maps = class Maps extends Component {
         }
         if (!isNullOrUndefined(this.dataLabelModule)) {
             this.dataLabelModule.dataLabelCollections = [];
-            this.dataLabelShape = [];
         }
         this.mapLayerPanel.measureLayerPanel();
         if (!isNullOrUndefined(this.svgObject)) {
@@ -7545,33 +7543,33 @@ let Maps = class Maps extends Component {
             let bottom;
             let top;
             let left;
-            left = parseFloat(tileElement.style.left) + element.offsetLeft;
+            left = parseFloat(tileElement.style.left);
             const titleTextSize = measureText(this.titleSettings.text, this.titleSettings.textStyle);
             const subTitleTextSize = measureText(this.titleSettings.subtitleSettings.text, this.titleSettings.subtitleSettings.textStyle);
             if (this.isTileMap && this.isTileMapSubLayer && this.legendSettings.position === 'Bottom' && this.legendSettings.visible) {
                 if (this.legendSettings.mode !== 'Default') {
                     if (titleTextSize.width !== 0 && titleTextSize.height !== 0) {
-                        top = parseFloat(tileElement.style.top) + element.offsetTop + (subTitleTextSize.height / 2)
+                        top = parseFloat(tileElement.style.top) + (subTitleTextSize.height / 2)
                             - (this.legendModule.legendBorderRect.height / 2);
                     }
                     else {
-                        top = parseFloat(tileElement.style.top) + element.offsetTop - this.mapAreaRect.y;
+                        top = parseFloat(tileElement.style.top) - this.mapAreaRect.y;
                     }
                 }
                 else {
                     left = this.legendModule.legendBorderRect.x;
                     if (titleTextSize.width !== 0 && titleTextSize.height !== 0) {
-                        top = parseFloat(tileElement.style.top) + element.offsetTop + (subTitleTextSize['height'] / 2)
+                        top = parseFloat(tileElement.style.top) + (subTitleTextSize['height'] / 2)
                             - this.legendModule.legendBorderRect.y;
                     }
                     else {
-                        top = parseFloat(tileElement.style.top) + element.offsetTop + (subTitleTextSize['height'] / 2);
+                        top = parseFloat(tileElement.style.top) + (subTitleTextSize['height'] / 2);
                     }
                 }
             }
             else {
                 bottom = svg.bottom - tile.bottom - element.offsetTop;
-                top = parseFloat(tileElement.style.top) + element.offsetTop;
+                top = parseFloat(tileElement.style.top);
             }
             top = (bottom <= 11) ? top : (!isNullOrUndefined(this.legendModule) && this.legendSettings.position === 'Bottom') ? this.mapAreaRect.y : (top * 2);
             left = (bottom <= 11) ? left : !isNullOrUndefined(this.legendModule) ? left : (left * 2);
@@ -7591,6 +7589,7 @@ let Maps = class Maps extends Component {
             }
         }
         this.element.style.outline = 'none';
+        this.element.style.position = 'relative';
         for (let i = 0; i < document.getElementsByTagName('path').length - 1; i++) {
             if (document.getElementsByTagName('path')[i].id.indexOf('shapeIndex') > -1) {
                 document.getElementsByTagName('path')[i].style.outline = 'none';
@@ -7768,7 +7767,7 @@ let Maps = class Maps extends Component {
             const secondaryElement = createElement('div', {
                 id: this.element.id + '_Secondary_Element'
             });
-            secondaryElement.style.cssText = 'position: absolute;z-index:2;';
+            secondaryElement.style.cssText = 'position: relative;z-index:2;';
             this.element.appendChild(secondaryElement);
         }
     }
@@ -7991,7 +7990,7 @@ let Maps = class Maps extends Component {
     wireEVents() {
         //let cancelEvent: string = Browser.isPointer ? 'pointerleave' : 'mouseleave';
         EventHandler.add(this.element, 'click', this.mapsOnClick, this);
-        // EventHandler.add(this.element, 'contextmenu', this.mapsOnRightClick, this);
+        EventHandler.add(this.element, 'contextmenu', this.mapsOnRightClick, this);
         EventHandler.add(this.element, 'dblclick', this.mapsOnDoubleClick, this);
         EventHandler.add(this.element, Browser.touchStartEvent, this.mouseDownOnMap, this);
         EventHandler.add(this.element, Browser.touchMoveEvent, this.mouseMoveOnMap, this);
@@ -8011,7 +8010,7 @@ let Maps = class Maps extends Component {
     unWireEVents() {
         //let cancelEvent: string = Browser.isPointer ? 'pointerleave' : 'mouseleave';
         EventHandler.remove(this.element, 'click', this.mapsOnClick);
-        // EventHandler.remove(this.element, 'contextmenu', this.mapsOnRightClick);
+        EventHandler.remove(this.element, 'contextmenu', this.mapsOnRightClick);
         EventHandler.remove(this.element, 'dblclick', this.mapsOnDoubleClick);
         EventHandler.remove(this.element, Browser.touchStartEvent, this.mouseDownOnMap);
         EventHandler.remove(this.element, Browser.touchMoveEvent, this.mouseMoveOnMap);
@@ -8370,6 +8369,31 @@ let Maps = class Maps extends Component {
             this.markerModule.sameMarkerData = [];
         }
     }
+    /**
+     * @param {PointerEvent} e - Specifies the pointer event.
+     * @returns {void}
+     * @private
+     */
+    mapsOnRightClick(e) {
+        const targetEle = e.target;
+        const targetId = targetEle.id;
+        let latitude = null;
+        let longitude = null;
+        this.mouseClickEvent = this.mouseDownEvent = { x: e.x, y: e.y };
+        if (targetEle.id.indexOf('_ToolBar') === -1) {
+            const latLongValue = this.getClickLocation(targetId, e.pageX, e.pageY, targetEle, e['layerX'], e['layerY']);
+            if (!isNullOrUndefined(latLongValue)) {
+                latitude = latLongValue.latitude;
+                longitude = latLongValue.longitude;
+            }
+            const eventArgs = {
+                cancel: false, name: rightClick, target: targetId, x: e.clientX, y: e.clientY,
+                latitude: latitude, longitude: longitude,
+                isShapeSelected: false
+            };
+            this.trigger('rightClick', eventArgs);
+        }
+    }
     /**
      * This method is used to perform operations when performing the double click operation on maps.
      *
@@ -8796,7 +8820,7 @@ let Maps = class Maps extends Component {
             this.maxLatOfGivenLocation = maxLatitude;
             this.maxLongOfGivenLocation = maxLongitude;
             this.zoomNotApplied = true;
-            this.scaleOfGivenLocation = calculateZoomLevel(minLatitude, maxLatitude, minLongitude, maxLongitude, this.mapAreaRect.width, this.mapAreaRect.height, this);
+            this.scaleOfGivenLocation = calculateZoomLevel(minLatitude, maxLatitude, minLongitude, maxLongitude, this.mapAreaRect.width, this.mapAreaRect.height, this, true);
             const zoomArgs = {
                 cancel: false, name: 'zoom', type: zoomIn, maps: this,
                 tileTranslatePoint: {}, translatePoint: {},
@@ -9989,6 +10013,9 @@ class DataLabel {
         if (isNullOrUndefined(text) && (layer.dataLabelSettings.template !== '' && layer.dataSource['length'] === 0)) {
             text = shapeData['properties'][layer.shapePropertyPath];
         }
+        if (isNullOrUndefined(text) && layer.dataSource['length'] > 0) {
+            text = '';
+        }
         const dataLabelText = text;
         const projectionType = this.maps.projectionType;
         if (isPoint) {
@@ -10041,9 +10068,9 @@ class DataLabel {
                 }
                 let position = [];
                 let width = zoomLabelsPosition && scaleZoomValue > 1 && !this.maps.zoomNotApplied
-                    && this.maps.zoomShapeCollection.length > index ? this.maps.zoomShapeCollection[index]['width'] :
+                    && this.maps.zoomShapeCollection.length > index ? (this.maps.dataLabelShape[index]) * scale :
                     (location['rightMax']['x'] - location['leftMax']['x']) * scale;
-                if (!isNullOrUndefined(this.maps.dataLabelShape)) {
+                if (!isNullOrUndefined(this.maps.dataLabelShape) && !this.maps.isReset) {
                     shapeWidth = firstLevelMapLocation['rightMax']['x'] - firstLevelMapLocation['leftMax']['x'];
                     this.maps.dataLabelShape.push(shapeWidth);
                 }
@@ -10069,8 +10096,9 @@ class DataLabel {
                     locationX = location1['x'];
                     location['x'] = location1['x'];
                     width = zoomLabelsPosition && scaleZoomValue > 1 && !this.maps.zoomNotApplied
-                        && this.maps.zoomShapeCollection.length > index ? this.maps.zoomShapeCollection[index]['width'] :
-                        (location1['rightMax']['x'] - location1['leftMax']['x']) * scale;
+                        && this.maps.zoomShapeCollection.length > index ? (this.maps.dataLabelShape[index]) * scale :
+                        ((location1['rightMax']['x'] - location1['leftMax']['x']) * scale) > 0 ?
+                            ((location1['rightMax']['x'] - location1['leftMax']['x']) * scale) : width;
                 }
                 const xpositionEnds = ((location['x'] + transPoint['x']) * scale) + textSize['width'] / 2;
                 const xpositionStart = ((location['x'] + transPoint['x']) * scale) - textSize['width'] / 2;
@@ -14197,6 +14225,7 @@ class Zoom {
             const datalabelTemplateElemement = getElementByID(maps.element.id + '_LayerIndex_'
                 + i + '_Label_Template_Group');
             if ((!isNullOrUndefined(markerTemplateElement)) && markerTemplateElement.childElementCount > 0) {
+                markerTemplateElement.style.visibility = "visible";
                 for (let k = 0; k < markerTemplateElement.childElementCount; k++) {
                     this.markerTranslate(markerTemplateElement.childNodes[k], factor, x, y, scale, 'Template');
                 }