|
@@ -27,7 +27,8 @@ export default class HistoryUtil {
|
|
if (
|
|
if (
|
|
line1.startId == line2.startId &&
|
|
line1.startId == line2.startId &&
|
|
line1.endId == line2.endId &&
|
|
line1.endId == line2.endId &&
|
|
- line1.category == line2.category
|
|
|
|
|
|
+ line1.category == line2.category &&
|
|
|
|
+ line1.locationMode == line2.locationMode
|
|
) {
|
|
) {
|
|
return false;
|
|
return false;
|
|
} else {
|
|
} else {
|
|
@@ -295,6 +296,7 @@ export default class HistoryUtil {
|
|
lineInfo.start = line2.start;
|
|
lineInfo.start = line2.start;
|
|
lineInfo.end = line2.end;
|
|
lineInfo.end = line2.end;
|
|
lineInfo.category = line2.category;
|
|
lineInfo.category = line2.category;
|
|
|
|
+ lineInfo.locationMode = line2.locationMode;
|
|
lineInfo.value = line2.value;
|
|
lineInfo.value = line2.value;
|
|
this.setLineInfo(lineInfo);
|
|
this.setLineInfo(lineInfo);
|
|
}
|
|
}
|
|
@@ -543,6 +545,7 @@ export default class HistoryUtil {
|
|
data.start = line.startId;
|
|
data.start = line.startId;
|
|
data.end = line.endId;
|
|
data.end = line.endId;
|
|
data.category = line.category;
|
|
data.category = line.category;
|
|
|
|
+ data.locationMode = line.locationMode;
|
|
data.type = line.geoType;
|
|
data.type = line.geoType;
|
|
return data;
|
|
return data;
|
|
}
|
|
}
|
|
@@ -780,6 +783,7 @@ export default class HistoryUtil {
|
|
line.startId = lineInfo.start;
|
|
line.startId = lineInfo.start;
|
|
line.endId = lineInfo.end;
|
|
line.endId = lineInfo.end;
|
|
line.category = lineInfo.category;
|
|
line.category = lineInfo.category;
|
|
|
|
+ line.locationMode = lineInfo.locationMode;
|
|
line.value = lineInfo.value;
|
|
line.value = lineInfo.value;
|
|
return line;
|
|
return line;
|
|
}
|
|
}
|
|
@@ -897,7 +901,6 @@ export default class HistoryUtil {
|
|
JSON.stringify(curveRoadPointInfo.parent)
|
|
JSON.stringify(curveRoadPointInfo.parent)
|
|
);
|
|
);
|
|
curveRoadPoint.index = curveRoadPointInfo.index;
|
|
curveRoadPoint.index = curveRoadPointInfo.index;
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
setCurveRoadEdgeInfo(curveRoadEdgeInfo) {
|
|
setCurveRoadEdgeInfo(curveRoadEdgeInfo) {
|