added gpx dialog

This commit is contained in:
Fedor Katurov 2020-01-24 16:53:47 +07:00
parent 947ec69e60
commit e995b46641
33 changed files with 11687 additions and 131 deletions

View file

@ -0,0 +1,35 @@
import { FC, useEffect, useState } from 'react';
import { Polyline, LatLngLiteral } from 'leaflet';
import { MainMap } from '~/constants/map';
interface IProps {
latlngs: LatLngLiteral[];
color: string;
}
const GpxPolyline: FC<IProps> = ({ latlngs, color }) => {
const [layer, setLayer] = useState<Polyline>(null);
useEffect(() => {
const item = new Polyline([], {
color,
stroke: true,
opacity: 0.4,
weight: 9,
}).addTo(MainMap);
setLayer(item);
return () => MainMap.removeLayer(item);
}, [MainMap]);
useEffect(() => {
if (!layer) return;
layer.setLatLngs(latlngs);
layer.options.color = color;
}, [latlngs, layer, color]);
return null;
};
export { GpxPolyline };

View file

@ -12,11 +12,13 @@ import { TileLayer } from '~/map/TileLayer';
import { Stickers } from '~/map/Stickers';
import { KmMarks } from '~/map/KmMarks';
import { CurrentLocation } from '~/map/CurrentLocation';
import { GpxPolyline } from '~/map/GpxPolyline';
import 'leaflet/dist/leaflet.css';
import { selectEditorEditing, selectEditorMode } from '~/redux/editor/selectors';
import { selectEditorEditing, selectEditorMode, selectEditorGpx } from '~/redux/editor/selectors';
import { MODES } from '~/constants/modes';
import { selectUserLocation } from '~/redux/user/selectors';
import { GPX_ROUTE_COLORS } from '~/redux/editor/constants';
const mapStateToProps = state => ({
provider: selectMapProvider(state),
@ -25,6 +27,7 @@ const mapStateToProps = state => ({
editing: selectEditorEditing(state),
mode: selectEditorMode(state),
location: selectUserLocation(state),
gpx: selectEditorGpx(state),
});
const mapDispatchToProps = {
@ -44,6 +47,7 @@ const MapUnconnected: React.FC<IProps> = ({
editing,
mode,
location,
gpx,
mapClicked,
mapSetSticker,
@ -51,12 +55,8 @@ const MapUnconnected: React.FC<IProps> = ({
}) => {
const onClick = React.useCallback(
event => {
if (
!MainMap.clickable ||
mode === MODES.NONE
)
return;
if (!MainMap.clickable || mode === MODES.NONE) return;
mapClicked(event.latlng);
},
[mapClicked, mode]
@ -86,6 +86,18 @@ const MapUnconnected: React.FC<IProps> = ({
<KmMarks />
<CurrentLocation location={location} />
{gpx.enabled &&
gpx.list.map(
({ latlngs, enabled, color }, index) =>
enabled && (
<GpxPolyline
latlngs={latlngs}
color={color}
key={index}
/>
)
)}
</div>,
document.getElementById('canvas')
);