@syncfusion/ej2-maps 24.2.9 → 25.1.37

package/src/maps/utils/helper.js

@@ -422,28 +422,26 @@ export { GeoLocation };
 export function measureText(text, font) {
     var measureObject = document.getElementById('mapsmeasuretext');
     if (measureObject === null) {
-        measureObject = createElement('text', { id: 'mapsmeasuretext' });
+        measureObject = document.createElement('text');
+        measureObject.id = 'mapsmeasuretext';
         document.body.appendChild(measureObject);
     }
     measureObject.innerText = text;
-    measureObject.style.position = 'absolute';
-    if (typeof (font.size) === 'number') {
-        measureObject.style.fontSize = (font.size) + 'px';
-    }
-    else {
-        measureObject.style.fontSize = font.size;
-    }
-    measureObject.style.fontWeight = font.fontWeight;
-    measureObject.style.fontStyle = font.fontStyle;
-    measureObject.style.fontFamily = font.fontFamily;
-    measureObject.style.visibility = 'hidden';
-    measureObject.style.top = '-100';
-    measureObject.style.left = '0';
-    measureObject.style.whiteSpace = 'nowrap';
-    // For bootstrap line height issue
-    measureObject.style.lineHeight = 'normal';
+    measureObject.style.cssText = 'position: absolute; font-size: ' + (typeof (font.size) === 'number' ? (font.size + 'px') : font.size) +
+        '; font-weight: ' + font.fontWeight + '; font-style: ' + font.fontStyle + '; font-family: ' + font.fontFamily +
+        '; visibility: hidden; top: -100; left: 0; whiteSpace: nowrap; lineHeight: normal';
     return new Size(measureObject.clientWidth, measureObject.clientHeight);
 }
