Index: resources/installer/license_template.txt
===================================================================
--- resources/installer/license_template.txt	(revision 1947)
+++ resources/installer/license_template.txt	(working copy)
@@ -1,6 +1,29 @@
-Map data (c) OpenStreetMap and contributors
-http://www.openstreetmap.org/
+About the Openmtbmap.org & Velomap.org Maps - Please Read.
 
-Map data licenced under Creative Commons Attribution ShareAlike 2.0
-See http://creativecommons.org/licenses/by-sa/2.0/
+ Copyrights:
+- Map Data
+All maptiles are compiled with mkgmap (http://www.mkgmap.org.uk/) using map data from openstreetmap.org. OpenStreetMap data can be used freely under the terms of the http://creativecommons.org/licenses/by-sa/2.0/ You can use and edit the map data by visiting openstreetmap.org. All map data is published CCBYSA 2.0 by openstreetmap.org and Constributors.
 
+-SRTM Contourlines Data
+The Contourlines data is provided by Jonathan de Ferranti where available and SRTM3" where no files are provided by www.viewfinderpanoramas.org Compiled also with mkgmap. All Copyrights to the contourdata remains with Jonathan de Ferranti.
+
+- Openmtbmaps and Openmtbmap contourline maps
+The openmtbmap contourline maps may be used according to http://creativecommons.org/licenses/by-nc-sa/3.0/ by attributing http://openmtbmap.org and attributing the exact date of map creation. If you distribute openmtbmaps without proper attribution you break the copyright of http://openmtbmap.org and I reserve my right to enforce legal action. You may publish screenshots showing the contourlines according to CCBYSA 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)
+
+The sale or distribution of the openmtbmap contourline maps is not allowed! Non commercial distribution not asking for any service charge or other charges (also not cost of shipping or cost of hardware) while attributing http://openmtbmap.org, www.viewfinderpanoramas.org and explicitely providing the date or contourline map creation is permitted.
+
+- gmt.exe - 
+Attention: gmt.exe has it's own copyright notice (file: Copyright gmt.exe.txt) and above text does not apply. gmt.exe is part of gmaptool and can be found here: http://www.anpo.republika.pl/download.html#gmaptool
+
+
+-------------------------------------------------------
+
+General Notes:
+The maps work best on your PC when using Mapsource 6.16 or Basecamp 3- See here for Installation Guide:  http://openmtbmap.org/tutorials/install-mapsource/
+Please don't complain that something does not work until having read the tutorials. To achieve good maps, I have to do things a bit differently to what you are used to. So read the tutorials. Autorouting is for MTBiking and Hiking only. The autorouting does not respect local laws but instead aims to provide the best / most beautiful to reach the destination.
+
+No openmtbmap has yet caused any damage to a Garmin GPS. However I cannot guarantee for this. By installing/using these maps you accept that you may not sue http://openmtbmap.org for anything.
+
+-- Autorouting uses different Format than other maps, please read this - if you don't know this information autorouting will fail: http://openmtbmap.org/about-2/autorouting/
+
+Whereas the uninstall*.bat only unregisters the map in Mapsource, the .exe uninstaller also deletes ALL files inside the folder. Be Aware if this is not what you intend.
Index: resources/LocatorConfig.xml
===================================================================
--- resources/LocatorConfig.xml	(revision 1947)
+++ resources/LocatorConfig.xml	(working copy)
@@ -63,6 +63,9 @@
 		<variant>Austria</variant>
 		<variant>AT</variant>
 		<variant>AUT</variant>
+		<variant>Oesterreich</variant>
+		<variant>Oestereich</variant>
+		<variant>��stereich</variant>
 	</country>
 	<country name="Azerbaijan" abr="AZE">
 		<variant>AZ</variant>
@@ -928,6 +931,7 @@
 	</country>
 	<country name="Schweiz" abr="CHE" geodb="1" poiDispFlag="0xc">
 		<variant>Switzerland</variant>
+		<variant>Suisse</variant>
 		<variant>CH</variant>
 		<variant>CHE</variant>
 	</country>
Index: src/uk/me/parabola/imgfmt/app/trergn/TREHeader.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/trergn/TREHeader.java	(revision 1947)
+++ src/uk/me/parabola/imgfmt/app/trergn/TREHeader.java	(working copy)
@@ -43,7 +43,7 @@
 
 	// A map has a display priority that determines which map is on top
 	// when two maps cover the same area.
-	private static final int DEFAULT_DISPLAY_PRIORITY = 0x19;
+	private static final int DEFAULT_DISPLAY_PRIORITY = 0x1F;
 
 	static final int MAP_LEVEL_REC_SIZE = 4;
 	private static final char POLYLINE_REC_LEN = 2;
@@ -172,7 +172,7 @@
 		writer.put(getPoiDisplayFlags());
 
 		writer.put3(displayPriority);
-		writer.putInt(0x110301);
+		writer.putInt(0x170401);
 
 		writer.putChar((char) 1);
 		writer.put((byte) 0);
@@ -233,7 +233,7 @@
 	public void config(EnhancedProperties props) {
 		String key = "draw-priority";
 		if (props.containsKey(key))
-			setDisplayPriority(props.getProperty(key, 0x19));
+			setDisplayPriority(props.getProperty(key, 0x1f));
 
 		if (props.containsKey("transparent"))
 			poiDisplayFlags |= POI_FLAG_TRANSPARENT;
Index: src/uk/me/parabola/mkgmap/build/MapBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/build/MapBuilder.java	(revision 1947)
+++ src/uk/me/parabola/mkgmap/build/MapBuilder.java	(working copy)
@@ -135,7 +135,7 @@
 		countryAbbr = props.getProperty("country-abbr", countryAbbr);
 		regionName = props.getProperty("region-name", null);
 		regionAbbr = props.getProperty("region-abbr", null);
- 		minSizePolygon = props.getProperty("min-size-polygon", 8);
+ 		minSizePolygon = props.getProperty("min-size-polygon", 15);
 		reducePointError = props.getProperty("reduce-point-density", 2.6);
  		reducePointErrorPolygon = props.getProperty("reduce-point-density-polygon", -1);
 		if (reducePointErrorPolygon == -1)
@@ -717,12 +717,12 @@
 		map.addInfo("Map created with mkgmap-r"
 				+ String.format("%-10s", Version.VERSION));
 
-		map.addInfo("Program released under the GPL");
+		map.addInfo("Mkgmap (map renderer) 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("Map CCBYSA 2.0 by http://openmtbmap.org");
 
 		// This one gets shown when you switch on, so put the actual
 		// map copyright here.
Index: src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java	(revision 1947)
+++ src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java	(working copy)
@@ -81,7 +81,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();
 		outputDir = args.getOutputDir();
 		sort = args.getSort();
Index: src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java	(revision 1947)
+++ src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java	(working copy)
@@ -36,6 +36,7 @@
 	private String licenseFilename;
 	private String outputDir;
 	private String familyName;
+	private String Country;
 	private String id;
 	private int productId;
 
@@ -49,8 +50,9 @@
 		int familyId = args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
 		productId = args.get("product-id", 1);
 
-		baseFilename = args.get("overview-mapname", "osmmap");
-		familyName = args.get("family-name", "OSM map");
+		baseFilename = args.get("overview-mapname", "velomap");
+		familyName = args.get("family-name", "VeloMap.org");
+		Country = args.get("country-name", "country");
 
 		String tmpId = Integer.toHexString(0x10000 | familyId);
 
@@ -129,12 +131,16 @@
 	}
 	
 	private void writeDefines(PrintWriter pw) {
-			pw.format(Locale.ROOT, "!define DEFAULT_DIR \"C:\\Garmin\\Maps\\%s\"\n", familyName);
+			pw.format(Locale.ROOT, "!define DEFAULT_DIR \"C:\\Garmin\\velomap\\%s\"\n", familyName);
 			pw.format(Locale.ROOT, "!define INSTALLER_DESCRIPTION \"%s\"\n", familyName);
 			pw.format(Locale.ROOT, "!define INSTALLER_NAME \"%s\"\n", familyName);
 			pw.format(Locale.ROOT, "!define MAPNAME \"%s\"\n", baseFilename);
 			pw.format(Locale.ROOT, "!define PRODUCT_ID \"%s\"\n", productId);
-			pw.format(Locale.ROOT, "!define REG_KEY \"%s\"\n", familyName);
+			pw.format(Locale.ROOT, "!define MAP_URL \"http://www.velomap.org\"\n");
+			pw.format(Locale.ROOT, "!define MAP_COPYRIGHT \"Copyright (C) CCBYSA 2.0 http://www.velomap.org\"\n");
+			pw.format(Locale.ROOT, "!define INSTALL_MSG \"This install wizard will guide you through the installation of the ${INSTALLER_DESCRIPTION} for Garmin Basecamp and Mapsource. The map you downloaded is copyrighted under CCBYSA 2.0 by ${MAP_URL}. It is recommended that you close all other applications before starting Setup.  This will make it possible to update relevant system files without having to reboot your computer. If you paid something for Downloading this map, make use of your 14 day return right or other applicable rights and download the map directly from ${MAP_URL} Click Next to continue.\"\n");
+			pw.format(Locale.ROOT, "!define MUI_WELCOMEPAGE_TITLE \"${INSTALLER_DESCRIPTION} Setup\"\n");
+			pw.format(Locale.ROOT, "!define MUI_WELCOMEPAGE_TEXT \"${INSTALL_MSG}\"\n");
 			if (hasIndex)
 				pw.format(Locale.ROOT, "!define INDEX\n");
 			if (hasTyp)
@@ -148,6 +154,9 @@
 			
 	private void writeAddedFiles(PrintWriter pw) {
 			pw.format(Locale.ROOT, "  File \"${MAPNAME}.img\"\n");
+			pw.format(Locale.ROOT, "  File \"*.txt\"\n");
+			pw.format(Locale.ROOT, "  File \"*.bat\"\n");
+			pw.format(Locale.ROOT, "  File \"gmt.exe\"\n");
 			if (hasIndex) {
 				pw.format(Locale.ROOT, "  File \"${MAPNAME}_mdr.img\"\n");
 				pw.format(Locale.ROOT, "  File \"${MAPNAME}.mdx\"\n");
@@ -164,6 +173,9 @@
 
 	private void writeRemovedFiles(PrintWriter pw) {
 			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}.img\"\n");
+			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\*.txt\"\n");
+			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\*.bat\"\n");
+			pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\gmt.exe\"\n");
 			if (hasIndex) {
 				pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}_mdr.img\"\n");
 				pw.format(Locale.ROOT, "  Delete \"$INSTDIR\\${MAPNAME}.mdx\"\n");
Index: src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java	(revision 1947)
+++ src/uk/me/parabola/mkgmap/combiners/TdbBuilder.java	(working copy)
@@ -65,8 +65,7 @@
 	 * In other words if the same argument appears more than once, then it will
 	 */
 	public void init(CommandArgs args) {
-		overviewMapname = args.get("overview-mapname", "osmmap");
-		overviewMapnumber = args.get("overview-mapnumber", "63240000");
+		overviewMapname = args.get("overview-mapname", "Openmtbmap");		overviewMapnumber = args.get("overview-mapnumber", "63240000");
 		
 		try {
 			parent = Integer.parseInt(overviewMapnumber);
@@ -80,8 +79,8 @@
 		int productId = args.get("product-id", 1);
 		short productVersion = (short)args.get("product-version", 100);
 
-		String seriesName = args.get("series-name", "OSM map");
-		String familyName = args.get("family-name", "OSM map");
+		String seriesName = args.get("series-name", "Openmtbmap");
+		String familyName = args.get("family-name", "Openmtbmap");
 
 		// Version 4 is the default.  If you really want v3 then the tdb-v3
 		// option can be used.
