Changeset 33387 in osm for applications/editors/josm/plugins

Timestamp:

2017-06-09T09:34:18+02:00 (8 years ago)

Author:

giackserva

Message:

[pt_assistant] using getUniqueId instead of getId for making comparisons

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant

Files:

• data/PTRouteSegment.java (modified) (3 diffs)
• validation/SegmentChecker.java (modified) (3 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java

@@ -149 +149 @@
             if (listsEqual) {
                 for (int i = 0; i < thisWays.size(); i++) {
-                    if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
+                    if (thisWays.get(i).getUniqueId() != otherWays.get(i).getUniqueId()) {
                         listsEqual = false;
                         break;
@@ -187 +187 @@
     public boolean equalsRouteSegment(PTRouteSegment other) {
 
+//      if(!firstStop.equalsStop(firstStop) || !lastStop.equalsStop(other.lastStop))
+//              return false;
+
         List<Way> thisWays = new ArrayList<>();
         for (PTWay ptway : this.ptways) {
@@ -201 +204 @@
 
         for (int i = 0; i < thisWays.size(); i++) {
-            if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
+            if (thisWays.get(i).getUniqueId() != otherWays.get(i).getUniqueId()) {
                 return false;
             }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java

@@ -330 +330 @@
                                 primitives.add(relation);
                                 List<OsmPrimitive> highlighted = new ArrayList<>();
-                                highlighted.addAll(wronglySortedPtway.getWays());
+                                highlighted.add(startStop.getStopPosition());
+                                highlighted.add(endStop.getStopPosition());
                                 Builder builder = TestError.builder(this.test, Severity.WARNING,
                                                 PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP);
@@ -664 +665 @@
                         List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
                         for (PTRouteSegment segment : correctSegments) {
-                                if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
-                                                && wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
+                                if (wrongSegment.getFirstWay().getUniqueId() == segment.getFirstWay().getUniqueId()
+                                                && wrongSegment.getLastWay().getUniqueId() == segment.getLastWay().getUniqueId()) {
                                         correctSegmentsForThisError.add(segment);
                                 }
@@ -794 +795 @@
                 List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
                 for (PTRouteSegment segment : correctSegments) {
-                        if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
-                                        && wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
+                        if (wrongSegment.getFirstWay().getUniqueId() == segment.getFirstWay().getUniqueId()
+                                        && wrongSegment.getLastWay().getUniqueId() == segment.getLastWay().getUniqueId()) {
                                 correctSegmentsForThisError.add(segment);
                         }