Changeset 20896 in osm for applications/editors/josm/plugins/public_transport

Timestamp:

2010-04-13T04:02:02+02:00 (15 years ago)

Author:

roland

Message:

Public Transport Plugin: Performance Improvements

File:

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

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

@@ -2108 +2108 @@
       if (curMember.isWay())
       {
-        insPos = insertGapIfNecessary(curMember.getWay(), curMember.getRole(), lastNodeId, insPos);
-        
         itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
         if (insPos >= 0)
           ++insPos;
-        
-        lastNodeId = getLastNodeId(curMember.getWay(), curMember.getRole());
-      }
-    }
+      }
+    }
+    itineraryData.cleanupGaps();
   }
   
@@ -2130 +2127 @@
           ++insPos;
       }
-    }
-  }
-  
-  private int insertGapIfNecessary(Way way, String role, long lastNodeId, int insPos)
-  {
-    String[] buf = { "", "" };
-    if (gapNecessary(way, role, lastNodeId))
-    {
-      buf[0] = "[gap]";
-      itineraryData.insertRow(insPos, buf);
-      if (insPos >= 0)
-        ++insPos;
-    }
-    return insPos;
-  }
-  
-  private boolean gapNecessary(Way way, String role, long lastNodeId)
-  {
-    if ((way != null) && (!(way.isIncomplete())) && (way.getNodesCount() >= 1))
-    {
-      if ("backward".equals(role))
-      {
-        long firstNodeId = way.getNode(way.getNodesCount() - 1).getId();
-        if ((lastNodeId != 0) && (lastNodeId != firstNodeId))
-          return true;
-      }
-      else
-      {
-        long firstNodeId = way.getNode(0).getId();
-        if ((lastNodeId != 0) && (lastNodeId != firstNodeId))
-          return true;
-      }
-    }
-    return false;
-  }
-  
-  private long getLastNodeId(Way way, String role)
-  {
-    if ((way == null) || (way.isIncomplete()) || (way.getNodesCount() < 1))
-    {
-      return 0;
-    }
-    else
-    {
-      if ("backward".equals(role))
-        return way.getNode(0).getId();
-      else
-        return way.getNode(way.getNodesCount() - 1).getId();
     }
   }