- mkgmap-dev - The mkgmap lists

[patch] small patch to make options a little more clear
by Ben Konrath 22 Feb '09

22 Feb '09

Hi, A small patch is attached to make the options a little more clear. Cheers, Ben diff --git a/ChangeLog b/ChangeLog index 996025a..7ed5273 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-02-21 Ben Konrath <ben(a)bagu.org> + + * resources/help/en/options: Make help options less confusing. + 2008-12-20 steve * src/uk/me/parabola/imgfmt/app/trergn/Subdivision.java: Ensure diff --git a/resources/help/en/options b/resources/help/en/options index 1f556d8..bd2c91b 100644 --- a/resources/help/en/options +++ b/resources/help/en/options @@ -20,16 +20,16 @@ Options: Sets the descriptive text for the map. This may be displayed in QLandkarte, MapSource on on a GPS etc. ---country-name +--country-name=name Sets the map's country name. The default is "UNITED KINGDOM". ---country-abbr +--country-abbr=abbreviation Sets the map's abbreviated country name. The default is "GBR". ---region-name +--region-name=name Sets the map's region name. By default, the map has no region name. ---region-abbr +--region-abbr=abbreviation Sets the map's abbreviated region name. By default, the map has no abbreviated region name.

1 0

[patch] add POIs to areas
by Ben Konrath 22 Feb '09

22 Feb '09

