mirror of
https://github.com/muerwre/orchidmap-front.git
synced 2025-04-25 11:06:40 +07:00
poly: preventing missclicks
This commit is contained in:
parent
be0cf2e035
commit
b90d2d6a68
2 changed files with 20 additions and 2 deletions
|
@ -38,7 +38,7 @@ export class Editor {
|
||||||
} = this;
|
} = this;
|
||||||
|
|
||||||
this.poly = new Poly({
|
this.poly = new Poly({
|
||||||
map, routerMoveStart, lockMapClicks, setTotalDist: this.setDistance, triggerOnChange
|
map, routerMoveStart, lockMapClicks, setTotalDist: this.setDistance, triggerOnChange, editor: this,
|
||||||
});
|
});
|
||||||
this.stickers = new Stickers({ map, lockMapClicks, triggerOnChange });
|
this.stickers = new Stickers({ map, lockMapClicks, triggerOnChange });
|
||||||
this.router = new Router({
|
this.router = new Router({
|
||||||
|
@ -101,6 +101,7 @@ export class Editor {
|
||||||
}
|
}
|
||||||
|
|
||||||
getUser = () => store.getState().user.user;
|
getUser = () => store.getState().user.user;
|
||||||
|
getMode = () => store.getState().user.mode;
|
||||||
getTitle = () => store.getState().user.title;
|
getTitle = () => store.getState().user.title;
|
||||||
getEditing = () => store.getState().user.editing;
|
getEditing = () => store.getState().user.editing;
|
||||||
getChanged = () => store.getState().user.changed;
|
getChanged = () => store.getState().user.changed;
|
||||||
|
|
|
@ -3,6 +3,7 @@ import 'leaflet-geometryutil';
|
||||||
import { simplify } from '$utils/simplify';
|
import { simplify } from '$utils/simplify';
|
||||||
import { findDistance, middleCoord } from '$utils/geom';
|
import { findDistance, middleCoord } from '$utils/geom';
|
||||||
import { CLIENT } from '$config/frontend';
|
import { CLIENT } from '$config/frontend';
|
||||||
|
import { MODES } from '$constants/modes';
|
||||||
|
|
||||||
const polyStyle = {
|
const polyStyle = {
|
||||||
color: 'url(#activePathGradient)',
|
color: 'url(#activePathGradient)',
|
||||||
|
@ -13,12 +14,13 @@ const polyStyle = {
|
||||||
|
|
||||||
export class Poly {
|
export class Poly {
|
||||||
constructor({
|
constructor({
|
||||||
map, routerMoveStart, lockMapClicks, setTotalDist, triggerOnChange,
|
map, routerMoveStart, lockMapClicks, setTotalDist, triggerOnChange, editor,
|
||||||
}) {
|
}) {
|
||||||
this.poly = L.polyline([], polyStyle);
|
this.poly = L.polyline([], polyStyle);
|
||||||
|
|
||||||
this.latlngs = [];
|
this.latlngs = [];
|
||||||
this.poly.addTo(map);
|
this.poly.addTo(map);
|
||||||
|
this.editor = editor;
|
||||||
|
|
||||||
this.map = map;
|
this.map = map;
|
||||||
|
|
||||||
|
@ -71,6 +73,20 @@ export class Poly {
|
||||||
if (coords.length > 1) this.triggerOnChange();
|
if (coords.length > 1) this.triggerOnChange();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
preventMissClicks = e => {
|
||||||
|
const mode = this.editor.getMode();
|
||||||
|
|
||||||
|
if (mode === MODES.POLY) return;
|
||||||
|
|
||||||
|
if (mode !== MODES.NONE) {
|
||||||
|
e.cancel();
|
||||||
|
} else {
|
||||||
|
this.editor.setMode(MODES.POLY);
|
||||||
|
e.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
bindEvents = () => {
|
bindEvents = () => {
|
||||||
// Если на карте что-то меняется, пересчитать километражи
|
// Если на карте что-то меняется, пересчитать километражи
|
||||||
this.map.editTools.addEventListener('editable:drawing:mouseup', this.updateMarks);
|
this.map.editTools.addEventListener('editable:drawing:mouseup', this.updateMarks);
|
||||||
|
@ -78,6 +94,7 @@ export class Poly {
|
||||||
this.map.editTools.addEventListener('editable:vertex:mouseup', this.updateMarks);
|
this.map.editTools.addEventListener('editable:vertex:mouseup', this.updateMarks);
|
||||||
this.map.editTools.addEventListener('editable:vertex:deleted', this.updateMarks);
|
this.map.editTools.addEventListener('editable:vertex:deleted', this.updateMarks);
|
||||||
this.map.editTools.addEventListener('editable:vertex:new', this.updateMarks);
|
this.map.editTools.addEventListener('editable:vertex:new', this.updateMarks);
|
||||||
|
this.map.editTools.addEventListener('editable:vertex:click', this.preventMissClicks);
|
||||||
|
|
||||||
this.map.editTools.addEventListener('editable:vertex:dragstart', this.lockMap);
|
this.map.editTools.addEventListener('editable:vertex:dragstart', this.lockMap);
|
||||||
this.map.editTools.addEventListener('editable:vertex:dragstart', this.clearArrows);
|
this.map.editTools.addEventListener('editable:vertex:dragstart', this.clearArrows);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue