July 2009 - mkgmap-dev - The mkgmap lists

14 Jul '09

Wwat would happen as far as routing is concerned if I download 3 different countries from Geofabrik and then combine them in a single file...e.g I download england, scotland, wales and then run java -Xmx2048M -jar mkgmap.jar --latin1 --gmapsupp --route --region-name="abc" --region-abbr="abc" --max-jobs --remove-short-arcs --net --code-page=1252 --country-name="abc" --country-abbr=abc --tdbfile --tdb-v4 --description="abc" england.osm scotland.osm wales.osm What I'm expecting is that routing within each country will work but routing across borders won't I've created a map with the above options and whilst what I expect to happen does seem to be happening I thought I'd check On a related note if I were to create separate england.img, scotland.img, wales.img files and then combine them into a single gmapsupp.img which of the family-name, map-name, series-nam etc options would I need for the individual files and for the combination step so that I could turn the individual maps on or off? Cheers Paul

4 5

Bugreport: Routing to POIs
by Thilo Hannemann 13 Jul '09

13 Jul '09

I see a strange behaviour lately: If I select a POI as the destination for a route, the calculated route will go to a completely unrelated coordinate on the map and will "jump" in a straight line to the destination. The calculated route is therefore completely unusable. The "wrong" coordinate the routing goes to was in one case at the border of a map tile, but thats not always the case. If I select a coordinate just beside the POI, routing is fine. Has anybody else seen this behaviour? It is triggered if you select a POI from the POI list on the GPS unit (Oregon 300 in my case). Regards Thilo

3 7

POI and style file
by frmas 13 Jul '09

13 Jul '09

Hello, I attach three screen captures of my GPS (oregon 400T) - I run mkgmap using the --add-pois-to-areas and --road-name-pois parameters. Is there a way to get the road names pois created, but not have them displayed on the map? I would like all those little dots I find in the middle of each road not to be displayed. I suppose the parameter --road-name-pois is mandatory to get routing ? If not, my pb would be solved. - Second, you will see "question marks", on both screen captures. Those question marks represent lighthouses. I have in my style file the following line : man_made=lighthouse [0x1600 resolution 20] and my .TYP file has the right entry (see file attached). What's wrong with my settings. Thank you. Francois --

2 1

Commit: r1087: Rest of the dem patch from Christian Gawron.
by svn commit 13 Jul '09

13 Jul '09

Version 1087 was commited by steve on 2009-07-13 20:33:41 +0100 (Mon, 13 Jul 2009) Rest of the dem patch from Christian Gawron.

1 0

Commit: r1086: This version of the patch (to be applied against rev. 1080) has a HGTDEM
by svn commit 13 Jul '09

13 Jul '09

Version 1086 was commited by steve on 2009-07-13 17:59:22 +0100 (Mon, 13 Jul 2009) This version of the patch (to be applied against rev. 1080) has a HGTDEM which reads SRTM .hgt files and an optional GeoTiffDEM which contains inner classes to read CGIAR and ASTER. To compile GeoTiffDEM.java you'll need Java Advanced Imaging (JAI) installed, so it is disabled in the build.xml. - Christian Gowron [Note this is just the complete files from the patch]

1 0

[PATCH v4] contours
by Christian Gawron 13 Jul '09

13 Jul '09

