Index: uk/me/parabola/imgfmt/app/trergn/TREHeader.java =================================================================== --- uk/me/parabola/imgfmt/app/trergn/TREHeader.java (revision 1580) +++ uk/me/parabola/imgfmt/app/trergn/TREHeader.java (working copy) @@ -172,7 +172,7 @@ writer.put(getPoiDisplayFlags()); writer.put3(displayPriority); - writer.putInt(0x110301); + writer.putInt(0x170401); writer.putChar((char) 1); writer.put((byte) 0); Index: uk/me/parabola/mkgmap/build/MapBuilder.java =================================================================== --- uk/me/parabola/mkgmap/build/MapBuilder.java (revision 1580) +++ uk/me/parabola/mkgmap/build/MapBuilder.java (working copy) @@ -92,6 +92,9 @@ public class MapBuilder implements Configurable { private static final Logger log = Logger.getLogger(MapBuilder.class); private static final int CLEAR_TOP_BITS = (32 - 15); + + private static final int MIN_SIZE_LINE = 1; + private static final int MIN_SIZE_POLYGON = 8; private final java.util.Map poimap = new HashMap(); private final java.util.Map cityMap = new HashMap(); @@ -111,6 +114,7 @@ private String regionAbbr; private double reducePointError; + private double reducePointErrorPolygon; private boolean mergeLines; private int locationAutofillLevel; @@ -132,6 +136,9 @@ regionName = props.getProperty("region-name", null); regionAbbr = props.getProperty("region-abbr", null); reducePointError = props.getProperty("reduce-point-density", 2.6); + reducePointErrorPolygon = props.getProperty("reduce-point-density-polygon", -1); + if (reducePointErrorPolygon == -1) + reducePointErrorPolygon = reducePointError; mergeLines = props.containsKey("merge-lines"); makePOIIndex = props.getProperty("make-poi-index", false); @@ -700,18 +707,18 @@ // // We use it to add copyright information that there is no room for // elsewhere. - map.addInfo("OSM Street map"); - map.addInfo("http://www.openstreetmap.org/"); - map.addInfo("Map data licenced under Creative Commons Attribution ShareAlike 2.0"); + map.addInfo("Openmtbmap - http://openmtbmap.org/"); + map.addInfo("Map data from http://openstreetmap.org/"); + map.addInfo("Map and data licenced under Creative Commons Attribution ShareAlike 2.0"); map.addInfo("http://creativecommons.org/licenses/by-sa/2.0/"); map.addInfo("Map created with mkgmap-r" + Version.VERSION); - map.addInfo("Program released under the GPL"); + map.addInfo("Mkgmap released under the GPL"); // There has to be (at least) two copyright messages or else the map // does not show up. The second one will be displayed at startup, // although the conditions where that happens are not known. - map.addCopyright("program licenced under GPL v2"); + map.addCopyright("openmtbmap.org"); // This one gets shown when you switch on, so put the actual // map copyright here. @@ -885,7 +892,7 @@ if (enableLineCleanFilters && (res < 24)) { filters.addFilter(new PreserveHorizontalAndVerticalLinesFilter()); filters.addFilter(new RoundCoordsFilter()); - filters.addFilter(new SizeFilter()); + filters.addFilter(new SizeFilter(MIN_SIZE_LINE)); if(reducePointError > 0) filters.addFilter(new DouglasPeuckerFilter(reducePointError)); } @@ -924,11 +931,11 @@ if (enableLineCleanFilters && (res < 24)) { filters.addFilter(new PreserveHorizontalAndVerticalLinesFilter()); filters.addFilter(new RoundCoordsFilter()); - filters.addFilter(new SizeFilter()); + filters.addFilter(new SizeFilter(MIN_SIZE_POLYGON)); //DouglasPeucker behaves at the moment not really optimal at low zooms, but acceptable. //Is there an similar algorithm for polygons? - if(reducePointError > 0) - filters.addFilter(new DouglasPeuckerFilter(reducePointError)); + if(reducePointErrorPolygon > 0) + filters.addFilter(new DouglasPeuckerFilter(reducePointErrorPolygon)); } filters.addFilter(new PolygonSplitterFilter()); filters.addFilter(new RemoveEmpty()); Index: uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java =================================================================== --- uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java (revision 1580) +++ uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java (working copy) @@ -76,7 +76,7 @@ public void init(CommandArgs args) { areaName = args.get("area-name", null); - mapsetName = args.get("mapset-name", "OSM map set"); + mapsetName = args.get("mapset-name", "Openmtbmap mapset"); overallDescription = args.getDescription(); } Index: uk/me/parabola/mkgmap/filters/SizeFilter.java =================================================================== --- uk/me/parabola/mkgmap/filters/SizeFilter.java (revision 1580) +++ uk/me/parabola/mkgmap/filters/SizeFilter.java (working copy) @@ -24,13 +24,16 @@ */ public class SizeFilter implements MapFilter { - // Minsize==1 may cause small holes in QLandkarte, but does not at etrex! - private static final int MIN_SIZE = 1; + private int size; private int minSize; + + public SizeFilter(int s) { + size = s; + } public void init(FilterConfig config) { - minSize = MIN_SIZE * (1<