@syncfusion/ej2-maps 25.2.5 → 26.1.35

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

@@ -1,12 +1,9 @@
-import { Animation, Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Fetch, Internationalization, L10n, NotifyPropertyChanges, Property, SanitizeHtmlHelper, animationMode, compile, createElement, extend, isNullOrUndefined, merge, print, remove, setValue } from '@syncfusion/ej2-base';
+import { isNullOrUndefined, createElement, merge, remove, animationMode, compile, Animation, SanitizeHtmlHelper, ChildProperty, Property, Complex, Collection, Fetch, extend, Component, setValue, Browser, EventHandler, Internationalization, L10n, Event, NotifyPropertyChanges, print } from '@syncfusion/ej2-base';
 import { SvgRenderer, Tooltip } from '@syncfusion/ej2-svg-base';
 import { DataManager, Query } from '@syncfusion/ej2-data';
-import { PdfBitmap, PdfDocument, PdfPageOrientation } from '@syncfusion/ej2-pdf-export';
+import { PdfPageOrientation, PdfDocument, PdfBitmap } from '@syncfusion/ej2-pdf-export';
 
 /* eslint-disable max-len */
-/**
- * Helper functions for maps control
- */
 /**
  * Specifies the size information of an element.
  */
@@ -209,18 +206,20 @@ function convertGeoToPoint(latitude, longitude, factor, layer, mapModel) {
  */
 function calculatePolygonPath(maps, factor, currentLayer, markerData) {
     let path = '';
-    Array.prototype.forEach.call(markerData, (data, dataIndex) => {
-        const lat = data.latitude;
-        const lng = data.longitude;
-        const location = (maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(lng, lat), factor, maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, currentLayer, maps);
-        if (dataIndex === 0) {
-            path += 'M ' + location.x + ' ' + location.y;
-        }
-        else {
-            path += ' L ' + location.x + ' ' + location.y;
-        }
-    });
-    path += ' z ';
+    if (!isNullOrUndefined(markerData) && markerData.length > 1) {
+        Array.prototype.forEach.call(markerData, (data, dataIndex) => {
+            const lat = data.latitude;
+            const lng = data.longitude;
+            const location = (maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(lng, lat), factor, maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, currentLayer, maps);
+            if (dataIndex === 0) {
+                path += 'M ' + location.x + ' ' + location.y;
+            }
+            else {
+                path += ' L ' + location.x + ' ' + location.y;
+            }
+        });
+        path += ' z ';
+    }
     return path;
 }
 /**
@@ -1360,15 +1359,6 @@ function markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, mark
         markerElement.style.left = (maps.isTileMap ? location.x : (location.x + transPoint.x) * scale) + offset.x - maps.mapAreaRect.x + 'px';
         markerElement.style.top = (maps.isTileMap ? location.y : (location.y + transPoint.y) * scale) + offset.y - maps.mapAreaRect.y + 'px';
         markerTemplate.appendChild(markerElement);
-        if (maps.layers[maps.baseLayerIndex].layerType === 'GoogleStaticMap') {
-            const staticMapOffset = getElementByID(maps.element.id + '_StaticGoogleMap').getBoundingClientRect();
-            const markerElementOffset = markerElement.getBoundingClientRect();
-            const staticMapOffsetWidth = 640;
-            if ((staticMapOffset['x'] > markerElementOffset['x'] || staticMapOffset['x'] + staticMapOffsetWidth < markerElementOffset['x'] + markerElementOffset['width'])
-                && (staticMapOffset['y'] > markerElementOffset['y'] || staticMapOffset['y'] + staticMapOffset['height'] < markerElementOffset['y'] + markerElementOffset['height'])) {
-                markerElement.style.display = 'none';
-            }
-        }
     }
     return markerTemplate;
 }
@@ -1790,7 +1780,7 @@ function getFieldData(dataSource, fields) {
 function checkShapeDataFields(dataSource, properties, dataPath, propertyPath, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 layer) {
-    if (!(isNullOrUndefined(properties))) {
+    if (!(isNullOrUndefined(properties)) && !isNullOrUndefined(dataSource)) {
         for (let i = 0; i < dataSource.length; i++) {
             const shapeDataPath = ((dataPath.indexOf('.') > -1) ? getValueFromObject(dataSource[i], dataPath) :
                 dataSource[i][dataPath]);
@@ -2414,8 +2404,7 @@ function getZoomTranslate(mapObject, layer, animate) {
  */
 function fixInitialScaleForTile(map) {
     map.tileZoomScale = map.tileZoomLevel = Math.floor(map.availableSize.height / 512) + 1;
-    const padding = map.layers[map.baseLayerIndex].layerType !== 'GoogleStaticMap' ?
-        20 : 0;
+    const padding = 20;
     const totalSize = Math.pow(2, map.tileZoomLevel) * 256;
     map.tileTranslatePoint.x = (map.availableSize.width / 2) - (totalSize / 2);
     map.tileTranslatePoint.y = (map.availableSize.height / 2) - (totalSize / 2) + padding;
@@ -2519,7 +2508,7 @@ function getShapeData(targetId, map) {
     let data;
     if (layer.dataSource) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data = layer.dataSource[checkShapeDataFields(layer.dataSource, shapeData, layer.shapeDataPath, layer.shapePropertyPath, layer)];
+        data = layer.dataSource[checkShapeDataFields(layer.dataSource, shapeData, layer.shapeDataPath, layer.shapePropertyPath)];
     }
     return { shapeData: shapeData, data: data };
 }
@@ -3548,7 +3537,7 @@ var Theme;
     };
     /** @private */
     Theme.dataLabelFont = {
-        size: '12px',
+        size: null,
         fontWeight: 'Medium',
         color: '#000000',
         fontStyle: 'Medium',
@@ -3701,6 +3690,15 @@ function getShapeColor(theme) {
             themePalette = ['#4EAAFF', '#FA4EAB', '#FFF500', '#17EA58', '#38FFE7',
                 '#FF9E45', '#B3F32F', '#B93CE4', '#FC5664', '#9B55FF'];
             break;
+        case 'fluent2':
+            themePalette = ['#6200EE', '#09AF74', '#0076E5', '#CB3587', '#E7910F',
+                '#0364DE', '#66CD15', '#F3A93C', '#107C10', '#C19C00'];
+            break;
+        case 'fluent2dark':
+        case 'fluent2highcontrast':
+            themePalette = ['#9BB449', '#2A72D5', '#43B786', '#3F579A', '#584EC6',
+                '#E85F9C', '#6E7A89', '#EA6266', '#0B6A0B', '#C19C00'];
+            break;
         default:
             themePalette = ['#B5E485', '#7BC1E8', '#DF819C', '#EC9B79', '#78D0D3',
                 '#D6D572', '#9178E3', '#A1E5B4', '#87A4B4', '#E4C16C'];
@@ -3756,7 +3754,7 @@ var HighContrastTheme;
     };
     /** @private */
     HighContrastTheme.dataLabelFont = {
-        size: '12px',
+        size: null,
         fontWeight: 'Medium',
         color: '#000000',
         fontStyle: 'Medium',
@@ -3850,13 +3848,19 @@ function getThemeStyle(theme) {
                 labelFontFamily: 'Roboto, Noto, Sans-serif',
                 fontFamily: 'Roboto, Noto, Sans-serif',
                 fontSize: '12px',
+                legendFontSize: '12px',
                 fontWeight: 'Medium',
                 titleFontWeight: 'Medium',
                 zoomSelectionColor: '#e61576',
                 shapeFill: '#A6A6A6',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'highcontrast':
@@ -3874,14 +3878,20 @@ function getThemeStyle(theme) {
                 zoomFillColor: '#FFFFFF',
                 fontFamily: 'Roboto, Noto, Sans-serif',
                 fontSize: '12px',
+                legendFontSize: '12px',
                 fontWeight: 'Medium',
                 labelFontFamily: 'Roboto, Noto, Sans-serif',
                 titleFontWeight: 'Medium',
                 zoomSelectionColor: '#e61576',
                 shapeFill: '#A6A6A6',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'bootstrap4':
@@ -3907,9 +3917,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: 'Medium',
                 zoomSelectionColor: '#e61576',
                 shapeFill: '#A6A6A6',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'tailwind':
@@ -3935,9 +3950,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: '500',
                 zoomSelectionColor: '#374151',
                 shapeFill: '#E5E7EB',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'tailwinddark':
@@ -3963,9 +3983,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: '500',
                 zoomSelectionColor: '#F3F4F6',
                 shapeFill: '#374151',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'bootstrap5':
@@ -3991,9 +4016,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: 'normal',
                 zoomSelectionColor: '#343A40',
                 shapeFill: '#E9ECEF',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'bootstrap5dark':
@@ -4019,9 +4049,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: 'normal',
                 zoomSelectionColor: '#DEE2E6',
                 shapeFill: '#495057',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'fluent':
@@ -4047,9 +4082,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: '600',
                 zoomSelectionColor: '#323130',
                 shapeFill: '#F3F2F1',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'fluentdark':
@@ -4075,9 +4115,14 @@ function getThemeStyle(theme) {
                 titleFontWeight: '600',
                 zoomSelectionColor: '#F3F2F1',
                 shapeFill: '#252423',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'material3':
@@ -4104,9 +4149,14 @@ function getThemeStyle(theme) {
                 fontWeight: '400',
                 zoomSelectionColor: '#49454E',
                 shapeFill: '#E7E0EC',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#6750A4',
                 rectangleZoomFillOpacity: 0.24,
-                rectangleZoomBorderColor: '#6750A4'
+                rectangleZoomBorderColor: '#6750A4',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
         case 'material3dark':
@@ -4133,9 +4183,117 @@ function getThemeStyle(theme) {
                 fontWeight: '400',
                 zoomSelectionColor: '#E6E1E5',
                 shapeFill: '#49454F',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#D0BCFF',
                 rectangleZoomFillOpacity: 0.24,
-                rectangleZoomBorderColor: '#D0BCFF'
+                rectangleZoomBorderColor: '#D0BCFF',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
+            };
+            break;
+        case 'fluent2':
+            style = {
+                backgroundColor: 'transparent',
+                areaBackgroundColor: 'transparent',
+                titleFontColor: '#242424',
+                subTitleFontColor: '#242424',
+                legendTitleFontColor: '#242424',
+                legendTextColor: '#242424',
+                dataLabelFontColor: '#242424',
+                tooltipFontColor: '#242424',
+                tooltipFillColor: '#FFFFFF',
+                zoomFillColor: '#D1D1D1',
+                fontFamily: 'Segoe UI',
+                fontSize: '10px',
+                fontWeight: '400',
+                titleFontSize: '14px',
+                subTitleFontSize: '12px',
+                legendFontSize: '12px',
+                tooltipFillOpacity: 1,
+                tooltipTextOpacity: 1,
+                labelFontFamily: 'Segoe UI',
+                titleFontWeight: '600',
+                zoomSelectionColor: '#242424',
+                shapeFill: '#E6E6E6',
+                shapeBorderColor: '#EBEBEB',
+                rectangleZoomFillColor: '#B4D6FA',
+                rectangleZoomFillOpacity: 0.25,
+                rectangleZoomBorderColor: '#0F6CBD',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 32
+            };
+            break;
+        case 'fluent2dark':
+            style = {
+                backgroundColor: 'transparent',
+                areaBackgroundColor: 'transparent',
+                titleFontColor: '#FFFFFF',
+                subTitleFontColor: '#FFFFFF',
+                legendTitleFontColor: '#FFFFFF',
+                legendTextColor: '#FFFFFF',
+                dataLabelFontColor: '#FFFFFF',
+                tooltipFontColor: '#FFFFFF',
+                tooltipFillColor: '#292929',
+                zoomFillColor: '#666',
+                fontFamily: 'Segoe UI',
+                fontSize: '10px',
+                fontWeight: '400',
+                titleFontSize: '14px',
+                subTitleFontSize: '12px',
+                legendFontSize: '12px',
+                tooltipFillOpacity: 1,
+                tooltipTextOpacity: 1,
+                labelFontFamily: 'Segoe UI',
+                titleFontWeight: '600',
+                zoomSelectionColor: '#FFFFFF',
+                shapeFill: '#333333',
+                shapeBorderColor: '#000000',
+                rectangleZoomFillColor: '#0E4775',
+                rectangleZoomFillOpacity: 0.25,
+                rectangleZoomBorderColor: '#0E4775',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 32
+            };
+            break;
+        case 'fluent2highcontrast':
+            style = {
+                backgroundColor: 'transparent',
+                areaBackgroundColor: 'transparent',
+                titleFontColor: '#FFFFFF',
+                subTitleFontColor: '#FFFFFF',
+                legendTitleFontColor: '#FFFFFF',
+                legendTextColor: '#FFFFFF',
+                dataLabelFontColor: '#FFFFFF',
+                tooltipFontColor: '#FFFFFF',
+                tooltipFillColor: '#000000',
+                zoomFillColor: '#3FF23F',
+                fontFamily: 'Segoe UI',
+                fontSize: '10px',
+                fontWeight: '400',
+                titleFontSize: '14px',
+                subTitleFontSize: '12px',
+                legendFontSize: '12px',
+                tooltipFillOpacity: 1,
+                tooltipTextOpacity: 1,
+                labelFontFamily: 'Segoe UI',
+                titleFontWeight: '600',
+                zoomSelectionColor: '#FFFFFF',
+                zoomBorderColor: '#FFFFFF',
+                shapeFill: '#292827',
+                shapeBorderColor: '#292827',
+                rectangleZoomFillColor: '#1AEBFF',
+                rectangleZoomFillOpacity: 0.25,
+                rectangleZoomBorderColor: '#1AEBFF',
+                legendBorderColor: '#FFFFFF',
+                legendBorderWidth: 1,
+                tooltipBorderColor: '#FFF',
+                zoomButtonRadius: 32
             };
             break;
         default:
@@ -4154,50 +4312,52 @@ function getThemeStyle(theme) {
                 labelFontFamily: 'Roboto, Noto, Sans-serif',
                 fontFamily: 'Roboto, Noto, Sans-serif',
                 fontSize: '12px',
+                legendFontSize: '12px',
                 fontWeight: 'Medium',
                 titleFontWeight: 'Medium',
                 zoomSelectionColor: '#e61576',
                 shapeFill: '#A6A6A6',
+                shapeBorderColor: '#000000',
                 rectangleZoomFillColor: '#d3d3d3',
                 rectangleZoomFillOpacity: 0.5,
-                rectangleZoomBorderColor: '#009900'
+                rectangleZoomBorderColor: '#009900',
+                legendBorderColor: '#000000',
+                legendBorderWidth: 0,
+                tooltipBorderColor: 'transparent',
+                zoomButtonRadius: 30
             };
             break;
     }
     return style;
 }
 
-var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-/* eslint-disable max-len */
-/**
- * Maps base document
- */
 /**
  * Gets or sets the options for customizing the annotation element in maps.
  */
 class Annotation extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('')
 ], Annotation.prototype, "content", void 0);
-__decorate$1([
+__decorate([
     Property('0px')
 ], Annotation.prototype, "x", void 0);
-__decorate$1([
+__decorate([
     Property('0px')
 ], Annotation.prototype, "y", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], Annotation.prototype, "verticalAlignment", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], Annotation.prototype, "horizontalAlignment", void 0);
-__decorate$1([
+__decorate([
     Property('-1')
 ], Annotation.prototype, "zIndex", void 0);
 /**
@@ -4205,19 +4365,19 @@ __decorate$1([
  */
 class Arrow extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('Start')
 ], Arrow.prototype, "position", void 0);
-__decorate$1([
+__decorate([
     Property('false')
 ], Arrow.prototype, "showArrow", void 0);
-__decorate$1([
+__decorate([
     Property(2)
 ], Arrow.prototype, "size", void 0);
-__decorate$1([
+__decorate([
     Property('black')
 ], Arrow.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], Arrow.prototype, "offSet", void 0);
 /**
@@ -4225,22 +4385,22 @@ __decorate$1([
  */
 class Font extends ChildProperty {
 }
-__decorate$1([
-    Property('12px')
+__decorate([
+    Property(null)
 ], Font.prototype, "size", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], Font.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property('Roboto, Noto, Sans-serif')
 ], Font.prototype, "fontFamily", void 0);
-__decorate$1([
+__decorate([
     Property('Medium')
 ], Font.prototype, "fontWeight", void 0);
-__decorate$1([
+__decorate([
     Property('Medium')
 ], Font.prototype, "fontStyle", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], Font.prototype, "opacity", void 0);
 /**
@@ -4248,37 +4408,37 @@ __decorate$1([
  */
 class ZoomToolbarButtonSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('transparent')
 ], ZoomToolbarButtonSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ZoomToolbarButtonSettings.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarButtonSettings.prototype, "borderOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarButtonSettings.prototype, "borderWidth", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ZoomToolbarButtonSettings.prototype, "borderColor", void 0);
-__decorate$1([
-    Property(30)
+__decorate([
+    Property(null)
 ], ZoomToolbarButtonSettings.prototype, "radius", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ZoomToolbarButtonSettings.prototype, "selectionColor", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ZoomToolbarButtonSettings.prototype, "highlightColor", void 0);
-__decorate$1([
+__decorate([
     Property(5)
 ], ZoomToolbarButtonSettings.prototype, "padding", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarButtonSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(['ZoomIn', 'ZoomOut', 'Reset'])
 ], ZoomToolbarButtonSettings.prototype, "toolbarItems", void 0);
 /**
@@ -4286,37 +4446,37 @@ __decorate$1([
  */
 class ZoomToolbarTooltipSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomToolbarTooltipSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property('white')
 ], ZoomToolbarTooltipSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarTooltipSettings.prototype, "borderOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarTooltipSettings.prototype, "borderWidth", void 0);
-__decorate$1([
+__decorate([
     Property('#707070')
 ], ZoomToolbarTooltipSettings.prototype, "borderColor", void 0);
-__decorate$1([
+__decorate([
     Property('black')
 ], ZoomToolbarTooltipSettings.prototype, "fontColor", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ZoomToolbarTooltipSettings.prototype, "fontFamily", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ZoomToolbarTooltipSettings.prototype, "fontStyle", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ZoomToolbarTooltipSettings.prototype, "fontWeight", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ZoomToolbarTooltipSettings.prototype, "fontSize", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarTooltipSettings.prototype, "fontOpacity", void 0);
 /**
@@ -4324,31 +4484,31 @@ __decorate$1([
  */
 class ZoomToolbarSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('transparent')
 ], ZoomToolbarSettings.prototype, "backgroundColor", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarSettings.prototype, "borderOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomToolbarSettings.prototype, "borderWidth", void 0);
-__decorate$1([
+__decorate([
     Property('transparent')
 ], ZoomToolbarSettings.prototype, "borderColor", void 0);
-__decorate$1([
+__decorate([
     Property('Far')
 ], ZoomToolbarSettings.prototype, "horizontalAlignment", void 0);
-__decorate$1([
+__decorate([
     Property('Near')
 ], ZoomToolbarSettings.prototype, "verticalAlignment", void 0);
-__decorate$1([
+__decorate([
     Property('Horizontal')
 ], ZoomToolbarSettings.prototype, "orientation", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ZoomToolbarButtonSettings)
 ], ZoomToolbarSettings.prototype, "buttonSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ZoomToolbarTooltipSettings)
 ], ZoomToolbarSettings.prototype, "tooltipSettings", void 0);
 /**
@@ -4356,13 +4516,13 @@ __decorate$1([
  */
 class Border extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('')
 ], Border.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], Border.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], Border.prototype, "opacity", void 0);
 /**
@@ -4370,10 +4530,10 @@ __decorate$1([
  */
 class CenterPosition extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], CenterPosition.prototype, "latitude", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], CenterPosition.prototype, "longitude", void 0);
 /**
@@ -4381,28 +4541,28 @@ __decorate$1([
  */
 class TooltipSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], TooltipSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], TooltipSettings.prototype, "template", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], TooltipSettings.prototype, "fill", void 0);
-__decorate$1([
-    Complex({ color: 'transparent', width: 1 }, Border)
+__decorate([
+    Complex({ color: null, width: 1 }, Border)
 ], TooltipSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Complex({ fontFamily: null, size: null, fontWeight: null }, Font)
 ], TooltipSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], TooltipSettings.prototype, "format", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], TooltipSettings.prototype, "valuePath", void 0);
-__decorate$1([
+__decorate([
     Property(2000)
 ], TooltipSettings.prototype, "duration", void 0);
 /**
@@ -4410,19 +4570,19 @@ __decorate$1([
  */
 class PolygonTooltipSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], PolygonTooltipSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], PolygonTooltipSettings.prototype, "fill", void 0);
-__decorate$1([
-    Complex({ color: 'transparent', width: 1 }, Border)
+__decorate([
+    Complex({ color: null, width: 1 }, Border)
 ], PolygonTooltipSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Complex({ fontFamily: null, size: null, fontWeight: null }, Font)
 ], PolygonTooltipSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property(2000)
 ], PolygonTooltipSettings.prototype, "duration", void 0);
 /**
@@ -4430,16 +4590,16 @@ __decorate$1([
  */
 class Margin extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(10)
 ], Margin.prototype, "left", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], Margin.prototype, "right", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], Margin.prototype, "top", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], Margin.prototype, "bottom", void 0);
 /**
@@ -4447,13 +4607,13 @@ __decorate$1([
  */
 class ConnectorLineSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('#000000')
 ], ConnectorLineSettings.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ConnectorLineSettings.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ConnectorLineSettings.prototype, "opacity", void 0);
 /**
@@ -4461,46 +4621,46 @@ __decorate$1([
  */
 class MarkerClusterSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], MarkerClusterSettings.prototype, "allowClustering", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], MarkerClusterSettings.prototype, "allowDeepClustering", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: 'transparent', width: 1 }, Border)
 ], MarkerClusterSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Property('#D2691E')
 ], MarkerClusterSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], MarkerClusterSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property('Rectangle')
 ], MarkerClusterSettings.prototype, "shape", void 0);