This version of the patch (to be applied against rev. 1080) has a HGTDEM which reads SRTM .hgt files and an optional GeoTiffDEM which contains inner classes to read CGIAR and ASTER. To compile GeoTiffDEM.java you'll need Java Advanced Imaging (JAI) installed, so it is disabled in the build.xml. BTW: Does anybody know how to switch the exclude on and off depending on a property? Best wishes Christian Index: src/uk/me/parabola/mkgmap/reader/dem/DEM.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/dem/DEM.java (revision 1080) +++ src/uk/me/parabola/mkgmap/reader/dem/DEM.java (working copy) @@ -17,20 +17,11 @@ package uk.me.parabola.mkgmap.reader.dem; import java.io.*; -import java.nio.channels.FileChannel; -import java.nio.MappedByteBuffer; - import java.util.Vector; import java.util.List; import java.util.ArrayList; import java.util.Locale; -import com.sun.media.jai.codec.*; -import javax.media.jai.*; -import java.awt.image.renderable.ParameterBlock; -import java.awt.image.Raster; -import java.awt.image.DataBuffer; - import uk.me.parabola.imgfmt.Utils; import uk.me.parabola.imgfmt.ExitException; import uk.me.parabola.imgfmt.FormatException; @@ -54,7 +45,6 @@ import uk.me.parabola.mkgmap.osmstyle.eval.SyntaxException; import uk.me.parabola.util.EnhancedProperties; -import static java.nio.channels.FileChannel.MapMode.READ_ONLY; /** * Create contour lines using an algorithm similar to that described in @@ -63,7 +53,7 @@ public abstract class DEM { final static double epsilon = 1e-9; - final static double delta = 1.5; + final protected static double delta = 1.5; final static int maxPoints=200000; final static double minDist = 15; final static double maxDist = 21; @@ -71,18 +61,17 @@ final static double semiMajorAxis = 6378137.0; final static double inverseFlattening = 298.257223563; - static int M=1200; - static int N=M; - static double res = 1.0/N; + protected static int M=1200; + protected static int N=M; + protected static double res = 1.0/N; static int id = -1; short values[] = null; - int lat; - int lon; + protected int lat; + protected int lon; - abstract double ele(int x, int y); - abstract void read(int minLon, int minLat, int maxLon, int maxLat); - abstract void serializeCopyRight(Writer out) throws IOException; + protected abstract double ele(int x, int y); + protected abstract void read(int minLon, int minLat, int maxLon, int maxLat); public static void createContours(LoadableMapDataSource mapData, EnhancedProperties config) { @@ -95,22 +84,33 @@ System.out.printf("bounds: %f %f %f %f\n", minLat, minLon, maxLat, maxLon); DEM data; - String demType = config.getProperty("dem-type", "CGIAR"); + String demType = config.getProperty("dem-type", "SRTM"); String dataPath; - if (demType.equals("ASTER")) { - dataPath = config.getProperty("dem-path", "ASTER"); - data = new ASTERGeoTiff(dataPath, minLat, minLon, maxLat, maxLon); + Class demClass; + try { + if (demType.equals("ASTER")) { + dataPath = config.getProperty("dem-path", "ASTER"); + demClass = Class.forName("uk.me.parabola.mkgmap.reader.dem.optional.GeoTiffDEM$ASTER"); + } + else if (demType.equals("CGIAR")) { + dataPath = config.getProperty("dem-path", "CGIAR"); + demClass = Class.forName("uk.me.parabola.mkgmap.reader.dem.optional.GeoTiffDEM$CGIAR"); + } + else { + dataPath = config.getProperty("dem-path", "SRTM"); + demClass = Class.forName("uk.me.parabola.mkgmap.reader.dem.HGTDEM"); + } + java.lang.reflect.Constructor<DEM> constructor = demClass.getConstructor(String.class, + Double.TYPE, Double.TYPE, + Double.TYPE, Double.TYPE); + data = constructor.newInstance(dataPath, minLat, minLon, maxLat, maxLon); } - else if (demType.equals("CGIAR")) { - dataPath = config.getProperty("dem-path", "CGIAR"); - data = new CGIARGeoTiff(dataPath, minLat, minLon, maxLat, maxLon); + catch (Exception ex) + { + throw new RuntimeException("failed to create DEM", ex); } - else { - dataPath = config.getProperty("dem-path", "SRTM"); - data = new HGTDEM(dataPath, minLat, minLon, maxLat, maxLon); - } - + Isolines lines = data.new Isolines(data, minLat, minLon, maxLat, maxLon); int increment = config.getProperty("dem-increment", 10); @@ -181,213 +181,11 @@ } } - public static class HGTDEM extends DEM - { - MappedByteBuffer buffer = null; - - public HGTDEM(String dataPath, double minLat, double minLon, double maxLat, double maxLon) - { - this.lat = (int) minLat; - this.lon = (int) minLon; - if (maxLat > lat+1 || maxLon > lon+1) - throw new RuntimeException("Area too large (must not span more than one SRTM file)"); - - String northSouth = lat < 0 ? "S" : "N"; - String eastWest = lon > 0 ? "E" : "W"; - String fileName = String.format("%s/%s%02d%s%03d.hgt", dataPath, - northSouth, lat < 0 ? -lat : lat, - eastWest, lon < 0 ? -lon : lon); - try { - FileInputStream is = new FileInputStream(fileName); - buffer = is.getChannel().map(READ_ONLY, 0, 2*(M+1)*(M+1)); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - public void read(int minLon, int minLat, int maxLon, int maxLat) - { - } - - public double ele(int x, int y) - { - return buffer.getShort(2*((M-y)*(M+1)+x))+delta; - } - - public void serializeCopyRight(Writer out) throws IOException - { - out.write(" <copyright>\n"); - out.write(" Contour lines generated from DEM data by NASA\n"); - out.write(" </copyright>\n"); - } - } - - public static class CGIARGeoTiff extends DEM - { - Raster raster; - String fileName; - int minLat, minLon, maxLat, maxLon; - PlanarImage image; - - public CGIARGeoTiff(String dataPath, double minLat, double minLon, double maxLat, double maxLon) - { - this.lat = ((int) (minLat/5))*5; - this.lon = ((int) (minLon/5))*5; - if (maxLat > lat+5 || maxLon > lon+5) - throw new RuntimeException("Area too large (must not span more than one CGIAR GeoTIFF)"); - - int tileX, tileY; - tileX = (180 + lon)/5 + 1; - tileY = (60 - lat)/5; - this.fileName = String.format("%s/srtm_%02d_%02d.tif", dataPath, tileX, tileY); - init(); - } - - public void serializeCopyRight(Writer out) throws IOException - { - out.write(" <copyright>\n"); - out.write(" Contour lines generated from improved SRTM data by CIAT-CSI (see http://srtm.csi.cgiar.org)\n"); - out.write(" </copyright>\n"); - } - - public void read(int minLon, int minLat, int maxLon, int maxLat) - { - this.minLon = minLon; - this.minLat = minLat; - this.maxLon = maxLon; - this.maxLat = maxLat; - raster = image.getData(new java.awt.Rectangle(minLon, 6000-maxLat-1, maxLon-minLon+1, maxLat-minLat+1)); - System.out.printf("read: %d %d %d %d\n", minLon, 6000-maxLat-1, maxLon-minLon+1, maxLat-minLat+1); - } - - void init() - { - System.out.printf("CGIAR GeoTIFF: %s\n", fileName); - N = 6000; - M = 6000; - res = 5.0/M; - - try { - SeekableStream s = new FileSeekableStream(fileName); - ParameterBlock pb = new ParameterBlock(); - pb.add(s); - - TIFFDecodeParam param = new TIFFDecodeParam(); - pb.add(param); - - RenderedOp op = JAI.create("tiff", pb); - image = op.createInstance(); - System.out.printf("Image: %d %d %d %d\n", image.getWidth(), image.getHeight(), - image.getNumXTiles(), image.getNumYTiles()); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - public double ele(int x, int y) - { - try { - int elevation = raster.getPixel(x, 6000-y-1, (int[])null)[0]; - return elevation+delta; - } - catch (ArrayIndexOutOfBoundsException ex) { - System.out.printf("ele: (%d, %d) (%d, %d, %d, %d) %s\n", - x, 6000-y-1, - raster.getMinX(), raster.getMinY(), - raster.getWidth(), raster.getHeight(), ex.toString()); - throw ex; - } - } - } - - public static class ASTERGeoTiff extends DEM - { - Raster raster; - String fileName; - int minLat, minLon, maxLat, maxLon; - PlanarImage image; - - public ASTERGeoTiff(String dataPath, double minLat, double minLon, double maxLat, double maxLon) - { - this.lat = (int) minLat; - this.lon = (int) minLon; - if (maxLat > lat+1 || maxLon > lon+1) - throw new RuntimeException("Area too large (must not span more than one ASTER GeoTIFF)"); - - String northSouth = lat < 0 ? "S" : "N"; - String eastWest = lon > 0 ? "E" : "W"; - fileName = String.format("%s/ASTGTM_%s%02d%s%03d_dem.tif", dataPath, - northSouth, lat < 0 ? -lat : lat, - eastWest, lon < 0 ? -lon : lon); - init(); - } - - public void serializeCopyRight(Writer out) throws IOException - { - out.write(" <copyright>\n"); - out.write(" Contour lines generated from DGM data by ASTER (see https://wist.echo.nasa.gov/~wist/api/imswelcome)\n"); - out.write(" </copyright>\n"); - } - - public void read(int minLon, int minLat, int maxLon, int maxLat) - { - this.minLon = minLon; - this.minLat = minLat; - this.maxLon = maxLon; - this.maxLat = maxLat; - raster = image.getData(new java.awt.Rectangle(minLon, 3601-maxLat-1, maxLon-minLon+1, maxLat-minLat+1)); - System.out.printf("read: %d %d %d %d\n", minLon, 3601-maxLat-1, maxLon-minLon+1, maxLat-minLat+1); - } - - void init() - { - System.out.printf("ASTER GeoTIFF: %s\n", fileName); - N = 3600; - M = 3600; - res = 1.0/M; - - try { - SeekableStream s = new FileSeekableStream(fileName); - ParameterBlock pb = new ParameterBlock(); - pb.add(s); - - TIFFDecodeParam param = new TIFFDecodeParam(); - pb.add(param); - - RenderedOp op = JAI.create("tiff", pb); - image = op.createInstance(); - System.out.printf("Image: %d %d %d %d\n", image.getWidth(), image.getHeight(), - image.getNumXTiles(), image.getNumYTiles()); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - public double ele(int x, int y) - { - try { - int elevation = raster.getPixel(x, 3601-y-1, (int[])null)[0]; - return elevation+delta; - } - catch (ArrayIndexOutOfBoundsException ex) { - System.out.printf("ele: (%d, %d) (%d, %d, %d, %d) %s\n", - x, 3601-y-1, - raster.getMinX(), raster.getMinY(), - raster.getWidth(), raster.getHeight(), ex.toString()); - throw ex; - } - } - } - private static void debug(String format, Object ... args) { //System.out.printf(format + "\n", args); } - int lastXi = -1; int lastYi = -1; @@ -1184,78 +982,6 @@ return 40075000 * Math.sqrt(distDegSq) / 360; } - /** - * Returns the orthodromic distance between two geographic coordinates in WGS84 datum. - * The orthodromic distance is the shortest distance between two points - * on a sphere's surface. The orthodromic path is always on a great circle. - * - * @param x1 Longitude of first point (in degrees). - * @param y1 Latitude of first point (in degrees). - * @param x2 Longitude of second point (in degrees). - * @param y2 Latitude of second point (in degrees). - * @return The orthodromic distance (in meters). - * - */ - public static double orthodromicDistance(double x1, double y1, double x2, double y2) - { - x1 = Math.toRadians(x1); - y1 = Math.toRadians(y1); - x2 = Math.toRadians(x2); - y2 = Math.toRadians(y2); - final int MAX_ITERATIONS = 100; - final double EPS = 5.0E-14; - final double F = 1 / inverseFlattening; - final double R = 1 - F; - double tu1 = R * Math.sin(y1) / Math.cos(y1); - double tu2 = R * Math.sin(y2) / Math.cos(y2); - double cu1 = 1 / Math.sqrt(tu1 * tu1 + 1); - double cu2 = 1 / Math.sqrt(tu2 * tu2 + 1); - double su1 = cu1 * tu1; - double s = cu1 * cu2; - double baz = s * tu2; - double faz = baz * tu1; - double x = x2 - x1; - for (int i = 0; i < MAX_ITERATIONS; i++) - { - final double sx = Math.sin(x); - final double cx = Math.cos(x); - tu1 = cu2 * sx; - tu2 = baz - su1 * cu2 * cx; - final double sy = Math.sqrt(tu1*tu1 + tu2*tu2);; - final double cy = s * cx + faz; - final double y = Math.atan2(sy, cy); - final double SA = s * sx / sy; - final double c2a = 1 - SA * SA; - double cz = faz + faz; - if (c2a > 0) { - cz = -cz / c2a + cy; - } - double e = cz * cz * 2 - 1; - double c = ((-3 * c2a + 4) * F + 4) * c2a * F / 16; - double d = x; - x = ((e * cy * c + cz) * sy * c + y) * SA; - x = (1 - c) * x * F + x2 - x1; - if (Math.abs(d - x) <= EPS) { - x = Math.sqrt((1 / (R * R) - 1) * c2a + 1) + 1; - x = (x - 2) / x; - c = 1 - x; - c = (x * x / 4 + 1) / c; - d = (0.375 * x * x - 1) * x; - x = e * cy; - s = 1 - 2 * e; - s = ((((sy * sy * 4 - 3) * s * cz * d / 6 - x) * d / 4 + cz) * sy * d + y) * c * R * semiMajorAxis; - return s; - } - } - final double LEPS = 1.0E-10; - if (Math.abs(x1 - x2) <= LEPS && Math.abs(y1 - y2) <= LEPS) { - return 0; - } - if (Math.abs(y1) <= LEPS && Math.abs(y2) <= LEPS) { - return Math.abs(x1 - x2) * semiMajorAxis; - } - throw new ArithmeticException("no convergence"); - } private static class DEMMapDataSource extends MapperBasedMapDataSource implements LoadableMapDataSource { Index: src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java (revision 1080) +++ src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java (working copy) @@ -27,12 +27,14 @@ import uk.me.parabola.imgfmt.app.Area; import uk.me.parabola.imgfmt.app.Coord; import uk.me.parabola.imgfmt.app.trergn.Overview; +import uk.me.parabola.mkgmap.general.LoadableMapDataSource; import uk.me.parabola.mkgmap.general.MapDataSource; import uk.me.parabola.mkgmap.general.MapDetails; 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.general.RoadNetwork; +import uk.me.parabola.mkgmap.reader.dem.DEM; import uk.me.parabola.util.Configurable; import uk.me.parabola.util.EnhancedProperties; @@ -118,6 +120,11 @@ return configProps; } + public MapDetails getMapper() + { + return mapper; + } + /** * We add the background polygons if the map is not transparent. */ @@ -146,5 +153,8 @@ // the overview section. mapper.addShape(background); } + if (getConfig().getProperty("contours", false)) { + DEM.createContours((LoadableMapDataSource) this, getConfig()); + } } } Index: src/uk/me/parabola/mkgmap/reader/osm/Way.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/osm/Way.java (revision 1080) +++ src/uk/me/parabola/mkgmap/reader/osm/Way.java (working copy) @@ -30,12 +30,18 @@ */ public class Way extends Element { - private final List<Coord> points = new ArrayList<Coord>(); + private final List<Coord> points; public Way(long id) { + points = new ArrayList<Coord>(); setId(id); } + public Way(long id, List<Coord> points) { + this.points = points; + setId(id); + } + /** * Get the points that make up the way. We attempt to re-order the segments * and return a list of points that traces the route of the way. Index: build.xml =================================================================== --- build.xml (revision 1080) +++ build.xml (working copy) @@ -72,7 +72,7 @@ <include name="**/*.java" /> <classpath refid="main"/>  - <exclude name="**/reader/dem/*.java"/> + <exclude name="**/reader/dem/optional/*.java"/> </javac> </target> /* * Copyright (C) 2009 Christian Gawron * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * * 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. * * * Author: Christian Gawron * Create date: 03-Jul-2009 */ package uk.me.parabola.mkgmap.reader.dem; import java.io.*; import java.nio.channels.FileChannel; import java.nio.MappedByteBuffer; import static java.nio.channels.FileChannel.MapMode.READ_ONLY; public class HGTDEM extends DEM { MappedByteBuffer buffer = null; public HGTDEM(String dataPath, double minLat, double minLon, double maxLat, double maxLon) { this.lat = (int) minLat; this.lon = (int) minLon; if (maxLat > lat+1 || maxLon > lon+1) throw new RuntimeException("Area too large (must not span more than one SRTM file)"); String northSouth = lat < 0 ? "S" : "N"; String eastWest = lon > 0 ? "E" : "W"; String fileName = String.format("%s/%s%02d%s%03d.hgt", dataPath, northSouth, lat < 0 ? -lat : lat, eastWest, lon < 0 ? -lon : lon); try { FileInputStream is = new FileInputStream(fileName); buffer = is.getChannel().map(READ_ONLY, 0, 2*(M+1)*(M+1)); } catch (Exception e) { throw new RuntimeException(e); } } public void read(int minLon, int minLat, int maxLon, int maxLat) { } public double ele(int x, int y) { return buffer.getShort(2*((M-y)*(M+1)+x))+delta; } public void serializeCopyRight(Writer out) throws IOException { out.write(" <copyright>\n"); out.write(" Contour lines generated from DEM data by NASA\n"); out.write(" </copyright>\n"); } } /* * Copyright (C) 2009 Christian Gawron * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * * 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. * * * Author: Christian Gawron * Create date: 03-Jul-2009 */ package uk.me.parabola.mkgmap.reader.dem.optional; import uk.me.parabola.mkgmap.reader.dem.DEM; import java.awt.image.renderable.ParameterBlock; import java.awt.image.Raster; import java.awt.image.DataBuffer; import java.io.*; import java.nio.channels.FileChannel; import java.nio.MappedByteBuffer; import com.sun.media.jai.codec.*; import javax.media.jai.*; public abstract class GeoTiffDEM extends DEM { Raster raster; String fileName; int minLat, minLon, maxLat, maxLon; PlanarImage image; void initData() { try { SeekableStream s = new FileSeekableStream(fileName); ParameterBlock pb = new ParameterBlock(); pb.add(s); TIFFDecodeParam param = new TIFFDecodeParam(); pb.add(param); RenderedOp op = JAI.create("tiff", pb); image = op.createInstance(); System.out.printf("Image: %d %d %d %d\n", image.getWidth(), image.getHeight(), image.getNumXTiles(), image.getNumYTiles()); } catch (Exception e) { throw new RuntimeException(e); } } public static class CGIAR extends GeoTiffDEM { public CGIAR(String dataPath, double minLat, double minLon, double maxLat, double maxLon) { this.lat = ((int) (minLat/5))*5; this.lon = ((int) (minLon/5))*5; if (maxLat > lat+5 || maxLon > lon+5) throw new RuntimeException("Area too large (must not span more than one CGIAR GeoTIFF)"); int tileX, tileY; tileX = (180 + lon)/5 + 1; tileY = (60 - lat)/5; this.fileName = String.format("%s/srtm_%02d_%02d.tif", dataPath, tileX, tileY); System.out.printf("CGIAR GeoTIFF: %s\n", fileName); N = 6000; M = 6000; res = 5.0/M; initData(); } public void serializeCopyRight(Writer out) throws IOException { out.write(" <copyright>\n"); out.write(" Contour lines generated from improved SRTM data by CIAT-CSI (see http://srtm.csi.cgiar.org)\n"); out.write(" </copyright>\n"); } protected void read(int minLon, int minLat, int maxLon, int maxLat) { this.minLon = minLon; this.minLat = minLat; this.maxLon = maxLon; this.maxLat = maxLat; raster = image.getData(new java.awt.Rectangle(minLon, 6000-maxLat-1, maxLon-minLon+1, maxLat-minLat+1)); System.out.printf("read: %d %d %d %d\n", minLon, 6000-maxLat-1, maxLon-minLon+1, maxLat-minLat+1); } public double ele(int x, int y) { try { int elevation = raster.getPixel(x, 6000-y-1, (int[])null)[0]; return elevation+delta; } catch (ArrayIndexOutOfBoundsException ex) { System.out.printf("ele: (%d, %d) (%d, %d, %d, %d) %s\n", x, 6000-y-1, raster.getMinX(), raster.getMinY(), raster.getWidth(), raster.getHeight(), ex.toString()); throw ex; } } } public static class ASTER extends GeoTiffDEM { public ASTER(String dataPath, double minLat, double minLon, double maxLat, double maxLon) { this.lat = (int) minLat; this.lon = (int) minLon; if (maxLat > lat+1 || maxLon > lon+1) throw new RuntimeException("Area too large (must not span more than one ASTER GeoTIFF)"); String northSouth = lat < 0 ? "S" : "N"; String eastWest = lon > 0 ? "E" : "W"; fileName = String.format("%s/ASTGTM_%s%02d%s%03d_dem.tif", dataPath, northSouth, lat < 0 ? -lat : lat, eastWest, lon < 0 ? -lon : lon); System.out.printf("ASTER GeoTIFF: %s\n", fileName); N = 3600; M = 3600; res = 1.0/M; initData(); } public void serializeCopyRight(Writer out) throws IOException { out.write(" <copyright>\n"); out.write(" Contour lines generated from DGM data by ASTER (see https://wist.echo.nasa.gov/~wist/api/imswelcome)\n"); out.write(" </copyright>\n"); } protected void read(int minLon, int minLat, int maxLon, int maxLat) { this.minLon = minLon; this.minLat = minLat; this.maxLon = maxLon; this.maxLat = maxLat; raster = image.getData(new java.awt.Rectangle(minLon, 3601-maxLat-1, maxLon-minLon+1, maxLat-minLat+1)); System.out.printf("read: %d %d %d %d\n", minLon, 3601-maxLat-1, maxLon-minLon+1, maxLat-minLat+1); } public double ele(int x, int y) { try { int elevation = raster.getPixel(x, 3601-y-1, (int[])null)[0]; return elevation+delta; } catch (ArrayIndexOutOfBoundsException ex) { System.out.printf("ele: (%d, %d) (%d, %d, %d, %d) %s\n", x, 3601-y-1, raster.getMinX(), raster.getMinY(), raster.getWidth(), raster.getHeight(), ex.toString()); throw ex; } } } }

