Changeset 20003 in osm for applications

Timestamp:

2010-02-14T17:49:04+01:00 (15 years ago)

Author:

roland

Message:

Minor bugfixes

Location:

applications/editors/josm

Files:

• dist/public_transport.jar (modified) ( previous)
• plugins/public_transport/src/public_transport/RoutePatternAction.java (modified) (5 diffs)

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

@@ -208 +208 @@
       if (e.getType() == TableModelEvent.UPDATE)
       {
+        relation.setModified(true);
+        
         String key = (String)getValueAt(e.getFirstRow(), 0);
         if (key == null)
@@ -480 +482 @@
   private static JCheckBox cbLeft = null;
   private static JTextField tfSuggestStopsLimit = null;
-/*  private static Vector< Relation > routes = new Vector< Relation >();*/
   private static Relation currentRoute = null;
   private static Vector< RelationMember > markedWays = new Vector< RelationMember >();
@@ -595 +596 @@
       /*JComboBox*/ comboBox = new JComboBox();
       comboBox.addItem("bus");
-/*      comboBox.addItem("tram");
+      comboBox.addItem("tram");
       comboBox.addItem("light_rail");
       comboBox.addItem("subway");
-      comboBox.addItem("rail");*/
+      comboBox.addItem("rail");
       requiredTagsTable.setCellEditor(1, 1, new DefaultCellEditor(comboBox));
       rowContent = new Vector< String >();
@@ -1695 +1696 @@
       if (mainDataSet != null)
       {
+        String stopKey = "";
+        String stopValue = "";
+        if ("bus".equals(currentRoute.get("route")))
+        {
+          stopKey = "highway";
+          stopValue = "bus_stop";
+        }
+        else if ("tram".equals(currentRoute.get("route")))
+        {
+          stopKey = "highway";
+          stopValue = "tram_stop";
+        }
+        else if ("light_rail".equals(currentRoute.get("route")))
+        {
+          stopKey = "railway";
+          stopValue = "station";
+        }
+        else if ("subway".equals(currentRoute.get("route")))
+        {
+          stopKey = "railway";
+          stopValue = "station";
+        }
+        else if ("rail".equals(currentRoute.get("route")))
+        {
+          stopKey = "railway";
+          stopValue = "station";
+        }
+
         Collection< Node > nodeCollection = mainDataSet.getNodes();
         Iterator< Node > nodeIter = nodeCollection.iterator();
@@ -1700 +1729 @@
         {
           Node currentNode = nodeIter.next();
-          if ("bus_stop".equals(currentNode.get("highway")))
+          if (stopValue.equals(currentNode.get(stopKey)))
           {
             StopReference sr = detectMinDistance