-__decorate$1([
+__decorate([
     Property(12)
 ], MarkerClusterSettings.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property(12)
 ], MarkerClusterSettings.prototype, "height", void 0);
-__decorate$1([
+__decorate([
     Property(new Point(0, 0))
 ], MarkerClusterSettings.prototype, "offset", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], MarkerClusterSettings.prototype, "imageUrl", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], MarkerClusterSettings.prototype, "dashArray", void 0);
-__decorate$1([
+__decorate([
     Complex({}, Font)
 ], MarkerClusterSettings.prototype, "labelStyle", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], MarkerClusterSettings.prototype, "allowClusterExpand", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ConnectorLineSettings)
 ], MarkerClusterSettings.prototype, "connectorLineSettings", void 0);
 /**
@@ -4513,28 +4673,28 @@ class MarkerClusterData extends ChildProperty {
  */
 class ColorMappingSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "from", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "to", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "value", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "minOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "maxOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ColorMappingSettings.prototype, "label", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ColorMappingSettings.prototype, "showLegend", void 0);
 /**
@@ -4543,10 +4703,10 @@ __decorate$1([
  */
 class InitialMarkerSelectionSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], InitialMarkerSelectionSettings.prototype, "latitude", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], InitialMarkerSelectionSettings.prototype, "longitude", void 0);
 /**
@@ -4555,10 +4715,10 @@ __decorate$1([
  */
 class InitialShapeSelectionSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], InitialShapeSelectionSettings.prototype, "shapePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], InitialShapeSelectionSettings.prototype, "shapeValue", void 0);
 /**
@@ -4566,19 +4726,19 @@ __decorate$1([
  */
 class SelectionSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], SelectionSettings.prototype, "enable", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], SelectionSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], SelectionSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], SelectionSettings.prototype, "enableMultiSelect", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: 'transparent', width: 0 }, Border)
 ], SelectionSettings.prototype, "border", void 0);
 /**
@@ -4586,16 +4746,16 @@ __decorate$1([
  */
 class HighlightSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], HighlightSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], HighlightSettings.prototype, "enable", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], HighlightSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: 'transparent', width: 0 }, Border)
 ], HighlightSettings.prototype, "border", void 0);
 /**
@@ -4603,28 +4763,28 @@ __decorate$1([
  */
 class PolygonSetting extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(1)
 ], PolygonSetting.prototype, "borderWidth", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], PolygonSetting.prototype, "borderOpacity", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], PolygonSetting.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property('#FF471A')
 ], PolygonSetting.prototype, "borderColor", void 0);
-__decorate$1([
+__decorate([
     Property('#FF471A')
 ], PolygonSetting.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property([])
 ], PolygonSetting.prototype, "points", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], PolygonSetting.prototype, "tooltipText", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], PolygonSetting.prototype, "tooltipTemplate", void 0);
 /**
@@ -4633,16 +4793,16 @@ __decorate$1([
  */
 class PolygonSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Collection([], PolygonSetting)
 ], PolygonSettings.prototype, "polygons", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SelectionSettings)
 ], PolygonSettings.prototype, "selectionSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, HighlightSettings)
 ], PolygonSettings.prototype, "highlightSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, PolygonTooltipSettings)
 ], PolygonSettings.prototype, "tooltipSettings", void 0);
 /**
@@ -4650,34 +4810,34 @@ __decorate$1([
  */
 class NavigationLineSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], NavigationLineSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], NavigationLineSettings.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], NavigationLineSettings.prototype, "longitude", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], NavigationLineSettings.prototype, "latitude", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], NavigationLineSettings.prototype, "dashArray", void 0);
-__decorate$1([
+__decorate([
     Property('black')
 ], NavigationLineSettings.prototype, "color", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], NavigationLineSettings.prototype, "angle", void 0);
-__decorate$1([
+__decorate([
     Complex({ showArrow: false, position: 'Start', size: 5, color: 'black' }, Arrow)
 ], NavigationLineSettings.prototype, "arrowSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SelectionSettings)
 ], NavigationLineSettings.prototype, "selectionSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, HighlightSettings)
 ], NavigationLineSettings.prototype, "highlightSettings", void 0);
 /**
@@ -4685,55 +4845,55 @@ __decorate$1([
  */
 class BubbleSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Complex({}, Border)
 ], BubbleSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], BubbleSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property([])
 ], BubbleSettings.prototype, "dataSource", void 0);
-__decorate$1([
+__decorate([
     Property()
 ], BubbleSettings.prototype, "query", void 0);
-__decorate$1([
+__decorate([
     Property(1000)
 ], BubbleSettings.prototype, "animationDuration", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], BubbleSettings.prototype, "animationDelay", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], BubbleSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], BubbleSettings.prototype, "minRadius", void 0);
-__decorate$1([
+__decorate([
     Property(20)
 ], BubbleSettings.prototype, "maxRadius", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], BubbleSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], BubbleSettings.prototype, "valuePath", void 0);
-__decorate$1([
+__decorate([
     Property('Circle')
 ], BubbleSettings.prototype, "bubbleType", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], BubbleSettings.prototype, "colorValuePath", void 0);
-__decorate$1([
+__decorate([
     Collection([], ColorMappingSettings)
 ], BubbleSettings.prototype, "colorMapping", void 0);
-__decorate$1([
+__decorate([
     Complex({}, TooltipSettings)
 ], BubbleSettings.prototype, "tooltipSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SelectionSettings)
 ], BubbleSettings.prototype, "selectionSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, HighlightSettings)
 ], BubbleSettings.prototype, "highlightSettings", void 0);
 /**
@@ -4741,10 +4901,10 @@ __decorate$1([
  */
 class CommonTitleSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property('')
 ], CommonTitleSettings.prototype, "text", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], CommonTitleSettings.prototype, "description", void 0);
 /**
@@ -4752,10 +4912,10 @@ __decorate$1([
  */
 class SubTitleSettings extends CommonTitleSettings {
 }
-__decorate$1([
+__decorate([
     Complex({ size: null, fontWeight: null, fontFamily: null }, Font)
 ], SubTitleSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property('Center')
 ], SubTitleSettings.prototype, "alignment", void 0);
 /**
@@ -4763,13 +4923,13 @@ __decorate$1([
  */
 class TitleSettings extends CommonTitleSettings {
 }
-__decorate$1([
+__decorate([
     Complex({ size: null, fontWeight: null, fontFamily: null }, Font)
 ], TitleSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property('Center')
 ], TitleSettings.prototype, "alignment", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SubTitleSettings)
 ], TitleSettings.prototype, "subtitleSettings", void 0);
 /**
@@ -4777,64 +4937,43 @@ __decorate$1([
  */
 class ZoomSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], ZoomSettings.prototype, "enable", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomSettings.prototype, "enablePanning", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomSettings.prototype, "enableSelectionZooming", void 0);
-__decorate$1([
-    Property('Horizontal')
-], ZoomSettings.prototype, "toolBarOrientation", void 0);
-__decorate$1([
-    Property(null)
-], ZoomSettings.prototype, "color", void 0);
-__decorate$1([
-    Property(null)
-], ZoomSettings.prototype, "highlightColor", void 0);
-__decorate$1([
-    Property(null)
-], ZoomSettings.prototype, "selectionColor", void 0);
-__decorate$1([
-    Property('Far')
-], ZoomSettings.prototype, "horizontalAlignment", void 0);
-__decorate$1([
-    Property('Near')
-], ZoomSettings.prototype, "verticalAlignment", void 0);
-__decorate$1([
-    Property(['ZoomIn', 'ZoomOut', 'Reset'])
-], ZoomSettings.prototype, "toolbars", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomSettings.prototype, "mouseWheelZoom", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], ZoomSettings.prototype, "doubleClickZoom", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomSettings.prototype, "pinchZooming", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], ZoomSettings.prototype, "zoomOnClick", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomSettings.prototype, "zoomFactor", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], ZoomSettings.prototype, "maxZoom", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ZoomSettings.prototype, "minZoom", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], ZoomSettings.prototype, "shouldZoomInitially", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ZoomSettings.prototype, "resetToInitial", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ZoomToolbarSettings)
 ], ZoomSettings.prototype, "toolbarSettings", void 0);
 /**
@@ -4842,19 +4981,19 @@ __decorate$1([
  */
 class ToggleLegendSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], ToggleLegendSettings.prototype, "enable", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], ToggleLegendSettings.prototype, "applyShapeSettings", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ToggleLegendSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ToggleLegendSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: '', width: 0 }, Border)
 ], ToggleLegendSettings.prototype, "border", void 0);
 /**
@@ -4862,94 +5001,94 @@ __decorate$1([
  */
 class LegendSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], LegendSettings.prototype, "useMarkerShape", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], LegendSettings.prototype, "toggleVisibility", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], LegendSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property('transparent')
 ], LegendSettings.prototype, "background", void 0);
-__decorate$1([
+__decorate([
     Property('Layers')
 ], LegendSettings.prototype, "type", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], LegendSettings.prototype, "invertedPointer", void 0);
-__decorate$1([
+__decorate([
     Property('After')
 ], LegendSettings.prototype, "labelPosition", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], LegendSettings.prototype, "labelDisplayMode", void 0);
-__decorate$1([
+__decorate([
     Property('Circle')
 ], LegendSettings.prototype, "shape", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], LegendSettings.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], LegendSettings.prototype, "height", void 0);
-__decorate$1([
+__decorate([
     Complex({ fontFamily: null, fontWeight: null }, Font)
 ], LegendSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property(15)
 ], LegendSettings.prototype, "shapeWidth", void 0);
-__decorate$1([
+__decorate([
     Property(15)
 ], LegendSettings.prototype, "shapeHeight", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], LegendSettings.prototype, "shapePadding", void 0);
-__decorate$1([
-    Complex({ color: '#000000', width: 0 }, Border)
+__decorate([
+    Complex({ color: null, width: 0 }, Border)
 ], LegendSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: '#000000', width: 0 }, Border)
 ], LegendSettings.prototype, "shapeBorder", void 0);
-__decorate$1([
+__decorate([
     Complex({}, CommonTitleSettings)
 ], LegendSettings.prototype, "title", void 0);
-__decorate$1([
+__decorate([
     Complex({ size: null, color: Theme.legendTitleFont.color, fontStyle: Theme.legendTitleFont.fontStyle, fontWeight: null, fontFamily: null }, Font)
 ], LegendSettings.prototype, "titleStyle", void 0);
-__decorate$1([
+__decorate([
     Property('Bottom')
 ], LegendSettings.prototype, "position", void 0);
-__decorate$1([
+__decorate([
     Property('Center')
 ], LegendSettings.prototype, "alignment", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], LegendSettings.prototype, "orientation", void 0);
-__decorate$1([
+__decorate([
     Property({ x: 0, y: 0 })
 ], LegendSettings.prototype, "location", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], LegendSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], LegendSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property('Default')
 ], LegendSettings.prototype, "mode", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], LegendSettings.prototype, "showLegendPath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], LegendSettings.prototype, "valuePath", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], LegendSettings.prototype, "removeDuplicateLegend", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ToggleLegendSettings)
 ], LegendSettings.prototype, "toggleLegendSettings", void 0);
 /**
@@ -4957,40 +5096,40 @@ __decorate$1([
  */
 class DataLabelSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(false)
 ], DataLabelSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Complex({ width: 0, color: 'transparent' }, Border)
 ], DataLabelSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Property('black')
 ], DataLabelSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], DataLabelSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(5)
 ], DataLabelSettings.prototype, "rx", void 0);
-__decorate$1([
+__decorate([
     Property(5)
 ], DataLabelSettings.prototype, "ry", void 0);
-__decorate$1([
+__decorate([
     Complex({ fontWeight: null }, Font)
 ], DataLabelSettings.prototype, "textStyle", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], DataLabelSettings.prototype, "labelPath", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], DataLabelSettings.prototype, "smartLabelMode", void 0);
-__decorate$1([
+__decorate([
     Property('None')
 ], DataLabelSettings.prototype, "intersectionAction", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], DataLabelSettings.prototype, "template", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], DataLabelSettings.prototype, "animationDuration", void 0);
 /**
@@ -4998,40 +5137,40 @@ __decorate$1([
  */
 class ShapeSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], ShapeSettings.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property([])
 ], ShapeSettings.prototype, "palette", void 0);
-__decorate$1([
+__decorate([
     Property(5)
 ], ShapeSettings.prototype, "circleRadius", void 0);
-__decorate$1([
-    Complex({ width: null, color: '#000000' }, Border)
+__decorate([
+    Complex({ width: null, color: null }, Border)
 ], ShapeSettings.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], ShapeSettings.prototype, "dashArray", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], ShapeSettings.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ShapeSettings.prototype, "colorValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ShapeSettings.prototype, "borderColorValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ShapeSettings.prototype, "borderWidthValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], ShapeSettings.prototype, "valuePath", void 0);
-__decorate$1([
+__decorate([
     Collection([], ColorMappingSettings)
 ], ShapeSettings.prototype, "colorMapping", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], ShapeSettings.prototype, "autofill", void 0);
 /**
@@ -5039,82 +5178,82 @@ __decorate$1([
  */
 class MarkerBase extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Complex({ color: 'transparent', width: 1 }, Border)
 ], MarkerBase.prototype, "border", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "dashArray", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], MarkerBase.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property(false)
 ], MarkerBase.prototype, "enableDrag", void 0);