Hi, A patch that will create a POI in various areas if they don't already have one is attached. This is very useful for me here in Costa Rica where most streets aren't named and addresses are given based on points of references like buildings, parks, etc rather than street names. This replaces Bernhard Heibler's patch from last week which does a similar thing for only buildings. As with Bernhard's patch, if you want a POI in a given area, you have to make sure that the style system will create a Garmin polygon by putting a suitable line in resources/styles/default/polygons. POIs are only made for areas which I thought made sense. Here is the code that describes the current mappings from Garmin polygon to Garmin point: + map.put(0x04, 0x640b); // Military + map.put(0x05, 0x2f0b); // Car Park + map.put(0x06, 0x2f0b); // Parking Garage + map.put(0x07, 0x2f04); // Airport + map.put(0x08, 0x2e04); // Shopping Centre + map.put(0x09, 0x2f09); // Marina + map.put(0x0a, 0x6410); // University + map.put(0x0b, 0x6408); // Hospital + map.put(0x13, 0x6400); // Man made area + map.put(0x17, 0x2c06); // City Park + map.put(0x18, 0x2d05); // Golf + map.put(0x19, 0x2c0a); // Sport + map.put(0x1a, 0x6403); // Cemetery Please let me know if you think something is missing or wrong here. The patch adds a new command line argument '--add-pois-to-areas' which enables this feature. The only thing left to do is calculate a better position for the POIs - currently they are placed in the centre of the polygon but that doesn't work for cases like 'Museo Nacional de Costa Rica' as shown here: http://openstreetmap.org/?lat=9.932949&lon=-84.071649&zoom=18&layers=B000FTF Comments and testing are appreciated. Cheers, Ben diff --git a/resources/help/en/options b/resources/help/en/options index 1f556d8..ad0bae1 100644 --- a/resources/help/en/options +++ b/resources/help/en/options @@ -117,6 +117,11 @@ Misc options: Generate a POI for each named road. By default, the POIs' Garmin type code is 0x640a. If desired, a different type code can be specified with this option. + +--add-pois-to-areas + Generate a POI for each area. The POIs are created after the style + is applied and only for polygon types that have a reasonable point + equivalent. --tdbfile Write a .tdb file. diff --git a/src/uk/me/parabola/mkgmap/general/MapShape.java b/src/uk/me/parabola/mkgmap/general/MapShape.java index 9811ff7..6496d8d 100644 --- a/src/uk/me/parabola/mkgmap/general/MapShape.java +++ b/src/uk/me/parabola/mkgmap/general/MapShape.java @@ -15,6 +15,11 @@ */ package uk.me.parabola.mkgmap.general; +import java.util.ArrayList; +import java.util.List; + +import uk.me.parabola.imgfmt.app.Coord; + /** * A shape or polygon is just the same as a line really as far as I can tell. * There are some things that you cannot do with them semantically. @@ -38,5 +43,148 @@ public class MapShape extends MapLine {// So top code can link objects from here throw new IllegalArgumentException( "can't set a direction on a polygon"); } + + /** + * Checks if a point is contained within this shape. Points on the + * edge of the shape are considered inside. + * + * @param co point to check + * @return true if point is in shape, false otherwise + */ + public boolean contains(Coord co) { + return contains(this.getPoints(), co, true); + } + + /* + * Checks if a point is contained within a shape. + * + * @param points points that define the shape + * @param target point to check + * @param onLineIsInside if a point on the line should be considered inside the shape + * @return true if point is contained within the shape, false if the target point is outside the shape + */ + private static boolean contains(List<Coord> points, Coord target, boolean onLineIsInside) { + // implementation of the Ray casting algorithm as described here: + // http://en.wikipedia.org/wiki/Point_in_polygon + // with inspiration from: + // http://www.visibone.com/inpoly/ + boolean inside = false; + if (points.size() < 3) + return false; + + // complete the shape if we're dealing with a MapShape that is not closed + Coord start = points.get(0); + Coord end = points.get(points.size() - 1); + if (!start.equals(end)) { + // make copy of the shape's geometry + List<Coord> pointsTemp = new ArrayList<Coord>(points.size() + 1); + for (Coord coord : points) { + pointsTemp.add(new Coord(coord.getLatitude(), coord.getLongitude())); + } + pointsTemp.add(new Coord(start.getLatitude(), start.getLongitude())); + points = pointsTemp; + } + + int xtarget = target.getLatitude(); + int ytarget = target.getLongitude(); + + for (int i = 0; i < points.size() - 1; i++) { + + // apply transformation points to change target point to (0,0) + int x0 = points.get(i).getLatitude() - xtarget; + int y0 = points.get(i).getLongitude() - ytarget; + int x1 = points.get(i+1).getLatitude() - xtarget; + int y1 = points.get(i+1).getLongitude() - ytarget; + + // ensure that x0 is smaller than x1 so that we can just check to see if the line intersects the y axis easily + if (x0 > x1) { + int xtemp = x0; + int ytemp = y0; + x0 = x1; + y0 = y1; + x1 = xtemp; + y1 = ytemp; + } + // use (0,0) as target because points already transformed + if (isPointOnLine(x0, y0, x1, y1, 0, 0)) + return onLineIsInside; + + // explanation of if statement + // + // (x0 < 0 && x1 >= 0): + // are the x values between the y axis? only include points from the right + // with this check so that corners aren't counted twice + // + // (y0 * (x1 - x0) > (y1 - y0) * x0): + // from y = mx + b: + // => b = y0 ((y1 - y0) / (x1 - x0)) * x0 + // for intersection, b > 0 + // from y = mx + b, b = y - mx + // => y - mx > 0 + // => y0 - ((y1 - y0) / (x1 - x0)) * x0 > 0 + // => y0 > ((y1 - y0) / (x1 - x0)) * x0 + // from 'if (x0 > x1)', x1 >= x0 + // => x1 - x0 >=0 + // => y0 * (x1 - x0) > (y1 - y0) * x0 + if ((x0 < 0 && x1 >= 0) && (y0 * (x1 - x0)) > ((y1 - y0) * x0)) + inside = !inside; + } + + return inside; + } + + /* + * Checks if a point is on a line. + * + * @param x0 x value of first point in line + * @param y0 y value of first point in line + * @param x1 x value of second point in line + * @param y1 y value of second point in line + * @param xt x value of target point + * @param yt y value of target point + * @return return true if point is on the line, false if the point isn't on the line + */ + private static boolean isPointOnLine(int x0, int y0, int x1, int y1, int xt, int yt) { + // this implementation avoids using doubles + // apply transformation points to change target point to (0,0) + x0 = x0 - xt; + y0 = y0 - yt; + x1 = x1 - xt; + y1 = y1 - yt; + + // ensure that x0 is smaller than x1 so that we can just check to see if the line intersects the y axis easily + if (x0 > x1) { + int xtemp = x0; + int ytemp = y0; + x0 = x1; + y0 = y1; + x1 = xtemp; + y1 = ytemp; + } + + // if a point is on the edge of shape (on a line), it's considered outside the shape + // special case if line is on y-axis + if (x0 == 0 && x1 == 0) { + // ensure that y0 is smaller than y1 so that we can just check if the line intersects the x axis + if (y0 > y1) { + int xtemp = x0; + int ytemp = y0; + x0 = x1; + y0 = y1; + x1 = xtemp; + y1 = ytemp; + } + // test to see if we have a vertical line touches x-axis + if (y0 <= 0 && y1 >= 0) + return true; + // checks if point is on the line, see comments in contain() for derivation of similar + // formula - left as an exercise to the reader ;) + } else if ((x0 <= 0 && x1 >= 0) && (y0 * (x1 - x0)) == ((y1 - y0) * x0)) { + return true; + } + return false; + } + + } diff --git a/src/uk/me/parabola/mkgmap/main/MapMaker.java b/src/uk/me/parabola/mkgmap/main/MapMaker.java index b93b4bc..548d068 100644 --- a/src/uk/me/parabola/mkgmap/main/MapMaker.java +++ b/src/uk/me/parabola/mkgmap/main/MapMaker.java @@ -36,6 +36,7 @@ import uk.me.parabola.mkgmap.build.MapBuilder; import uk.me.parabola.mkgmap.general.LoadableMapDataSource; import uk.me.parabola.mkgmap.general.MapLine; import uk.me.parabola.mkgmap.general.MapPoint; +import uk.me.parabola.mkgmap.general.MapShape; import uk.me.parabola.mkgmap.reader.plugin.MapReader; /** @@ -50,6 +51,7 @@ public class MapMaker implements MapProcessor { try { LoadableMapDataSource src = loadFromFile(args, filename); makeRoadNamePOIS(args, src); + makeAreaPOIs(args, src); return makeMap(args, src); } catch (FormatException e) { System.err.println("Bad file format: " + filename); @@ -135,6 +137,58 @@ public class MapMaker implements MapProcessor { return src; } + private void makeAreaPOIs(CommandArgs args, LoadableMapDataSource src) { + String s = args.getProperties().getProperty("add-pois-to-areas"); + if (s != null) { + // please update the initialCapacity argument if you a new conversion + HashMap<Integer, Integer> map = new HashMap<Integer, Integer>(13, 1.0f); + // create map of known garmin polygon -> garmin point conversions + map.put(0x04, 0x640b); // Military + map.put(0x05, 0x2f0b); // Car Park + map.put(0x06, 0x2f0b); // Parking Garage + map.put(0x07, 0x2f04); // Airport + map.put(0x08, 0x2e04); // Shopping Centre + map.put(0x09, 0x2f09); // Marina + map.put(0x0a, 0x6410); // University + map.put(0x0b, 0x6408); // Hospital + map.put(0x13, 0x6400); // Man made area + map.put(0x17, 0x2c06); // City Park + map.put(0x18, 0x2d05); // Golf + map.put(0x19, 0x2c0a); // Sport + map.put(0x1a, 0x6403); // Cemetery + + for (MapShape shape : src.getShapes()) { + String shapeName = shape.getName(); + int shapeType = shape.getType(); + + // only make a point if the shape has a name and we know what type of point to make + if (shapeName == null || !map.containsKey(shapeType)) + continue; + + // go through all points to make sure there is no name or location collision + boolean addPOI = true; + for (MapPoint point : src.getPoints()) { + if (shapeName.equals(point.getName()) && shape.contains(point.getLocation())) { + addPOI = false; + break; + } + } + + // finally add the point + if (addPOI) { + MapPoint newPoint = new MapPoint(); + newPoint.setName(shapeName); + newPoint.setType(map.get(shapeType)); + newPoint.setLocation(shape.getLocation()); // TODO use centriod + src.getPoints().add(newPoint); + log.info("created POI ", shapeName, "from shape"); + } + } + } + + } + + void makeRoadNamePOIS(CommandArgs args, LoadableMapDataSource src) { String rnp = args.getProperties().getProperty("road-name-pois", null); // are road name POIS wanted?

