@syncfusion/ej2-maps 27.2.2 → 28.1.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.gitleaksignore +3 -3
- package/README.md +2 -2
- package/dist/ej2-maps.min.js +3 -3
- package/dist/ej2-maps.umd.min.js +3 -3
- package/dist/ej2-maps.umd.min.js.map +1 -1
- package/dist/es6/ej2-maps.es2015.js +508 -206
- package/dist/es6/ej2-maps.es2015.js.map +1 -1
- package/dist/es6/ej2-maps.es5.js +517 -215
- package/dist/es6/ej2-maps.es5.js.map +1 -1
- package/dist/global/ej2-maps.min.js +3 -3
- package/dist/global/ej2-maps.min.js.map +1 -1
- package/dist/global/index.d.ts +2 -2
- package/package.json +13 -13
- package/src/maps/layers/legend.js +23 -21
- package/src/maps/layers/marker.d.ts +8 -1
- package/src/maps/layers/marker.js +104 -33
- package/src/maps/maps-model.d.ts +8 -1
- package/src/maps/maps.d.ts +19 -3
- package/src/maps/maps.js +53 -15
- package/src/maps/model/base-model.d.ts +20 -0
- package/src/maps/model/base.d.ts +17 -0
- package/src/maps/model/base.js +9 -0
- package/src/maps/model/constants.d.ts +6 -0
- package/src/maps/model/constants.js +6 -0
- package/src/maps/model/export-image.js +4 -4
- package/src/maps/model/export-pdf.js +4 -4
- package/src/maps/model/interface.d.ts +15 -0
- package/src/maps/model/print.js +2 -2
- package/src/maps/model/theme.js +72 -0
- package/src/maps/user-interaction/tooltip.js +3 -1
- package/src/maps/user-interaction/zoom.d.ts +13 -1
- package/src/maps/user-interaction/zoom.js +136 -90
- package/src/maps/utils/enum.d.ts +4 -0
- package/src/maps/utils/helper.d.ts +4 -9
- package/src/maps/utils/helper.js +102 -46
|
@@ -318,6 +318,7 @@ var Zoom = /** @class */ (function () {
|
|
|
318
318
|
var zoomCalculationFactor = this.pinchFactor;
|
|
319
319
|
var isZoomCancelled;
|
|
320
320
|
var prevTilePoint = map.tileTranslatePoint;
|
|
321
|
+
this.maps.mergeCluster();
|
|
321
322
|
if (!map.isTileMap) {
|
|
322
323
|
var availSize = map.mapAreaRect;
|
|
323
324
|
map.isMarkerZoomCompleted = false;
|
|
@@ -517,6 +518,17 @@ var Zoom = /** @class */ (function () {
|
|
|
517
518
|
if (document.getElementById(maps.element.id + '_mapsTooltip')) {
|
|
518
519
|
removeElement(maps.element.id + '_mapsTooltip');
|
|
519
520
|
}
|
|
521
|
+
if (maps.isTileMap) {
|
|
522
|
+
var element = document.getElementById(maps.element.id + '_svg');
|
|
523
|
+
if (element) {
|
|
524
|
+
for (var k = 0; k < maps.layers.length; k++) {
|
|
525
|
+
var layerElement = element.querySelector('#' + maps.element.id + '_LayerIndex_' + k);
|
|
526
|
+
if (layerElement) {
|
|
527
|
+
element.removeChild(layerElement);
|
|
528
|
+
}
|
|
529
|
+
}
|
|
530
|
+
}
|
|
531
|
+
}
|
|
520
532
|
if (this.layerCollectionEle) {
|
|
521
533
|
var _loop_1 = function (i) {
|
|
522
534
|
var layerElement = this_1.layerCollectionEle.childNodes[i];
|
|
@@ -526,6 +538,7 @@ var Zoom = /** @class */ (function () {
|
|
|
526
538
|
this_1.currentLayer = maps.layersCollection[this_1.index];
|
|
527
539
|
var factor_1 = maps.mapLayerPanel.calculateFactor(this_1.currentLayer);
|
|
528
540
|
var elementCount = layerElement.childElementCount;
|
|
541
|
+
var templateElement = document.getElementById(maps.element.id + '_LayerIndex_' + this_1.index + '_Markers_Template_Group');
|
|
529
542
|
var _loop_2 = function (j) {
|
|
530
543
|
var currentEle = layerElement.childNodes[j];
|
|
531
544
|
if (!(currentEle.id.indexOf('_Markers_Group') > -1) && (!(currentEle.id.indexOf('_bubble_Group') > -1))
|
|
@@ -559,17 +572,16 @@ var Zoom = /** @class */ (function () {
|
|
|
559
572
|
}
|
|
560
573
|
}
|
|
561
574
|
else if (currentEle.id.indexOf('_Markers_Group') > -1) {
|
|
562
|
-
if ((!this_1.isPanModeEnabled || !isPanning) && !isNullOrUndefined(currentEle.childNodes[0])) {
|
|
563
|
-
|
|
575
|
+
if ((!this_1.isPanModeEnabled || !isPanning) && (!isNullOrUndefined(currentEle.childNodes[0]) || !isNullOrUndefined(templateElement.childNodes[0]))) {
|
|
576
|
+
var processElement = (!isNullOrUndefined(currentEle.childNodes[0]) ? currentEle.childNodes[0] : templateElement.childNodes[0]);
|
|
577
|
+
this_1.markerTranslates(processElement, factor_1, x, y, scale, 'Marker', layerElement);
|
|
564
578
|
}
|
|
565
579
|
currentEle = layerElement.childNodes[j];
|
|
566
|
-
var markerAnimation_1;
|
|
567
580
|
if (!isNullOrUndefined(currentEle) && currentEle.id.indexOf('Markers') !== -1) {
|
|
568
581
|
Array.prototype.forEach.call(currentEle.childNodes, function (childNode, k) {
|
|
569
582
|
_this.markerTranslate(childNode, factor_1, x, y, scale, 'Marker', animate);
|
|
570
583
|
var dataIndex = parseInt(childNode['id'].split('_dataIndex_')[1].split('_')[0], 10);
|
|
571
584
|
var markerIndex = parseInt(childNode['id'].split('_MarkerIndex_')[1].split('_')[0], 10);
|
|
572
|
-
markerAnimation_1 = _this.currentLayer.markerSettings[markerIndex].animationDuration > 0 || animationMode === 'Enable';
|
|
573
585
|
if (_this.currentLayer.markerSettings[markerIndex].initialMarkerSelection.length > 0) {
|
|
574
586
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
575
587
|
var markerSelectionValues = _this.currentLayer.markerSettings[markerIndex].dataSource[dataIndex];
|
|
@@ -583,13 +595,7 @@ var Zoom = /** @class */ (function () {
|
|
|
583
595
|
}
|
|
584
596
|
}
|
|
585
597
|
if (((_this.currentLayer.animationDuration > 0 || animationMode === 'Enable') || ((maps.layersCollection[0].animationDuration > 0 || animationMode === 'Enable') && _this.currentLayer.type === 'SubLayer')) && !_this.isPanModeEnabled) {
|
|
586
|
-
if (maps.isTileMap) {
|
|
587
|
-
var groupElement = document.querySelector('.GroupElement');
|
|
588
|
-
if (groupElement && !(document.querySelector('.ClusterGroupElement')) && markerAnimation_1) {
|
|
589
|
-
groupElement.style.display = 'none';
|
|
590
|
-
}
|
|
591
|
-
}
|
|
592
|
-
else {
|
|
598
|
+
if (!maps.isTileMap) {
|
|
593
599
|
markerStyle = 'visibility:hidden';
|
|
594
600
|
currentEle.style.cssText = markerStyle;
|
|
595
601
|
}
|
|
@@ -737,92 +743,111 @@ var Zoom = /** @class */ (function () {
|
|
|
737
743
|
removeElement(markerTemplateElements.id);
|
|
738
744
|
}
|
|
739
745
|
var currentLayers = this.maps.layersCollection[layerIndex];
|
|
746
|
+
var allowInnerClusterSetting = this.maps.markerModule.allowInnerClusterSetting(currentLayers);
|
|
740
747
|
Array.prototype.forEach.call(currentLayers.markerSettings, function (markerSettings, markerIndex) {
|
|
748
|
+
markerTemplateCounts = 0;
|
|
749
|
+
markerCounts = 0;
|
|
741
750
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
742
751
|
var markerDatas = markerSettings.dataSource;
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
|
|
765
|
-
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? data['Latitude'] : null;
|
|
766
|
-
var long = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
|
|
767
|
-
Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
|
|
768
|
-
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? data['Longitude'] : null;
|
|
769
|
-
var offset = markerSettings.offset;
|
|
770
|
-
if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(long) && !isNullOrUndefined(lati)) {
|
|
771
|
-
var markerID = _this.maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
772
|
-
+ markerIndex + '_dataIndex_' + dataIndex;
|
|
773
|
-
var location_1 = (_this.maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(long, lati), _this.maps.tileZoomLevel, _this.maps.tileTranslatePoint, true) : convertGeoToPoint(lati, long, factor, currentLayers, _this.maps);
|
|
774
|
-
var transPoint = { x: x, y: y };
|
|
775
|
-
if (eventArgs.template && (!isNaN(location_1.x) && !isNaN(location_1.y))) {
|
|
776
|
-
markerTemplateCounts++;
|
|
777
|
-
markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, markerTemplateElements, location_1, transPoint, scale, offset, _this.maps);
|
|
752
|
+
if (!isNullOrUndefined(markerDatas)) {
|
|
753
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
754
|
+
Array.prototype.forEach.call(markerDatas, function (data, dataIndex) {
|
|
755
|
+
_this.maps.markerNullCount = markerIndex >= 0 && dataIndex === 0 ? 0 : _this.maps.markerNullCount;
|
|
756
|
+
var eventArgs = {
|
|
757
|
+
template: markerSettings.template, data: data, maps: _this.maps, marker: markerSettings,
|
|
758
|
+
cancel: false, name: markerRendering, fill: markerSettings.fill, colorValuePath: markerSettings.colorValuePath,
|
|
759
|
+
shapeValuePath: markerSettings.shapeValuePath,
|
|
760
|
+
height: !isNullOrUndefined(markerSettings.heightValuePath) && !isNullOrUndefined(data[markerSettings.heightValuePath])
|
|
761
|
+
? data[markerSettings.heightValuePath] : markerSettings.height,
|
|
762
|
+
width: !isNullOrUndefined(markerSettings.widthValuePath) && !isNullOrUndefined(data[markerSettings.widthValuePath])
|
|
763
|
+
? data[markerSettings.widthValuePath] : markerSettings.width,
|
|
764
|
+
imageUrl: markerSettings.imageUrl, imageUrlValuePath: markerSettings.imageUrlValuePath, shape: markerSettings.shape,
|
|
765
|
+
border: markerSettings.border
|
|
766
|
+
};
|
|
767
|
+
eventArgs = markerShapeChoose(eventArgs, data);
|
|
768
|
+
eventArgs = markerColorChoose(eventArgs, data);
|
|
769
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
770
|
+
_this.maps.trigger('markerRendering', eventArgs, function (MarkerArgs) {
|
|
771
|
+
if (markerSettings.shapeValuePath !== eventArgs.shapeValuePath) {
|
|
772
|
+
eventArgs = markerShapeChoose(eventArgs, data);
|
|
778
773
|
}
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
marker(eventArgs, markerSettings, markerDatas, dataIndex, location_1, transPoint, markerID, offset, scale, _this.maps, markerSVGObject);
|
|
774
|
+
if (markerSettings.colorValuePath !== eventArgs.colorValuePath) {
|
|
775
|
+
eventArgs = markerColorChoose(eventArgs, data);
|
|
782
776
|
}
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
var
|
|
794
|
-
var
|
|
795
|
-
if (!
|
|
796
|
-
|
|
777
|
+
var lati = (!isNullOrUndefined(markerSettings.latitudeValuePath)) ?
|
|
778
|
+
Number(getValueFromObject(data, markerSettings.latitudeValuePath)) : !isNullOrUndefined(data['latitude']) ?
|
|
779
|
+
parseFloat(data['latitude']) : !isNullOrUndefined(data['Latitude']) ? data['Latitude'] : null;
|
|
780
|
+
var long = (!isNullOrUndefined(markerSettings.longitudeValuePath)) ?
|
|
781
|
+
Number(getValueFromObject(data, markerSettings.longitudeValuePath)) : !isNullOrUndefined(data['longitude']) ?
|
|
782
|
+
parseFloat(data['longitude']) : !isNullOrUndefined(data['Longitude']) ? data['Longitude'] : null;
|
|
783
|
+
var offset = markerSettings.offset;
|
|
784
|
+
if (!eventArgs.cancel && markerSettings.visible && !isNullOrUndefined(long) && !isNullOrUndefined(lati)) {
|
|
785
|
+
var markerID = _this.maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_'
|
|
786
|
+
+ markerIndex + '_dataIndex_' + dataIndex;
|
|
787
|
+
var location_1 = (_this.maps.isTileMap) ? convertTileLatLongToPoint(new MapLocation(long, lati), _this.maps.tileZoomLevel, _this.maps.tileTranslatePoint, true) : convertGeoToPoint(lati, long, factor, currentLayers, _this.maps);
|
|
788
|
+
var transPoint = { x: x, y: y };
|
|
789
|
+
if (eventArgs.template && (!isNaN(location_1.x) && !isNaN(location_1.y))) {
|
|
790
|
+
markerTemplateCounts++;
|
|
791
|
+
markerTemplate(eventArgs, templateFn, markerID, data, markerIndex, markerTemplateElements, location_1, transPoint, scale, offset, _this.maps);
|
|
797
792
|
}
|
|
798
|
-
else {
|
|
799
|
-
|
|
800
|
-
|
|
793
|
+
else if (!eventArgs.template && (!isNaN(location_1.x) && !isNaN(location_1.y))) {
|
|
794
|
+
markerCounts++;
|
|
795
|
+
marker(eventArgs, markerSettings, markerDatas, dataIndex, location_1, transPoint, markerID, offset, scale, _this.maps, markerSVGObject);
|
|
796
|
+
}
|
|
797
|
+
}
|
|
798
|
+
nullCount += (!isNaN(lati) && !isNaN(long)) ? 0 : 1;
|
|
799
|
+
markerTemplateCounts += (eventArgs.cancel) ? 1 : 0;
|
|
800
|
+
markerCounts += (eventArgs.cancel) ? 1 : 0;
|
|
801
|
+
_this.maps.markerNullCount = (isNullOrUndefined(lati) || isNullOrUndefined(long))
|
|
802
|
+
? _this.maps.markerNullCount + 1 : _this.maps.markerNullCount;
|
|
803
|
+
var markerDataLength = markerDatas.length - _this.maps.markerNullCount;
|
|
804
|
+
var isMarkersClustered = false;
|
|
805
|
+
var markerGroup = (markerSettings.clusterSettings.allowClustering
|
|
806
|
+
|| (currentLayers.markerClusterSettings.allowClustering && currentLayers.markerSettings.length > 1))
|
|
807
|
+
? markerSVGObject.querySelectorAll("[id*='LayerIndex_" + layerIndex + "_MarkerIndex_" + markerIndex + "']:not([id*='_Group'])")
|
|
808
|
+
: markerSVGObject.childNodes;
|
|
809
|
+
if (markerGroup.length === (markerDataLength - markerTemplateCounts - nullCount) && (type !== 'Template')) {
|
|
810
|
+
if (_this.maps.isTileMap) {
|
|
811
|
+
var polygonsElement = document.getElementById(_this.maps.element.id + '_LayerIndex_' + layerIndex + '_Polygons_Group');
|
|
812
|
+
var polygonElement = document.getElementById(_this.maps.element.id + '_LayerIndex_' + layerIndex + '_Polygon_Group');
|
|
813
|
+
if (!isNullOrUndefined(polygonsElement)) {
|
|
814
|
+
polygonsElement.insertAdjacentElement('afterend', markerSVGObject);
|
|
801
815
|
}
|
|
802
816
|
else {
|
|
803
|
-
|
|
817
|
+
if (!isNullOrUndefined(polygonElement)) {
|
|
818
|
+
polygonElement.insertAdjacentElement('afterend', markerSVGObject);
|
|
819
|
+
}
|
|
820
|
+
else {
|
|
821
|
+
layerElement.insertBefore(markerSVGObject, layerElement.firstElementChild);
|
|
822
|
+
}
|
|
804
823
|
}
|
|
805
824
|
}
|
|
825
|
+
else {
|
|
826
|
+
layerElement.appendChild(markerSVGObject);
|
|
827
|
+
}
|
|
828
|
+
if (currentLayers.markerSettings[markerIndex].clusterSettings.allowClustering ||
|
|
829
|
+
!allowInnerClusterSetting && currentLayers.markerClusterSettings.allowClustering) {
|
|
830
|
+
_this.maps.svgObject.appendChild(markerSVGObject);
|
|
831
|
+
_this.maps.element.appendChild(_this.maps.svgObject);
|
|
832
|
+
isMarkersClustered = clusterTemplate(currentLayers, markerSVGObject, _this.maps, layerIndex, markerIndex, markerSVGObject, layerElement, true, true, null, allowInnerClusterSetting);
|
|
833
|
+
}
|
|
806
834
|
}
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
_this.maps.element.appendChild(
|
|
813
|
-
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
if (scale >= 1) {
|
|
819
|
-
if (currentLayers.markerClusterSettings.allowClustering && !isMarkersClustered) {
|
|
820
|
-
clusterTemplate(currentLayers, markerTemplateElements, _this.maps, layerIndex, markerSVGObject, layerElement, false, true);
|
|
835
|
+
var markerTemplateGroup = (markerSettings.clusterSettings.allowClustering
|
|
836
|
+
|| (currentLayers.markerClusterSettings.allowClustering && currentLayers.markerSettings.length > 1))
|
|
837
|
+
? markerTemplateElements.querySelectorAll("[id*='LayerIndex_" + layerIndex + "_MarkerIndex_" + markerIndex + "']:not([id*='_Group'])")
|
|
838
|
+
: markerTemplateElements.childNodes;
|
|
839
|
+
if (markerTemplateGroup.length === (markerDataLength - markerCounts - nullCount) && getElementByID(_this.maps.element.id + '_Secondary_Element')) {
|
|
840
|
+
getElementByID(_this.maps.element.id + '_Secondary_Element').appendChild(markerTemplateElements);
|
|
841
|
+
if (scale >= 1) {
|
|
842
|
+
if ((markerSettings.clusterSettings.allowClustering || !allowInnerClusterSetting &&
|
|
843
|
+
currentLayers.markerClusterSettings.allowClustering) && !isMarkersClustered) {
|
|
844
|
+
clusterTemplate(currentLayers, markerTemplateElements, _this.maps, layerIndex, markerIndex, markerSVGObject, layerElement, false, true, null, allowInnerClusterSetting);
|
|
845
|
+
}
|
|
821
846
|
}
|
|
822
847
|
}
|
|
823
|
-
}
|
|
848
|
+
});
|
|
824
849
|
});
|
|
825
|
-
}
|
|
850
|
+
}
|
|
826
851
|
});
|
|
827
852
|
};
|
|
828
853
|
/**
|
|
@@ -1018,6 +1043,18 @@ var Zoom = /** @class */ (function () {
|
|
|
1018
1043
|
}
|
|
1019
1044
|
}
|
|
1020
1045
|
};
|
|
1046
|
+
/**
|
|
1047
|
+
*
|
|
1048
|
+
* @param {Element | HTMLElement} element - Specifies the marker element.
|
|
1049
|
+
* @param {number} factor - Specifies scale factor.
|
|
1050
|
+
* @param {number} x - Specifies the x location of the marker element.
|
|
1051
|
+
* @param {number} y - Specifies the y location of the marker element.
|
|
1052
|
+
* @param {number} scale - Specifies scale factor.
|
|
1053
|
+
* @param {number} type - Specifies the type of the marker processing.
|
|
1054
|
+
* @param {number} animate - Specifies whether the animation is enabled or not.
|
|
1055
|
+
* @returns {void}
|
|
1056
|
+
* @private
|
|
1057
|
+
*/
|
|
1021
1058
|
Zoom.prototype.markerTranslate = function (element, factor, x, y, scale, type, animate) {
|
|
1022
1059
|
if (animate === void 0) { animate = false; }
|
|
1023
1060
|
var layerIndex = parseInt(element.id.split('_LayerIndex_')[1].split('_')[0], 10);
|
|
@@ -1038,9 +1075,8 @@ var Zoom = /** @class */ (function () {
|
|
|
1038
1075
|
var location_2 = (this.maps.isTileMap) ? convertTileLatLongToPoint(new Point(lng, lat), this.maps.tileZoomLevel, this.maps.tileTranslatePoint, true) : convertGeoToPoint(lat, lng, factor, layer, this.maps);
|
|
1039
1076
|
if (this.maps.isTileMap) {
|
|
1040
1077
|
if (type === 'Template') {
|
|
1041
|
-
|
|
1042
|
-
element.style.
|
|
1043
|
-
element.style.top = ((location_2.y - (templateOffset.height / 2)) + marker.offset.y) + 'px';
|
|
1078
|
+
element.style.left = (location_2.x + marker.offset.x) + 'px';
|
|
1079
|
+
element.style.top = (location_2.y + marker.offset.y) + 'px';
|
|
1044
1080
|
}
|
|
1045
1081
|
else {
|
|
1046
1082
|
location_2.x += marker.offset.x;
|
|
@@ -1060,9 +1096,8 @@ var Zoom = /** @class */ (function () {
|
|
|
1060
1096
|
element.style.transform = 'translate(-50%, -50%)';
|
|
1061
1097
|
}
|
|
1062
1098
|
else {
|
|
1063
|
-
|
|
1064
|
-
element.style.
|
|
1065
|
-
element.style.top = ((location_2.y + y) * scale) + marker.offset.y - this.maps.mapAreaRect.y - (elementOffset.height / 2) + 'px';
|
|
1099
|
+
element.style.left = ((location_2.x + x) * scale) + marker.offset.x - this.maps.mapAreaRect.x + 'px';
|
|
1100
|
+
element.style.top = ((location_2.y + y) * scale) + marker.offset.y - this.maps.mapAreaRect.y + 'px';
|
|
1066
1101
|
}
|
|
1067
1102
|
}
|
|
1068
1103
|
else {
|
|
@@ -1216,6 +1251,7 @@ var Zoom = /** @class */ (function () {
|
|
|
1216
1251
|
var size = map.mapAreaRect;
|
|
1217
1252
|
var translatePoint = map.previousPoint = map.translatePoint;
|
|
1218
1253
|
var prevTilePoint = map.tileTranslatePoint;
|
|
1254
|
+
this.maps.mergeCluster();
|
|
1219
1255
|
map.previousProjection = type === 'Reset' ? undefined : map.projectionType;
|
|
1220
1256
|
zoomFactor = (type === 'ZoomOut') ? (Math.round(zoomFactor) === 1 ? 1 : zoomFactor) : zoomFactor;
|
|
1221
1257
|
zoomFactor = (type === 'Reset') ? minZoom : (Math.round(zoomFactor) === 0) ? 1 : zoomFactor;
|
|
@@ -1897,6 +1933,7 @@ var Zoom = /** @class */ (function () {
|
|
|
1897
1933
|
var delta = 1;
|
|
1898
1934
|
var staticMaxZoomLevel = map.zoomSettings.maxZoom;
|
|
1899
1935
|
var value = (map.isTileMap) ? prevLevel : prevScale;
|
|
1936
|
+
this.maps.mergeCluster();
|
|
1900
1937
|
if (((position.x > map.mapAreaRect.x) && (position.x < (map.mapAreaRect.x + map.mapAreaRect.width))) &&
|
|
1901
1938
|
(position.y > map.mapAreaRect.y) && position.y < (map.mapAreaRect.y + map.mapAreaRect.height)) {
|
|
1902
1939
|
e.preventDefault();
|
|
@@ -2250,6 +2287,16 @@ var Zoom = /** @class */ (function () {
|
|
|
2250
2287
|
this.maps.off(Browser.touchStartEvent, this.mouseDownHandler);
|
|
2251
2288
|
this.maps.off(Browser.touchEndEvent, this.mouseUpHandler);
|
|
2252
2289
|
EventHandler.remove(this.maps.element, this.cancelEvent, this.mouseCancelHandler);
|
|
2290
|
+
var toolbarElement = document.getElementById(this.maps.element.id + '_Zooming_KitCollection');
|
|
2291
|
+
if (toolbarElement) {
|
|
2292
|
+
for (var i = 0; i < toolbarElement.childNodes.length; i++) {
|
|
2293
|
+
if (toolbarElement.childNodes[i].tagName === 'g') {
|
|
2294
|
+
EventHandler.add(toolbarElement.childNodes[i], Browser.touchStartEvent, this.performToolBarAction);
|
|
2295
|
+
EventHandler.add(toolbarElement.childNodes[i], 'mouseover', this.showTooltip);
|
|
2296
|
+
EventHandler.add(toolbarElement.childNodes[i], 'mouseout', this.removeTooltip);
|
|
2297
|
+
}
|
|
2298
|
+
}
|
|
2299
|
+
}
|
|
2253
2300
|
};
|
|
2254
2301
|
/**
|
|
2255
2302
|
* Get module name.
|
|
@@ -2284,7 +2331,6 @@ var Zoom = /** @class */ (function () {
|
|
|
2284
2331
|
this.layerCollectionEle = null;
|
|
2285
2332
|
this.currentLayer = null;
|
|
2286
2333
|
this.pinchDistance = null;
|
|
2287
|
-
this.maps = null;
|
|
2288
2334
|
};
|
|
2289
2335
|
return Zoom;
|
|
2290
2336
|
}());
|
package/src/maps/utils/enum.d.ts
CHANGED
|
@@ -37,6 +37,10 @@ export declare type MapsTheme =
|
|
|
37
37
|
'Tailwind' |
|
|
38
38
|
/** Renders a map with TailwindDark theme. */
|
|
39
39
|
'TailwindDark' |
|
|
40
|
+
/** Renders a map with Tailwind3 theme. */
|
|
41
|
+
'Tailwind3' |
|
|
42
|
+
/** Renders a map with Tailwind3Dark theme. */
|
|
43
|
+
'Tailwind3Dark' |
|
|
40
44
|
/** Renders a map with Bootstrap5 theme. */
|
|
41
45
|
'Bootstrap5' |
|
|
42
46
|
/** Render a map with Bootstrap5 dark theme. */
|
|
@@ -488,14 +488,17 @@ export declare function markerShapeChoose(eventArgs: IMarkerRenderingEventArgs,
|
|
|
488
488
|
* @param {HTMLElement | Element} markerTemplate - Specifies the marker template
|
|
489
489
|
* @param {Maps} maps - Specifies the instance of the maps
|
|
490
490
|
* @param {number} layerIndex - Specifies the layer index
|
|
491
|
+
* @param {number} markerIndex - Specifies the marker index
|
|
491
492
|
* @param {Element} markerCollection - Specifies the marker collection
|
|
492
493
|
* @param {Element} layerElement - Specifies the layer element
|
|
493
494
|
* @param {boolean} check - Specifies the boolean value
|
|
494
495
|
* @param {boolean} zoomCheck - Specifies the boolean value
|
|
496
|
+
* @param {any} translatePoint - Specifies the data
|
|
497
|
+
* @param {boolean} allowInnerClusterSetting - Specifies the boolean value
|
|
495
498
|
* @returns {boolean} -Returns boolean for cluster completion
|
|
496
499
|
* @private
|
|
497
500
|
*/
|
|
498
|
-
export declare function clusterTemplate(currentLayer: LayerSettings, markerTemplate: HTMLElement | Element, maps: Maps, layerIndex: number, markerCollection: Element, layerElement: Element, check: boolean, zoomCheck: boolean): boolean;
|
|
501
|
+
export declare function clusterTemplate(currentLayer: LayerSettings, markerTemplate: HTMLElement | Element, maps: Maps, layerIndex: number, markerIndex: number, markerCollection: Element, layerElement: Element, check: boolean, zoomCheck: boolean, translatePoint?: any, allowInnerClusterSetting?: boolean): boolean;
|
|
499
502
|
/**
|
|
500
503
|
* @param {Maps} maps - Specifies the map control.
|
|
501
504
|
* @param {number} currentZoomFactor - Specifies the current zoom factor.
|
|
@@ -921,14 +924,6 @@ export declare function fixInitialScaleForTile(map: Maps): void;
|
|
|
921
924
|
* @private
|
|
922
925
|
*/
|
|
923
926
|
export declare function getElementByID(id: string): Element;
|
|
924
|
-
/**
|
|
925
|
-
* Function to get clientElement from id.
|
|
926
|
-
*
|
|
927
|
-
* @param {string} id - Specifies the id
|
|
928
|
-
* @returns {Element} - Returns the element
|
|
929
|
-
* @private
|
|
930
|
-
*/
|
|
931
|
-
export declare function getClientElement(id: string): ClientRect;
|
|
932
927
|
/**
|
|
933
928
|
* Function to return the number value for the string value.
|
|
934
929
|
*
|