|
@@ -41,7 +41,8 @@ export default class HistoryUtil {
|
|
|
isDifferentForCircles(circle1, circle2) {
|
|
|
if (
|
|
|
mathUtil.equalPoint(circle1.center, circle2.center) &&
|
|
|
- circle1.radius == circle2.radius
|
|
|
+ circle1.radius == circle2.radius &&
|
|
|
+ circle1.color == circle2.color
|
|
|
) {
|
|
|
return false;
|
|
|
} else {
|
|
@@ -114,7 +115,8 @@ export default class HistoryUtil {
|
|
|
circleInfo.vectorId = circle1.vectorId;
|
|
|
circleInfo.center = circle2.center;
|
|
|
circleInfo.radius = circle2.radius;
|
|
|
- circleInfo.points = circle2.points;
|
|
|
+ circleInfo.points = JSON.parse(JSON.stringify(circle2.points));
|
|
|
+ circleInfo.color = circle2.color;
|
|
|
this.setCircleInfo(circleInfo);
|
|
|
}
|
|
|
|
|
@@ -172,6 +174,7 @@ export default class HistoryUtil {
|
|
|
mathUtil.clonePoint(data.center, circle.center);
|
|
|
data.radius = circle.radius;
|
|
|
data.points = circle.points;
|
|
|
+ data.color = circle.color;
|
|
|
data.type = circle.geoType;
|
|
|
return data;
|
|
|
}
|
|
@@ -235,6 +238,7 @@ export default class HistoryUtil {
|
|
|
let circle = dataService.getCircle(circleInfo.vectorId);
|
|
|
circle.center = circleInfo.center;
|
|
|
circle.radius = circleInfo.radius;
|
|
|
+ circle.color = circleInfo.color;
|
|
|
circle.points = circleInfo.points;
|
|
|
return circle;
|
|
|
}
|