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

router now continues after confirmation

Browse source
This commit is contained in:
muerwre 2018-08-24 15:04:49 +07:00
parent acc7cf6a22
commit fd01e69075
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/components/panels/EditorPanel.jsx
View file

@ -38,22 +38,22 @@ export class EditorPanel extends React.PureComponent {
<span>РЕДАКТОР</span> <span>РЕДАКТОР</span>
</button> </button>
</div> </div>
</div>
<div className="panel right">
<div className="control-dist"> <div className="control-dist">
{(totalDistance > 0) {(totalDistance > 0)
? ?
<React.Fragment> <React.Fragment>
{totalDistance} км {totalDistance} км
<Icon icon="icon-cycle" size={32} /> <Icon icon="icon-cycle" size={32} />
{ {
(estimateTime > 0) && (estimateTime > 0) && <span>{toHours(estimateTime)}</span> (estimateTime > 0) && (estimateTime > 0) && <span>{toHours(estimateTime)}</span>
} }
</React.Fragment> </React.Fragment>
: <div>Начните рисовать --&gt;</div> : <div>Начните рисовать --&gt;</div>
} }
</div> </div>
</div>
<div className="panel right">
<div className="control-bar"> <div className="control-bar">
<button <button
className={classnames({ active: mode === MODES.ROUTER })} className={classnames({ active: mode === MODES.ROUTER })}

8
src/modules/Router.js
View file

@ -124,9 +124,11 @@ export class Router {
const [route] = this.router._routes; const [route] = this.router._routes;
if (!route) return; if (!route) return;
const { coordinates, summary: { totalDistance } } = route; const { coordinates } = route;
this.pushPolyPoints(coordinates); this.pushPolyPoints(coordinates);
this.router.setWaypoints([]); const waypoints = this.router.getWaypoints().filter(({ latLng }) => !!latLng);
this.changeMode(MODES.POLY); this.router.setWaypoints(waypoints[waypoints.length-1]);
// this.changeMode(MODES.POLY);
}; };
} }

2
src/styles/panel.less
View file

@ -11,7 +11,7 @@
padding: 0 10px; padding: 0 10px;
display: flex; display: flex;
align-items: center; align-items: center;
border-radius: 3px 0 0 3px; border-radius: 0 3px 3px 0;
font-weight: 200; font-weight: 200;
color: #cccccc; color: #cccccc;
user-select: none; user-select: none;