Hi Geoff

Thanks to your help, I figured out what the problem was and was able to reproduce it. It happens when the map and index is built without --latin1 or --code-page.

Attached is a fix that works for me.

A ready built version is at:
  http://files.mkgmap.org.uk/download/68/mkgmap.jar

..Steve
Index: src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java	(revision 2316)
+++ src/uk/me/parabola/imgfmt/app/mdr/MDRFile.java	(revision )
@@ -27,7 +27,6 @@
 import uk.me.parabola.imgfmt.app.srt.Sort;
 import uk.me.parabola.imgfmt.app.trergn.Point;
 import uk.me.parabola.imgfmt.fs.ImgChannel;
-import uk.me.parabola.mkgmap.srt.SrtTextReader;
 
 /**
  * The MDR file.  This is embedded into a .img file, either its own
@@ -142,14 +141,9 @@
 		currentMap++;
 		mdr1.addMap(mapName);
 		Sort sort = mdrHeader.getSort();
-		if (sort.getSortOrderId() == 0) {
-			sort = SrtTextReader.sortForCodepage(codePage);
-			mdrHeader.setSort(sort);
-		} else {
+
-			if (sort.getCodepage() != codePage)
-				System.err.println("WARNING: input files have different code pages");
+		if (sort.getCodepage() != codePage)
+			System.err.println("WARNING: input files have different code pages");
-		}
-
 	}
 
 	public Mdr14Record addCountry(Country country) {
_______________________________________________
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev

Reply via email to