Index: /applications/editors/josm/plugins/routing/.checkstyle
===================================================================
--- /applications/editors/josm/plugins/routing/.checkstyle (revision 32768)
+++ /applications/editors/josm/plugins/routing/.checkstyle (revision 32768)
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/routing/.project
===================================================================
--- /applications/editors/josm/plugins/routing/.project (revision 32767)
+++ /applications/editors/josm/plugins/routing/.project (revision 32768)
@@ -16,7 +16,13 @@
+
+ net.sf.eclipsecs.core.CheckstyleBuilder
+
+
+
org.eclipse.jdt.core.javanature
+ net.sf.eclipsecs.core.CheckstyleNature
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/EdgeIterator.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/EdgeIterator.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/EdgeIterator.java (revision 32768)
@@ -1,9 +1,10 @@
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.core;
public interface EdgeIterator {
- public boolean hasNext();
+ boolean hasNext();
- public RoutingEdge next();
+ RoutingEdge next();
}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingEdge.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingEdge.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingEdge.java (revision 32768)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.core;
@@ -5,23 +6,23 @@
public interface RoutingEdge {
- public LatLon fromLatLon();
+ LatLon fromLatLon();
- public LatLon toLatLon();
+ LatLon toLatLon();
- public Object fromV();
+ Object fromV();
- public Object toV();
+ Object toV();
- public double getLength();
+ double getLength();
- public void setLength(double length);
+ void setLength(double length);
- public double getSpeed();
+ double getSpeed();
- public void setSpeed(double speed);
+ void setSpeed(double speed);
- public boolean isOneway();
+ boolean isOneway();
- public void setOneway(boolean isOneway);
+ void setOneway(boolean isOneway);
}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraph.java (revision 32768)
@@ -1,29 +1,3 @@
-/*
- * Copyright (C) 2008 Innovant
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA.
- *
- * For more information, please contact:
- *
- * Innovant
- * juangui@gmail.com
- * vidalfree@gmail.com
- *
- * http://public.grupoinnovant.com/blog
- *
- */
-
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.core;
@@ -68,10 +42,13 @@
public enum Algorithm {
ROUTING_ALG_DIJKSTRA, ROUTING_ALG_BELLMANFORD
- };
+ }
/**
* Search criteria for the route.
*/
- public enum RouteType {FASTEST,SHORTEST};
+ public enum RouteType {
+ FASTEST,
+ SHORTEST
+ }
/**
@@ -91,8 +68,8 @@
private static Collection excludedHighwayValues = Arrays.asList(new String[]{
- "bus_stop", "traffic_signals", "street_lamp", "stop", "construction",
- "platform", "give_way", "proposed", "milestone", "speed_camera", "abandoned"
+ "bus_stop", "traffic_signals", "street_lamp", "stop", "construction",
+ "platform", "give_way", "proposed", "milestone", "speed_camera", "abandoned"
});
-
+
/**
* Graph state
@@ -108,5 +85,5 @@
// private WeightedMultigraph graph;
private Graph graph;
- private RoutingGraphDelegator rgDelegator=null;
+ private RoutingGraphDelegator rgDelegator = null;
@@ -114,21 +91,19 @@
* Graph getter
*/
- public Graph getGraph(){
+ public Graph getGraph() {
return graph;
-
- }
-
-
- private void addEdgeBidirectional( Way way, Node from, Node to){
- addEdge(way,from,to);
- addEdge(way,to,from);
- }
-
- private void addEdgeReverseOneway( Way way, Node from, Node to){
- addEdge(way,to,from);
- }
-
- private void addEdgeNormalOneway( Way way, Node from, Node to){
- addEdge(way,from,to);
+ }
+
+ private void addEdgeBidirectional(Way way, Node from, Node to) {
+ addEdge(way, from, to);
+ addEdge(way, to, from);
+ }
+
+ private void addEdgeReverseOneway(Way way, Node from, Node to) {
+ addEdge(way, to, from);
+ }
+
+ private void addEdgeNormalOneway(Way way, Node from, Node to) {
+ addEdge(way, from, to);
}
@@ -136,5 +111,5 @@
* Speeds
*/
- private Map waySpeeds;
+ private Map waySpeeds;
/**
@@ -145,6 +120,6 @@
this.graph = null;
this.data = data;
- routeType=RouteType.SHORTEST;
- routingProfile=new RoutingProfile("default");
+ routeType = RouteType.SHORTEST;
+ routingProfile = new RoutingProfile("default");
routingProfile.setOnewayUse(true); // Don't ignore oneways by default
this.setWaySpeeds(routingProfile.getWaySpeeds());
@@ -154,6 +129,4 @@
/**
* Create OSM graph for routing
- *
- * @return
*/
public void createGraph() {
@@ -161,5 +134,5 @@
logger.debug("Creating Graph...");
graph = new DirectedWeightedMultigraph<>(OsmEdge.class);
- rgDelegator=new RoutingGraphDelegator(graph);
+ rgDelegator = new RoutingGraphDelegator(graph);
rgDelegator.setRouteType(this.routeType);
// iterate all ways and segments for all nodes:
@@ -178,18 +151,18 @@
/*
* Assume node is A B C D E. The procedure should be
- *
+ *
* case 1 - bidirectional ways:
* 1) Add vertex A B C D E
* 2) Link A<->B, B<->C, C<->D, D<->E as Edges
- *
+ *
* case 2 - oneway reverse:
* 1) Add vertex A B C D E
* 2) Link B->A,C->B,D->C,E->D as Edges. result: A<-B<-C<-D<-E
- *
+ *
* case 3 - oneway normal:
* 1) Add vertex A B C D E
* 2) Link A->B, B->C, C->D, D->E as Edges. result: A->B->C->D->E
- *
- *
+ *
+ *
*/
@@ -244,9 +217,6 @@
/**
* Compute weight and add edge to the graph
- * @param way
- * @param from
- * @param to
- */
- private void addEdge(Way way,Node from, Node to) {
+ */
+ private void addEdge(Way way, Node from, Node to) {
LatLon fromLL = from.getCoor();
LatLon toLL = from.getCoor();
@@ -263,7 +233,7 @@
setWeight(edge, length);
logger.debug("edge for way " + way.getId()
- + "(from node " + from.getId() + " to node "
- + to.getId() + ") has weight: " + weight);
- ((DirectedWeightedMultigraph)graph).setEdgeWeight(edge, weight);
+ + "(from node " + from.getId() + " to node "
+ + to.getId() + ") has weight: " + weight);
+ ((DirectedWeightedMultigraph) graph).setEdgeWeight(edge, weight);
}
@@ -275,5 +245,4 @@
* @param way
* the way.
- * @return
*/
private void setWeight(OsmEdge osmedge, double length) {
@@ -292,5 +261,4 @@
* @param way
* the way.
- * @return
*/
private double getWeight(Way way, double length) {
@@ -302,10 +270,10 @@
// Same speed for all types of ways
if (this.waySpeeds.containsKey("residential"))
- speed=this.waySpeeds.get("residential");
+ speed = this.waySpeeds.get("residential");
break;
case FASTEST:
// Each type of way may have a different speed
if (this.waySpeeds.containsKey(way.get("highway")))
- speed=this.waySpeeds.get(way.get("highway"));
+ speed = this.waySpeeds.get(way.get("highway"));
logger.debug("Speed="+speed);
break;
@@ -327,5 +295,5 @@
//if (!way.isTagged()) <---not needed me thinks
// return false;
-
+
String highway = way.get("highway");
@@ -348,7 +316,7 @@
public List applyAlgorithm(List nodes, Algorithm algorithm) {
List path = new ArrayList<>();
- Graph g;
+ Graph g;
double totalWeight = 0;
- RoutingLayer layer = (RoutingLayer)Main.getLayerManager().getActiveLayer();
+ RoutingLayer layer = (RoutingLayer) Main.getLayerManager().getActiveLayer();
RoutingModel routingModel = layer.getRoutingModel();
@@ -405,7 +373,7 @@
* @return the number of vertices.
*/
- public int getVertexCount(){
- int value=0;
- if (graph!=null) value=graph.vertexSet().size();
+ public int getVertexCount() {
+ int value = 0;
+ if (graph != null) value = graph.vertexSet().size();
return value;
}
@@ -415,7 +383,7 @@
* @return the number of edges.
*/
- public int getEdgeCount(){
- int value=0;
- if (graph!=null) value=graph.edgeSet().size();
+ public int getEdgeCount() {
+ int value = 0;
+ if (graph != null) value = graph.edgeSet().size();
return value;
}
@@ -445,5 +413,5 @@
public void resetGraph() {
- graph=null;
+ graph = null;
}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraphDelegator.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraphDelegator.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingGraphDelegator.java (revision 32768)
@@ -1,5 +1,3 @@
-/**
- *
- */
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.core;
@@ -9,5 +7,4 @@
import org.openstreetmap.josm.data.osm.Node;
-import com.innovant.josm.jrt.core.RoutingGraphDelegator;
import com.innovant.josm.jrt.core.RoutingGraph.RouteType;
import com.innovant.josm.jrt.osm.OsmEdge;
@@ -33,5 +30,4 @@
}
-
public RouteType getRouteType() {
return routeType;
@@ -42,5 +38,4 @@
}
-
/**
*
@@ -50,8 +45,8 @@
@Override
public double getEdgeWeight(OsmEdge edge) {
- double weight=Double.MAX_VALUE;
+ double weight = Double.MAX_VALUE;
- if (routeType==RouteType.SHORTEST) weight=edge.getLength();
- if (routeType==RouteType.FASTEST) weight=edge.getLength() / edge.getSpeed();
+ if (routeType == RouteType.SHORTEST) weight = edge.getLength();
+ if (routeType == RouteType.FASTEST) weight = edge.getLength() / edge.getSpeed();
// Return the time spent to traverse the way
return weight;
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/core/RoutingProfile.java (revision 32768)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.core;
@@ -57,5 +58,5 @@
* A speed of zero means that this type of way cannot be traversed.
*/
- private Map waySpeeds;
+ private Map waySpeeds;
@@ -64,5 +65,5 @@
* Holds permission of use for each type of transport mode, using the mode as key.
*/
- private Map allowedModes;
+ private Map allowedModes;
/**
@@ -75,11 +76,12 @@
logger.debug("Init RoutingProfile with name: "+name);
this.name = name;
- waySpeeds=new HashMap<>();
- Map prefs=Main.pref.getAllPrefix("routing.profile."+name+".speed");
- for(String key:prefs.keySet()){
+ waySpeeds = new HashMap<>();
+ Map prefs = Main.pref.getAllPrefix("routing.profile."+name+".speed");
+ for (String key:prefs.keySet()) {
waySpeeds.put((key.split("\\.")[4]), Double.valueOf(prefs.get(key)));
}
- for (String key:waySpeeds.keySet())
+ for (String key:waySpeeds.keySet()) {
logger.debug(key+ "-- speed: "+waySpeeds.get(key));
+ }
logger.debug("End init RoutingProfile with name: "+name);
}
@@ -147,6 +149,6 @@
}
- public double getSpeed(String key){
- if(!waySpeeds.containsKey(key)) return 0.0;
+ public double getSpeed(String key) {
+ if (!waySpeeds.containsKey(key)) return 0.0;
return waySpeeds.get(key);
}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/gtfs/GTFSTransportModes.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/gtfs/GTFSTransportModes.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/gtfs/GTFSTransportModes.java (revision 32768)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.gtfs;
@@ -7,5 +8,9 @@
* Routing Profile keys should be Strings
*/
-public class GTFSTransportModes {
+public final class GTFSTransportModes {
+
+ private GTFSTransportModes() {
+
+ }
/**
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmEdge.java (revision 32768)
@@ -1,28 +1,3 @@
-/*
- * Copyright (C) 2008 Innovant
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA.
- *
- * For more information, please contact:
- *
- * Innovant
- * juangui@gmail.com
- * vidalfree@gmail.com
- *
- * http://public.grupoinnovant.com/blog
- *
- */
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.osm;
@@ -37,32 +12,29 @@
*/
public class OsmEdge extends DefaultWeightedEdge {
- /**
- * Serial
- */
- private static final long serialVersionUID = 1L;
- /**
- * Way associated
- */
- private Way way;
- /**
- * Nodes in the edge
- */
- private Node from, to;
- /**
- * Length edge
- */
- private double length;
- /**
- * Speed edge.
- */
- private double speed;
+ /**
+ * Serial
+ */
+ private static final long serialVersionUID = 1L;
+ /**
+ * Way associated
+ */
+ private Way way;
+ /**
+ * Nodes in the edge
+ */
+ private Node from, to;
+ /**
+ * Length edge
+ */
+ private double length;
+ /**
+ * Speed edge.
+ */
+ private double speed;
-
-/**
- * Constructor
- * @param way
- * @param length
- */
- public OsmEdge(Way way, Node from, Node to) {
+ /**
+ * Constructor
+ */
+ public OsmEdge(Way way, Node from, Node to) {
super();
this.way = way;
@@ -70,39 +42,39 @@
this.to = to;
this.length = from.getCoor().greatCircleDistance(to.getCoor());
- }
+ }
- /**
- * @return the way
- */
- public Way getWay() {
- return this.way;
- }
+ /**
+ * @return the way
+ */
+ public Way getWay() {
+ return this.way;
+ }
- public EastNorth fromEastNorth() {
- return this.from.getEastNorth();
- }
+ public EastNorth fromEastNorth() {
+ return this.from.getEastNorth();
+ }
- public EastNorth toEastNorth() {
- return this.to.getEastNorth();
- }
+ public EastNorth toEastNorth() {
+ return this.to.getEastNorth();
+ }
- /**
- * Returns length of segment in meters
- * @return length of segment in meters.
- */
- public double getLength() {
- return length;
- }
+ /**
+ * Returns length of segment in meters
+ * @return length of segment in meters.
+ */
+ public double getLength() {
+ return length;
+ }
- public void setLength(double length) {
- this.length = length;
+ public void setLength(double length) {
+ this.length = length;
+ }
+
+ public double getSpeed() {
+ return speed;
+ }
+
+ public void setSpeed(double speed) {
+ this.speed = speed;
+ }
}
-
-public double getSpeed() {
- return speed;
- }
-
- public void setSpeed(double speed) {
- this.speed = speed;
- }
-}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmWayTypes.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmWayTypes.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/jrt/osm/OsmWayTypes.java (revision 32768)
@@ -1,30 +1,3 @@
-/*
- *
- * Copyright (C) 2008 Innovant
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA.
- *
- * For more information, please contact:
- *
- * Innovant
- * juangui@gmail.com
- * vidalfree@gmail.com
- *
- * http://public.grupoinnovant.com/blog
- *
- */
-
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.jrt.osm;
@@ -34,32 +7,31 @@
*/
public enum OsmWayTypes {
- MOTORWAY ("motorway",120),
- MOTORWAY_LINK ("motorway_link",120),
- TRUNK ("trunk",120),
- TRUNK_LINK ("trunk_link",120),
- PRIMARY ("primary",100),
- PRIMARY_LINK ("primary_link",100),
- SECONDARY ("secondary",90),
- TERTIARY ("tertiary",90),
- UNCLASSIFIED ("unclassified",50),
- ROAD ("road",100),
- RESIDENTIAL ("residential",50),
- LIVING_STREET ("living_street",30),
- SERVICE ("service",30),
- TRACK ("track",50),
- PEDESTRIAN ("pedestrian",30),
- BUS_GUIDEWAY ("bus_guideway",50),
- PATH ("path",40),
- CYCLEWAY ("cycleway",40),
- FOOTWAY ("footway",20),
- BRIDLEWAY ("bridleway",40),
- BYWAY ("byway",50),
- STEPS ("steps",10);
+ MOTORWAY("motorway", 120),
+ MOTORWAY_LINK("motorway_link", 120),
+ TRUNK("trunk", 120),
+ TRUNK_LINK("trunk_link", 120),
+ PRIMARY("primary", 100),
+ PRIMARY_LINK("primary_link", 100),
+ SECONDARY("secondary", 90),
+ TERTIARY("tertiary", 90),
+ UNCLASSIFIED("unclassified", 50),
+ ROAD("road", 100),
+ RESIDENTIAL("residential", 50),
+ LIVING_STREET("living_street", 30),
+ SERVICE("service", 30),
+ TRACK("track", 50),
+ PEDESTRIAN("pedestrian", 30),
+ BUS_GUIDEWAY("bus_guideway", 50),
+ PATH("path", 40),
+ CYCLEWAY("cycleway", 40),
+ FOOTWAY("footway", 20),
+ BRIDLEWAY("bridleway", 40),
+ BYWAY("byway", 50),
+ STEPS("steps", 10);
/**
* Default Constructor
- * @param tag
*/
- OsmWayTypes(String tag,int speed) {
+ OsmWayTypes(String tag, int speed) {
this.tag = tag;
this.speed = speed;
@@ -72,8 +44,10 @@
private final int speed;
- /**
- * @return
- */
- public String getTag() {return tag;};
- public int getSpeed() {return speed;};
+ public String getTag() {
+ return tag;
+ }
+
+ public int getSpeed() {
+ return speed;
+ }
}
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java (revision 32767)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java (revision 32768)
@@ -1,29 +1,3 @@
-/*
- * Copyright (C) 2008 Innovant
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,USA.
- *
- * For more information, please contact:
- *
- * Innovant
- * juangui@gmail.com
- * vidalfree@gmail.com
- *
- * http://public.grupoinnovant.com/blog
- *
- */
-
+// License: GPL. For details, see LICENSE file.
package com.innovant.josm.plugin.routing;
@@ -72,15 +46,17 @@
public enum PreferencesKeys {
- KEY_ACTIVE_ROUTE_COLOR (marktr("routing active route")),
- KEY_INACTIVE_ROUTE_COLOR (marktr("routing inactive route")),
- KEY_ROUTE_WIDTH ("routing.route.width"),
- KEY_ROUTE_SELECT ("routing.route.select");
+ KEY_ACTIVE_ROUTE_COLOR(marktr("routing active route")),
+ KEY_INACTIVE_ROUTE_COLOR(marktr("routing inactive route")),
+ KEY_ROUTE_WIDTH("routing.route.width"),
+ KEY_ROUTE_SELECT("routing.route.select");
public final String key;
- PreferencesKeys (String key) {
- this.key=key;
- }
-
- public String getKey() {return key;};
+ PreferencesKeys(String key) {
+ this.key = key;
+ }
+
+ public String getKey() {
+ return key;
+ }
}
@@ -103,5 +79,5 @@
* Start, Middle and End icons
*/
- private Icon startIcon,middleIcon,endIcon;
+ private Icon startIcon, middleIcon, endIcon;
/**
@@ -117,11 +93,11 @@
super(name);
logger.debug("Creating Routing Layer...");
- if(startIcon == null) startIcon = ImageProvider.get("routing", "startflag");
- if(middleIcon == null) middleIcon = ImageProvider.get("routing", "middleflag");
- if(endIcon == null) endIcon = ImageProvider.get("routing", "endflag");
+ if (startIcon == null) startIcon = ImageProvider.get("routing", "startflag");
+ if (middleIcon == null) middleIcon = ImageProvider.get("routing", "middleflag");
+ if (endIcon == null) endIcon = ImageProvider.get("routing", "endflag");
this.dataLayer = dataLayer;
this.routingModel = new RoutingModel(dataLayer.data);
logger.debug("Routing Layer created.");
-
+
this.routingModel.routingGraph.createGraph(); /* construct the graph right after we we create the layer */
@@ -155,5 +131,5 @@
double minDist = 0;
for (Way w : dataLayer.data.getWays()) {
- if (w.isDeleted() || w.isIncomplete() || w.get("highway")==null) continue;
+ if (w.isDeleted() || w.isIncomplete() || w.get("highway") == null) continue;
for (Node n : w.getNodes()) {
if (n.isDeleted() || n.isIncomplete()) continue;
@@ -181,9 +157,9 @@
public Object getInfoComponent() {
String info = ""
- + ""
- +"Graph Vertex: "+this.routingModel.routingGraph.getVertexCount()+"
"
- +"Graph Edges: "+this.routingModel.routingGraph.getEdgeCount()+"
"
- + ""
- + "";
+ + ""
+ +"Graph Vertex: "+this.routingModel.routingGraph.getVertexCount()+"
"
+ +"Graph Edges: "+this.routingModel.routingGraph.getEdgeCount()+"
"
+ + ""
+ + "