Changeset 32823 in osm

Timestamp:

2016-08-16T23:43:26+02:00 (8 years ago)

Author:

darya

Message:

fix bug at the pre-last stop

Location:

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

Files:

• PTAssistantPlugin.java (modified) (3 diffs)
• actions/RepeatLastFixAction.java (added)
• data/PTRouteDataManager.java (modified) (3 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java

@@ -11 +11 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.AddStopPositionAction;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
 import org.openstreetmap.josm.plugins.pt_assistant.validation.PTAssistantValidatorTest;
 
@@ -22 +23 @@
 
         private JMenuItem addStopPositionMenu;
+        private JMenuItem repeatLastFixMenu;
 
         /**
@@ -37 +39 @@
                 AddStopPositionAction addStopPositionAction = new AddStopPositionAction();
                 addStopPositionMenu = MainMenu.add(Main.main.menu.toolsMenu, addStopPositionAction, false);
-
+                RepeatLastFixAction repeatLastFixAction = new RepeatLastFixAction();
+                repeatLastFixMenu = MainMenu.add(Main.main.menu.toolsMenu, repeatLastFixAction, false);
+                
         }
 

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

@@ -45 +45 @@
 
                 PTStop prev = null; // stores the last created PTStop
-
+                
                 for (RelationMember member : this.relation.getMembers()) {
 
@@ -61 +61 @@
                                                 // Squared distance of 0.000004 corresponds to
                                                 // around 100 m
-                                                if (this.calculateDistanceSq(member, prev) < 0.000004) {
-
+                                                if (this.calculateDistanceSq(member, prev) < 0.000001) {
                                                         stopExists = true;
                                                 }
+                                                
                                         } else {
 
@@ -99 +99 @@
 
                         } else {
+                        
                                 this.failedMembers.add(member);
+                                
                         }