+/** @private */
+export function measureTextElement(text, font) {
+    var canvas = document.createElement('canvas');
+    var context = canvas.getContext('2d');
+    context.font = font.fontStyle + " " + font.fontWeight + " " + (typeof font.size === 'number' ? font.size + 'px' : font.size) + " " + font.fontFamily;
+    var metrics = context.measureText(text);
+    var width = metrics.width;
+    var height = parseFloat(font.size) || 16;
+    return new Size(width, height);
+}
 /**
  * Internal use of text options
  *
@@ -1003,6 +1001,7 @@ export function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex,
         factor = maps.mapLayerPanel.calculateFactor(currentLayer);
     }
     var isClusteringCompleted = false;
+    var currentZoomFactor = !maps.isTileMap ? maps.mapScaleValue : maps.tileZoomLevel;
     maps.trigger('markerClusterRendering', eventArg, function (clusterargs) {
         Array.prototype.forEach.call(markerTemplate.childNodes, function (markerElement, o) {
             indexCollection = [];
@@ -1011,20 +1010,28 @@ export function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex,
                 bounds1 = tempElement.getBoundingClientRect();
                 indexCollection.push(o);
                 if (!isNullOrUndefined(bounds1)) {
-                    Array.prototype.forEach.call(markerTemplate.childNodes, function (otherMarkerElement, p) {
-                        if (p >= o + 1 && otherMarkerElement['style']['visibility'] !== 'hidden') {
-                            tempElement = otherMarkerElement;
-                            bounds2 = tempElement.getBoundingClientRect();
-                            if (!isNullOrUndefined(bounds2)) {
-                                if (!(bounds1.left > bounds2.right || bounds1.right < bounds2.left
-                                    || bounds1.top > bounds2.bottom || bounds1.bottom < bounds2.top)) {
-                                    colloideBounds.push(bounds2);
-                                    otherMarkerElement['style']['visibility'] = 'hidden';
-                                    indexCollection.push(p);
+                    var list = (maps.markerModule.zoomedMarkerCluster.length > 0 && maps.markerModule.zoomedMarkerCluster[layerIndex] && maps.markerModule.zoomedMarkerCluster[layerIndex][o] && maps.markerModule.zoomedMarkerCluster[layerIndex][o].length > 0)
+                        || (maps.markerModule.initialMarkerCluster.length > 0 && maps.markerModule.initialMarkerCluster[layerIndex] && maps.markerModule.initialMarkerCluster[layerIndex][o] && maps.markerModule.initialMarkerCluster[layerIndex][o].length > 0) ?
+                        (maps.previousScale < currentZoomFactor ? maps.markerModule.zoomedMarkerCluster[layerIndex][o] : maps.markerModule.initialMarkerCluster[layerIndex][o]) : null;
+                    if (!isNullOrUndefined(list) && list.length !== 0) {
+                        Array.prototype.forEach.call(list, function (currentIndex, p) {
+                            if (o !== currentIndex) {
+                                var otherMarkerElement = document.getElementById(maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
+                                    + 0 + '_dataIndex_' + currentIndex);
+                                if (otherMarkerElement['style']['visibility'] !== 'hidden') {
+                                    markerBoundsComparer(otherMarkerElement, bounds1, colloideBounds, indexCollection, currentIndex);
                                 }
                             }
-                        }
-                    });
+                        });
+                    }
+                    else {
+                        Array.prototype.forEach.call(markerTemplate.childNodes, function (otherMarkerElement, p) {
+                            if (p >= o + 1 && otherMarkerElement['style']['visibility'] !== 'hidden') {
+                                markerBoundsComparer(otherMarkerElement, bounds1, colloideBounds, indexCollection, p);
+                            }
+                        });
+                    }
+                    markerClusterListHandler(maps, currentZoomFactor, layerIndex, o, indexCollection);
                     tempX = bounds1.left + bounds1.width / 2;
                     tempY = bounds1.top + bounds1.height;
                     if (colloideBounds.length > 0) {
@@ -1099,6 +1106,9 @@ export function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex,
                 }
                 colloideBounds = [];
             }
+            else {
+                markerClusterListHandler(maps, currentZoomFactor, layerIndex, o, indexCollection);
+            }
             isClusteringCompleted = true;
         });
         layerElement.appendChild(clusterGroup);
@@ -1187,6 +1197,30 @@ export function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex,
     });
     return isClusteringCompleted;
 }
+/** @private */
+export function markerClusterListHandler(maps, currentZoomFactor, layerIndex, index, indexCollection) {
+    if (currentZoomFactor == 1) {
+        var initialMarkerClusterList = isNullOrUndefined(maps.markerModule.initialMarkerCluster[layerIndex][index]) ? [] : indexCollection.length > 1 ? indexCollection : [];
+        maps.markerModule.initialMarkerCluster[layerIndex][index] = initialMarkerClusterList;
+        var zoomedMarkerClusterList = isNullOrUndefined(maps.markerModule.zoomedMarkerCluster[layerIndex][index]) ? [] : indexCollection.length > 1 ? indexCollection : [];
+        maps.markerModule.zoomedMarkerCluster[layerIndex][index] = zoomedMarkerClusterList;
+    }
+    else if (currentZoomFactor > 1) {
+        maps.markerModule.zoomedMarkerCluster[layerIndex][index] = indexCollection.length > 1 ? indexCollection : [];
+    }
+}
+/** @private */
+export function markerBoundsComparer(tempElement, markerBounds, colloideBounds, indexCollection, p) {
+    var currentMarkerBound = tempElement.getBoundingClientRect();
+    if (!isNullOrUndefined(currentMarkerBound)) {
+        if (!(markerBounds.left > currentMarkerBound.right || markerBounds.right < currentMarkerBound.left
+            || markerBounds.top > currentMarkerBound.bottom || markerBounds.bottom < currentMarkerBound.top)) {
+            colloideBounds.push(currentMarkerBound);
+            tempElement['style']['visibility'] = 'hidden';
+            indexCollection.push(p);
+        }
+    }
+}
 /**
  *
  * @param {MarkerClusterData[]} sameMarkerData - Specifies the marker data
@@ -1981,22 +2015,40 @@ export function isCustomPath(layerData) {
  * @returns {string} - Returns the string
  * @private
  */
