Hi
Did something happen to the patch file, or am I missing something?
Yes something weird happened to the patch file. There was a change to
Mdr20. Trying again...
..Steve
Index: src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java (revision 1957)
+++ src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java (working copy)
@@ -64,16 +64,18 @@
cities.clear();
int count = 0;
int lastMapId = 0;
+ int lastRegion = 0;
String lastName = null;
for (SortKey<Mdr5Record> key : sortKeys) {
Mdr5Record c = key.getObject();
- if (c.getMapIndex() != lastMapId || !c.getName().equals(lastName)) {
+ if (c.getMapIndex() != lastMapId || !c.getName().equals(lastName) || c.getRegionIndex() != lastRegion) {
count++;
c.setGlobalCityIndex(count);
cities.add(c);
lastName = c.getName();
lastMapId = c.getMapIndex();
+ lastRegion = c.getRegionIndex();
} else {
c.setGlobalCityIndex(count);
}
Index: src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java (revision 1957)
+++ src/uk/me/parabola/imgfmt/app/mdr/Mdr20.java (working copy)
@@ -73,19 +73,23 @@
String lastCityName = null;
int lastMapid = 0;
int record = 0;
+ int lastRegion = 0;
for (SortKey<Mdr7Record> key : keys) {
Mdr7Record street = key.getObject();
int mapid = street.getMapIndex();
String name = street.getName();
String cityName = street.getCity().getName();
- if (mapid != lastMapid || !name.equals(lastName) || !cityName.equals(lastCityName)) {
+ int region = street.getCity().getRegionIndex();
+
+ if (mapid != lastMapid || !name.equals(lastName) || !cityName.equals(lastCityName) || region != lastRegion) {
record++;
streets.add(street);
lastMapid = mapid;
lastName = name;
lastCityName = cityName;
+ lastRegion = region;
}
int gci = street.getCity().getGlobalCityIndex();
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
