On 31/05/13 12:57, GerdP wrote:
Sorry, doesn't work yet, München still comes out as Munchen.

I believe that the attached patch is all that is needed.

..Steve

Index: .idea/runConfigurations/mkgmap.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- .idea/runConfigurations/mkgmap.xml	(revision 2634)
+++ .idea/runConfigurations/mkgmap.xml	(revision )
@@ -3,7 +3,7 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="uk.me.parabola.mkgmap.main.Main" />
     <option name="VM_PARAMETERS" value="-ea -Xmx1000m" />
-    <option name="PROGRAM_PARAMETERS" value="--tdbfile --index --code-page=65001 --route u.osm" />
+    <option name="PROGRAM_PARAMETERS" value="--tdbfile --index --latin1 --route  63240013.img" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" value="" />
\ No newline at end of file
Index: src/uk/me/parabola/mkgmap/combiners/OverviewBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/OverviewBuilder.java	(revision 2634)
+++ src/uk/me/parabola/mkgmap/combiners/OverviewBuilder.java	(revision )
@@ -15,6 +15,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.List;
+
 import uk.me.parabola.imgfmt.ExitException;
 import uk.me.parabola.imgfmt.FileExistsException;
 import uk.me.parabola.imgfmt.FileNotWritableException;
@@ -55,6 +56,8 @@
 	private Zoom[] levels;
 	private String outputDir;		
 	private Sort sort;
+	private String charset;
+	private boolean isForceUpper;
 
 
 	public OverviewBuilder(OverviewMap overviewSource) {
@@ -67,6 +70,8 @@
 		overviewMapnumber = args.get("overview-mapnumber", "63240000");
 		outputDir = args.getOutputDir();
 		sort = args.getSort();
+		charset = args.getCharset();
+		isForceUpper = args.isForceUpper();
 	}
 
 	public void onMapEnd(FileInfo finfo) {
@@ -112,6 +117,8 @@
 
 		try {
 			Map map = Map.createMap(overviewMapname, outputDir, params, overviewMapnumber, sort);
+			if (charset != null)
+				map.setLabelCharset(charset, isForceUpper);
 			mb.makeMap(map, overviewSource);
 			map.close();
 		} catch (FileExistsException e) {
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://lists.mkgmap.org.uk/mailman/listinfo/mkgmap-dev

Reply via email to