-export function textTrim(maxWidth, text, font) {
+export function textTrim(maxWidth, text, font, width, isCanvasMeasure, widthList) {
     var label = text;
-    var size = measureText(text, font).width;
-    if (size > maxWidth) {
+    if (isNullOrUndefined(width)) {
+        if (!isCanvasMeasure) {
+            width = measureText(text, font).width;
+        }
+        else {
+            width = measureTextElement(text, font).width;
+        }
+    }
+    if (width > maxWidth) {
         var textLength = text.length;
         for (var i = textLength - 1; i >= 0; --i) {
             label = text.substring(0, i) + '...';
-            size = measureText(label, font).width;
-            if (size <= maxWidth || label.length < 4) {
+            if (!isCanvasMeasure) {
+                width = measureText(label, font).width;
+            }
+            else {
+                width = measureTextElement(label, font).width;
+            }
+            if (width <= maxWidth || label.length < 4) {
                 if (label.length < 4) {
                     label = ' ';
                 }
+                if (!isNullOrUndefined(widthList)) {
+                    widthList.push(width);
+                }
                 return label;
             }
         }
     }
+    if (!isNullOrUndefined(widthList)) {
+        widthList.push(width);
+    }
     return label;
 }
 /**
@@ -2074,11 +2126,11 @@ export function getTranslate(mapObject, layer, animate) {
     }
     if (mapObject.zoomSettings.shouldZoomInitially && mapObject.zoomSettings.enable) {
         mapObject.mapScaleValue = scaleFactor = zoomFactorValue = ((mapObject.zoomSettings.shouldZoomInitially || mapObject.enablePersistence) && mapObject.scale === 1)
-            ? mapObject.scale : (isNullOrUndefined(mapObject.markerZoomFactor)) ? 1 : mapObject.markerZoomFactor;
-        if (mapObject.mapScaleValue !== mapObject.markerZoomFactor && !mapObject.enablePersistence) {
+            ? mapObject.scale : (isNullOrUndefined(mapObject.markerZoomFactor)) ? 1 : (mapObject.markerZoomedState ? mapObject.markerZoomFactor : parseInt(mapObject.scale.toString()));
+        if (mapObject.markerZoomedState && mapObject.mapScaleValue !== mapObject.markerZoomFactor && !mapObject.enablePersistence) {
             mapObject.mapScaleValue = zoomFactorValue = mapObject.markerZoomFactor;
         }
-        if (!isNullOrUndefined(mapObject.markerCenterLatitude) && !isNullOrUndefined(mapObject.markerCenterLongitude)) {
+        if (mapObject.markerZoomedState && !isNullOrUndefined(mapObject.markerCenterLatitude) && !isNullOrUndefined(mapObject.markerCenterLongitude)) {
             centerLatitude = mapObject.markerCenterLatitude;
             centerLongitude = mapObject.markerCenterLongitude;
         }

package/.eslintrc.json

@@ -1,260 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:jsdoc/recommended",
-        "plugin:security/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaFeatures": { "js": true },
-        "ecmaVersion": 2018,
-        "project": "./tsconfig.json",
-        "sourceType": "module"
-      },
-    "plugins": [
-        "@typescript-eslint",
-        "@typescript-eslint/tslint",
-        "eslint-plugin-security",
-        "jsdoc"
-    ],
-    "rules": {
-        "use-isnan": "error",
-        "security/detect-unsafe-regex":"error",
-        "security/detect-buffer-noassert":"error",
-        "security/detect-child-process":"error",
-        "security/detect-disable-mustache-escape":"error",
-        "security/detect-eval-with-expression":"error",
-        "security/detect-no-csrf-before-method-override":"error",
-        "security/detect-non-literal-fs-filename":"error",
-        "security/detect-non-literal-regexp":"error",
-        "security/detect-non-literal-require":"error",
-        "security/detect-object-injection":"error",
-        "security/detect-possible-timing-attacks":"error",
-        "security/detect-pseudoRandomBytes":"error",
-        "security/detect-new-buffer":"error",
-        "security/detect-bidi-characters":"error",
-        "@typescript-eslint/no-inferrable-types": "off",
-        "@typescript-eslint/ban-types": ["warn", {
-            "types": {
-                "Object": false,
-                "object": false,
-                "{}": false,
-                "Function": false
-            }
-        }],
-        "jsdoc/check-tag-names": 0,
-        "@typescript-eslint/tslint/config": [
-            "error",
-            {
-                "rules": {
-                    "ban": true,
-                    "chai-vague-errors": true,
-                    "max-func-body-length": [
-                        true,
-                        120,
-                        {
-                            "ignore-parameters-to-function-regex": "describe"
-                        }
-                    ],
-                    "missing-jsdoc": true,
-                    "no-backbone-get-set-outside-model": false,
-                    "no-cookies": false,
-                    "no-delete-expression": false,
-                    "no-disable-auto-sanitization": true,
-                    "no-duplicate-case": true,
-                    "no-duplicate-parameter-names": true,
-                    "no-empty-interfaces": false,
-                    "no-exec-script": true,
-                    "no-function-expression": false,
-                    "no-multiple-var-decl": false,
-                    "no-string-based-set-immediate": false,
-                    "no-string-based-set-interval": false,
-                    "no-unnecessary-bind": false,
-                    "no-unused-imports": true,
-                    "no-with-statement": false,
-                    "prefer-array-literal": false,
-                    "typedef": [
-                        true,
-                        "call-signature",
-                        "parameter",
-                        "property-declaration",
-                        "variable-declaration",
-                        "arrow-parameter",
-                        "member-variable-declaration"
-                    ],
-                    "use-named-parameter": false,
-                    "valid-typeof": true,
-                    "whitespace": [
-                        true,
-                        "check-branch",
-                        "check-decl",
-                        "check-operator",
-                        "check-separator",
-                        "check-type"
-                    ]
-                }
-            }
-        ],
-        "no-control-regex": "error",
-        "no-constant-condition": "error",
-        "no-invalid-regexp": "error",
-        "curly": "error",
-        "eol-last": [
-            "error",
-            "always"
-        ],
-        "guard-for-in": "error",
-        "no-labels": "error",
-        "max-len": [
-            "error",
-            {
-                "code": 140,
-                "tabWidth": 4,
-                "ignoreComments": true,
-                "ignoreStrings": true,
-                "ignoreTemplateLiterals": true,
-                "ignoreRegExpLiterals": true
-            }
-        ],
-        "no-console": [
-            "error",
-            {
-                "allow": [
-                    "warn",
-                    "dir",
-                    "timeLog",
-                    "assert",
-                    "clear",
-                    "count",
-                    "countReset",
-                    "group",
-                    "groupEnd",
-                    "table",
-                    "dirxml",
-                    "error",
-                    "groupCollapsed",
-                    "Console",
-                    "profile",
-                    "profileEnd",
-                    "timeStamp",
-                    "context"
-                ]
-            }
-        ],
-        "no-redeclare": [
-            "error",
-            {
-                "builtinGlobals": true
-            }
-        ],
-        "@typescript-eslint/no-parameter-properties": "error",
-        "@typescript-eslint/indent": [
-            "error",
-            4,
-            {
-                "CallExpression": {
-                    "arguments": "first"
-                },
-                "FunctionDeclaration": {
-                    "parameters": "first"
-                },
-                "FunctionExpression": {
-                    "parameters": "first"
-                }
-            }
-        ],
-        "no-debugger": "error",
-        "no-eval": "error",
-        "no-extra-semi": "error",
-        "no-throw-literal": "error",
-        "no-fallthrough": "error",
-        "comma-dangle": [
-            "error",
-            "never"
-        ],
-        "no-trailing-spaces": "error",
-        "@typescript-eslint/no-unused-expressions": "error",
-        "@typescript-eslint/no-var-requires": "error",
-        "one-var": [
-            "error",
-            "never"
-        ],
-        "@typescript-eslint/no-explicit-any": "error",
-        "no-cond-assign": [
-            "error",
-            "always"
-        ],
-        "@typescript-eslint/consistent-type-assertions": "off",
-        "jsdoc/check-alignment": "error",
-        "no-empty": "error",
-        "quotes": [
-            "error",
-            "single"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "eqeqeq": [
-            "error",
-            "smart"
-        ],
-        "valid-typeof": [
-            "error",
-            {
-                "requireStringLiterals": true
-            }
-        ],
-        "camelcase": [
-            "error",
-            {
-                "properties": "always",
-                "ignoreDestructuring": true,
-                "ignoreImports": true
-            }
-        ],
-        "no-irregular-whitespace": [
-            "error",
-            {
-                "skipStrings": true,
-                "skipComments": true,
-                "skipRegExps": true,
-                "skipTemplates": true
-            }
-        ],
-        "valid-jsdoc": [
-            "error",
-            {
-                "prefer": {
-                    "arg": "param",
-                    "argument": "param",
-                    "class": "constructor",
-                    "return": "returns",
-                    "virtual": "abstract"
-                }
-            }
-        ],
-        "no-var": "error",
-        "radix": "error"
-    },
-    "reportUnusedDisableDirectives": true,
-    "overrides": [
-        {
-            "files": [
-                "node_modules",
-                "dist",
-                "public",
-                "coverage",
-                "test-report"
-            ],
-            "rules": {
-                "no-unused-expressions": "off"
-            }
-        }
-    ]
-}

package/.github/PULL_REQUEST_TEMPLATE/Bug.md

@@ -1,72 +0,0 @@
-# Bug description
-
-Clearly and concisely describe the problem or feature (this cannot be empty).
-
-## Root cause
-
-Briefly describe the root cause and analysis of the problem.
-If there is an internal discussion on the forum, provide the link.
-
-## Reason for not identifying earlier
-
-Find how it was missed in our earlier testing and development and by whom it was missed. This will help prevent similar mistakes in the future.
-
-### Reason
-
-Provide reason for missing.
-
-### Action taken:
-
-Provide the action plan taken to avoid this issue further. Also, mention if we addressed any other area in the same product based on this learning.
-
-### Related Area for missing test case: 
-
-Unit test case / E2E test case / Manual testing
-
-## Is it a breaking issue?
-
-If it is a breaking issue, provide the commit detail which caused this break.
-
-## Solution description
-
-Describe your code changes in detail for reviewers.
-
-### Cause:
-
-Technical explanation for cause.
-
-### Fix: 
-
-Technical explanation for your fix.
-
-## Output screenshots
-
-Post the output screenshots if an UI is affected or added due to this bug.
-
-### Before issue fix output image:
-
-Provide issue image before fix.
-
-### After issue fix output image:
-
-Provide issue fixed image with your fix.
-
-## Areas affected and ensured
-
-List the areas affected by your code changes.
-
-## Additional checklist
-
-- [ ] Did you run the automation against your fix? <b> Yes | No Your Explanation </b>
-
-- [ ] Is there any API name change? <b> Yes | No Your Explanation </b>
-
-- [ ] Is there any existing behavior change of other features due to this code change? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you record this case in the unit test or UI test? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you added issue fix comment? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you tested this issue fix for all browsers? <b> [ ] Chrome [ ] Firefox [ ] Edge [ ] Internet Explorer </b>
-
-- [ ] Does it have any known issues? <b> Yes | No Your Explanation </b>

package/.github/PULL_REQUEST_TEMPLATE/Feature.md

@@ -1,49 +0,0 @@
-# Feature description
-
-Clearly and concisely describe the problem/feature (this cannot be empty)
-
-## Analysis / Design
-
-If there is an external design, link to it project documentation area
-If there is an internal discussion on the Forum, provide the link.
-
-## Solution Description
-
-Describe your code changes in detail for reviewers
-
-## Output screenshots
-
-Post the output screenshots if an UI is affected or added due to this feature.
-
-## Areas affected and ensured
-
-List out the areas are affected by your code changes.
-
-## Test cases
-
-Provide the unit testing written file details to understand the use cases considered in this implementation.
-If there is no TDD (if it’s not possible to follow), provide the UI automation script location and the Excel file that contains the use cases considered in this implementation.
-Provide the test cases Excel file alone if the feature cannot be automated in any case.
-
-## Test bed sample location
-
-Provide the test bed sample location where code reviewers can review the new feature’s behaviors. It can be from NPMCI, staging site, local server, etc.
-
-## Additional checklist
-
-- [ ] Did you run the automation against your feature? <b> Yes | No Your Explanation </b>
-
-- [ ] Is there any API name change? <b> Yes | No Your Explanation </b>
-
-- [ ] Is there any existing behavior change of other features due to this code change? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you record this case in the unit test or UI test? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you add comment for your new code (Method / Class / API / Interface / Event)? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you configured third party config your feature? <b> Yes | No Your Explanation </b>
-
-- [ ] Did you tested this feature with all browsers? <b> [ ] Chrome [ ] Firefox [ ] Edge [ ] Internet Explorer </b>
-
- 
-