1 1

PATCH: Disallow bicycles and pedestrians on motorways
by Christian Gawron 21 Feb '09

21 Feb '09

Hi, the default style allows bicycles/pedestrians to drive on motorways if the tag "bicycle/foot=no" is missing. The attached patch adds these tags if they are not set. Best wishes Christian Index: resources/styles/default/lines =================================================================== --- resources/styles/default/lines (Revision 919) +++ resources/styles/default/lines (Arbeitskopie) @@ -15,6 +15,11 @@ junction=roundabout & highway=unclassified [0x0c road_class=1 road_speed=2 resolution 21] junction=roundabout [0x0c road_class=0 road_speed=1 resolution 21] +# bicycles & pedestrians are not allowed on motorways +highway=motorway {add bicycle = no } +highway=motorway {add foot = no } + + # Set highway names to include the reference if there is one highway=* {name '${name} (${ref})' | '${ref}' | '${name}' } highway=bridleway [0x16 road_class=0 road_speed=0 resolution 23]

1 0

Howto: Installing mkgmap generated maps in Mapsource
by Christian Gawron 21 Feb '09

21 Feb '09

I'm not sure if this is the easiest way, but this works for me: 1. Create the map, tdb and overview: $ java -jar dist/mkgmap.jar --tdbfile --route map.osm This creates 63240000.tdb, 63240000.img (overview) and 63240001.img (map). 2. Install the map using MapsetToolkit (s. http://cypherman1.googlepages.com/) See the attached screenshot for the parameters to use, but they should be straight forward. If there are no objections, I volunteer to put this information on the wiki page. The only problem which still remains for me is that mapsources does not recognise the map as routable.Has anyone a solution for this or does anyone know what the problem is? Best wishes Christian

