Changeset 28318 in osm

Timestamp:

2012-04-19T06:41:57+02:00 (13 years ago)

Author:

roland

Message:

Prepared the introduction of routing for route construction.

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/public_transport/AStarAlgorithm.java (added)
• src/public_transport/PublicTransportAStar.java (added)
• src/public_transport/RoutePatternAction.java (modified) (6 diffs)

applications/editors/josm/plugins/public_transport/build.xml

@@ -27 +27 @@
     <!-- this is the directory where the plugin jar is copied to -->
     <property name="plugin.dist.dir" value="${josm.basedir}/dist"/>
-    <property name="ant.build.javac.target" value="1.5"/>
+    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.6"/>
     <property name="plugin.dist.dir" value="${josm.basedir}/dist"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>

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

@@ -1116 +1116 @@
       int insPos = itineraryTable.getSelectedRow();
 
+      // Temp
+      Node firstNode = null;
+      Node lastNode = null;
+
       for (int i = 0; i < currentRoute.getMembersCount(); ++i)
       {
@@ -1131 +1135 @@
 
           itemsToReflect.add(new RelationMember(role, item.getWay()));
+
+          // Temp
+          if (firstNode == null)
+          {
+              firstNode = item.getWay().getNode(0);
+          }
+          lastNode = item.getWay().getNode(item.getWay().getNodesCount() - 1);
         }
         else if (item.isNode())
@@ -1150 +1161 @@
         if (currentRoute == ((RouteReference)relsListModel.elementAt(i)).route)
           relsList.setSelectedIndex(i);
+      }
+
+      // Temp
+      if (firstNode != null)
+      {
+        Vector< AStarAlgorithm.Edge > path = new PublicTransportAStar(firstNode, lastNode).shortestPath();
+        Iterator< AStarAlgorithm.Edge > iter = path.iterator();
+        while (iter.hasNext())
+        {
+          PublicTransportAStar.PartialWayEdge edge = (PublicTransportAStar.PartialWayEdge)iter.next();
+          System.out.print(edge.way.getUniqueId());
+          System.out.print("\t");
+          System.out.print(edge.beginIndex);
+          System.out.print("\t");
+          System.out.print(edge.endIndex);
+          System.out.print("\n");
+        }
       }
     }
@@ -2108 +2136 @@
   private void fillStoplistTable
       (Iterator<RelationMember> relIter, int insPos) {
+
     while (relIter.hasNext())
     {
@@ -2115 +2144 @@
         StopReference sr = detectMinDistance
             (curMember.getNode(), segmentMetrics, cbRight.isSelected(), cbLeft.isSelected());
-        double offset = segmentMetrics.elementAt((sr.index+1) / 2).distance;
-        System.out.print(sr.index);
-        System.out.print(" ");
-        System.out.print(offset);
-        System.out.print(" ");
-        System.out.println(sr.pos);
-        if (sr.index % 2 == 0)
-          offset += sr.pos;
-        stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(), offset);
-        if (insPos >= 0)
-          ++insPos;
+        if (sr == null)
+          stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(), 360.0);
+        else
+        {
+          double offset = segmentMetrics.elementAt((sr.index+1) / 2).distance;
+          if (sr.index % 2 == 0)
+            offset += sr.pos;
+          stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(), offset);
+          if (insPos >= 0)
+            ++insPos;
+        }
       }
     }
@@ -2174 +2203 @@
       (Node node, Vector< SegmentMetric > segmentMetrics,
        boolean rhsPossible, boolean lhsPossible) {
-    if (node == null)
+    if (node == null || node.getCoor() == null)
       return null;