Commit 7f8c3ad0b386650e0bd27ce1609e33d1384f18b9

Authored by Kalutka Zhenya
1 parent ac0a3fdf

Refactoring

... ... @@ -217,18 +217,18 @@ export default abstract class LeafletMap {
217 217 });
218 218
219 219 const dragListener = (e: L.DragEndEvent) => {
220   - const polygonOffset = this.options.provider === MapProviders.image ? 10 : 0.01;
  220 + if (e.type === 'dragend') {
  221 + const polygonOffset = this.options.provider === MapProviders.image ? 10 : 0.01;
221 222
222   - let convert = this.convertToCustomFormat(mousePositionOnMap,polygonOffset);
223   - mousePositionOnMap.lat = convert[this.options.latKeyName];
224   - mousePositionOnMap.lng = convert[this.options.lngKeyName];
  223 + let convert = this.convertToCustomFormat(mousePositionOnMap,polygonOffset);
  224 + mousePositionOnMap.lat = convert[this.options.latKeyName];
  225 + mousePositionOnMap.lng = convert[this.options.lngKeyName];
225 226
226   - const latlng1 = mousePositionOnMap;
227   - const latlng2 = L.latLng(mousePositionOnMap.lat, mousePositionOnMap.lng + polygonOffset);
228   - const latlng3 = L.latLng(mousePositionOnMap.lat - polygonOffset, mousePositionOnMap.lng);
229   - polygonPoints = [latlng1, latlng2, latlng3];
  227 + const latlng1 = mousePositionOnMap;
  228 + const latlng2 = L.latLng(mousePositionOnMap.lat, mousePositionOnMap.lng + polygonOffset);
  229 + const latlng3 = L.latLng(mousePositionOnMap.lat - polygonOffset, mousePositionOnMap.lng);
  230 + polygonPoints = [latlng1, latlng2, latlng3];
230 231
231   - if (e.type === 'dragend' && polygonPoints) {
232 232 const newPolygon = L.polygon(polygonPoints).addTo(this.map);
233 233 this.addPolygons.push(newPolygon);
234 234 const datasourcesList = document.createElement('div');
... ...
... ... @@ -192,7 +192,7 @@ export class ImageMap extends LeafletMap {
192 192 this.updateMarkers(this.markersData);
193 193 if (this.options.draggableMarker && this.addMarkers.length) {
194 194 this.addMarkers.forEach((marker) => {
195   - const prevPoint = this.convertToCustomFormat(marker.getLatLng(),null, prevWidth, prevHeight);
  195 + const prevPoint = this.convertToCustomFormat(marker.getLatLng(), null, prevWidth, prevHeight);
196 196 marker.setLatLng(this.convertPosition(prevPoint));
197 197 });
198 198 }
... ...