@syncfusion/ej2-maps 26.2.10 → 27.1.48

package/src/maps/utils/helper.js

@@ -41,7 +41,10 @@ export { Size };
  * @private
  */
 export function stringToNumber(value, containerSize) {
-    if (value !== null && value !== undefined) {
+    if (typeof value !== 'string') {
+        return value;
+    }
+    if (!isNullOrUndefined(value)) {
         return value.indexOf('%') !== -1 ? (containerSize / 100) * parseInt(value, 10) : parseInt(value, 10);
     }
     return null;
@@ -59,8 +62,10 @@ export function calculateSize(maps) {
     maps.element.style.setProperty('display', 'block');
     var containerWidth = maps.element.clientWidth;
     var containerHeight = maps.element.clientHeight;
-    var containerElementWidth = stringToNumber(maps.element.style.width, containerWidth);
-    var containerElementHeight = stringToNumber(maps.element.style.height, containerHeight);
+    var containerElementWidth = (typeof maps.element.style.width === 'string') ?
+        stringToNumber(maps.element.style.width, containerWidth) : maps.element.style.width;
+    var containerElementHeight = (typeof maps.element.style.height === 'string') ?
+        stringToNumber(maps.element.style.height, containerHeight) : maps.element.style.height;
     var availableSize = new Size(0, 0);
     if (maps.width === '0px' || maps.width === '0%' || maps.height === '0%' || maps.height === '0px') {
         availableSize = new Size(0, 0);
@@ -153,7 +158,7 @@ export function convertGeoToPoint(latitude, longitude, factor, layer, mapModel)
     var latitudeMinMax = mapModel.baseMapBounds.latitude;
     var latRadian = degreesToRadians(latitude);
     var lngRadian = degreesToRadians(longitude);
-    var type = mapModel.projectionType;
+    var type = !isNullOrUndefined(mapModel.projectionType) ? mapModel.projectionType : 'Mercator';
     var size = (mapModel.isTileMap) ? Math.pow(2, 1) * 256 : (isNullOrUndefined(factor)) ?
         Math.min(mapSize.width, mapSize.height) : (Math.min(mapSize.width, mapSize.height) * factor);
     if (layer.geometryType === 'Normal') {
@@ -941,26 +946,54 @@ export function markerColorChoose(eventArgs, data) {
  */
 export function markerShapeChoose(eventArgs, data) {
     if (!isNullOrUndefined(eventArgs.shapeValuePath) && !isNullOrUndefined(data[eventArgs.shapeValuePath])) {
-        var shape = ((eventArgs.shapeValuePath.indexOf('.') > -1) ?
-            (getValueFromObject(data, eventArgs.shapeValuePath).toString()) :
-            data[eventArgs.shapeValuePath]);
-        eventArgs.shape = (shape.toString() !== '') ? shape : eventArgs.shape;
+        updateShape(eventArgs, data);
         if (data[eventArgs.shapeValuePath] === 'Image') {
-            eventArgs.imageUrl = (!isNullOrUndefined(eventArgs.imageUrlValuePath)) ?
-                ((eventArgs.imageUrlValuePath.indexOf('.') > -1) ? getValueFromObject(data, eventArgs.imageUrlValuePath).toString() : (!isNullOrUndefined(data[eventArgs.imageUrlValuePath]) ?
-                    data[eventArgs.imageUrlValuePath] : eventArgs.imageUrl)) : eventArgs.imageUrl;
+            updateImageUrl(eventArgs, data);
         }
     }
     else {
-        var shapes = (!isNullOrUndefined(eventArgs.shapeValuePath)) ? ((eventArgs.shapeValuePath.indexOf('.') > -1) ? getValueFromObject(data, eventArgs.shapeValuePath).toString() : eventArgs.shape) : eventArgs.shape;
-        eventArgs.shape = (shapes.toString() !== '') ? shapes : eventArgs.shape;
-        var shapeImage = (!isNullOrUndefined(eventArgs.imageUrlValuePath)) ?
-            ((eventArgs.imageUrlValuePath.indexOf('.') > -1) ? getValueFromObject(data, eventArgs.imageUrlValuePath).toString() : (!isNullOrUndefined(data[eventArgs.imageUrlValuePath]) ?
-                data[eventArgs.imageUrlValuePath] : eventArgs.imageUrl)) : eventArgs.imageUrl;
-        eventArgs.imageUrl = shapeImage;
+        updateShape(eventArgs, data);
+        updateImageUrl(eventArgs, data);
     }
     return eventArgs;
 }
+/**
+ *
+ * @param {any} path - contains a dot, it implies that the desired property is nested within the object.
+ * @param {any} data - The data object from which the value is to be retrieved. This can be any object that contains the properties specified in the path.
+ * @returns {any} - Returns the value of the property specified in the path.
+ * @private
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function getValue(path, data) {
+    return (path.indexOf('.') > -1) ? getValueFromObject(data, path).toString() : data[path];
+}
+/**
+ *
+ * @param {any} eventArgs - Specifies the event arguments
+ * @param {any} data - Specifies the data
+ * @private
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function updateShape(eventArgs, data) {
+    if (!isNullOrUndefined(eventArgs.shapeValuePath)) {
+        var shape = getValue(eventArgs.shapeValuePath, data);
+        eventArgs.shape = (!isNullOrUndefined(shape) && shape.toString() !== '') ? shape : eventArgs.shape;
+    }
+}
+/**
+ *
+ * @param {any} eventArgs - Specifies the event arguments
+ * @param {any} data - Specifies the data
+ * @private
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function updateImageUrl(eventArgs, data) {
+    if (!isNullOrUndefined(eventArgs.imageUrlValuePath)) {
+        var imageUrl = getValue(eventArgs.imageUrlValuePath, data);
+        eventArgs.imageUrl = (!isNullOrUndefined(imageUrl)) ? imageUrl : eventArgs.imageUrl;
+    }
+}
 /**
  *
  * @param {LayerSettings} currentLayer - Specifies the current layer
@@ -1057,7 +1090,7 @@ export function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex,
                         var longitude = (!isNullOrUndefined(markerSetting.longitudeValuePath)) ?
                             Number(getValueFromObject(markerData, markerSetting.longitudeValuePath)) :
                             !isNullOrUndefined(markerData['longitude']) ? parseFloat(markerData['longitude']) :
-                                !isNullOrUndefined(markerData['Latitude']) ? parseFloat(markerData['Latitude']) : 0;
+                                !isNullOrUndefined(markerData['Longitude']) ? parseFloat(markerData['Longitude']) : 0;
                         var latitude = (!isNullOrUndefined(markerSetting.latitudeValuePath)) ?
                             Number(getValueFromObject(markerData, markerSetting.latitudeValuePath)) :
                             !isNullOrUndefined(markerData['latitude']) ? parseFloat(markerData['latitude']) :
@@ -1389,8 +1422,8 @@ export function marker(eventArgs, markerSettings, markerData, dataIndex, locatio
     };
     removeElement(markerID);
     var ele = drawSymbols(eventArgs.shape, eventArgs.imageUrl, { x: 0, y: 0 }, markerID, shapeCustom, markerCollection, maps);
-    var x = (maps.isTileMap ? location.x : (location.x + transPoint.x) * scale) + (!isNullOrUndefined(offset.x) ? offset.x : 0);
-    var y = (maps.isTileMap ? location.y : (location.y + transPoint.y) * scale) + (!isNullOrUndefined(offset.y) ? offset.y : 0);
+    var x = (maps.isTileMap ? location.x : (location.x + transPoint.x) * scale) + ((!isNullOrUndefined(offset) && !isNullOrUndefined(offset.x)) ? offset.x : 0);
+    var y = (maps.isTileMap ? location.y : (location.y + transPoint.y) * scale) + ((!isNullOrUndefined(offset) && !isNullOrUndefined(offset.y)) ? offset.y : 0);
     ele.setAttribute('transform', 'translate( ' + x + ' ' + y + ' )');
     maintainSelection(maps.selectedMarkerElementId, maps.markerSelectionClass, ele, 'MarkerselectionMapStyle');
     if (maps.legendSettings.toggleLegendSettings.enable && maps.legendSettings.type === 'Markers') {
@@ -1757,9 +1790,9 @@ export function drawVerticalLine(maps, options, size, location, element) {
  */
 export function drawStar(maps, options, size, location, element) {
     options.d = 'M ' + (location.x + size.width / 3) + ' ' + (location.y + size.height / 2) + ' L ' + (location.x - size.width / 2)
-        + ' ' + (location.y - size.height / 6) + ' L ' + (location.x + size.width / 2) + ' ' + (location.y - size.height / 6) + ' L '
-        + (location.x - size.width / 3) + ' ' + (location.y + size.height / 2) + ' L ' + location.x + ' ' + (location.y - size.height / 2)
-        + ' L ' + (location.x + size.width / 3) + ' ' + (location.y + size.height / 2) + ' Z';
+        + ' ' + (location.y - size.height / 6) + ' L ' + (location.x + size.width / 2) + ' ' + (location.y - size.height / 6)
+        + ' L ' + (location.x - size.width / 3) + ' ' + (location.y + size.height / 2) + ' L ' + location.x + ' ' +
+        (location.y - size.height / 2) + ' L ' + (location.x + size.width / 3) + ' ' + (location.y + size.height / 2) + ' Z';
     return appendShape(maps.renderer.drawPath(options), element);
 }
 /**
@@ -1858,7 +1891,7 @@ export function getFieldData(dataSource, fields) {
 export function checkShapeDataFields(dataSource, properties, dataPath, propertyPath, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 layer) {
-    if (!(isNullOrUndefined(properties)) && !isNullOrUndefined(dataSource)) {
+    if (!(isNullOrUndefined(properties)) && !isNullOrUndefined(dataSource) && !isNullOrUndefined(dataPath)) {
         for (var i = 0; i < dataSource.length; i++) {
             var shapeDataPath = ((dataPath.indexOf('.') > -1) ? getValueFromObject(dataSource[i], dataPath) :
                 dataSource[i][dataPath]);
@@ -2192,9 +2225,9 @@ export function getTranslate(mapObject, layer, animate) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var max = !isNullOrUndefined(mapObject.baseMapRectBounds) ? mapObject.baseMapRectBounds['max'] : null;
     var zoomFactor = animate ? 1 : mapObject.mapScaleValue;
-    if (isNullOrUndefined(mapObject.currentShapeDataLength)) {
+    if (isNullOrUndefined(mapObject.currentShapeDataLength) && !isNullOrUndefined(layer.shapeData)) {
         mapObject.currentShapeDataLength = !isNullOrUndefined(layer.shapeData['features'])
-            ? layer.shapeData['features'].length : layer.shapeData['geometries'].length;
+            ? layer.shapeData['features'].length : !isNullOrUndefined(layer.shapeData['geometries']) ? layer.shapeData['geometries'].length : 0;
     }
     var size = (mapObject.totalRect && mapObject.legendSettings.visible) ? mapObject.totalRect : mapObject.mapAreaRect;
     var availSize = mapObject.availableSize;
@@ -2274,7 +2307,8 @@ export function getTranslate(mapObject, layer, animate) {
                         x = size.x + ((-(min['x']))
                             + ((size.width / 2) - (mapWidth / 2)));
                     }
-                    else if (mapObject.availableSize.height !== mapObject.heightBeforeRefresh || mapObject.widthBeforeRefresh !== mapObject.availableSize.width) {
+                    else if ((mapObject.availableSize.height !== mapObject.heightBeforeRefresh || mapObject.widthBeforeRefresh !== mapObject.availableSize.width)
+                        && !isNullOrUndefined(mapObject.translatePoint) && !isNullOrUndefined(mapObject.previousTranslate)) {
                         var cscaleFactor = parseFloat(Math.min(size.width / mapWidth, size.height / mapHeight).toFixed(2));
                         var cmapWidth = mapWidth;
                         cmapWidth *= cscaleFactor;
@@ -2515,6 +2549,16 @@ export function getClientElement(id) {
         return null;
     }
 }
+/**
+ * Function to return the number value for the string value.
+ *
+ * @param {string | number} marginValue - Specifies the margin value.
+ * @returns {number} - Returns the number value.
+ * @private
+ */
+export function getProcessedMarginValue(marginValue) {
+    return typeof marginValue === 'string' ? parseFloat(marginValue) : marginValue;
+}
 /**
  * To apply internalization.
  *
@@ -2703,8 +2747,8 @@ export function createStyle(id, className, eventArgs) {
         id: id
     });
     styleEle.innerText = '.' + className + '{fill:'
-        + eventArgs['fill'] + ';' + 'fill-opacity:' + (eventArgs['opacity']).toString() + ';' +
-        'stroke-opacity:' + (eventArgs['border']['opacity']).toString() + ';' +
+        + eventArgs['fill'] + ';' + 'fill-opacity:' + (!isNullOrUndefined(eventArgs['opacity']) ? (eventArgs['opacity']).toString() : '1') + ';' +
+        'stroke-opacity:' + (!isNullOrUndefined(eventArgs['border']['opacity']) ? (eventArgs['border']['opacity']).toString() : '1') + ';' +
         'stroke-width:' + (eventArgs['border']['width']).toString() + ';' +
         'stroke:' + eventArgs['border']['color'] + ';' + '}';
     return styleEle;
@@ -2723,9 +2767,9 @@ export function customizeStyle(id, className, eventArgs) {
     var styleEle = getElement(id);
     if (!isNullOrUndefined(styleEle)) {
         styleEle.innerText = '.' + className + '{fill:'
-            + eventArgs['fill'] + ';' + 'fill-opacity:' + (eventArgs['opacity']).toString() + ';' +
+            + eventArgs['fill'] + ';' + 'fill-opacity:' + (!isNullOrUndefined(eventArgs['opacity']) ? (eventArgs['opacity']).toString() : '1') + ';' +
             'stroke-width:' + (eventArgs['border']['width']).toString() + ';' +
-            'stroke-opacity:' + (eventArgs['border']['opacity']).toString() + ';' +
+            'stroke-opacity:' + (!isNullOrUndefined(eventArgs['border']['opacity']) ? (eventArgs['border']['opacity']).toString() : '1') + ';' +
             'stroke:' + eventArgs['border']['color'] + '}';
     }
 }

package/hotfix/26.1.35_Vol2.txt

@@ -1 +0,0 @@
-hotfix/26.1.35_Vol2