-__decorate$1([
+__decorate([
     Property('#FF471A')
 ], MarkerBase.prototype, "fill", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], MarkerBase.prototype, "height", void 0);
-__decorate$1([
+__decorate([
     Property(10)
 ], MarkerBase.prototype, "width", void 0);
-__decorate$1([
+__decorate([
     Property(1)
 ], MarkerBase.prototype, "opacity", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "colorValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "shapeValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "imageUrlValuePath", void 0);
-__decorate$1([
+__decorate([
     Property('Balloon')
 ], MarkerBase.prototype, "shape", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], MarkerBase.prototype, "legendText", void 0);
-__decorate$1([
+__decorate([
     Property(new Point(0, 0))
 ], MarkerBase.prototype, "offset", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], MarkerBase.prototype, "imageUrl", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "template", void 0);
-__decorate$1([
+__decorate([
     Property([])
 ], MarkerBase.prototype, "dataSource", void 0);
-__decorate$1([
+__decorate([
     Property()
 ], MarkerBase.prototype, "query", void 0);
-__decorate$1([
+__decorate([
     Complex({}, TooltipSettings)
 ], MarkerBase.prototype, "tooltipSettings", void 0);
-__decorate$1([
+__decorate([
     Property(1000)
 ], MarkerBase.prototype, "animationDuration", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], MarkerBase.prototype, "animationDelay", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SelectionSettings)
 ], MarkerBase.prototype, "selectionSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, HighlightSettings)
 ], MarkerBase.prototype, "highlightSettings", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "latitudeValuePath", void 0);
-__decorate$1([
+__decorate([
     Property(null)
 ], MarkerBase.prototype, "longitudeValuePath", void 0);
-__decorate$1([
+__decorate([
     Collection([], InitialMarkerSelectionSettings)
 ], MarkerBase.prototype, "initialMarkerSelection", void 0);
 /**
@@ -5138,82 +5277,70 @@ class LayerSettings extends ChildProperty {
         this.isBaseLayer = false;
     }
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], LayerSettings.prototype, "shapeData", void 0);
-__decorate$1([
+__decorate([
     Property()
 ], LayerSettings.prototype, "query", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ShapeSettings)
 ], LayerSettings.prototype, "shapeSettings", void 0);
-__decorate$1([
+__decorate([
     Property([])
 ], LayerSettings.prototype, "dataSource", void 0);
-__decorate$1([
+__decorate([
     Property('Layer')
 ], LayerSettings.prototype, "type", void 0);
-__decorate$1([
+__decorate([
     Property('Geographic')
 ], LayerSettings.prototype, "geometryType", void 0);
-__decorate$1([
-    Property('Aerial')
-], LayerSettings.prototype, "bingMapType", void 0);
-__decorate$1([
-    Property('RoadMap')
-], LayerSettings.prototype, "staticMapType", void 0);
-__decorate$1([
-    Property('')
-], LayerSettings.prototype, "key", void 0);
-__decorate$1([
-    Property('Geometry')
-], LayerSettings.prototype, "layerType", void 0);
-__decorate$1([
+__decorate([
     Property('')
 ], LayerSettings.prototype, "urlTemplate", void 0);
-__decorate$1([
+__decorate([
     Property(true)
 ], LayerSettings.prototype, "visible", void 0);
-__decorate$1([
+__decorate([
     Property('name')
 ], LayerSettings.prototype, "shapeDataPath", void 0);
-__decorate$1([
+__decorate([
     Property('name')
 ], LayerSettings.prototype, "shapePropertyPath", void 0);
-__decorate$1([
+__decorate([
     Property(0)
 ], LayerSettings.prototype, "animationDuration", void 0);
-__decorate$1([
+__decorate([
     Collection([], MarkerSettings)
 ], LayerSettings.prototype, "markerSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, MarkerClusterSettings)
 ], LayerSettings.prototype, "markerClusterSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, DataLabelSettings)
 ], LayerSettings.prototype, "dataLabelSettings", void 0);
-__decorate$1([
+__decorate([
     Collection([], BubbleSettings)
 ], LayerSettings.prototype, "bubbleSettings", void 0);
-__decorate$1([
+__decorate([
     Collection([], NavigationLineSettings)
 ], LayerSettings.prototype, "navigationLineSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, PolygonSettings)
 ], LayerSettings.prototype, "polygonSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, TooltipSettings)
 ], LayerSettings.prototype, "tooltipSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, SelectionSettings)
 ], LayerSettings.prototype, "selectionSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, HighlightSettings)
 ], LayerSettings.prototype, "highlightSettings", void 0);
-__decorate$1([
+__decorate([
     Complex({}, ToggleLegendSettings)
 ], LayerSettings.prototype, "toggleLegendSettings", void 0);
-__decorate$1([
+__decorate([
     Collection([], InitialShapeSelectionSettings)
 ], LayerSettings.prototype, "initialShapeSelection", void 0);
 /**
@@ -5235,10 +5362,10 @@ class Tile {
  */
 class MapsAreaSettings extends ChildProperty {
 }
-__decorate$1([
+__decorate([
     Property(null)
 ], MapsAreaSettings.prototype, "background", void 0);
-__decorate$1([
+__decorate([
     Complex({ color: 'transparent', width: 1 }, Border)
 ], MapsAreaSettings.prototype, "border", void 0);
 
@@ -5763,19 +5890,10 @@ class LayerPanel {
             id: this.mapObject.element.id + '_Layer_Collections',
             'clip-path': 'url(#' + this.mapObject.element.id + '_MapArea_ClipRect)'
         }));
-        if (this.mapObject.layers[this.mapObject.baseLayerIndex].layerType === 'GoogleStaticMap') {
-            const staticMapSize = 640;
-            this.clipRectElement = this.mapObject.renderer.drawClipPath(new RectOption(this.mapObject.element.id + '_MapArea_ClipRect', 'transparent', { width: 1, color: 'Gray' }, 1, {
-                x: ((areaRect.width - staticMapSize) / 2), y: 0,
-                width: staticMapSize, height: areaRect.height
-            }));
-        }
-        else {
-            this.clipRectElement = this.mapObject.renderer.drawClipPath(new RectOption(this.mapObject.element.id + '_MapArea_ClipRect', 'transparent', { width: 1, color: 'Gray' }, 1, {
-                x: this.mapObject.isTileMap ? 0 : areaRect.x, y: this.mapObject.isTileMap ? 0 : areaRect.y,
-                width: areaRect.width, height: areaRect.height
-            }));
-        }
+        this.clipRectElement = this.mapObject.renderer.drawClipPath(new RectOption(this.mapObject.element.id + '_MapArea_ClipRect', 'transparent', { width: 1, color: 'Gray' }, 1, {
+            x: this.mapObject.isTileMap ? 0 : areaRect.x, y: this.mapObject.isTileMap ? 0 : areaRect.y,
+            width: areaRect.width, height: areaRect.height
+        }));
         this.layerGroup.appendChild(this.clipRectElement);
         this.mapObject.baseMapBounds = null;
         this.mapObject.baseMapRectBounds = null;
@@ -5909,8 +6027,7 @@ class LayerPanel {
             && this.mapObject.availableSize.height > 512) {
             this.mapObject.applyZoomReset = true;
             this.mapObject.initialZoomLevel = Math.floor(this.mapObject.availableSize.height / 512);
-            const padding = this.mapObject.layers[this.mapObject.baseLayerIndex].layerType !== 'GoogleStaticMap' ?
-                20 : 0;
+            const padding = 20;
             const totalSize = Math.pow(2, this.mapObject.initialZoomLevel) * 256;
             if (!isNullOrUndefined(this.mapObject.initialTileTranslate)) {
                 this.mapObject.initialTileTranslate.x = (this.mapObject.availableSize.width / 2) - (totalSize / 2);
@@ -5967,55 +6084,13 @@ class LayerPanel {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         this.mapObject.trigger('layerRendering', eventArgs, (observedArgs) => {
             if (!eventArgs.cancel && eventArgs.visible) {
-                if (layer.layerType === 'OSM') {
-                    layer.urlTemplate = 'https://a.tile.openstreetmap.org/level/tileX/tileY.png';
-                }
-                if (layer.layerType === 'Google') {
-                    layer.urlTemplate = 'https://mt1.google.com/vt/lyrs=m@129&hl=en&x=tileX&y=tileY&z=level';
-                }
-                if (layer.layerType !== 'Geometry' || (isNullOrUndefined(layer.shapeData) && !isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate !== '')) {
-                    if (layer.layerType !== 'Bing' || this.bing) {
-                        if (!isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate.indexOf('quadkey') > -1) {
-                            const bing = new BingMap(this.mapObject);
-                            this.bingMapCalculation(layer, layerIndex, this, bing);
-                        }
-                        else {
-                            this.renderTileLayer(this, layer, layerIndex);
-                        }
-                    }
-                    else if (layer.key && layer.key.length > 1) {
-                        // eslint-disable-next-line @typescript-eslint/no-this-alias
-                        const proxy = this;
+                if ((isNullOrUndefined(layer.shapeData) && !isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate !== '')) {
+                    if (!isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate.indexOf('quadkey') > -1) {
                         const bing = new BingMap(this.mapObject);
-                        const bingType = layer.bingMapType === 'AerialWithLabel' ? 'AerialWithLabelsOnDemand' : layer.bingMapType;
-                        const url = 'https://dev.virtualearth.net/REST/V1/Imagery/Metadata/' + bingType;
-                        const ajax = new Fetch({
-                            url: url + '?output=json&include=ImageryProviders&urischeme=https&key=' + layer.key
-                        });
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        ajax.onSuccess = (json) => {
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            const resource = json['resourceSets'][0]['resources'][0];
-                            const imageUrl = resource['imageUrl'];
-                            const subDomains = resource['imageUrlSubdomains'];
-                            const maxZoom = resource['zoomMax'];
-                            if (imageUrl !== null && imageUrl !== undefined && imageUrl !== bing.imageUrl) {
-                                bing.imageUrl = imageUrl;
-                            }
-                            if (subDomains !== null && subDomains !== undefined && subDomains !== bing.subDomains) {
-                                bing.subDomains = subDomains;
-                            }
-                            if (maxZoom !== null && maxZoom !== undefined && maxZoom !== bing.maxZoom) {
-                                bing.maxZoom = maxZoom;
-                            }
-                            proxy.mapObject['bingMap'] = bing;
-                            proxy.renderTileLayer(proxy, layer, layerIndex, bing);
-                            this.mapObject.arrangeTemplate();
-                            if (this.mapObject.zoomModule && (this.mapObject.previousScale !== this.mapObject.scale)) {
-                                this.mapObject.zoomModule.applyTransform(this.mapObject, true);
-                            }
-                        };
-                        ajax.send();
+                        this.bingMapCalculation(layer, layerIndex, this, bing);
+                    }
+                    else {
+                        this.renderTileLayer(this, layer, layerIndex);
                     }
                 }
                 else {
@@ -6122,7 +6197,7 @@ class LayerPanel {
             for (let i = 0; i < this.currentLayer.layerData.length; i++) {
                 let k;
                 const borderValue = {
-                    color: shapeSettings.border.color,
+                    color: shapeSettings.border.color || this.mapObject.themeStyle.shapeBorderColor,
                     width: shapeSettings.border.width,
                     opacity: shapeSettings.border.opacity
                 };
@@ -6154,9 +6229,9 @@ class LayerPanel {
                 }
                 const shapeID = this.mapObject.element.id + '_LayerIndex_' + layerIndex + '_shapeIndex_' + i + '_dataIndex_' + k;
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const getShapeColor$$1 = this.getShapeColorMapping(this.currentLayer, currentShapeData['property'], fill);
-                fill = Object.prototype.toString.call(getShapeColor$$1) === '[object Object]' && !isNullOrUndefined(getShapeColor$$1['fill'])
-                    ? getShapeColor$$1['fill'] : fill;
+                const getShapeColor = this.getShapeColorMapping(this.currentLayer, currentShapeData['property'], fill);
+                fill = Object.prototype.toString.call(getShapeColor) === '[object Object]' && !isNullOrUndefined(getShapeColor['fill'])
+                    ? getShapeColor['fill'] : fill;
                 if (this.currentLayer.shapeSettings.borderColorValuePath || this.currentLayer.shapeSettings.borderWidthValuePath) {
                     k = checkShapeDataFields(
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -6170,8 +6245,8 @@ class LayerPanel {
                         }
                     }
                 }
-                const opacity = (Object.prototype.toString.call(getShapeColor$$1) === '[object Object]'
-                    && !isNullOrUndefined(getShapeColor$$1['opacity'])) ? getShapeColor$$1['opacity'] : shapeSettings.opacity;
+                const opacity = (Object.prototype.toString.call(getShapeColor) === '[object Object]'
+                    && !isNullOrUndefined(getShapeColor['opacity'])) ? getShapeColor['opacity'] : shapeSettings.opacity;
                 const eventArgs = {
                     cancel: false, name: shapeRendering, index: i,
                     data: this.currentLayer.dataSource ? this.currentLayer.dataSource[k] : null,
@@ -6187,21 +6262,20 @@ class LayerPanel {
                     if (!eventArgs.cancel) {
                         eventArgs.fill = eventArgs.fill === '#A6A6A6' ? eventArgs.shape.fill ||
                             this.mapObject.themeStyle.shapeFill : eventArgs.fill;
-                        eventArgs.border.color = eventArgs.border.color === '#000000' ?
+                        eventArgs.border.color = eventArgs.border.color === 'transparent' ?
                             eventArgs.shape.border.color : eventArgs.border.color;
                         eventArgs.border.width = eventArgs.border.width === 0 ? eventArgs.shape.border.width : eventArgs.border.width;
                         if (isNullOrUndefined(shapeSettings.borderColorValuePath)) {
-                            this.mapObject.layers[layerIndex].shapeSettings.border.color = eventArgs.border.color;
+                            borderValue.color = eventArgs.border.color;
                         }
                         if (isNullOrUndefined(shapeSettings.borderWidthValuePath)) {
-                            this.mapObject.layers[layerIndex].shapeSettings.border.width = eventArgs.border.width;
+                            borderValue.width = eventArgs.border.width;
                         }
                     }
                     else {
                         eventArgs.fill = fill;
-                        eventArgs.border.color = shapeSettings.border.color;
+                        eventArgs.border.color = shapeSettings.border.color || this.mapObject.themeStyle.shapeBorderColor;
                         eventArgs.border.width = shapeSettings.border.width;
-                        this.mapObject.layers[layerIndex].shapeSettings.border = shapeSettings.border;
                     }
                     eventArgs.border.opacity = isNullOrUndefined(eventArgs.border.opacity) ? opacity : eventArgs.border.opacity;
                     if (this.groupElements.length < 1) {
@@ -6393,10 +6467,12 @@ class LayerPanel {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const bubbleDataSource = bubble.dataSource;
                 this.mapObject.bubbleModule.bubbleCollection = [];
-                bubbleDataSource.map((bubbleData, i) => {
-                    this.renderBubble(this.currentLayer, bubbleData, colors[i % colors.length], range, j, i, bubbleG, layerIndex, bubble);
-                });
-                this.groupElements.push(bubbleG);
+                if (!isNullOrUndefined(bubbleDataSource) && bubbleDataSource.length > 0) {
+                    bubbleDataSource.map((bubbleData, i) => {
+                        this.renderBubble(this.currentLayer, bubbleData, colors[i % colors.length], range, j, i, bubbleG, layerIndex, bubble);
+                    });
+                    this.groupElements.push(bubbleG);
+                }
             }
         }
         if ((this.mapObject.markerModule && !this.mapObject.isTileMap) && this.mapObject.zoomSettings.enable) {
@@ -6418,9 +6494,13 @@ class LayerPanel {
         if (this.mapObject.navigationLineModule) {
             this.groupElements.push(this.mapObject.navigationLineModule.renderNavigation(this.currentLayer, this.currentFactor, layerIndex));
         }
-        this.groupElements.map((element) => {
-            this.layerObject.appendChild(element);
-        });
+        if (!isNullOrUndefined(this.groupElements) && !isNullOrUndefined(this.layerObject)) {
+            this.groupElements.map((element) => {
+                if (!isNullOrUndefined(element)) {
+                    this.layerObject.appendChild(element);
+                }
+            });
+        }
         if (this.mapObject.markerModule) {
             this.mapObject.markerModule.markerRender(this.mapObject, this.layerObject, layerIndex, (this.mapObject.isTileMap ? Math.floor(this.currentFactor) :
                 this.currentFactor), null);
@@ -6509,9 +6589,9 @@ class LayerPanel {
             return color;
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const index = checkShapeDataFields(layer.dataSource, shape, layer.shapeDataPath, layer.shapePropertyPath, layer);
+        const index = checkShapeDataFields(layer.dataSource, shape, layer.shapeDataPath, layer.shapePropertyPath);
         const colorMapping = new ColorMapping(this.mapObject);
-        if (isNullOrUndefined(layer.dataSource[index])) {
+        if (isNullOrUndefined(layer.dataSource) || isNullOrUndefined(layer.dataSource[index])) {
             return color;
         }
         return colorMapping.getShapeColorMapping(layer.shapeSettings, layer.dataSource[index], color);
@@ -6689,15 +6769,15 @@ class LayerPanel {
         if (!isNullOrUndefined(this.mapObject.baseMapRectBounds)) {
             const duration = animationMode === 'Disable' ? 0 : (this.currentLayer.animationDuration === 0 && animationMode === 'Enable') ?
                 1000 : this.currentLayer.animationDuration;
-            const animate$$1 = duration !== 0 || isNullOrUndefined(this.mapObject.zoomModule);
+            const animate = duration !== 0 || isNullOrUndefined(this.mapObject.zoomModule);
             this.mapObject.baseTranslatePoint = this.mapObject.zoomTranslatePoint;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let translate;
             if (this.mapObject.zoomSettings.zoomFactor > 1 && !isNullOrUndefined(this.mapObject.zoomModule)) {
-                translate = getZoomTranslate(this.mapObject, this.currentLayer, animate$$1);
+                translate = getZoomTranslate(this.mapObject, this.currentLayer, animate);
             }
             else {
-                translate = getTranslate(this.mapObject, this.currentLayer, animate$$1);
+                translate = getTranslate(this.mapObject, this.currentLayer, animate);
             }
             const scale = this.mapObject.previousScale = translate['scale'];
             const location = this.mapObject.previousPoint = translate['location'];
@@ -6888,9 +6968,8 @@ class LayerPanel {
                         const tile = new Tile(tileI % ycount, j);
                         tile.left = Math.round(x);
                         tile.top = Math.round(y);
-                        if (baseLayer.layerType === 'Bing' || (bing && !isNullOrUndefined(baseLayer.urlTemplate) && baseLayer.urlTemplate !== '')) {
-                            const key = baseLayer.key;
-                            tile.src = bing.getBingMap(tile, key, baseLayer.bingMapType, userLang, bing.imageUrl, bing.subDomains);
+                        if ((bing && !isNullOrUndefined(baseLayer.urlTemplate) && baseLayer.urlTemplate !== '')) {
+                            tile.src = bing.getBingMap(tile, '', '', userLang, bing.imageUrl, bing.subDomains);
                         }
                         else {
                             tile.src = this.urlTemplate.replace('level', zoomLevel.toString()).replace('tileX', tile.x.toString())
@@ -6916,13 +6995,12 @@ class LayerPanel {
             if (!(layer.type === 'SubLayer' && layer.visible)) {
                 continue;
             }
-            if ((layer.layerType !== 'Geometry' && layer.layerType !== 'GoogleStaticMap') || (layer.layerType === 'Geometry' &&
-                isNullOrUndefined(layer.shapeData) && !isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate !== '')) {
+            if (isNullOrUndefined(layer.shapeData) && !isNullOrUndefined(layer.urlTemplate) && layer.urlTemplate !== '') {
                 for (const baseTile of proxTiles) {
                     const subtile = extend({}, baseTile, {}, true);
-                    if (layer.layerType === 'Bing') {
+                    if (layer.urlTemplate.indexOf('quadkey')) {
                         bing = new BingMap(this.mapObject);
-                        subtile.src = bing.getBingMap(subtile, layer.key, layer.bingMapType, userLang, bing.imageUrl, bing.subDomains);
+                        subtile.src = bing.getBingMap(subtile, '', '', userLang, bing.imageUrl, bing.subDomains);
                     }
                     else {
                         subtile.src = layer.urlTemplate.replace('level', zoomLevel.toString()).replace('tileX', baseTile.x.toString())
@@ -6949,111 +7027,106 @@ class LayerPanel {
         else {
             timeOut = 0;
         }
-        if (this.mapObject.layers[this.mapObject.baseLayerIndex].layerType === 'GoogleStaticMap') {
-            this.renderGoogleMap(this.mapObject.layers[0].key, this.mapObject.staticMapZoom);
-        }
-        else {
-            setTimeout(() => {
-                if (element) {
-                    element.style.zIndex = '1';
-                }
-                if (element1) {
-                    element1.style.zIndex = '0';
-                }
-                let animateElement;
-                if (!document.getElementById(this.mapObject.element.id + '_animated_tiles') && element) {
+        setTimeout(() => {
+            if (element) {
+                element.style.zIndex = '1';
+            }
+            if (element1) {
+                element1.style.zIndex = '0';
+            }
+            let animateElement;
+            if (!document.getElementById(this.mapObject.element.id + '_animated_tiles') && element) {
+                animateElement = createElement('div', { id: this.mapObject.element.id + '_animated_tiles' });
+                element.appendChild(animateElement);
+            }
+            else {
+                if (type !== 'Pan' && element1 && element) {
+                    element1.appendChild(element.children[0]);
+                    if (!this.mapObject.isAddLayer && !isNullOrUndefined(document.getElementById(this.mapObject.element.id + '_animated_tiles'))) {
+                        document.getElementById(this.mapObject.element.id + '_animated_tiles').id =
+                            this.mapObject.element.id + '_animated_tiles_old';
+                    }
                     animateElement = createElement('div', { id: this.mapObject.element.id + '_animated_tiles' });
                     element.appendChild(animateElement);
                 }
                 else {
-                    if (type !== 'Pan' && element1 && element) {
-                        element1.appendChild(element.children[0]);
-                        if (!this.mapObject.isAddLayer && !isNullOrUndefined(document.getElementById(this.mapObject.element.id + '_animated_tiles'))) {
-                            document.getElementById(this.mapObject.element.id + '_animated_tiles').id =
-                                this.mapObject.element.id + '_animated_tiles_old';
-                        }
-                        animateElement = createElement('div', { id: this.mapObject.element.id + '_animated_tiles' });
-                        element.appendChild(animateElement);
+                    animateElement = element ? element.children[0] : null;
+                }
+            }
+            for (let id = 0; id < this.tiles.length; id++) {
+                const tile = this.tiles[id];
+                let imgElement = null;
+                const mapId = this.mapObject.element.id;
+                if (type === 'Pan') {
+                    let child = document.getElementById(mapId + '_tile_' + id);
+                    let isNewTile = false;
+                    if (isNullOrUndefined(child)) {
+                        isNewTile = true;
+                        child = createElement('div', { id: mapId + '_tile_' + id });
+                        imgElement = createElement('img');
                     }
                     else {
-                        animateElement = element ? element.children[0] : null;
+                        child.style.removeProperty('display');
+                        imgElement = child.children[0];
                     }
-                }
-                for (let id = 0; id < this.tiles.length; id++) {
-                    const tile = this.tiles[id];
-                    let imgElement = null;
-                    const mapId = this.mapObject.element.id;
-                    if (type === 'Pan') {
-                        let child = document.getElementById(mapId + '_tile_' + id);
-                        let isNewTile = false;
-                        if (isNullOrUndefined(child)) {
-                            isNewTile = true;
-                            child = createElement('div', { id: mapId + '_tile_' + id });
-                            imgElement = createElement('img');
-                        }
-                        else {
-                            child.style.removeProperty('display');
-                            imgElement = child.children[0];
-                        }
-                        if (!isNewTile && imgElement && imgElement.src !== tile.src) {
-                            imgElement.src = tile.src;
-                        }
-                        child.style.position = 'absolute';
-                        child.style.left = tile.left + 'px';
-                        child.style.top = tile.top + 'px';
-                        child.style.height = tile.height + 'px';
-                        child.style.width = tile.width + 'px';
-                        if (isNewTile) {
-                            imgElement.setAttribute('height', '256px');
-                            imgElement.setAttribute('width', '256px');
-                            imgElement.setAttribute('src', tile.src);
-                            imgElement.setAttribute('alt', this.mapObject.getLocalizedLabel('ImageNotFound'));
-                            imgElement.style.setProperty('user-select', 'none');
-                            child.appendChild(imgElement);
-                            animateElement.appendChild(child);
-                        }
+                    if (!isNewTile && imgElement && imgElement.src !== tile.src) {
+                        imgElement.src = tile.src;
                     }
-                    else {
-                        imgElement = createElement('img');
+                    child.style.position = 'absolute';
+                    child.style.left = tile.left + 'px';
+                    child.style.top = tile.top + 'px';
+                    child.style.height = tile.height + 'px';
+                    child.style.width = tile.width + 'px';
+                    if (isNewTile) {
                         imgElement.setAttribute('height', '256px');
                         imgElement.setAttribute('width', '256px');
                         imgElement.setAttribute('src', tile.src);
-                        imgElement.style.setProperty('user-select', 'none');
                         imgElement.setAttribute('alt', this.mapObject.getLocalizedLabel('ImageNotFound'));
-                        const child = createElement('div', { id: mapId + '_tile_' + id });
-                        child.style.position = 'absolute';
-                        child.style.left = tile.left + 'px';
-                        child.style.top = tile.top + 'px';
-                        child.style.height = tile.height + 'px';
-                        child.style.width = tile.width + 'px';
+                        imgElement.style.setProperty('user-select', 'none');
                         child.appendChild(imgElement);
-                        if (animateElement) {
-                            animateElement.appendChild(child);
-                        }
+                        animateElement.appendChild(child);
                     }
-                    if (id === (this.tiles.length - 1) && document.getElementById(this.mapObject.element.id + '_animated_tiles_old')) {
-                        removeElement(this.mapObject.element.id + '_animated_tiles_old');
+                }
+                else {
+                    imgElement = createElement('img');
+                    imgElement.setAttribute('height', '256px');
+                    imgElement.setAttribute('width', '256px');
+                    imgElement.setAttribute('src', tile.src);
+                    imgElement.style.setProperty('user-select', 'none');
+                    imgElement.setAttribute('alt', this.mapObject.getLocalizedLabel('ImageNotFound'));
+                    const child = createElement('div', { id: mapId + '_tile_' + id });
+                    child.style.position = 'absolute';
+                    child.style.left = tile.left + 'px';
+                    child.style.top = tile.top + 'px';
+                    child.style.height = tile.height + 'px';
+                    child.style.width = tile.width + 'px';
+                    child.appendChild(imgElement);
+                    if (animateElement) {
+                        animateElement.appendChild(child);
                     }
                 }
-                if (!isNullOrUndefined(this.mapObject.currentTiles)) {
-                    for (let l = this.tiles.length; l < animateElement.childElementCount; l++) {
-                        let isExistingElement = false;
-                        for (let a = 0; a < this.mapObject.currentTiles.childElementCount; a++) {
-                            if (!isExistingElement &&
-                                this.mapObject.currentTiles.children[a].id === animateElement.children[l].id) {
-                                isExistingElement = true;
-                            }
-                        }
-                        if (isExistingElement) {
-                            animateElement.children[l].style.display = 'none';
-                        }
-                        else {
-                            animateElement.removeChild(animateElement.children[l]);
+                if (id === (this.tiles.length - 1) && document.getElementById(this.mapObject.element.id + '_animated_tiles_old')) {
+                    removeElement(this.mapObject.element.id + '_animated_tiles_old');
+                }
+            }
+            if (!isNullOrUndefined(this.mapObject.currentTiles)) {
+                for (let l = this.tiles.length; l < animateElement.childElementCount; l++) {
+                    let isExistingElement = false;
+                    for (let a = 0; a < this.mapObject.currentTiles.childElementCount; a++) {
+                        if (!isExistingElement &&
+                            this.mapObject.currentTiles.children[a].id === animateElement.children[l].id) {
+                            isExistingElement = true;
                         }
                     }
+                    if (isExistingElement) {
+                        animateElement.children[l].style.display = 'none';
+                    }
+                    else {
+                        animateElement.removeChild(animateElement.children[l]);
+                    }
                 }
-            }, timeOut);
-        }
+            }
+        }, timeOut);
     }
     /**
      * Animation for tile layers and hide the group element until the tile layer rendering.
@@ -7128,7 +7201,7 @@ class LayerPanel {
         const eleWidth = mapWidth > 640 ? (mapWidth - 640) / 2 : 0;
         const eleHeight = mapHeight > 640 ? (mapHeight - 640) / 2 : 0;
         let center;
-        const mapType = (map.layers[map.layers.length - 1].staticMapType).toString().toLowerCase();
+        const mapType = 'roadmap';
         if (map.centerPosition.latitude && map.centerPosition.longitude) {
             center = map.centerPosition.latitude.toString() + ',' + map.centerPosition.longitude.toString();
         }
@@ -7154,8 +7227,7 @@ class LayerPanel {
             this.mapObject.tileZoomLevel = this.mapObject.tileZoomScale;
         }
         const level = this.mapObject.tileZoomLevel;
-        let padding = this.mapObject.layers[this.mapObject.layers.length - 1].layerType !== 'GoogleStaticMap' ?
-            20 : 0;
+        let padding = 20;
         let x;
         let y;
         const totalSize = Math.pow(2, level) * 256;
@@ -7342,15 +7414,12 @@ class Annotations {
     }
 }
 
-var __decorate = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
+var __decorate$1 = (undefined && undefined.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-/**
- * Maps Component file
- */
 /**
  * Represents the maps control. It is ideal for rendering maps from GeoJSON data or other map providers like OpenStreetMap, Google Maps, Bing Maps, etc that
  * has rich feature set that includes markers, labels, bubbles and much more.
@@ -7631,7 +7700,7 @@ let Maps = class Maps extends Component {
                     }
                 }
             }
-            if (layer.dataSource instanceof MapAjax || !isNullOrUndefined(layer.dataSource['dataOptions'])) {
+            if (layer.dataSource instanceof MapAjax || (!isNullOrUndefined(layer.dataSource) && !isNullOrUndefined(layer.dataSource['dataOptions']))) {
                 this.processAjaxRequest(layer, layer.dataSource, 'DataSource');
             }
             if (this.serverProcess['request'] === this.serverProcess['response'] && length === layerIndex) {
@@ -8069,8 +8138,7 @@ let Maps = class Maps extends Component {
     createTile() {
         const mainLayer = this.layersCollection[0];
         const padding = 0;
-        if (mainLayer.isBaseLayer && (mainLayer.layerType === 'OSM' || mainLayer.layerType === 'Bing' ||
-            mainLayer.layerType === 'GoogleStaticMap' || mainLayer.layerType === 'Google' || (!isNullOrUndefined(mainLayer.urlTemplate) && mainLayer.urlTemplate !== ''))) {
+        if (mainLayer.isBaseLayer && (!isNullOrUndefined(mainLayer.urlTemplate) && mainLayer.urlTemplate !== '' && isNullOrUndefined(mainLayer.shapeData))) {
             removeElement(this.element.id + '_tile_parent');
             removeElement(this.element.id + '_tiles');
             removeElement('animated_tiles');
@@ -8120,7 +8188,7 @@ let Maps = class Maps extends Component {
             const baseLayer = mainLayers[i];
             if (baseLayer.visible && baseIndex === i) {
                 baseLayer.isBaseLayer = true;
-                this.isTileMap = (baseLayer.layerType === 'Geometry' && !isNullOrUndefined(baseLayer.shapeData)) ? false : true;
+                this.isTileMap = !isNullOrUndefined(baseLayer.shapeData) ? false : true;
                 this.layersCollection.push(baseLayer);
                 break;
             }
@@ -8488,11 +8556,11 @@ let Maps = class Maps extends Component {
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    getMarkerClickLocation(pageX, pageY, x, y, marker$$1, isDragEnd) {
+    getMarkerClickLocation(pageX, pageY, x, y, marker, isDragEnd) {
         document.getElementById(this.element.id + '_svg').style.cursor = 'grabbing';
-        const targetElement = getElement(marker$$1.targetId);
-        let latLongValue = this.getClickLocation(marker$$1.targetId, pageX, pageY, targetElement, x, y);
-        const location = (this.isTileMap) ? convertTileLatLongToPoint(new MapLocation(latLongValue.longitude, latLongValue.latitude), this.tileZoomLevel, this.tileTranslatePoint, true) : convertGeoToPoint(latLongValue.latitude, latLongValue.longitude, this.mapLayerPanel.currentFactor, this.layersCollection[marker$$1.layerIndex], this);
+        const targetElement = getElement(marker.targetId);
+        let latLongValue = this.getClickLocation(marker.targetId, pageX, pageY, targetElement, x, y);
+        const location = (this.isTileMap) ? convertTileLatLongToPoint(new MapLocation(latLongValue.longitude, latLongValue.latitude), this.tileZoomLevel, this.tileTranslatePoint, true) : convertGeoToPoint(latLongValue.latitude, latLongValue.longitude, this.mapLayerPanel.currentFactor, this.layersCollection[marker.layerIndex], this);
         const transPoint = this.translatePoint;
         const translateX = (this.isTileMap ? location.x : (location.x + transPoint.x) * this.scale);
         const translateY = (this.isTileMap ? location.y : (location.y + transPoint.y) * this.scale);
@@ -8503,8 +8571,8 @@ let Maps = class Maps extends Component {
             targetElement.parentElement.setAttribute('transform', 'translate( ' + translateX + ' ' + translateY + ' )');
         }
         if (isDragEnd) {
-            const markerSettings = this.layers[marker$$1.layerIndex].markerSettings[marker$$1.markerIndex];
-            latLongValue = this.getClickLocation(marker$$1.targetId, (pageX - markerSettings.offset.x), (pageY - markerSettings.offset.y), targetElement, (x - markerSettings.offset.x), (y - markerSettings.offset.y));
+            const markerSettings = this.layers[marker.layerIndex].markerSettings[marker.markerIndex];
+            latLongValue = this.getClickLocation(marker.targetId, (pageX - markerSettings.offset.x), (pageY - markerSettings.offset.y), targetElement, (x - markerSettings.offset.x), (y - markerSettings.offset.y));
         }
         return latLongValue;
     }
@@ -8653,32 +8721,32 @@ let Maps = class Maps extends Component {
         }
         if (!isNullOrUndefined(this.markerDragArgument)) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const marker$$1 = this.markerDragArgument;
+            const marker = this.markerDragArgument;
             this.mouseClickEvent['x'] = this.mouseDownEvent['x'];
             this.mouseClickEvent['y'] = this.mouseDownEvent['y'];
             const latLongValue = this.getMarkerClickLocation(pageX, pageY, layerX, layerY, this.markerDragArgument, true);
-            const markerObject = this.layers[marker$$1.layerIndex].markerSettings[marker$$1.markerIndex];
+            const markerObject = this.layers[marker.layerIndex].markerSettings[marker.markerIndex];
             document.getElementById(this.element.id + '_svg').style.cursor = markerObject.enableDrag ? 'pointer' : 'grabbing';
             const dragEventArgs = {
                 name: 'markerDragEnd', x: pageX, y: pageY,
                 latitude: latLongValue.latitude, longitude: latLongValue.longitude,
-                layerIndex: marker$$1.layerIndex, markerIndex: marker$$1.markerIndex,
-                dataIndex: marker$$1.dataIndex
+                layerIndex: marker.layerIndex, markerIndex: marker.markerIndex,
+                dataIndex: marker.dataIndex
             };
             if (isNullOrUndefined(markerObject.latitudeValuePath) && isNullOrUndefined(markerObject.longitudeValuePath)) {
-                const data = markerObject.dataSource[marker$$1.dataIndex];
+                const data = markerObject.dataSource[marker.dataIndex];
                 if (!isNullOrUndefined(data['Longitude']) && !isNullOrUndefined(data['Latitude'])) {
-                    markerObject.dataSource[marker$$1.dataIndex].Latitude = dragEventArgs.latitude;
-                    markerObject.dataSource[marker$$1.dataIndex].Longitude = dragEventArgs.longitude;
+                    markerObject.dataSource[marker.dataIndex].Latitude = dragEventArgs.latitude;
+                    markerObject.dataSource[marker.dataIndex].Longitude = dragEventArgs.longitude;
                 }
                 else {
-                    markerObject.dataSource[marker$$1.dataIndex].latitude = dragEventArgs.latitude;
-                    markerObject.dataSource[marker$$1.dataIndex].longitude = dragEventArgs.longitude;
+                    markerObject.dataSource[marker.dataIndex].latitude = dragEventArgs.latitude;
+                    markerObject.dataSource[marker.dataIndex].longitude = dragEventArgs.longitude;
                 }
             }
             else {
-                markerObject.dataSource[marker$$1.dataIndex][markerObject.latitudeValuePath] = dragEventArgs.latitude;
-                markerObject.dataSource[marker$$1.dataIndex][markerObject.longitudeValuePath] = dragEventArgs.longitude;
+                markerObject.dataSource[marker.dataIndex][markerObject.latitudeValuePath] = dragEventArgs.latitude;
+                markerObject.dataSource[marker.dataIndex][markerObject.longitudeValuePath] = dragEventArgs.longitude;
             }
             this.markerDragId = '';
             this.markerDragArgument = null;
@@ -8865,10 +8933,10 @@ let Maps = class Maps extends Component {
         }
         if (!isNullOrUndefined(this.markerDragArgument)) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const marker$$1 = this.markerDragArgument;
+            const marker = this.markerDragArgument;
             this.mouseClickEvent['x'] = this.mouseDownEvent['x'];
             this.mouseClickEvent['y'] = this.mouseDownEvent['y'];
-            this.getMarkerClickLocation(pageX, pageY, layerX, layerY, marker$$1, false);
+            this.getMarkerClickLocation(pageX, pageY, layerX, layerY, marker, false);
         }
         if (this.zoomModule) {
             this.zoomModule.removeToolbarOpacity(this.isTileMap ? Math.round(this.tileZoomLevel) : this.scale, e.target.id);
@@ -9402,7 +9470,6 @@ let Maps = class Maps extends Component {
             let render = false;
             let isMarker = false;
             let isLayer = false;
-            let isStaticMapType = false;
             for (const prop of Object.keys(newProp)) {
                 switch (prop) {
                     case 'background':
@@ -9422,17 +9489,13 @@ let Maps = class Maps extends Component {
                                 if (!isNullOrUndefined(newProp.layers[x])) {
                                     const collection = Object.keys(newProp.layers[x]);
                                     for (const collectionProp of collection) {
-                                        if ((collectionProp === 'layerType' && newProp.layers[x].layerType !== 'Geometry') ||
-                                            (isNullOrUndefined(this.layers[x].shapeData)
-                                                && !isNullOrUndefined(this.layers[x].urlTemplate) && this.layers[x].urlTemplate !== '')) {
+                                        if ((isNullOrUndefined(this.layers[x].shapeData)
+                                            && !isNullOrUndefined(this.layers[x].urlTemplate) && this.layers[x].urlTemplate !== '')) {
                                             this.isReset = true;
                                         }
                                         else if (collectionProp === 'markerSettings') {
                                             isMarker = true;
                                         }
-                                        else if (collectionProp === 'staticMapType') {
-                                            isStaticMapType = true;
-                                        }
                                     }
                                 }
                             }
@@ -9476,9 +9539,6 @@ let Maps = class Maps extends Component {
                         this.render();
                     }
                 }
-                else if (newProp.layers && isStaticMapType) {
-                    this.mapLayerPanel.renderGoogleMap(this.layers[this.layers.length - 1].key, this.staticMapZoom);
-                }
                 else {
                     this.createSVG();
                     this.renderElements();
@@ -9792,17 +9852,17 @@ let Maps = class Maps extends Component {
                     }
                 }
                 for (const polygon of polygonSetting.polygons) {
-                    if (polygon.points.length > 0) {
+                    if (!isNullOrUndefined(polygon.points) && polygon.points.length > 0) {
                         isSelection = layer.polygonSettings.highlightSettings.enable || isSelection;
                         isHighlight = layer.polygonSettings.selectionSettings.enable || isHighlight;
                         istooltipVisible = layer.polygonSettings.tooltipSettings.visible || istooltipVisible;
                     }
                 }
-                for (const marker$$1 of markers) {
-                    if (marker$$1.visible) {
-                        istooltipVisible = marker$$1.tooltipSettings.visible || istooltipVisible;
-                        isSelection = marker$$1.selectionSettings.enable || isSelection;
-                        isHighlight = marker$$1.highlightSettings.enable || isHighlight;
+                for (const marker of markers) {
+                    if (marker.visible) {
+                        istooltipVisible = marker.tooltipSettings.visible || istooltipVisible;
+                        isSelection = marker.selectionSettings.enable || isSelection;
+                        isHighlight = marker.highlightSettings.enable || isHighlight;
                     }
                     if (istooltipVisible) {
                         break;
@@ -9899,7 +9959,7 @@ let Maps = class Maps extends Component {
         let latitude = 0;
         let longitude = 0;
         if (!this.isDestroyed && !isNullOrUndefined(this.translatePoint)) {
-            const padding = this.layers[this.layers.length - 1].layerType === 'GoogleStaticMap' ? 0 : 10;
+            const padding = 10;
             pageY = pageY + padding;
             const mapSize = 256 * Math.pow(2, this.tileZoomLevel);
             const x1 = (this.clip(pageX - (this.translatePoint.x * this.scale), 0, mapSize - 1) / mapSize) - 0.5;
@@ -9910,181 +9970,181 @@ let Maps = class Maps extends Component {
         return { latitude: latitude, longitude: longitude };
     }
 };
-__decorate([
+__decorate$1([
     Property(null)
 ], Maps.prototype, "background", void 0);
-__decorate([
+__decorate$1([
     Property(false)
 ], Maps.prototype, "useGroupingSeparator", void 0);
-__decorate([
+__decorate$1([
     Property(null)
 ], Maps.prototype, "format", void 0);
-__decorate([
+__decorate$1([
     Property(null)
 ], Maps.prototype, "width", void 0);
-__decorate([
+__decorate$1([
     Property(null)
 ], Maps.prototype, "height", void 0);
-__decorate([
+__decorate$1([
     Property('MouseMove')
 ], Maps.prototype, "tooltipDisplayMode", void 0);
-__decorate([
+__decorate$1([
     Property(false)
 ], Maps.prototype, "allowPrint", void 0);
-__decorate([
+__decorate$1([
     Property(false)
 ], Maps.prototype, "allowImageExport", void 0);
-__decorate([
+__decorate$1([
     Property(false)
 ], Maps.prototype, "allowPdfExport", void 0);
-__decorate([
+__decorate$1([
     Complex({}, TitleSettings)
 ], Maps.prototype, "titleSettings", void 0);
-__decorate([
+__decorate$1([
     Complex({}, ZoomSettings)
 ], Maps.prototype, "zoomSettings", void 0);
-__decorate([
+__decorate$1([
     Complex({}, LegendSettings)
 ], Maps.prototype, "legendSettings", void 0);
-__decorate([
+__decorate$1([
     Collection([], LayerSettings)
 ], Maps.prototype, "layers", void 0);
-__decorate([
+__decorate$1([
     Collection([], Annotation)
 ], Maps.prototype, "annotations", void 0);
-__decorate([
+__decorate$1([
     Complex({}, Margin)
 ], Maps.prototype, "margin", void 0);
-__decorate([
+__decorate$1([
     Complex({ color: '#DDDDDD', width: 0 }, Border)
 ], Maps.prototype, "border", void 0);
-__decorate([
+__decorate$1([
     Property('Material')
 ], Maps.prototype, "theme", void 0);
-__decorate([
+__decorate$1([
     Property('Mercator')
 ], Maps.prototype, "projectionType", void 0);
-__decorate([
+__decorate$1([
     Property(0)
 ], Maps.prototype, "baseLayerIndex", void 0);
-__decorate([
+__decorate$1([
     Property(null)
 ], Maps.prototype, "description", void 0);
-__decorate([
+__decorate$1([
     Property(0)
 ], Maps.prototype, "tabIndex", void 0);
-__decorate([
+__decorate$1([
     Complex({ latitude: null, longitude: null }, CenterPosition)
 ], Maps.prototype, "centerPosition", void 0);
-__decorate([
+__decorate$1([
     Complex({}, MapsAreaSettings)
 ], Maps.prototype, "mapsArea", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "load", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "beforePrint", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "loaded", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "click", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "onclick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "doubleClick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "rightClick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "resize", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "tooltipRender", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "legendRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "tooltipRenderComplete", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "shapeSelected", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "itemSelection", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "itemHighlight", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "shapeHighlight", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "layerRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "shapeRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerClusterRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerClick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerDragStart", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerDragEnd", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerClusterClick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerClusterMouseMove", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "markerMouseMove", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "dataLabelRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "bubbleRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "bubbleClick", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "bubbleMouseMove", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "animationComplete", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "annotationRendering", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "zoom", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "pan", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "panComplete", void 0);
-__decorate([
+__decorate$1([
     Event()
 ], Maps.prototype, "zoomComplete", void 0);
-Maps = __decorate([
+Maps = __decorate$1([
     NotifyPropertyChanges
 ], Maps);
 
@@ -10247,12 +10307,12 @@ class Bubble {
                 });
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 let translate;
-                const animate$$1 = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(this.maps.zoomModule);
+                const animate = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(this.maps.zoomModule);
                 if (this.maps.zoomSettings.zoomFactor > 1 && !isNullOrUndefined(this.maps.zoomModule) && !this.maps.isTileMap) {
-                    translate = getZoomTranslate(this.maps, layer, animate$$1);
+                    translate = getZoomTranslate(this.maps, layer, animate);
                 }
                 else {
-                    translate = getTranslate(this.maps, layer, animate$$1);
+                    translate = getTranslate(this.maps, layer, animate);
                 }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const bubbleDataSource = bubbleSettings.dataSource;
@@ -10430,83 +10490,85 @@ class Marker {
         Array.prototype.forEach.call(currentLayer.markerSettings, (markerSettings, markerIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const markerData = markerSettings.dataSource;
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            Array.prototype.forEach.call(markerData, (data, dataIndex) => {
-                maps.markerNullCount = markerIndex > 0 && dataIndex === 0 ? 0 : maps.markerNullCount;
-                let eventArgs = {
-                    cancel: false, name: markerRendering, fill: markerSettings.fill, height: markerSettings.height,
-                    width: markerSettings.width, imageUrl: markerSettings.imageUrl, shape: markerSettings.shape,
-                    template: markerSettings.template, data: data, maps: maps, marker: markerSettings,
-                    border: markerSettings.border, colorValuePath: markerSettings.colorValuePath,
-                    shapeValuePath: markerSettings.shapeValuePath, imageUrlValuePath: markerSettings.imageUrlValuePath
-                };
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                maps.trigger('markerRendering', eventArgs, (MarkerArgs) => {
-                    eventArgs = markerColorChoose(eventArgs, data);
-                    eventArgs = markerShapeChoose(eventArgs, data);
-                    const lng = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
-                        Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
-                        parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) : null;
-                    const lat = (!isNullOrUndefined(markerSettings.latitudeValuePath)) ?
-                        Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
-                        parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) : null;
-                    const offset = markerSettings.offset;
-                    if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(lng) && !isNullOrUndefined(lat)) {
-                        const markerID = maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
-                            + markerIndex + '_dataIndex_' + dataIndex;
-                        let location = (maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(lng, lat), factor, maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, currentLayer, maps);
-                        if (maps.isTileMap) {
-                            translatePoint = (currentLayer.type === 'SubLayer' && isNullOrUndefined(maps.zoomModule)) ? location = convertTileLatLongToPoint(new MapLocation(lng, lat), maps.tileZoomLevel, maps.tileTranslatePoint, true) : new Object();
-                        }
-                        const scale = type === 'AddMarker' ? maps.scale : translatePoint['scale'];
-                        const transPoint = type === 'AddMarker' ? maps.translatePoint : translatePoint['location'];
-                        if (eventArgs.template && (!isNaN(location.x) && !isNaN(location.y))) {
-                            markerTemplateCount++;
-                            markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, markerTemplateEle, location, transPoint, scale, offset, maps);
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            maps.renderReactTemplates();
-                        }
-                        else if (!eventArgs.template && (!isNaN(location.x) && !isNaN(location.y))) {
-                            markerCount++;
-                            marker(eventArgs, markerSettings, markerData, dataIndex, location, transPoint, markerID, offset, scale, maps, this.markerSVGObject);
-                        }
-                    }
-                    nullCount += (!isNaN(lat) && !isNaN(lng)) ? 0 : 1;
-                    markerTemplateCount += (eventArgs.cancel) ? 1 : 0;
-                    markerCount += (eventArgs.cancel) ? 1 : 0;
-                    maps.markerNullCount = (isNullOrUndefined(lng) || isNullOrUndefined(lat)) ?
-                        maps.markerNullCount + 1 : maps.markerNullCount;
-                    const markerDataLength = markerData.length - maps.markerNullCount;
-                    let isMarkersClustered = false;
-                    if (this.markerSVGObject.childElementCount === (markerDataLength - markerTemplateCount - nullCount) && (type !== 'Template')) {
-                        layerElement.appendChild(this.markerSVGObject);
-                        if (currentLayer.markerClusterSettings.allowClustering) {
-                            maps.svgObject.appendChild(this.markerSVGObject);
-                            maps.element.appendChild(maps.svgObject);
-                            if ((currentLayer.layerType === 'OSM' || (currentLayer.urlTemplate.indexOf('openstreetmap') !== -1 && isNullOrUndefined(currentLayer.shapeData)))
-                                && maps.zoomSettings.enable) {
-                                isMarkersClustered = clusterTemplate(currentLayer, this.markerSVGObject, maps, layerIndex, this.markerSVGObject, layerElement, true, false);
-                                layerElement.appendChild(this.markerSVGObject);
+            if (!isNullOrUndefined(markerSettings.dataSource)) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                Array.prototype.forEach.call(markerData, (data, dataIndex) => {
+                    maps.markerNullCount = markerIndex > 0 && dataIndex === 0 ? 0 : maps.markerNullCount;
+                    let eventArgs = {
+                        cancel: false, name: markerRendering, fill: markerSettings.fill, height: markerSettings.height,
+                        width: markerSettings.width, imageUrl: markerSettings.imageUrl, shape: markerSettings.shape,
+                        template: markerSettings.template, data: data, maps: maps, marker: markerSettings,
+                        border: markerSettings.border, colorValuePath: markerSettings.colorValuePath,
+                        shapeValuePath: markerSettings.shapeValuePath, imageUrlValuePath: markerSettings.imageUrlValuePath
+                    };
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    maps.trigger('markerRendering', eventArgs, (MarkerArgs) => {
+                        eventArgs = markerColorChoose(eventArgs, data);
+                        eventArgs = markerShapeChoose(eventArgs, data);
+                        const lng = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
+                            Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
+                            parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) : null;
+                        const lat = (!isNullOrUndefined(markerSettings.latitudeValuePath)) ?
+                            Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
+                            parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) : null;
+                        const offset = markerSettings.offset;
+                        if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(lng) && !isNullOrUndefined(lat)) {
+                            const markerID = maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
+                                + markerIndex + '_dataIndex_' + dataIndex;
+                            let location = (maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(lng, lat), factor, maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, currentLayer, maps);
+                            if (maps.isTileMap) {
+                                translatePoint = (currentLayer.type === 'SubLayer' && isNullOrUndefined(maps.zoomModule)) ? location = convertTileLatLongToPoint(new MapLocation(lng, lat), maps.tileZoomLevel, maps.tileTranslatePoint, true) : new Object();
                             }
-                            else {
-                                isMarkersClustered = clusterTemplate(currentLayer, this.markerSVGObject, maps, layerIndex, this.markerSVGObject, layerElement, true, false);
+                            const scale = type === 'AddMarker' ? maps.scale : translatePoint['scale'];
+                            const transPoint = type === 'AddMarker' ? maps.translatePoint : translatePoint['location'];
+                            if (eventArgs.template && (!isNaN(location.x) && !isNaN(location.y))) {
+                                markerTemplateCount++;
+                                markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, markerTemplateEle, location, transPoint, scale, offset, maps);
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                maps.renderReactTemplates();
+                            }
+                            else if (!eventArgs.template && (!isNaN(location.x) && !isNaN(location.y))) {
+                                markerCount++;
+                                marker(eventArgs, markerSettings, markerData, dataIndex, location, transPoint, markerID, offset, scale, maps, this.markerSVGObject);
                             }
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            maps.renderReactTemplates();
                         }
-                    }
-                    if (markerTemplateEle.childElementCount === (markerDataLength - markerCount - nullCount) && getElementByID(maps.element.id + '_Secondary_Element')) {
-                        getElementByID(maps.element.id + '_Secondary_Element').appendChild(markerTemplateEle);
-                        if (maps.checkInitialRender) {
-                            if (currentLayer.markerClusterSettings.allowClustering && !isMarkersClustered) {
-                                clusterTemplate(currentLayer, markerTemplateEle, maps, layerIndex, this.markerSVGObject, layerElement, false, false);
+                        nullCount += (!isNaN(lat) && !isNaN(lng)) ? 0 : 1;
+                        markerTemplateCount += (eventArgs.cancel) ? 1 : 0;
+                        markerCount += (eventArgs.cancel) ? 1 : 0;
+                        maps.markerNullCount = (isNullOrUndefined(lng) || isNullOrUndefined(lat)) ?
+                            maps.markerNullCount + 1 : maps.markerNullCount;
+                        const markerDataLength = markerData.length - maps.markerNullCount;
+                        let isMarkersClustered = false;
+                        if (this.markerSVGObject.childElementCount === (markerDataLength - markerTemplateCount - nullCount) && (type !== 'Template')) {
+                            layerElement.appendChild(this.markerSVGObject);
+                            if (currentLayer.markerClusterSettings.allowClustering) {
+                                maps.svgObject.appendChild(this.markerSVGObject);
+                                maps.element.appendChild(maps.svgObject);
+                                if ((currentLayer.urlTemplate.indexOf('openstreetmap') !== -1 && isNullOrUndefined(currentLayer.shapeData))
+                                    && maps.zoomSettings.enable) {
+                                    isMarkersClustered = clusterTemplate(currentLayer, this.markerSVGObject, maps, layerIndex, this.markerSVGObject, layerElement, true, false);
+                                    layerElement.appendChild(this.markerSVGObject);
+                                }
+                                else {
+                                    isMarkersClustered = clusterTemplate(currentLayer, this.markerSVGObject, maps, layerIndex, this.markerSVGObject, layerElement, true, false);
+                                }
                                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                                 maps.renderReactTemplates();
                             }
                         }
-                    }
+                        if (markerTemplateEle.childElementCount === (markerDataLength - markerCount - nullCount) && getElementByID(maps.element.id + '_Secondary_Element')) {
+                            getElementByID(maps.element.id + '_Secondary_Element').appendChild(markerTemplateEle);
+                            if (maps.checkInitialRender) {
+                                if (currentLayer.markerClusterSettings.allowClustering && !isMarkersClustered) {
+                                    clusterTemplate(currentLayer, markerTemplateEle, maps, layerIndex, this.markerSVGObject, layerElement, false, false);
+                                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                    maps.renderReactTemplates();
+                                }
+                            }
+                        }
+                    });
                 });
-            });
+            }
         });
     }
     /**
@@ -10563,35 +10625,37 @@ class Marker {
                         Array.prototype.forEach.call(currentLayer.markerSettings, (markerSetting) => {
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
                             const markerData = markerSetting.dataSource;
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            Array.prototype.forEach.call(markerData, (data, dataIndex) => {
-                                const latitude = !isNullOrUndefined(data['latitude']) ? parseFloat(data['latitude']) :
-                                    !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) : null;
-                                const longitude = !isNullOrUndefined(data['longitude']) ? parseFloat(data['longitude']) :
-                                    !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) : null;
-                                if (!isNullOrUndefined(latitude) && !isNullOrUndefined(longitude)) {
-                                    minLong = isNullOrUndefined(minLong) && dataIndex === 0 ?
-                                        longitude : minLong;
-                                    maxLat = isNullOrUndefined(maxLat) && dataIndex === 0 ?
-                                        latitude : maxLat;
-                                    minLat = isNullOrUndefined(minLat) && dataIndex === 0 ?
-                                        latitude : minLat;
-                                    maxLong = isNullOrUndefined(maxLong) && dataIndex === 0 ?
-                                        longitude : maxLong;
-                                    if (minLong > longitude) {
-                                        minLong = longitude;
-                                    }
-                                    if (minLat > latitude) {
-                                        minLat = latitude;
-                                    }
-                                    if (maxLong < longitude) {
-                                        maxLong = longitude;
-                                    }
-                                    if (maxLat < latitude) {
-                                        maxLat = latitude;
+                            if (!isNullOrUndefined(markerData) && markerData.length > 0) {
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                Array.prototype.forEach.call(markerData, (data, dataIndex) => {
+                                    const latitude = !isNullOrUndefined(data['latitude']) ? parseFloat(data['latitude']) :
+                                        !isNullOrUndefined(data['Latitude']) ? parseFloat(data['Latitude']) : null;
+                                    const longitude = !isNullOrUndefined(data['longitude']) ? parseFloat(data['longitude']) :
+                                        !isNullOrUndefined(data['Longitude']) ? parseFloat(data['Longitude']) : null;
+                                    if (!isNullOrUndefined(latitude) && !isNullOrUndefined(longitude)) {
+                                        minLong = isNullOrUndefined(minLong) && dataIndex === 0 ?
+                                            longitude : minLong;
+                                        maxLat = isNullOrUndefined(maxLat) && dataIndex === 0 ?
+                                            latitude : maxLat;
+                                        minLat = isNullOrUndefined(minLat) && dataIndex === 0 ?
+                                            latitude : minLat;
+                                        maxLong = isNullOrUndefined(maxLong) && dataIndex === 0 ?
+                                            longitude : maxLong;
+                                        if (minLong > longitude) {
+                                            minLong = longitude;
+                                        }
+                                        if (minLat > latitude) {
+                                            minLat = latitude;
+                                        }
+                                        if (maxLong < longitude) {
+                                            maxLong = longitude;
+                                        }
+                                        if (maxLat < latitude) {
+                                            maxLat = latitude;
+                                        }
                                     }
-                                }
-                            });
+                                });
+                            }
                         });
                     }
                 });
@@ -10700,7 +10764,7 @@ class Marker {
             const layerIndex = parseInt(target.split('_LayerIndex_')[1].split('_')[0], 10);
             const markerIndex = parseInt(target.split('_MarkerIndex_')[1].split('_')[0], 10);
             const dataIndex = parseInt(target.split('_dataIndex_')[1].split('_')[0], 10);
-            const marker$$1 = this.maps.layers[layerIndex].markerSettings[markerIndex];
+            const marker = this.maps.layers[layerIndex].markerSettings[markerIndex];
             if (this.sameMarkerData.length > 0) {
                 isCluster = (this.sameMarkerData[0].data.filter((el) => { return (el['index'] === dataIndex); })).length > 0 &&
                     this.sameMarkerData[0].layerIndex === layerIndex && this.sameMarkerData[0].markerIndex === markerIndex;
@@ -10717,8 +10781,8 @@ class Marker {
                     targetId: target, x: e.clientX, y: e.clientY,
                     latitude: options.data['latitude'] || options.data['Latitude'],
                     longitude: options.data['longitude'] || options.data['Longitude'],
-                    shape: isNullOrUndefined(marker$$1.shapeValuePath) ? marker$$1.shape
-                        : marker$$1.dataSource[dataIndex][marker$$1.shapeValuePath],
+                    shape: isNullOrUndefined(marker.shapeValuePath) ? marker.shape
+                        : marker.dataSource[dataIndex][marker.shapeValuePath],
                     layerIndex: layerIndex, markerIndex: markerIndex, dataIndex: dataIndex
                 };
             }
@@ -10779,19 +10843,19 @@ class Marker {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const markCollection = [];
         const clusterCollection = [];
-        let marker$$1;
+        let marker;
         this.maps.markerClusterExpand = layer.markerClusterSettings.allowClusterExpand;
         if (target.indexOf('_MarkerIndex_') > -1) {
             const markerIndex = parseInt(id[1].split('_MarkerIndex_')[1].split('_')[0], 10);
             const dataIndex = parseInt(id[1].split('_dataIndex_')[1].split('_')[0], 10);
-            marker$$1 = layer.markerSettings[markerIndex];
+            marker = layer.markerSettings[markerIndex];
             if (!isNaN(markerIndex)) {
-                data = marker$$1.dataSource[dataIndex];
+                data = marker.dataSource[dataIndex];
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 let collection = [];
-                if (!marker$$1.template && (target.indexOf('_cluster_') > -1) && (this.maps.layers[index].markerClusterSettings.allowClusterExpand)) {
+                if (!marker.template && (target.indexOf('_cluster_') > -1) && (this.maps.layers[index].markerClusterSettings.allowClusterExpand)) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    Array.prototype.forEach.call(marker$$1.dataSource, (location, index) => {
+                    Array.prototype.forEach.call(marker.dataSource, (location, index) => {
                         if (location['latitude'] === data['latitude'] && location['longitude'] === data['longitude']) {
                             collection.push({ data: data, index: index });
                         }
@@ -10803,8 +10867,8 @@ class Marker {
                     const indexes = layer.markerClusterSettings.shape === 'Balloon' ? clusterElement.children[0].textContent.split(',').map(Number) : clusterElement.textContent.split(',').map(Number);
                     collection = [];
                     for (const i of indexes) {
-                        collection.push({ data: marker$$1.dataSource[i], index: i });
-                        markCollection.push(marker$$1.dataSource[i]);
+                        collection.push({ data: marker.dataSource[i], index: i });
+                        markCollection.push(marker.dataSource[i]);
                     }
                     isClusterSame = false;
                     clusterCollection.push({
@@ -10813,7 +10877,7 @@ class Marker {
                         isClusterSame: isClusterSame
                     });
                 }
-                return { marker: marker$$1, data: data, clusterCollection: clusterCollection, markCollection: markCollection };
+                return { marker: marker, data: data, clusterCollection: clusterCollection, markCollection: markCollection };
             }
         }
         return null;
@@ -10932,12 +10996,14 @@ class Polygon {
                 id: maps.element.id + '_LayerIndex_' + layerIndex + '_Polygons_Group_' + polygonIndex
             });
             const polygonData = polygonSetting.points;
-            const path = calculatePolygonPath(maps, factor, currentLayer, polygonData);
-            const pathOptions = new PathOption(maps.element.id + '_LayerIndex_' + layerIndex + '_PolygonIndex_' + polygonIndex, polygonSetting.fill, (polygonSetting.borderWidth / factor), polygonSetting.borderColor, polygonSetting.opacity, polygonSetting.borderOpacity, '', path);
-            const polygonEle = maps.renderer.drawPath(pathOptions);
-            maintainSelection(maps.selectedPolygonElementId, maps.polygonSelectionClass, polygonEle, 'PolygonselectionMapStyle');
-            polygonSVGObject.appendChild(polygonEle);
-            polygonsSVGObject.appendChild(polygonSVGObject);
+            if (!isNullOrUndefined(polygonSetting.points) && polygonSetting.points.length > 0) {
+                const path = calculatePolygonPath(maps, factor, currentLayer, polygonData);
+                const pathOptions = new PathOption(maps.element.id + '_LayerIndex_' + layerIndex + '_PolygonIndex_' + polygonIndex, polygonSetting.fill, (polygonSetting.borderWidth / factor), polygonSetting.borderColor, polygonSetting.opacity, polygonSetting.borderOpacity, '', path);
+                const polygonEle = maps.renderer.drawPath(pathOptions);
+                maintainSelection(maps.selectedPolygonElementId, maps.polygonSelectionClass, polygonEle, 'PolygonselectionMapStyle');
+                polygonSVGObject.appendChild(polygonEle);
+                polygonsSVGObject.appendChild(polygonSVGObject);
+            }
         });
         return polygonsSVGObject;
     }
@@ -10975,7 +11041,7 @@ class DataLabel {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let text;
         let shapeNameValue;
-        for (let i = 0; i < dataSource.length; i++) {
+        for (let i = 0; i < (isNullOrUndefined(dataSource) ? 0 : dataSource.length); i++) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const data = dataSource[i];
             const dataShapePathValue = !isNullOrUndefined(data[shapeDataPath]) && isNaN(data[shapeDataPath]) &&
@@ -11037,17 +11103,17 @@ class DataLabel {
         let locationX;
         let locationY;
         style.fontFamily = this.maps.theme.toLowerCase() !== 'material' ? this.maps.themeStyle.labelFontFamily : style.fontFamily;
-        style.fontWeight = style.fontWeight || this.maps.themeStyle.fontWeight || Theme.dataLabelFont.fontWeight;
+        style.fontWeight = style.fontWeight || this.maps.themeStyle.fontWeight;
+        style.size = style.size || this.maps.themeStyle.fontSize;
         shape = !isNullOrUndefined(shapes) ? shapes['property'] : null;
         const properties = (Object.prototype.toString.call(layer.shapePropertyPath) === '[object Array]' ?
             layer.shapePropertyPath : [layer.shapePropertyPath]);
         let propertyPath;
-        const isPoint = false;
-        const animate$$1 = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(this.maps.zoomModule);
+        const animate = (layer.animationDuration !== 0 || animationMode === 'Enable') || isNullOrUndefined(this.maps.zoomModule);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const translate = (this.maps.isTileMap) ? new Object() : ((this.maps.zoomSettings.zoomFactor > 1 &&
-            !isNullOrUndefined(this.maps.zoomModule)) ? getZoomTranslate(this.maps, layer, animate$$1) :
-            getTranslate(this.maps, layer, animate$$1));
+            !isNullOrUndefined(this.maps.zoomModule)) ? getZoomTranslate(this.maps, layer, animate) :
+            getTranslate(this.maps, layer, animate));
         const scale = (this.maps.isTileMap) ? this.maps.scale : translate['scale'];
         const transPoint = (this.maps.isTileMap) ? this.maps.translatePoint : translate['location'];
         const zoomTransPoint = this.maps.zoomTranslatePoint;
@@ -11098,7 +11164,7 @@ class DataLabel {
         text = (!isNullOrUndefined(datasrcObj)) ? !isNullOrUndefined(datasrcObj[labelpath]) ?
             datasrcObj[labelpath].toString() : datasrcObj[layer.shapeDataPath] : shapeData['properties'][labelpath];
         if ((Object.prototype.toString.call(layer.shapePropertyPath) === '[object Array]') &&
-            (isNullOrUndefined(text) && layer.dataSource['length'] === 0)) {
+            (isNullOrUndefined(text) && (!isNullOrUndefined(layer.dataSource) && layer.dataSource['length'] === 0))) {
             for (let l = 0; l < layer.shapePropertyPath.length; l++) {
                 if (shapeData['properties'][layer.shapePropertyPath[l]]) {
                     text = shapeData['properties'][layer.shapePropertyPath[l]];
@@ -11109,20 +11175,12 @@ class DataLabel {
         if (isNullOrUndefined(text) && (layer.dataLabelSettings.template !== '' && layer.dataSource['length'] === 0)) {
             text = shapeData['properties'][layer.shapePropertyPath];
         }
-        if (isNullOrUndefined(text) && layer.dataSource['length'] > 0) {
+        if (isNullOrUndefined(text) && (!isNullOrUndefined(layer.dataSource) && layer.dataSource['length'] > 0)) {
             text = '';
         }
         const dataLabelText = text;
         const projectionType = this.maps.projectionType;
-        if (isPoint) {
-            location = {
-                x: shapePoint[midIndex][index]['x'], y: shapePoint[midIndex][index]['y'],
-                rightMin: 0, rightMax: 0, leftMin: 0, leftMax: 0,
-                points: shapePoint[midIndex][index], topMax: 0, topMin: 0,
-                bottomMax: 0, bottomMin: 0, height: 0
-            };
-        }
-        else {
+        {
             location = findMidPointOfPolygon(shapePoint[midIndex], projectionType, layer.geometryType);
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -11181,7 +11239,7 @@ class DataLabel {
                 const start = ((location['y'] + transPoint['y']) * scale) - textSize['height'] / 2;
                 const end = ((location['y'] + transPoint['y']) * scale) + textSize['height'] / 2;
                 position = filter(shapePoint[midIndex], startY, endY);
-                if (!isPoint && position.length > 5 && (shapeData['geometry']['type'] !== 'MultiPolygon') &&
+                if ( position.length > 5 && (shapeData['geometry']['type'] !== 'MultiPolygon') &&
                     (shapeData['type'] !== 'MultiPolygon')) {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const location1 = findMidPointOfPolygon(position, projectionType, layer.geometryType);
@@ -11463,7 +11521,7 @@ class NavigationLine {
                 dashArray = navigation[i].dashArray;
                 arrowSettings = navigation[i].arrowSettings;
                 showArrow = !isNullOrUndefined(arrowSettings) ? arrowSettings.showArrow : false;
-                if (longitude.length === latitude.length && visible) {
+                if (!isNullOrUndefined(longitude) && !isNullOrUndefined(latitude) && longitude.length === latitude.length && visible) {
                     for (let i = 0; i < longitude.length; i++) {
                         const location = (this.maps.isTileMap) ? convertTileLatLongToPoint(new Point(longitude[i], latitude[i]), factor, this.maps.tileTranslatePoint, true) : convertGeoToPoint(latitude[i], longitude[i], factor, layer, this.maps);
                         point.push(location);
@@ -12066,8 +12124,8 @@ class Legend {
                 }
                 if (legend.type === 'Markers' && legend.useMarkerShape) {
                     const legendShapeData = this.legendCollection[collection['idIndex']].data[0];
-                    const marker$$1 = map.layers[legendShapeData['layerIndex']].markerSettings[legendShapeData['markerIndex']];
-                    legendShape = !isNullOrUndefined(marker$$1.dataSource[legendShapeData['dataIndex']][marker$$1['shapeValuePath']]) && marker$$1.dataSource[legendShapeData['dataIndex']][marker$$1['shapeValuePath']] !== '' ? marker$$1.dataSource[legendShapeData['dataIndex']][marker$$1['shapeValuePath']] : marker$$1.shape;
+                    const marker = map.layers[legendShapeData['layerIndex']].markerSettings[legendShapeData['markerIndex']];
+                    legendShape = !isNullOrUndefined(marker.dataSource[legendShapeData['dataIndex']][marker['shapeValuePath']]) && marker.dataSource[legendShapeData['dataIndex']][marker['shapeValuePath']] !== '' ? marker.dataSource[legendShapeData['dataIndex']][marker['shapeValuePath']] : marker.shape;
                 }
                 if (legendShape === 'Balloon') {
                     legendElement.appendChild(drawBalloon(map, renderOptions, shapeSize, { x: shapeLocation.x, y: (shapeLocation.y + 5) }, 'Legend'));
@@ -12193,7 +12251,9 @@ class Legend {
             }
             else {
                 const layerIndex = currentItem[currentItem.length - 1].layerIndex;
-                this.setToggleAttributes(legendTextElement, legendShapeElement, this.maps.layers[layerIndex].shapeSettings.fill, this.maps.layers[layerIndex].shapeSettings.opacity, this.maps.layers[layerIndex].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[layerIndex].shapeSettings.border.width)
+                this.setToggleAttributes(legendTextElement, legendShapeElement, this.maps.layers[layerIndex].shapeSettings.fill, this.maps.layers[layerIndex].shapeSettings.opacity, 
+                /* eslint-disable-next-line max-len */
+                this.maps.layers[layerIndex].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor, isNullOrUndefined(this.maps.layers[layerIndex].shapeSettings.border.width)
                     ? 0 : this.maps.layers[layerIndex].shapeSettings.border.width, isNullOrUndefined(this.maps.layers[layerIndex].shapeSettings.border.opacity)
                     ? this.maps.layers[layerIndex].shapeSettings.opacity
                     : this.maps.layers[layerIndex].shapeSettings.border.opacity, this.maps.layers[layerIndex].shapeSettings.fill);
@@ -12392,7 +12452,7 @@ class Legend {
         collection.push({
             legendElement: targetElement, legendOldFill: oldElement['fill'], legendOldOpacity: oldElement['opacity'],
             legendOldBorderColor: oldElement['borderColor'], legendOldBorderWidth: oldElement['borderWidth'],
-            shapeOpacity: shapeSettings.opacity, shapeOldBorderColor: shapeSettings.border.color,
+            shapeOpacity: shapeSettings.opacity, shapeOldBorderColor: shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor,
             shapeOldBorderWidth: shapeSettings.border.width
         });
         const length = collection.length;
@@ -12869,7 +12929,8 @@ class Legend {
         this.legendBorderRect = new Rect((this.legendItemRect.x - spacing), (this.legendItemRect.y - spacing - textSize.height), (this.legendItemRect.width) + (spacing * 2), (this.legendItemRect.height) + (spacing * 2) + textSize.height +
             (legend.mode === 'Interactive' ? 0 : (this.page !== 0) ? spacing : 0));
         const legendBorder = {
-            color: legend.border.color, width: legend.border.width, opacity: legend.border.opacity
+            color: legend.border.color || this.maps.themeStyle.legendBorderColor, opacity: legend.border.opacity,
+            width: legend.border.width || this.maps.themeStyle.legendBorderWidth
         };
         legendBorder.opacity = isNullOrUndefined(legendBorder.opacity) ? 1 : legendBorder.opacity;
         const renderOptions = new RectOption(map.element.id + '_Legend_Border', legend.background, legendBorder, 1, this.legendBorderRect, null, null, '', '');
@@ -12984,10 +13045,10 @@ class Legend {
         }
     }
     getMarkersLegendCollections(layerIndex, markers) {
-        Array.prototype.forEach.call(markers, (marker$$1, markerIndex) => {
+        Array.prototype.forEach.call(markers, (marker, markerIndex) => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const dataSource = marker$$1.dataSource;
-            const field = marker$$1.legendText;
+            const dataSource = marker.dataSource;
+            const field = marker.legendText;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             let templateFn;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -12995,9 +13056,9 @@ class Legend {
                 let imageSrc = null;
                 const showLegend = isNullOrUndefined(data[this.maps.legendSettings.showLegendPath]) ? true :
                     data[this.maps.legendSettings.showLegendPath];
-                if (marker$$1.visible && showLegend && (!isNullOrUndefined(data['latitude'])) && (!isNullOrUndefined(data['longitude']))) {
-                    if (marker$$1.template) {
-                        templateFn = getTemplateFunction(marker$$1.template, this.maps);
+                if (marker.visible && showLegend && (!isNullOrUndefined(data['latitude'])) && (!isNullOrUndefined(data['longitude']))) {
+                    if (marker.template) {
+                        templateFn = getTemplateFunction(marker.template, this.maps);
                         const templateElement = templateFn(this.maps);
                         const markerEle = isNullOrUndefined(templateElement.childElementCount) ? templateElement[0] :
                             templateElement;
@@ -13005,7 +13066,7 @@ class Legend {
                         imageSrc = markerEle.querySelector('img').src;
                     }
                     const text = isNullOrUndefined(data[field]) ? '' : data[field];
-                    const legendFill = !isNullOrUndefined(marker$$1.colorValuePath) ? data[marker$$1.colorValuePath] : marker$$1.fill;
+                    const legendFill = !isNullOrUndefined(marker.colorValuePath) ? data[marker.colorValuePath] : marker.fill;
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const newData = [];
                     if (this.maps.legendSettings.removeDuplicateLegend) {
@@ -13015,7 +13076,7 @@ class Legend {
                     else {
                         newData.push({ layerIndex: layerIndex, markerIndex: markerIndex, dataIndex: dataIndex, value: legendFill,
                             name: text,
-                            shape: (!isNullOrUndefined(marker$$1.shapeValuePath) && !isNullOrUndefined(data[marker$$1.shapeValuePath]) && data[marker$$1.shapeValuePath] !== '') ? data[marker$$1.shapeValuePath] : (this.maps.legendSettings.useMarkerShape ? marker$$1.shape : this.maps.legendSettings.shape) });
+                            shape: (!isNullOrUndefined(marker.shapeValuePath) && !isNullOrUndefined(data[marker.shapeValuePath]) && data[marker.shapeValuePath] !== '') ? data[marker.shapeValuePath] : (this.maps.legendSettings.useMarkerShape ? marker.shape : this.maps.legendSettings.shape) });
                         this.getOverallLegendItemsCollection(text, legendFill, newData, showLegend);
                     }
                 }
@@ -13031,10 +13092,10 @@ class Legend {
             const markerData = markerSettings.dataSource;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             Array.prototype.forEach.call(markerData, (data, dataIndex) => {
-                const marker$$1 = this.maps.layers[layerIndex].markerSettings[markerIndex];
-                if ((text === data[marker$$1.legendText] || text === '') && legendFill === (data[marker$$1.colorValuePath] || marker$$1.fill)) {
+                const marker = this.maps.layers[layerIndex].markerSettings[markerIndex];
+                if ((text === data[marker.legendText] || text === '') && legendFill === (data[marker.colorValuePath] || marker.fill)) {
                     legendData.push({ layerIndex: layerIndex, markerIndex: markerIndex, dataIndex: dataIndex, value: legendFill, name: text,
-                        shape: !isNullOrUndefined(marker$$1.shapeValuePath) ? data[marker$$1.shapeValuePath] : marker$$1.shape });
+                        shape: !isNullOrUndefined(marker.shapeValuePath) ? data[marker.shapeValuePath] : marker.shape });
                 }
             });
         });
@@ -13053,15 +13114,17 @@ class Legend {
                 legendText = !isNullOrUndefined(colorMap.label) ? colorMap.label : colorMap.from + ' - ' + colorMap.to;
                 rangeData = [];
                 let colorMapProcess = false;
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                Array.prototype.forEach.call(dataSource, (data, dataIndex) => {
-                    const colorValue = (colorValuePath.indexOf('.') > -1) ? Number(getValueFromObject(data, colorValuePath)) :
-                        parseFloat(data[colorValuePath]);
-                    if (colorValue >= colorMap.from && colorValue <= colorMap.to) {
-                        colorMapProcess = true;
-                        rangeData.push(this.getLegendData(layerIndex, dataIndex, data, dataPath, layerData, propertyPath, colorValue));
-                    }
-                });
+                if (!isNullOrUndefined(dataSource) && dataSource.length > 0) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    Array.prototype.forEach.call(dataSource, (data, dataIndex) => {
+                        const colorValue = (colorValuePath.indexOf('.') > -1) ? Number(getValueFromObject(data, colorValuePath)) :
+                            parseFloat(data[colorValuePath]);
+                        if (colorValue >= colorMap.from && colorValue <= colorMap.to) {
+                            colorMapProcess = true;
+                            rangeData.push(this.getLegendData(layerIndex, dataIndex, data, dataPath, layerData, propertyPath, colorValue));
+                        }
+                    });
+                }
                 if (!colorMapProcess) {
                     rangeData.push({
                         layerIndex: layerIndex, shapeIndex: null, dataIndex: null,
@@ -13143,23 +13206,25 @@ class Legend {
                 legendText = !isNullOrUndefined(colorMap.label) ? colorMap.label : colorMap.value;
                 equalData = [];
                 let eqaulColorProcess = false;
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                Array.prototype.forEach.call(dataSource, (data, dataIndex) => {
-                    const equalValue = ((colorValuePath.indexOf('.') > -1) ? (getValueFromObject(data, colorValuePath)) :
-                        (data[colorValuePath]));
-                    if (equalValue === colorMap.value) {
-                        eqaulColorProcess = true;
-                        if (equalValues.indexOf(equalValue) === -1) {
-                            equalValues.push(equalValue);
+                if (!isNullOrUndefined(dataSource) && dataSource.length > 0) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    Array.prototype.forEach.call(dataSource, (data, dataIndex) => {
+                        const equalValue = ((colorValuePath.indexOf('.') > -1) ? (getValueFromObject(data, colorValuePath)) :
+                            (data[colorValuePath]));
+                        if (equalValue === colorMap.value) {
+                            eqaulColorProcess = true;
+                            if (equalValues.indexOf(equalValue) === -1) {
+                                equalValues.push(equalValue);
+                            }
+                            equalData.push(this.getLegendData(layerIndex, dataIndex, data, dataPath, layerData, propertyPath, equalValue));
                         }
-                        equalData.push(this.getLegendData(layerIndex, dataIndex, data, dataPath, layerData, propertyPath, equalValue));
-                    }
-                    else {
-                        if (outOfRangeValues.indexOf(equalValue) === -1) {
-                            outOfRangeValues.push(equalValue);
+                        else {
+                            if (outOfRangeValues.indexOf(equalValue) === -1) {
+                                outOfRangeValues.push(equalValue);
+                            }
                         }
-                    }
-                });
+                    });
+                }
                 for (let x = 0; x < equalValues.length; x++) {
                     for (let y = 0; y < outOfRangeValues.length; y++) {
                         if (equalValues[x] === outOfRangeValues[y]) {
@@ -13414,7 +13479,7 @@ class Legend {
                             if (isVisible && mapElement !== null) {
                                 if (this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
                                     mapElement.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                    mapElement.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color);
+                                    mapElement.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                     mapElement.setAttribute('fill-opacity', (this.maps.layers[k].shapeSettings.opacity).toString());
                                     mapElement.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width).toString());
                                     mapElement.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
@@ -13444,7 +13509,9 @@ class Legend {
                                         this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[k].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width)
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, 
+                                        /* eslint-disable-next-line max-len */
+                                        this.maps.layers[k].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width)
                                             ? 0 : this.maps.layers[k].shapeSettings.border.width, 
                                         /* eslint-disable-next-line max-len */
                                         isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity)
@@ -13501,7 +13568,7 @@ class Legend {
                                 if (this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
                                     layerElement.setAttribute('fill', this.maps.layers[j].shapeSettings.fill);
                                     layerElement.setAttribute('fill-opacity', (this.maps.layers[j].shapeSettings.opacity).toString());
-                                    layerElement.setAttribute('stroke', this.maps.layers[j].shapeSettings.border.color);
+                                    layerElement.setAttribute('stroke', this.maps.layers[j].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                     layerElement.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[j].shapeSettings.border.width) ? 0 : this.maps.layers[j].shapeSettings.border.width).toString());
                                     layerElement.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[j].shapeSettings.border.opacity) ?
                                         this.maps.layers[j].shapeSettings.opacity :
@@ -13521,7 +13588,9 @@ class Legend {
                                         this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[j].shapeSettings.fill, this.maps.layers[j].shapeSettings.opacity, this.maps.layers[j].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[j].shapeSettings.border.width)
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[j].shapeSettings.fill, this.maps.layers[j].shapeSettings.opacity, 
+                                        /* eslint-disable-next-line max-len */
+                                        this.maps.layers[j].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor, isNullOrUndefined(this.maps.layers[j].shapeSettings.border.width)
                                             ? 0 : this.maps.layers[j].shapeSettings.border.width, 
                                         /* eslint-disable-next-line max-len */
                                         isNullOrUndefined(this.maps.layers[j].shapeSettings.border.opacity)
@@ -13543,7 +13612,7 @@ class Legend {
                                     this.maps.layers[j].shapeSettings.border.opacity).toString());
                                 layerElement.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[j].shapeSettings.border.width) ? 0 : this.maps.layers[j].shapeSettings.border.width).toString());
                                 layerElement.setAttribute('fill-opacity', (this.maps.layers[j].shapeSettings.opacity).toString());
-                                layerElement.setAttribute('stroke', this.maps.layers[j].shapeSettings.border.color);
+                                layerElement.setAttribute('stroke', this.maps.layers[j].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                 if (targetEle !== null) {
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Shape_Index_' + legendIndex, this.maps.element.id);
@@ -13593,7 +13662,7 @@ class Legend {
                                 }
                                 if (this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
                                     LegendInteractive.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                    LegendInteractive.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color);
+                                    LegendInteractive.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                     LegendInteractive.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width).toString());
                                     LegendInteractive.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
                                         this.maps.layers[k].shapeSettings.opacity :
@@ -13614,7 +13683,9 @@ class Legend {
                                         this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[k].shapeSettings.border.color, 
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, 
+                                        /* eslint-disable-next-line max-len */
+                                        this.maps.layers[k].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor, 
                                         /* eslint-disable-next-line max-len */
                                         (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width)
                                             ? 0
@@ -13675,7 +13746,7 @@ class Legend {
                                 }
                                 if (this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
                                     mapLegendElement.setAttribute('fill', this.maps.layers[0].shapeSettings.fill);
-                                    mapLegendElement.setAttribute('stroke', this.maps.layers[0].shapeSettings.border.color);
+                                    mapLegendElement.setAttribute('stroke', this.maps.layers[0].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                     mapLegendElement.setAttribute('fill-opacity', (this.maps.layers[k].shapeSettings.opacity).toString());
                                     mapLegendElement.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width).toString());
                                     mapLegendElement.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
@@ -13696,7 +13767,9 @@ class Legend {
                                         this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[0].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[0].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width)
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[0].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, 
+                                        /* eslint-disable-next-line max-len */
+                                        this.maps.layers[0].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width)
                                             ? 0
                                             : this.maps.layers[k].shapeSettings.border.width, 
                                         /* eslint-disable-next-line max-len */
@@ -13716,7 +13789,7 @@ class Legend {
                                 mapLegendElement.setAttribute('fill-opacity', (this.maps.layers[k].shapeSettings.opacity).toString());
                                 mapLegendElement.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 :
                                     this.maps.layers[k].shapeSettings.border.width).toString());
-                                mapLegendElement.setAttribute('stroke', this.maps.layers[0].shapeSettings.border.color);
+                                mapLegendElement.setAttribute('stroke', this.maps.layers[0].shapeSettings.border.color || this.maps.themeStyle.shapeBorderColor);
                                 mapLegendElement.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
                                     this.maps.layers[k].shapeSettings.opacity :
                                     this.maps.layers[k].shapeSettings.border.opacity).toString());
@@ -13962,10 +14035,10 @@ class Highlight {
                 this.highlightSettings = this.maps.layers[layerIndex].bubbleSettings[bubble].highlightSettings;
             }
             else if (targetEle.id.indexOf('MarkerIndex') > -1) {
-                const marker$$1 = parseInt(targetEle.id.split('_MarkerIndex_')[1].split('_')[0], 10);
+                const marker = parseInt(targetEle.id.split('_MarkerIndex_')[1].split('_')[0], 10);
                 dataIndex = parseInt(targetEle.id.split('_dataIndex_')[1].split('_')[0], 10);
-                data = this.maps.layers[layerIndex].markerSettings[marker$$1].dataSource[dataIndex];
-                this.highlightSettings = this.maps.layers[layerIndex].markerSettings[marker$$1].highlightSettings;
+                data = this.maps.layers[layerIndex].markerSettings[marker].dataSource[dataIndex];
+                this.highlightSettings = this.maps.layers[layerIndex].markerSettings[marker].highlightSettings;
             }
             else if (targetEle.id.indexOf('_PolygonIndex_') > -1) {
                 dataIndex = parseInt(targetEle.id.split('_PolygonIndex_')[1].split('_')[0], 10);
@@ -14048,8 +14121,8 @@ class Highlight {
         const layerIndex = parseInt(targetEle.id.split('_LayerIndex_')[1].split('_')[0], 10);
         let isMarkerSelect = false;
         if (targetEle.id.indexOf('MarkerIndex') > -1) {
-            const marker$$1 = parseInt(targetEle.id.split('_MarkerIndex_')[1].split('_')[0], 10);
-            isMarkerSelect = this.maps.layers[layerIndex].markerSettings[marker$$1].highlightSettings.enable;
+            const marker = parseInt(targetEle.id.split('_MarkerIndex_')[1].split('_')[0], 10);
+            isMarkerSelect = this.maps.layers[layerIndex].markerSettings[marker].highlightSettings.enable;
         }
         const borderColor = (targetEle.parentElement.id.indexOf('LineString') === -1) ? this.highlightSettings.border.color : (this.highlightSettings.fill || this.highlightSettings.border.color);
         const borderWidth = (targetEle.parentElement.id.indexOf('LineString') === -1) ? (this.highlightSettings.border.width / (isMarkerSelect ? 1 : this.maps.scale)) : (this.highlightSettings.border.width / this.maps.scale);
@@ -14610,22 +14683,22 @@ class MapsTooltip {
             else if (targetId.indexOf('_MarkerIndex_') > -1) {
                 const markerIdex = parseInt(targetId.split('_MarkerIndex_')[1].split('_')[0], 10);
                 const dataIndex = parseInt(targetId.split('_MarkerIndex_')[1].split('_')[2], 10);
-                const marker$$1 = layer.markerSettings[markerIdex];
-                option = marker$$1.tooltipSettings;
-                templateData = marker$$1.dataSource[dataIndex];
+                const marker = layer.markerSettings[markerIdex];
+                option = marker.tooltipSettings;
+                templateData = marker.dataSource[dataIndex];
                 if (option.visible && !isNaN(markerIdex)) {
-                    if (marker$$1.tooltipSettings.format) {
-                        currentData = this.formatter(marker$$1.tooltipSettings.format, marker$$1.dataSource[dataIndex]);
+                    if (marker.tooltipSettings.format) {
+                        currentData = this.formatter(marker.tooltipSettings.format, marker.dataSource[dataIndex]);
                     }
                     else {
-                        if (typeof marker$$1.template !== 'function' && marker$$1.template && !marker$$1.tooltipSettings.valuePath) {
-                            currentData = marker$$1.template.split('>')[1].split('<')[0];
+                        if (typeof marker.template !== 'function' && marker.template && !marker.tooltipSettings.valuePath) {
+                            currentData = marker.template.split('>')[1].split('<')[0];
                         }
                         else {
                             currentData =
-                                formatValue(((marker$$1.tooltipSettings.valuePath.indexOf('.') > -1) ?
-                                    (getValueFromObject(marker$$1.dataSource[dataIndex], marker$$1.tooltipSettings.valuePath)) :
-                                    marker$$1.dataSource[dataIndex][marker$$1.tooltipSettings.valuePath]), this.maps);
+                                formatValue(((marker.tooltipSettings.valuePath.indexOf('.') > -1) ?
+                                    (getValueFromObject(marker.dataSource[dataIndex], marker.tooltipSettings.valuePath)) :
+                                    marker.dataSource[dataIndex][marker.tooltipSettings.valuePath]), this.maps);
                         }
                     }
                 }
@@ -14713,8 +14786,17 @@ class MapsTooltip {
                                 || this.maps.themeStyle.fontWeight;
                             tooltipArgs.options['textStyle']['opacity'] = tooltipArgs.options['textStyle']['opacity']
                                 || this.maps.themeStyle.tooltipTextOpacity;
+                            const borderObject = isPolygon ? {
+                                color: polygonTooltipOption.border.color ||
+                                    this.maps.themeStyle.tooltipBorderColor, width: polygonTooltipOption.border.width,
+                                opacity: polygonTooltipOption.border.opacity
+                            } : {
+                                color: option.border.color ||
+                                    this.maps.themeStyle.tooltipBorderColor, width: option.border.width, opacity: option.border.opacity
+                            };
                             if (tooltipArgs.cancel) {
                                 this.svgTooltip = new Tooltip({
+                                    theme: this.maps.theme,
                                     enable: true,
                                     header: '',
                                     data: option['data'],
@@ -14729,11 +14811,12 @@ class MapsTooltip {
                                     availableSize: this.maps.availableSize,
                                     fill: option.fill || this.maps.themeStyle.tooltipFillColor,
                                     enableShadow: true,
-                                    border: isPolygon ? polygonTooltipOption.border : option.border
+                                    border: borderObject
                                 });
                             }
                             else {
                                 this.svgTooltip = new Tooltip({
+                                    theme: this.maps.theme,
                                     enable: true,
                                     header: '',
                                     data: tooltipArgs.options['data'],
@@ -14748,7 +14831,7 @@ class MapsTooltip {
                                     availableSize: this.maps.availableSize,
                                     fill: tooltipArgs.fill || this.maps.themeStyle.tooltipFillColor,
                                     enableShadow: true,
-                                    border: isPolygon ? polygonTooltipOption.border : option.border
+                                    border: borderObject
                                 });
                             }
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -14980,10 +15063,8 @@ class Zoom {
         this.maps = maps;
         this.wheelEvent = this.browserName === 'mozilla' ? (this.isPointer ? 'mousewheel' : 'DOMMouseScroll') : 'mousewheel';
         this.cancelEvent = this.isPointer ? 'pointerleave' : 'mouseleave';
-        this.selectionColor = this.maps.zoomSettings.toolbarSettings.buttonSettings.selectionColor == null ?
-            this.maps.zoomSettings.selectionColor : this.maps.zoomSettings.toolbarSettings.buttonSettings.selectionColor;
-        this.fillColor = this.maps.zoomSettings.toolbarSettings.buttonSettings.color == null ? this.maps.zoomSettings.color :
-            this.maps.zoomSettings.toolbarSettings.buttonSettings.color;
+        this.selectionColor = this.maps.zoomSettings.toolbarSettings.buttonSettings.selectionColor;
+        this.fillColor = this.maps.zoomSettings.toolbarSettings.buttonSettings.color;
         this.addEventListener();
     }
     /**
@@ -15423,9 +15504,9 @@ class Zoom {
      * @param {number} scale - Specifies the scale value
      * @returns {void}
      */
-    animateTransform(element, animate$$1, x, y, scale) {
+    animateTransform(element, animate, x, y, scale) {
         const duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
-        if (!animate$$1 || duration === 0 || this.maps.isTileMap) {
+        if (!animate || duration === 0 || this.maps.isTileMap) {
             if (!(this.maps.isTileMap && element.id.indexOf('_Polygons_Group') > -1)) {
                 element.setAttribute('transform', 'scale(' + (scale) + ') translate( ' + x + ' ' + y + ' )');
             }
@@ -15442,7 +15523,7 @@ class Zoom {
      * @returns {void}
      * @private
      */
-    applyTransform(maps, animate$$1, isPanning) {
+    applyTransform(maps, animate, isPanning) {
         let layerIndex;
         this.templateCount = 0;
         let markerStyle;
@@ -15483,7 +15564,9 @@ class Zoom {
                                         const markerData = polygonSettings.points;
                                         const path = calculatePolygonPath(maps, maps.tileZoomLevel, this.currentLayer, markerData);
                                         const element = document.getElementById(maps.element.id + '_LayerIndex_' + this.index + '_PolygonIndex_' + polygonIndex);
-                                        element.setAttribute('d', path);
+                                        if (!isNullOrUndefined(element)) {
+                                            element.setAttribute('d', path);
+                                        }
                                     });
                                     document.getElementById(maps.element.id + '_LayerIndex_' + this.index + '_Polygons_Group').style.visibility = '';
                                 }
@@ -15491,7 +15574,7 @@ class Zoom {
                             else if (currentEle.id.indexOf('Legend') === -1) {
                                 changeBorderWidth(currentEle, this.index, scale, maps);
                                 maps.zoomTranslatePoint = maps.translatePoint;
-                                this.animateTransform(currentEle, animate$$1, x, y, scale);
+                                this.animateTransform(currentEle, animate, x, y, scale);
                             }
                         }
                         else if (currentEle.id.indexOf('_Markers_Group') > -1) {
@@ -15502,7 +15585,7 @@ class Zoom {
                             let markerAnimation;
                             if (!isNullOrUndefined(currentEle) && currentEle.id.indexOf('Markers') !== -1) {
                                 Array.prototype.forEach.call(currentEle.childNodes, (childNode, k) => {
-                                    this.markerTranslate(childNode, factor, x, y, scale, 'Marker', animate$$1);
+                                    this.markerTranslate(childNode, factor, x, y, scale, 'Marker', animate);
                                     const dataIndex = parseInt(childNode['id'].split('_dataIndex_')[1].split('_')[0], 10);
                                     const markerIndex = parseInt(childNode['id'].split('_MarkerIndex_')[1].split('_')[0], 10);
                                     markerAnimation = this.currentLayer.markerSettings[markerIndex].animationDuration > 0 || animationMode === 'Enable';
@@ -15580,7 +15663,7 @@ class Zoom {
                                         const currentX = ((centerX + x) * scale);
                                         const currentY = ((centerY + y) * scale);
                                         const duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
-                                        if (!animate$$1 || duration === 0) {
+                                        if (!animate || duration === 0) {
                                             childElement.setAttribute('transform', 'translate( ' + currentX + ' ' + currentY + ' )');
                                         }
                                         else {
@@ -15594,7 +15677,7 @@ class Zoom {
                         else if (currentEle.id.indexOf('_dataLableIndex_Group') > -1 && !isNullOrUndefined(maps.layers[this.index])) {
                             maps.zoomLabelPositions = [];
                             maps.zoomLabelPositions = maps.dataLabelModule.dataLabelCollections;
-                            const labelAnimate = !maps.isTileMap && animate$$1;
+                            const labelAnimate = !maps.isTileMap && animate;
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
                             const intersect = [];
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -15630,7 +15713,7 @@ class Zoom {
                 maps.arrangeTemplate();
             }
             if (!isNullOrUndefined(this.currentLayer)) {
-                if (!animate$$1 || this.currentLayer.animationDuration === 0 || maps.isTileMap) {
+                if (!animate || this.currentLayer.animationDuration === 0 || maps.isTileMap) {
                     this.processTemplate(x, y, scale, maps);
                 }
             }
@@ -15794,7 +15877,7 @@ class Zoom {
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    dataLabelTranslate(element, factor, x, y, scale, type, animate$$1 = false, currentLabelIndex, isPanning, intersect) {
+    dataLabelTranslate(element, factor, x, y, scale, type, animate = false, currentLabelIndex, isPanning, intersect) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const labelCollection = this.maps.dataLabelModule.dataLabelCollections;
         let text;
@@ -15842,7 +15925,7 @@ class Zoom {
                 labelX = ((labelX + x) * scale);
                 labelY = ((labelY + y) * scale);
                 zoomtext = label['dataLabelText'];
-                if (!animate$$1 || duration === 0) {
+                if (!animate || duration === 0) {
                     element.setAttribute('transform', 'translate( ' + labelX + ' ' + labelY + ' )');
                 }
                 if ((isNullOrUndefined(isPanning) || !isPanning) && (this.maps.layers[this.index].dataLabelSettings.smartLabelMode !== 'None' ||
@@ -15939,51 +16022,38 @@ class Zoom {
                         }
                     }
                 }
-                if (animate$$1 || duration > 0) {
+                if (animate || duration > 0) {
                     smoothTranslate(element, 0, duration, new MapLocation(labelX, labelY));
                 }
             }
         }
     }
-    markerTranslate(element, factor, x, y, scale, type, animate$$1 = false) {
+    markerTranslate(element, factor, x, y, scale, type, animate = false) {
         const layerIndex = parseInt(element.id.split('_LayerIndex_')[1].split('_')[0], 10);
         const markerIndex = parseInt(element.id.split('_MarkerIndex_')[1].split('_')[0], 10);
         const dataIndex = parseInt(element.id.split('_dataIndex_')[1].split('_')[0], 10);
         const layer = this.maps.layersCollection[layerIndex];
-        const marker$$1 = layer.markerSettings[markerIndex];
-        if (!isNullOrUndefined(marker$$1) && !isNullOrUndefined(marker$$1.dataSource) && !isNullOrUndefined(marker$$1.dataSource[dataIndex])) {
-            const lng = (!isNullOrUndefined(marker$$1.longitudeValuePath)) ?
-                Number(getValueFromObject(marker$$1.dataSource[dataIndex], marker$$1.longitudeValuePath)) :
-                !isNullOrUndefined(marker$$1.dataSource[dataIndex]['longitude']) ? parseFloat(marker$$1.dataSource[dataIndex]['longitude']) :
-                    !isNullOrUndefined(marker$$1.dataSource[dataIndex]['Longitude']) ? parseFloat(marker$$1.dataSource[dataIndex]['Longitude']) : 0;
-            const lat = (!isNullOrUndefined(marker$$1.latitudeValuePath)) ?
-                Number(getValueFromObject(marker$$1.dataSource[dataIndex], marker$$1.latitudeValuePath)) :
-                !isNullOrUndefined(marker$$1.dataSource[dataIndex]['latitude']) ? parseFloat(marker$$1.dataSource[dataIndex]['latitude']) :
-                    !isNullOrUndefined(marker$$1.dataSource[dataIndex]['Latitude']) ? parseFloat(marker$$1.dataSource[dataIndex]['Latitude']) : 0;
+        const marker = layer.markerSettings[markerIndex];
+        if (!isNullOrUndefined(marker) && !isNullOrUndefined(marker.dataSource) && !isNullOrUndefined(marker.dataSource[dataIndex])) {
+            const lng = (!isNullOrUndefined(marker.longitudeValuePath)) ?
+                Number(getValueFromObject(marker.dataSource[dataIndex], marker.longitudeValuePath)) :
+                !isNullOrUndefined(marker.dataSource[dataIndex]['longitude']) ? parseFloat(marker.dataSource[dataIndex]['longitude']) :
+                    !isNullOrUndefined(marker.dataSource[dataIndex]['Longitude']) ? parseFloat(marker.dataSource[dataIndex]['Longitude']) : 0;
+            const lat = (!isNullOrUndefined(marker.latitudeValuePath)) ?
+                Number(getValueFromObject(marker.dataSource[dataIndex], marker.latitudeValuePath)) :
+                !isNullOrUndefined(marker.dataSource[dataIndex]['latitude']) ? parseFloat(marker.dataSource[dataIndex]['latitude']) :
+                    !isNullOrUndefined(marker.dataSource[dataIndex]['Latitude']) ? parseFloat(marker.dataSource[dataIndex]['Latitude']) : 0;
             const duration = this.currentLayer.animationDuration === 0 && animationMode === 'Enable' ? 1000 : this.currentLayer.animationDuration;
             const location = (this.maps.isTileMap) ? convertTileLatLongToPoint(new Point(lng, lat), this.maps.tileZoomLevel, this.maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, layer, this.maps);
             if (this.maps.isTileMap) {
                 if (type === 'Template') {
                     const templateOffset = element.getBoundingClientRect();
-                    element.style.left = ((location.x - (templateOffset.width / 2)) + marker$$1.offset.x) + 'px';
-                    element.style.top = ((location.y - (templateOffset.height / 2)) + marker$$1.offset.y) + 'px';
-                    if (this.maps.layers[this.maps.baseLayerIndex].layerType === 'GoogleStaticMap') {
-                        const staticMapOffset = getElementByID(this.maps.element.id + '_StaticGoogleMap').getBoundingClientRect();
-                        const staticMapOffsetWidth = 640;
-                        if (element['style']['display'] !== 'none') {
-                            if ((staticMapOffset['x'] > templateOffset['x'] || staticMapOffset['x'] + staticMapOffsetWidth < templateOffset['x'] + templateOffset['width'])
-                                && (staticMapOffset['y'] > templateOffset['y'] || staticMapOffset['y'] + staticMapOffset['height'] < templateOffset['y'] + templateOffset['height'])) {
-                                element.style.display = 'none';
-                            }
-                            else if ((staticMapOffset['x'] > templateOffset['x'] || staticMapOffset['x'] + staticMapOffsetWidth < templateOffset['x'] + templateOffset['width'])) {
-                                element.style.display = 'none';
-                            }
-                        }
-                    }
+                    element.style.left = ((location.x - (templateOffset.width / 2)) + marker.offset.x) + 'px';
+                    element.style.top = ((location.y - (templateOffset.height / 2)) + marker.offset.y) + 'px';
                 }
                 else {
-                    location.x += marker$$1.offset.x;
-                    location.y += marker$$1.offset.y;
+                    location.x += marker.offset.x;
+                    location.y += marker.offset.y;
                     element.setAttribute('transform', 'translate( ' + location.x + ' ' + location.y + ' )');
                 }
             }
@@ -15994,20 +16064,20 @@ class Zoom {
                         location.y = ((Math.abs(this.maps.baseMapRectBounds['min']['y'] - location.y)) * scale);
                         const layerOffset = getElementByID(this.maps.element.id + '_Layer_Collections').getBoundingClientRect();
                         const elementOffset = element.parentElement.getBoundingClientRect();
-                        element.style.left = (((location.x) + (layerOffset.left - elementOffset.left)) + marker$$1.offset.x) + 'px';
-                        element.style.top = (((location.y) + (layerOffset.top - elementOffset.top)) + marker$$1.offset.y) + 'px';
+                        element.style.left = (((location.x) + (layerOffset.left - elementOffset.left)) + marker.offset.x) + 'px';
+                        element.style.top = (((location.y) + (layerOffset.top - elementOffset.top)) + marker.offset.y) + 'px';
                         element.style.transform = 'translate(-50%, -50%)';
                     }
                     else {
                         const elementOffset = element.getBoundingClientRect();
-                        element.style.left = ((location.x + x) * scale) + marker$$1.offset.x - this.maps.mapAreaRect.x - (elementOffset.width / 2) + 'px';
-                        element.style.top = ((location.y + y) * scale) + marker$$1.offset.y - this.maps.mapAreaRect.y - (elementOffset.height / 2) + 'px';
+                        element.style.left = ((location.x + x) * scale) + marker.offset.x - this.maps.mapAreaRect.x - (elementOffset.width / 2) + 'px';
+                        element.style.top = ((location.y + y) * scale) + marker.offset.y - this.maps.mapAreaRect.y - (elementOffset.height / 2) + 'px';
                     }
                 }
                 else {
-                    location.x = (((location.x + x) * scale) + marker$$1.offset.x);
-                    location.y = (((location.y + y) * scale) + marker$$1.offset.y);
-                    if (!animate$$1 || duration === 0) {
+                    location.x = (((location.x + x) * scale) + marker.offset.x);
+                    location.y = (((location.y + y) * scale) + marker.offset.y);
+                    if (!animate || duration === 0) {
                         element.setAttribute('transform', 'translate( ' + location.x + ' ' + location.y + ' )');
                     }
                     else {
@@ -16257,44 +16327,44 @@ class Zoom {
         const toolbar = map.zoomSettings.toolbarSettings;
         const button = map.zoomSettings.toolbarSettings.buttonSettings;
         this.maps.toolbarProperties = {
-            toolBarOrientation: toolbar.orientation === 'Horizontal' ? map.zoomSettings.toolBarOrientation : toolbar.orientation,
-            highlightColor: button.highlightColor == null ? map.zoomSettings.highlightColor : button.highlightColor,
-            selectionColor: button.selectionColor == null ? map.zoomSettings.selectionColor : button.selectionColor,
-            horizontalAlignment: toolbar.horizontalAlignment === 'Far' ? map.zoomSettings.horizontalAlignment : toolbar.horizontalAlignment,
-            verticalAlignment: toolbar.verticalAlignment === 'Near' ? map.zoomSettings.verticalAlignment : toolbar.verticalAlignment,
-            color: button.color == null ? map.zoomSettings.color : button.color,
-            shapeOpacity: button.opacity !== 1 ? button.opacity : 1,
-            borderOpacity: button.borderOpacity !== 1 ? button.borderOpacity : 1
+            toolBarOrientation: toolbar.orientation,
+            highlightColor: button.highlightColor,
+            selectionColor: button.selectionColor,
+            horizontalAlignment: toolbar.horizontalAlignment,
+            verticalAlignment: toolbar.verticalAlignment,
+            color: button.color,
+            shapeOpacity: button.opacity,
+            borderOpacity: button.borderOpacity
         };
-        const cx = button.radius / 4;
-        const cy = button.radius / 4;
-        const radius = button.radius / 2;
+        const buttonRadius = button.radius || map.themeStyle.zoomButtonRadius;
+        const cx = buttonRadius / 4;
+        const cy = buttonRadius / 4;
+        const radius = buttonRadius / 2;
         const padding = button.padding;
         const orientation = this.maps.toolbarProperties.toolBarOrientation;
         const toolbarCollection = map.zoomSettings.toolbarSettings.buttonSettings.toolbarItems.map((value) => { return value; });
-        const toolbarsCollection = toolbarCollection.length === 3 ? map.zoomSettings.toolbars : toolbarCollection;
-        xSpacing = (button.radius / 4) + (button.borderWidth / 2) + padding;
-        ySpacing = (button.radius / 4) + (button.borderWidth / 2) + padding;
+        xSpacing = (buttonRadius / 4) + (button.borderWidth / 2) + padding;
+        ySpacing = (buttonRadius / 4) + (button.borderWidth / 2) + padding;
         let shadowElement = '<filter id="chart_shadow" height="130%"><feGaussianBlur in="SourceAlpha" stdDeviation="5"/>';
         shadowElement += '<feOffset dx="-3" dy="4" result="offsetblur"/><feComponentTransfer><feFuncA type="linear" slope="1"/>';
         shadowElement += '</feComponentTransfer><feMerge><feMergeNode/><feMergeNode in="SourceGraphic"/></feMerge></filter>';
         const toolBarLength = toolbarCollection.length;
-        const toolWidth = (orientation === 'Horizontal') ? ((toolBarLength * button.radius) + (toolBarLength * padding) + padding + (toolBarLength * button.borderWidth)) : (button.radius + button.borderWidth + (2 * padding));
-        const toolHeight = (orientation === 'Horizontal') ? (button.radius + button.borderWidth + (2 * padding)) : ((toolBarLength * button.radius) + (toolBarLength * padding) + padding + (toolBarLength * button.borderWidth));
+        const toolWidth = (orientation === 'Horizontal') ? ((toolBarLength * buttonRadius) + (toolBarLength * padding) + padding + (toolBarLength * button.borderWidth)) : (buttonRadius + button.borderWidth + (2 * padding));
+        const toolHeight = (orientation === 'Horizontal') ? (buttonRadius + button.borderWidth + (2 * padding)) : ((toolBarLength * buttonRadius) + (toolBarLength * padding) + padding + (toolBarLength * button.borderWidth));
         const defElement = map.renderer.createDefs();
         defElement.innerHTML = shadowElement;
         this.toolBarGroup.appendChild(defElement);
         const outerElement = map.renderer.drawRectangle(new RectOption(map.element.id + '_Zooming_Rect', toolbar.backgroundColor, { color: toolbar.borderColor, width: toolbar.borderWidth, opacity: toolbar.borderOpacity }, toolbar.borderOpacity, new Rect((toolbar.borderWidth / 2), (toolbar.borderWidth / 2), (toolWidth - toolbar.borderWidth), (toolHeight - toolbar.borderWidth)), 0, 0));
         this.toolBarGroup.appendChild(outerElement);
-        const scaleX = (button.radius - (button.borderWidth / 2)) / 30;
-        for (let i = 0; i < toolbarsCollection.length; i++) {
+        const scaleX = (buttonRadius - (button.borderWidth / 2)) / 30;
+        for (let i = 0; i < toolbarCollection.length; i++) {
             if (i !== 0) {
-                xSpacing = (map.toolbarProperties.toolBarOrientation === 'Horizontal') ? (xSpacing + (button.radius + padding) + button.borderWidth) : xSpacing;
-                ySpacing = (map.toolbarProperties.toolBarOrientation === 'Horizontal') ? ySpacing : (ySpacing + (button.radius + padding) + button.borderWidth);
+                xSpacing = (map.toolbarProperties.toolBarOrientation === 'Horizontal') ? (xSpacing + (buttonRadius + padding) + button.borderWidth) : xSpacing;
+                ySpacing = (map.toolbarProperties.toolBarOrientation === 'Horizontal') ? ySpacing : (ySpacing + (buttonRadius + padding) + button.borderWidth);
             }
-            const toolbar = toolbarsCollection[i];
+            const toolbar = toolbarCollection[i];
             const pathStroke = !isNullOrUndefined(this.maps.toolbarProperties.color) ? this.maps.toolbarProperties.color : this.maps.themeStyle.zoomFillColor;
-            const borderColor = button.borderColor || this.maps.themeStyle.zoomFillColor;
+            const borderColor = button.borderColor || (this.maps.themeStyle.zoomBorderColor || this.maps.themeStyle.zoomFillColor);
             this.currentToolbarEle = map.renderer.createGroup({
                 id: map.element.id + '_Zooming_ToolBar_' + toolbar + '_Group',
                 transform: 'translate( ' + xSpacing + ' ' + ySpacing + ' ) '
@@ -16942,7 +17012,6 @@ class Zoom {
         let pageX;
         let pageY;
         const map = this.maps;
-        //eslint-disable-next-line @typescript-eslint/no-unused-vars
         let target;
         let touches = null;
         const zoom = this.maps.zoomSettings;
@@ -17267,10 +17336,13 @@ class Print {
             backgroundElement = backgroundElement.childNodes[0];
             if (!isNullOrUndefined(backgroundElement)) {
                 const backgroundColor = backgroundElement.getAttribute('fill');
-                if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+                if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3' || maps.theme === 'Fluent2')
+                    && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                     backgroundElement.setAttribute('fill', 'rgba(255,255,255, 1)');
                 }
-                else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+                else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark' ||
+                    maps.theme === 'Fluent2Dark' || maps.theme === 'Fluent2HighContrast')
+                    && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                     backgroundElement.setAttribute('fill', 'rgba(0, 0, 0, 1)');
                 }
             }
@@ -17372,10 +17444,13 @@ class ImageExport {
             const svgObject = getElementByID(maps.element.id + '_svg').cloneNode(true);
             const backgroundElement = svgObject.childNodes[0];
             const backgroundColor = backgroundElement.getAttribute('fill');
-            if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+            if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3' || maps.theme === 'Fluent2')
+                && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                 svgObject.childNodes[0].setAttribute('fill', 'rgba(255,255,255, 1)');
             }
-            else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+            else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark' ||
+                maps.theme === 'Fluent2Dark' || maps.theme === 'Fluent2HighContrast')
+                && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                 svgObject.childNodes[0].setAttribute('fill', 'rgba(0, 0, 0, 1)');
             }
             if (!maps.isTileMap) {
@@ -17555,10 +17630,13 @@ class PdfExport {
             const exportElement = maps.svgObject.cloneNode(true);
             const backgroundElement = exportElement.childNodes[0];
             const backgroundColor = backgroundElement.getAttribute('fill');
-            if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+            if ((maps.theme === 'Tailwind' || maps.theme === 'Bootstrap5' || maps.theme === 'Fluent' || maps.theme === 'Material3' || maps.theme === 'Fluent2')
+                && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                 exportElement.childNodes[0].setAttribute('fill', 'rgba(255,255,255, 1)');
             }
-            else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark') && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
+            else if ((maps.theme === 'TailwindDark' || maps.theme === 'Bootstrap5Dark' || maps.theme === 'FluentDark' || maps.theme === 'Material3Dark' ||
+                maps.theme === 'Fluent2Dark' || maps.theme === 'Fluent2HighContrast')
+                && (backgroundColor === 'rgba(255,255,255, 0.0)' || backgroundColor === 'transparent')) {
                 exportElement.childNodes[0].setAttribute('fill', 'rgba(0, 0, 0, 1)');
             }
             const url = window.URL.createObjectURL(new Blob(type === 'SVG' ? [svgData] :
@@ -17678,13 +17756,5 @@ class PdfExport {
     destroy() { }
 }
 
-/**
- * export all modules from maps component
- */
-
-/**
- * exporting all modules from maps index
- */
-
-export { Maps, load, loaded, click, onclick, rightClick, doubleClick, resize, tooltipRender, shapeSelected, shapeHighlight, mousemove, mouseup, mousedown, layerRendering, shapeRendering, markerRendering, markerClusterRendering, markerClick, markerDragStart, markerDragEnd, markerClusterClick, markerMouseMove, markerClusterMouseMove, dataLabelRendering, bubbleRendering, bubbleClick, bubbleMouseMove, animationComplete, legendRendering, annotationRendering, itemSelection, panComplete, zoomComplete, itemHighlight, beforePrint, zoomIn, zoomOut, pan, Annotation, Arrow, Font, ZoomToolbarButtonSettings, ZoomToolbarTooltipSettings, ZoomToolbarSettings, Border, CenterPosition, TooltipSettings, PolygonTooltipSettings, Margin, ConnectorLineSettings, MarkerClusterSettings, MarkerClusterData, ColorMappingSettings, InitialMarkerSelectionSettings, InitialShapeSelectionSettings, SelectionSettings, HighlightSettings, PolygonSetting, PolygonSettings, NavigationLineSettings, BubbleSettings, CommonTitleSettings, SubTitleSettings, TitleSettings, ZoomSettings, ToggleLegendSettings, LegendSettings, DataLabelSettings, ShapeSettings, MarkerBase, MarkerSettings, LayerSettings, Tile, MapsAreaSettings, Size, stringToNumber, calculateSize, createSvg, getMousePosition, degreesToRadians, radiansToDegrees, convertGeoToPoint, calculatePolygonPath, convertTileLatLongToPoint, xToCoordinate, yToCoordinate, aitoff, roundTo, sinci, acos, calculateBound, triggerDownload, Point, Coordinate, MinMax, GeoLocation, measureText, measureTextElement, TextOption, PathOption, ColorValue, RectOption, CircleOption, PolygonOption, PolylineOption, LineOption, Line, MapLocation, Rect, PatternOptions, renderTextElement, convertElement, formatValue, convertStringToValue, convertElementFromLabel, drawSymbols, getValueFromObject, markerColorChoose, markerShapeChoose, clusterTemplate, markerClusterListHandler, markerBoundsComparer, mergeSeparateCluster, clusterSeparate, marker, markerTemplate, maintainSelection, maintainToggleSelection, maintainStyleClass, appendShape, drawCircle, drawRectangle, drawPath, drawPolygon, drawPolyline, drawLine, calculateShapes, drawDiamond, drawTriangle, drawCross, drawHorizontalLine, drawVerticalLine, drawStar, drawBalloon, drawPattern, getFieldData, checkShapeDataFields, checkPropertyPath, filter, getRatioOfBubble, findMidPointOfPolygon, isCustomPath, textTrim, findPosition, removeElement, calculateCenterFromPixel, getTranslate, getZoomTranslate, fixInitialScaleForTile, getElementByID, getClientElement, Internalize, getTemplateFunction, getElement, getShapeData, triggerShapeEvent, getElementsByClassName, querySelector, getTargetElement, createStyle, customizeStyle, triggerItemSelectionEvent, removeClass, elementAnimate, timeout, showTooltip, wordWrap, createTooltip, getHexColor, drawSymbol, renderLegendShape, getElementOffset, changeBorderWidth, changeNavaigationLineWidth, targetTouches, calculateScale, getDistance, getTouches, getTouchCenter, sum, zoomAnimate, animate, MapAjax, smoothTranslate, compareZoomFactor, calculateZoomLevel, processResult, LayerPanel, Bubble, BingMap, Marker, Polygon, ColorMapping, DataLabel, NavigationLine, Legend, Highlight, Selection, MapsTooltip, Zoom, Annotations, Print, ImageExport, PdfExport };
+export { Annotation, Annotations, Arrow, BingMap, Border, Bubble, BubbleSettings, CenterPosition, CircleOption, ColorMapping, ColorMappingSettings, ColorValue, CommonTitleSettings, ConnectorLineSettings, Coordinate, DataLabel, DataLabelSettings, Font, GeoLocation, Highlight, HighlightSettings, ImageExport, InitialMarkerSelectionSettings, InitialShapeSelectionSettings, Internalize, LayerPanel, LayerSettings, Legend, LegendSettings, Line, LineOption, MapAjax, MapLocation, Maps, MapsAreaSettings, MapsTooltip, Margin, Marker, MarkerBase, MarkerClusterData, MarkerClusterSettings, MarkerSettings, MinMax, NavigationLine, NavigationLineSettings, PathOption, PatternOptions, PdfExport, Point, Polygon, PolygonOption, PolygonSetting, PolygonSettings, PolygonTooltipSettings, PolylineOption, Print, Rect, RectOption, Selection, SelectionSettings, ShapeSettings, Size, SubTitleSettings, TextOption, Tile, TitleSettings, ToggleLegendSettings, TooltipSettings, Zoom, ZoomSettings, ZoomToolbarButtonSettings, ZoomToolbarSettings, ZoomToolbarTooltipSettings, acos, aitoff, animate, animationComplete, annotationRendering, appendShape, beforePrint, bubbleClick, bubbleMouseMove, bubbleRendering, calculateBound, calculateCenterFromPixel, calculatePolygonPath, calculateScale, calculateShapes, calculateSize, calculateZoomLevel, changeBorderWidth, changeNavaigationLineWidth, checkPropertyPath, checkShapeDataFields, click, clusterSeparate, clusterTemplate, compareZoomFactor, convertElement, convertElementFromLabel, convertGeoToPoint, convertStringToValue, convertTileLatLongToPoint, createStyle, createSvg, createTooltip, customizeStyle, dataLabelRendering, degreesToRadians, doubleClick, drawBalloon, drawCircle, drawCross, drawDiamond, drawHorizontalLine, drawLine, drawPath, drawPattern, drawPolygon, drawPolyline, drawRectangle, drawStar, drawSymbol, drawSymbols, drawTriangle, drawVerticalLine, elementAnimate, filter, findMidPointOfPolygon, findPosition, fixInitialScaleForTile, formatValue, getClientElement, getDistance, getElement, getElementByID, getElementOffset, getElementsByClassName, getFieldData, getHexColor, getMousePosition, getRatioOfBubble, getShapeData, getTargetElement, getTemplateFunction, getTouchCenter, getTouches, getTranslate, getValueFromObject, getZoomTranslate, isCustomPath, itemHighlight, itemSelection, layerRendering, legendRendering, load, loaded, maintainSelection, maintainStyleClass, maintainToggleSelection, marker, markerBoundsComparer, markerClick, markerClusterClick, markerClusterListHandler, markerClusterMouseMove, markerClusterRendering, markerColorChoose, markerDragEnd, markerDragStart, markerMouseMove, markerRendering, markerShapeChoose, markerTemplate, measureText, measureTextElement, mergeSeparateCluster, mousedown, mousemove, mouseup, onclick, pan, panComplete, processResult, querySelector, radiansToDegrees, removeClass, removeElement, renderLegendShape, renderTextElement, resize, rightClick, roundTo, shapeHighlight, shapeRendering, shapeSelected, showTooltip, sinci, smoothTranslate, stringToNumber, sum, targetTouches, textTrim, timeout, tooltipRender, triggerDownload, triggerItemSelectionEvent, triggerShapeEvent, wordWrap, xToCoordinate, yToCoordinate, zoomAnimate, zoomComplete, zoomIn, zoomOut };
 //# sourceMappingURL=ej2-maps.es2015.js.map