Hello Ævar,
Please try this version, it should now print the browse URL whether the
road is from OSM input or MP input.
Mark
diff --git a/src/uk/me/parabola/imgfmt/app/net/RoadDef.java b/src/uk/me/parabola/imgfmt/app/net/RoadDef.java
index de87495..1dc1e8a 100644
--- a/src/uk/me/parabola/imgfmt/app/net/RoadDef.java
+++ b/src/uk/me/parabola/imgfmt/app/net/RoadDef.java
@@ -70,18 +70,10 @@ public class RoadDef implements Comparable {
this.name = name;
}
- public void showOSMBrowseURL() {
- showBrowseURL = true;
- }
-
// for diagnostic purposes
public String toString() {
- String browseURL;
- if(showBrowseURL)
- browseURL = "http://www.openstreetmap.org/browse/way/"; + id;
- else
- browseURL = "" + id;
-
+ // assumes id is an OSM id
+ String browseURL = "http://www.openstreetmap.org/browse/way/"; + id;
if(name != null)
return "(" + name + ", " + browseURL + ")";
else
@@ -128,7 +120,6 @@ public class RoadDef implements Comparable {
private boolean synthesised;
private boolean flareCheck;
private boolean deadEndCheck;
- private boolean showBrowseURL;
private Set<String> messageIssued;
/**
diff --git a/src/uk/me/parabola/mkgmap/general/MapRoad.java b/src/uk/me/parabola/mkgmap/general/MapRoad.java
index 3703ad2..a955827 100644
--- a/src/uk/me/parabola/mkgmap/general/MapRoad.java
+++ b/src/uk/me/parabola/mkgmap/general/MapRoad.java
@@ -80,10 +80,6 @@ public class MapRoad extends MapLine {
this.roadDef.ferry(f);
}
- public void showOSMBrowseURL() {
- this.roadDef.showOSMBrowseURL();
- }
-
public void setSynthesised(boolean s) {
this.roadDef.setSynthesised(s);
}
diff --git a/src/uk/me/parabola/mkgmap/general/RoadNetwork.java b/src/uk/me/parabola/mkgmap/general/RoadNetwork.java
index 6be2d0c..e6bb4e4 100644
--- a/src/uk/me/parabola/mkgmap/general/RoadNetwork.java
+++ b/src/uk/me/parabola/mkgmap/general/RoadNetwork.java
@@ -133,14 +133,11 @@ public class RoadNetwork {
RouteNode node1 = getNode(lastId, lastCoord);
RouteNode node2 = getNode(id, co);
- if(node1 == node2) {
- log.error("Road " + road.getRoadDef().getName() + " (OSM id " + road.getRoadDef().getId() + ") contains consecutive identical nodes - routing will be broken");
- log.error(" " + co.toOSMURL());
- }
- else if(arcLength == 0) {
- log.error("Road " + road.getRoadDef().getName() + " (OSM id " + road.getRoadDef().getId() + ") contains zero length arc");
- log.error(" " + co.toOSMURL());
- }
+ if(node1 == node2)
+ log.error("Road " + road.getRoadDef() + " contains consecutive identical nodes at " + co.toOSMURL() + " - routing will be broken");
+ else if(arcLength == 0)
+ log.error("Road " + road.getRoadDef() + " contains zero length arc at " + co.toOSMURL());
+
Coord bearingPoint = coordList.get(lastIndex + 1);
if(lastCoord.equals(bearingPoint)) {
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java b/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
index 784f238..b39a7a6 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
@@ -1304,7 +1304,6 @@ public class StyledConverter implements OsmConverter {
line.setPoints(points);
MapRoad road = new MapRoad(way.getId(), line);
- road.showOSMBrowseURL();
boolean doFlareCheck = true;
if("roundabout".equals(way.getTag("junction"))) {
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
