- mkgmap-dev - The mkgmap lists

Commit: r888: Add zero to the bit array when the road does not end in a node
by svn commit 15 Feb '09

15 Feb '09

Version 888 was commited by steve on 2009-02-14 23:44:24 +0000 (Sat, 14 Feb 2009) Add zero to the bit array when the road does not end in a node as well as when it does not start with a node. Also fix the loop that writes the array out. -Johann Gail

4 5

Commit: r892: Another try at the NOD2 bit array loop.
by svn commit 15 Feb '09

15 Feb '09

Version 892 was commited by steve on 2009-02-15 11:38:15 +0000 (Sun, 15 Feb 2009) Another try at the NOD2 bit array loop. Please test for dead-end roads.

1 0

[PATCH] pink line in dead end street.
by Johann Gail 15 Feb '09

15 Feb '09

After some digging in the code I found a place, where is a special treatment for roads starting with or without a node. I give it just a try and duplicated this code for the end of the road. With these changes the wrong pink line in roads with dead end has disappeared in my cases. If this patch is working, then the superfluous nodes at end of streets can be removed again. Here the patch: Index: src/uk/me/parabola/imgfmt/app/net/RoadDef.java =================================================================== --- src/uk/me/parabola/imgfmt/app/net/RoadDef.java (Revision 881) +++ src/uk/me/parabola/imgfmt/app/net/RoadDef.java (Arbeitskopie) @@ -281,6 +281,7 @@ // the first point in the road is a node (the above routing node) private boolean startsWithNode = true; + private boolean endsWithNode = true; // number of nodes in the road private int nnodes; @@ -310,6 +311,10 @@ startsWithNode = s; } + public void setEndsWithNode(boolean s) { + endsWithNode = s; + } + public void setNumNodes(int n) { nnodes = n; } @@ -343,17 +348,21 @@ int nbits = nnodes; if (!startsWithNode) nbits++; + if (!endsWithNode) + nbits++; writer.putChar((char) nbits); boolean[] bits = new boolean[nbits]; for (int i = 0; i < bits.length; i++) bits[i] = true; if (!startsWithNode) bits[0] = false; + if (!endsWithNode) + bits[bits.length] = false; for (int i = 0; i < bits.length; i += 8) { int b = 0; - for (int j = 0; j < bits.length - i; j++) + for (int j = i*8; j < bits.length; j++) if (bits[j]) - b |= 1 << j; + b |= 1 << j-i*8; writer.put((byte) b); } } Index: src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java =================================================================== --- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (Revision 881) +++ src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (Arbeitskopie) @@ -433,6 +433,7 @@ } road.setStartsWithNode(nodeIndices.get(0) == 0); + road.setEndsWithNode(nodeIndices.get(numNodes-1) == points.size() - 1); road.setInternalNodes(hasInternalNodes); } Index: src/uk/me/parabola/mkgmap/general/MapRoad.java =================================================================== --- src/uk/me/parabola/mkgmap/general/MapRoad.java (Revision 881) +++ src/uk/me/parabola/mkgmap/general/MapRoad.java (Arbeitskopie) @@ -90,6 +90,10 @@ this.roadDef.setStartsWithNode(s); } + public void setEndsWithNode(boolean s) { + this.roadDef.setStartsWithNode(s); + } + public void setInternalNodes(boolean s) { this.roadDef.setInternalNodes(s); }

2 3

Commit: r891: Changed default target to dist.
by svn commit 15 Feb '09

15 Feb '09

Version 891 was commited by markb on 2009-02-15 10:19:18 +0000 (Sun, 15 Feb 2009) Changed default target to dist.

1 0

Commit: r890: Moved getSpeedIdx() definition.
by svn commit 15 Feb '09

15 Feb '09

Version 890 was commited by markb on 2009-02-15 10:19:16 +0000 (Sun, 15 Feb 2009) Moved getSpeedIdx() definition.

1 0

Commit: r889: Now handles way's maxspeed attribute.
by svn commit 15 Feb '09

15 Feb '09

