Changeset 26533 in osm

Timestamp:

2011-08-12T10:15:25+02:00 (13 years ago)

Author:

roland

Message:

Fixed a bug concerning relation role treatment in the stoplist.

File:

• applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java (modified) (5 diffs)

applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

@@ -1623 +1623 @@
                 Double.parseDouble(tfSuggestStopsLimit.getText()) * 9.0 / 1000000.0 )
               {
-            sr.role = (String)stoplistData.getValueAt(i, 1);
+            sr.role = (String)stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
             srm.addElement(sr);
               }
               else
               {
-            sr.role = (String)stoplistData.getValueAt(i, 1);
+            sr.role = (String)stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
             sr.index = segmentMetrics.size()*2;
             sr.pos = 0;
@@ -1655 +1655 @@
                   Double.parseDouble(tfSuggestStopsLimit.getText()) * 9.0 / 1000000.0 )
             {
-              sr.role = (String)stoplistData.getValueAt(i, 1);
+              sr.role = (String)stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
               srm.addElement(sr);
             }
             else
             {
-              sr.role = (String)stoplistData.getValueAt(i, 1);
+              sr.role = (String)stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
               sr.index = segmentMetrics.size()*2;
               sr.pos = 0;
@@ -1693 +1693 @@
           if (stoplistTable.isRowSelected(i))
           {
-            String role = (String)(stoplistData.getValueAt(i, 1));
+            String role = (String)(stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN));
             RelationMember markedNode = new RelationMember
             (role, stoplistData.nodes.elementAt(i));
@@ -1707 +1707 @@
         for (int i = stoplistData.getRowCount()-1; i >=0; --i)
         {
-          String role = (String)(stoplistData.getValueAt(i, 1));
+          String role = (String)(stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN));
           RelationMember markedNode = new RelationMember
               (role, stoplistData.nodes.elementAt(i));
@@ -1943 +1943 @@
     {
       RelationMember member = new RelationMember
-      ((String)(stoplistData.getValueAt(i, 1)), stoplistData.nodes.elementAt(i));
+          ((String)(stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN)),
+           stoplistData.nodes.elementAt(i));
       currentRoute.addMember(member);
     }