7 17

Re: [mkgmap-dev] [PATCH] some natural points
by Jani Patanen 13 Jul '09

13 Jul '09

I tried to compile a test map to go trough POIs on my eTrex legend. java -Xmx512m -jar mkgmap.jar test-map:all-elements provides me just with a list of errors: Can't set city point index for 0x10,0x22 (too many indexed points in division) Can't set city point index for 0x10,0x23 (too many indexed points in division) .. etc.

4 3

Commit: r1085: Merge in smaller_img branch.
by svn commit 12 Jul '09

12 Jul '09

Version 1085 was commited by steve on 2009-07-12 12:07:49 +0100 (Sun, 12 Jul 2009) Merge in smaller_img branch. The directory is now just as big as it needs to be, rather than having a fixed size that was large enough (almost) to deal with any file. As a result even an empty(ish) map was over 100k. in size, the minimum size is now closer to 5k.

1 0

Commit: r1084: railway=platform
by svn commit 12 Jul '09

12 Jul '09

Version 1084 was commited by steve on 2009-07-12 11:15:19 +0100 (Sun, 12 Jul 2009) railway=platform - Marko M?\195?\164kel?\195?\164

1 0

[PATCH] some natural points
by Marko Mäkelä 11 Jul '09

11 Jul '09

Some natural=* POI values were missing from the translation. On the Edge 705, natural=wood will be displayed with an icon. That would be useful for marking the names of forest areas in cities. The other two (natural=rock, natural=water) will be displayed as hollow white circles by the Edge 705. The attribute natural=rock is not listed at http://wiki.openstreetmap.org/wiki/Key:natural, but I thought that it would be OK to mark large rocks (diameter over 1 m) as natural=rock. Please apply the attached patch. On a related note, when I tested this, I originally downloaded a small area and tried to create a map. The map was blank when zoomed at anything closer than 80 m. No tooltips were presented for any roads or POIs, and the Edge 705 complained something about no POI information being available. The bounding box of the download was as follows: minlat='60.3461917134347' minlon='25.0977978880827' maxlat='60.3564969730713' maxlon='25.1192281119173' Surprisingly, routing worked, even though the map was blank at closer zoom levels (tested 20 to 50 m). Ultimately, I edited a 180MB *.osm map tile in a text editor and changed some attributes there. When compiled, that map tile was displayed OK. Regards, Marko

4 11