Version 889 was commited by markb on 2009-02-15 00:41:53 +0000 (Sun, 15 Feb 2009) Now handles way's maxspeed attribute. Slightly changed version of patch by Bernhard Heibler.

1 0

[mkgmap] Bug or missunderstanding?
by Johann Gail 14 Feb '09

14 Feb '09

I'm looking at the moment at RoadDef.java, lines 352 to 358. As I understand it by the comments, there should be a bitfield converted into a byte array and in some cases be shifted by one. I think the inner loop in 354 is wrong. At least I see no sense in the loop limits. Can anyone give me a comment or explain what is intended here? The next question appearing to me: What happens, if the road has no final node (a dead end road)? Is there also a zero bit needed? // this is related to the number of nodes, but there // is more to it... // For now, shift by one if the first node is not a // routing node. Supposedly, other holes are also // possible. // This might be unnecessary if we just make sure // that every road starts with a node. int nbits = nnodes; if (!startsWithNode) nbits++; writer.putChar((char) nbits); boolean[] bits = new boolean[nbits]; for (int i = 0; i < bits.length; i++) bits[i] = true; if (!startsWithNode) bits[0] = false; 352: for (int i = 0; i < bits.length; i += 8) { 353: int b = 0; 354: for (int j = 0; j < bits.length - i; j++) if (bits[j]) b |= 1 << j; writer.put((byte) b); }

2 2

[PATCH] max speed patch for nod branch
by Bernhard Heibler 14 Feb '09

14 Feb '09

Hi, this small patch just adds the handling for the maxspeed tag. I have used the code from osm2mp as reference. The method should be able to handle both mph and kmh speed limits. Berni. Index: src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java =================================================================== --- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (revision 209) +++ src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java (working copy) @@ -308,6 +308,48 @@ } } + int getSpeedIdx(String tag) + { + double kmh = 0.0; + double factor = 1.0; + + String speedTag = tag.toLowerCase().trim(); + + if(speedTag.matches(".*mph")) // Check if it is a limit in mph + { + speedTag = speedTag.replaceFirst("mph", ""); + factor = 1.61; + } + else + speedTag = speedTag.replaceFirst("kmh", ""); // get rid of kmh just in case + + try { + kmh = Integer.parseInt(speedTag) * factor; + } + catch (Exception e) + { + return -1; + } + + if(kmh > 110) + return 7; + if(kmh > 90) + return 6; + if(kmh > 80) + return 5; + if(kmh > 60) + return 4; + if(kmh > 40) + return 3; + if(kmh > 20) + return 2; + if(kmh > 10) + return 1; + else + return 0; + + } + void addRoadWithoutLoops(Way way, GType gt) { List<Integer> nodeIndices = new ArrayList<Integer>(); List<Coord> points = way.getPoints(); @@ -357,9 +399,24 @@ // set road parameters. road.setRoadClass(gt.getRoadClass()); - road.setSpeed(gt.getRoadSpeed()); road.setOneway(line.isDirection()); + + // Max Speed Handling + + String maxSpeed = way.getTag("maxspeed"); + int speedIdx = -1; + + if(maxSpeed != null) + speedIdx = getSpeedIdx(maxSpeed); + if(speedIdx >= 0) // valid max speed tag detected + { + road.setSpeed(speedIdx); + } + else + road.setSpeed(gt.getRoadSpeed()); + + boolean[] noAccess = new boolean[RoadNetwork.NO_MAX]; String highwayType = way.getTag("highway"); if(highwayType == null) {

1 0

Commit: r886: Add place = island
by svn commit 14 Feb '09

14 Feb '09

Version 886 was commited by steve on 2009-02-14 19:29:17 +0000 (Sat, 14 Feb 2009) Add place = island

1 0

Commit: r884: Improve splitting of looped ways.
by svn commit 14 Feb '09

14 Feb '09

Version 884 was commited by robert on 2009-02-14 18:16:09 +0000 (Sat, 14 Feb 2009) Improve splitting of looped ways. - Bernhard Heibler / Mark Burton

2 1