|
@@ -138,17 +138,10 @@ export default class Draw {
|
|
|
}
|
|
|
|
|
|
drawRoad(vector, isTemp) {
|
|
|
- const startReal = isTemp
|
|
|
- ? vector.start
|
|
|
- : dataService.getRoadPoint(vector.startId);
|
|
|
- const endReal = isTemp
|
|
|
- ? vector.end
|
|
|
- : dataService.getRoadPoint(vector.endId);
|
|
|
-
|
|
|
- if (vector?.midDivide?.display && vector?.midDivideWidth) {
|
|
|
+ if (vector.display && vector.midDivide && vector?.midDivideWidth) {
|
|
|
const ctx = this.context;
|
|
|
- const startScreen = coordinate.getScreenXY(startReal);
|
|
|
- const endScreen = coordinate.getScreenXY(endReal);
|
|
|
+ const startScreen = coordinate.getScreenXY(vector.midDivide.start);
|
|
|
+ const endScreen = coordinate.getScreenXY(vector.midDivide.end);
|
|
|
const draw = () => {
|
|
|
ctx.beginPath();
|
|
|
ctx.moveTo(startScreen.x, startScreen.y);
|
|
@@ -167,6 +160,12 @@ export default class Draw {
|
|
|
}
|
|
|
|
|
|
if (import.meta.env.DEV && !isTemp) {
|
|
|
+ const startReal = isTemp
|
|
|
+ ? vector.start
|
|
|
+ : dataService.getRoadPoint(vector.startId);
|
|
|
+ const endReal = isTemp
|
|
|
+ ? vector.end
|
|
|
+ : dataService.getRoadPoint(vector.endId);
|
|
|
this.drawText(
|
|
|
{ x: (startReal.x + endReal.x) / 2, y: (startReal.y + endReal.y) / 2 },
|
|
|
vector.vectorId
|
|
@@ -293,18 +292,19 @@ export default class Draw {
|
|
|
}
|
|
|
|
|
|
drawCurveRoad(vector) {
|
|
|
- console.log(vector)
|
|
|
- const [coves] = help.transformCoves([vector.curves]);
|
|
|
- const ctx = this.context;
|
|
|
-
|
|
|
- ctx.save();
|
|
|
- const vectorStyle = help.setVectorStyle(ctx, vector);
|
|
|
- ctx.lineWidth = vector?.midDivideWidth || vectorStyle.lineWidth
|
|
|
- help.drawCoves(ctx, coves);
|
|
|
- ctx.lineWidth = ctx.lineWidth - vectorStyle.realLineWidth
|
|
|
- ctx.strokeStyle = Style.bgColor
|
|
|
- help.drawCoves(ctx, coves);
|
|
|
- ctx.restore();
|
|
|
+ if (vector.display && vector.midDivide) {
|
|
|
+ const covesArray = help.transformCoves([
|
|
|
+ vector.midDivide.leftMidDivideCurves,
|
|
|
+ vector.midDivide.rightMidDivideCurves
|
|
|
+ ]);
|
|
|
+ const ctx = this.context;
|
|
|
+ ctx.save();
|
|
|
+ help.setVectorStyle(ctx, vector);
|
|
|
+ for (let coves of covesArray) {
|
|
|
+ help.drawCoves(ctx, coves);
|
|
|
+ }
|
|
|
+ ctx.restore();
|
|
|
+ }
|
|
|
|
|
|
this.drawCurveRoadEdge(dataService.getCurveRoadEdge(vector.rightEdgeId));
|
|
|
this.drawCurveRoadEdge(dataService.getCurveRoadEdge(vector.leftEdgeId));
|