3 4

Mapsource
by Ralf Kleineisel 21 Feb '09

21 Feb '09

Hi, I try to get a map I made with mkgmap to work with mapsource. I split the gmapsupp.img using wgmaptool (gmt.exe -S -f 1331 gmapsupp.img). When I run install.bat it says that mapset00.img is missing. Then I copied the 63240000.img created by mkgmap into the directory, renamed it mapset00.img and everything works. Should mkgmap include the overview map mapset00.img in the gmapsupp.img?

2 1

Commit: r919: Get the tests working again.
by svn commit 21 Feb '09

21 Feb '09

Version 919 was commited by steve on 2009-02-21 14:15:46 +0000 (Sat, 21 Feb 2009) Get the tests working again.

1 0

Commit: r918: Plazas and squares as areas.
by svn commit 21 Feb '09

21 Feb '09

Version 918 was commited by steve on 2009-02-21 13:41:12 +0000 (Sat, 21 Feb 2009) Plazas and squares as areas. - Ben Konrath

1 0

Commit: r917: Deal with the case where there are no roads.
by svn commit 21 Feb '09

21 Feb '09

Version 917 was commited by steve on 2009-02-21 13:33:16 +0000 (Sat, 21 Feb 2009) Deal with the case where there are no roads. Perhaps it is unexpected that this is called when there are no roads, but I see it.

1 0

Commit: r916: Make version 4 of the tdb the default.
by svn commit 21 Feb '09

21 Feb '09

Version 916 was commited by steve on 2009-02-21 13:27:45 +0000 (Sat, 21 Feb 2009) Make version 4 of the tdb the default. You can use tdb-v3 to get the older version, although I may remove it if there is no use for it.

1 0

Problem using --split-file option in splitter
by Carlos Dávila 21 Feb '09

21 Feb '09

If I use --split-file=areas.list option in splitter I always get the same error: key split-file/ val areas.list g30xfff8f800 Bad number in areas list file Exception in thread "main" java.lang.NullPointerException at uk.me.parabola.splitter.AreaList.dump(Unknown Source) at uk.me.parabola.splitter.Main.readArgs(Unknown Source) at uk.me.parabola.splitter.Main.split(Unknown Source) at uk.me.parabola.splitter.Main.main(Unknown Source) areas.list file was generated by splitter for the same osm file. This is the content of the file: # List of areas # Generated Sat Feb 21 10:57:27 GMT 2009 # 63240001: 0x199800,0xfff8f800 to 0x1f4000,0xfffd6800 # : 35,991211,-9,887695 to 43,945313,-3,647461 63240002: 0x199800,0xfffd6800 to 0x1f4000,0x34800 # : 35,991211,-3,647461 to 43,945313,4,614258 Regards Carlos

2 1