Changeset 15106 in osm for applications

Timestamp:

2009-05-19T01:21:12+02:00 (16 years ago)

Author:

juangui

Message:

Fixed bugs in RoutingGraph. Added interfaces EdgeIterator and RoutingEdge.

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core

Files:

• EdgeIterator.java (added)
• RoutingEdge.java (added)
• RoutingGraph.java (modified) (6 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java

@@ -89 +89 @@
          * <code>false</code> Graph not created.
          */
-        public boolean graphState;
+//      public boolean graphState;
 
         /**
@@ -108 +108 @@
          */
         public RoutingGraph(DataSet data) {
-                this.graphState = false;
+//              this.graphState = false;
                 this.graph = null;
-                this.data = data;
+//              this.data = data;
                 routeType=RouteType.SHORTEST;
                 routingProfile=new RoutingProfile("default");
@@ -147 +147 @@
                         }
                 }
-                graph.vertexSet().size();
+//              graph.vertexSet().size();
                 logger.debug("End Create Graph");
                 logger.debug("Vertex: "+graph.vertexSet().size());
@@ -167 +167 @@
                 // weight = getWeight(way);
                 double weight = getWeight(way, length);
-                getWeight(edge, length);
+                setWeight(edge, length);
                 logger.debug("edge for way " + way.id
                                      + "(from node " + from.id + " to node "
@@ -176 +176 @@
 
         /**
-         * Returns the weight for the given segment depending on the highway type
+         * Set the weight for the given segment depending on the highway type
          * and the length of the segment. The higher the value, the less it is used
          * in routing.
@@ -184 +184 @@
          * @return
          */
-        private void getWeight(OsmEdge osmedge, double length) {
+        private void setWeight(OsmEdge osmedge, double length) {
                 
                 osmedge.setLength(length);