Hi Minko
When I'm trying to combine two img tiles from different maps mkgmap gives this
warning:
input file ...img has a different sort order
The attached patch should now fix this.
As an aside, I also noticed that if you put the TYP file first, then
any following .osm files start with number 63240002, rather than the
expected 63240001.
..Steve
Index: src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java (revision 2423)
+++ src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java (revision )
@@ -118,7 +118,9 @@
Sort prevSort = sortMap.get(familyId);
Sort sort = info.getSort();
if (prevSort == null) {
+ if (info.getKind() == FileKind.IMG_KIND) {
- sortMap.put(familyId, sort);
+ sortMap.put(familyId, sort);
+ }
} else {
if (prevSort.getCodepage() != sort.getCodepage())
System.err.printf("WARNING: input file '%s' has a different code page (%d rather than %d)\n",
@@ -138,13 +140,15 @@
public void onMapEnd(FileInfo info) {
files.put(info.getFilename(), info);
+ if (info.isImg()) {
- int familyId = info.getFamilyId();
- if (createIndex) {
- MdrBuilder mdrBuilder = addMdrFile(familyId, info.getSort(), info.getOutputDir());
- mdrBuilder.onMapEnd(info);
- }
+ int familyId = info.getFamilyId();
+ if (createIndex) {
+ MdrBuilder mdrBuilder = addMdrFile(familyId, info.getSort(), info.getOutputDir());
+ mdrBuilder.onMapEnd(info);
+ }
- addSrtFile(familyId, info);
+ addSrtFile(familyId, info);
+ }
}
/**
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://lists.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
