muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-26 03:26:41 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

InteractivePoly: working marker dragging

Browse source
This commit is contained in:
muerwre 2019-02-21 18:15:20 +07:00
parent 4dfba4839d
commit edbd911de6
6 changed files with 277 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

133
src/modules/Poly.ts
View file

@ -1,12 +1,12 @@
import { Map, LayerGroup } from 'leaflet';
import 'leaflet-geometryutil';
import { Map, LayerGroup, Polyline } from 'leaflet';
import { EditablePolyline } from '$utils/EditablePolyline';
import { simplify } from '$utils/simplify';
import { findDistance, middleCoord } from '$utils/geom';
import { findDistance, getPolyLength, middleCoord } from '$utils/geom';
import { CLIENT } from '$config/frontend';
import { MODES } from '$constants/modes';
import { editor, Editor } from "$modules/Editor";
import { ILatLng } from "$modules/Stickers";
import { InteractivePoly } from "$modules/InteractivePoly";
const polyStyle = {
color: 'url(#activePathGradient)',
@ -27,22 +27,28 @@ export class Poly {
constructor({
map, routerMoveStart, lockMapClicks, setDistance, triggerOnChange, editor,
}: Props) {
this.poly = new EditablePolyline([], {
...polyStyle,
maxMarkers: 100,
onPointsSet: this.updateMarks,
onMarkerDragEnd: this.updateMarks,
onPointAdded: this.updateMarks,
onPointDropped: this.updateMarks,
onContinueDrawing: this.setModeOnDrawing,
onMarkersHide: () => editor.setMarkersShown(false),
onMarkersShow: () => editor.setMarkersShown(true),
}).addTo(map);
this.poly = new InteractivePoly([], {
color: 'url(#activePathGradient)',
weight: 6,
maxMarkers: 300,
});
// this.poly = new EditablePolyline([], {
// ...polyStyle,
// maxMarkers: 100,
//
// onPointsSet: this.updateMarks,
// onMarkerDragEnd: this.updateMarks,
// onPointAdded: this.updateMarks,
// onPointDropped: this.updateMarks,
// onContinueDrawing: this.setModeOnDrawing,
//
// onMarkersHide: () => editor.setMarkersShown(false),
// onMarkersShow: () => editor.setMarkersShown(true),
// }).addTo(map);
this.poly.addTo(map);
this.poly._reloadPolyline();
// todo: uncomment
// this.poly._reloadPolyline();
this.editor = editor;
this.map = map;
@ -61,45 +67,46 @@ export class Poly {
drawArrows = () => {
// todo: fix this
// this.arrows.clearLayers();
// const { latlngs } = this;
//
// if (!latlngs || latlngs.length <= 1) return;
//
// latlngs.forEach((latlng, i) => {
// if (i === 0) return;
//
// const mid = middleCoord(latlngs[i], latlngs[i - 1]);
// const dist = findDistance(latlngs[i - 1].lat, latlngs[i - 1].lng, latlngs[i].lat, latlngs[i].lng);
//
// if (dist <= 1) return;
//
// const slide = new Polyline(
// [
// latlngs[i - 1],
// [mid.lat, mid.lng]
// ],
// { color: 'none', weight: CLIENT.STROKE_WIDTH }
// ).addTo(this.arrows);
//
// // todo: uncomment and fix this:
// // slide._path.setAttribute('marker-end', 'url(#long-arrow)');
// });
this.arrows.clearLayers();
const { latlngs } = this;
if (!latlngs || latlngs.length <= 1) return;
latlngs.forEach((latlng, i) => {
if (i === 0) return;
const mid = middleCoord(latlngs[i], latlngs[i - 1]);
const dist = findDistance(latlngs[i - 1].lat, latlngs[i - 1].lng, latlngs[i].lat, latlngs[i].lng);
if (dist <= 1) return;
const slide = new Polyline(
[
latlngs[i - 1],
[mid.lat, mid.lng]
],
{ color: 'none', weight: CLIENT.STROKE_WIDTH }
).addTo(this.arrows) as any;
// todo: uncomment and fix this:
slide._path.setAttribute('marker-end', 'url(#long-arrow)');
});
};
updateMarks = () => {
// todo: fix this
// const coords = this.poly.toGeoJSON().geometry.coordinates;
//
// const meters = (this.poly && (L.GeometryUtil.length(this.poly) / 1000)) || 0;
// const kilometers = (meters && meters.toFixed(1)) || 0;
//
// this.setTotalDist(kilometers);
// this.routerMoveStart();
//
// this.drawArrows(); // <-- uncomment
//
// if (coords.length > 1) this.triggerOnChange();
const coords = this.poly.toGeoJSON().geometry.coordinates;
// const meters = (this.latlngs && this.latlngs.length > 1 && getPolyLength(this.latlngs)) || 0;
// const kilometers = (meters && Number(meters.toFixed(1))) || 0;
const kilometers = ((this.latlngs && this.latlngs.length > 1 && getPolyLength(this.latlngs)) || 0);
this.setDistance(parseFloat(kilometers.toFixed(2)));
this.routerMoveStart();
this.drawArrows(); // <-- uncomment
if (coords.length > 1) this.triggerOnChange();
};
preventMissClicks = (e): void => {
@ -113,15 +120,18 @@ export class Poly {
};
continue = (): void => {
this.poly.editor.continueForward();
// todo: implement
// this.poly.editor.continueForward();
};
stop = (): void => {
if (this.poly) this.poly.editor.stopDrawing();
// todo: implement
// if (this.poly) this.poly.editor.stopDrawing();
};
continueForward = (): void => {
this.poly.continueForward();
// todo: implement
// this.poly.continueForward();
};
lockMap = (): void => {
@ -129,7 +139,10 @@ export class Poly {
};
setPoints = (latlngs: Array<ILatLng>): void => {
console.log('setP');
if (!latlngs || latlngs.length <= 1) return;
// todo: implement
this.poly.setPoints(latlngs);
};
@ -141,15 +154,15 @@ export class Poly {
...simplified,
];
this.poly.setLatLngs(summary);
this.poly.editor.enable();
this.poly.editor.reset();
this.poly.setPoints(summary);
this.updateMarks();
};
clearAll = (): void => {
// this.poly.setLatLngs([]);
this.poly.editor.clear();
// todo: implement
// this.poly.editor.clear();
this.poly.setPoints([]);
this.updateMarks();
};