[mkgmap-dev] Minor Display changes

[Ticker Berkin]

Hi Gerd

I've had a few minor display changes sitting around, mainly MdrSummary
+ something to reduce noise from reverse route calcs being slightly
different.

patch attached.

Following your last commit I don't get any lint warnings.

Ticker




Index: src/test/check/NodCheck.java
===================================================================
--- src/test/check/NodCheck.java	(revision 569)
+++ src/test/check/NodCheck.java	(working copy)
@@ -866,7 +866,7 @@
         int d2 = rarc.getDistance();
 	    int diff = Math.abs(d1 - d2);
 
-	    if (diff > 0)
+	    if (diff > 2)
             error("Node:%x/%d: distance along reverse arc different %d/%d", arc.getNode().getOffset(), arc.getIndex(), d1, d2);
     }
 
Index: src/test/display/MdrDisplay.java
===================================================================
--- src/test/display/MdrDisplay.java	(revision 569)
+++ src/test/display/MdrDisplay.java	(working copy)
@@ -1293,9 +1293,9 @@
 
 		charSet = Sort.charsetFromCodepage(codePage);
 
+		d.charValue("id1 %d");
+		d.charValue("id2 %d");
 		d.charValue("??? %d");
-		d.charValue("??? %d");
-		d.charValue("??? %d");
 
 		Section sect = readSection(d, "MDR 1", 1, true, true);
 		numberOfMaps = sect.getNumberOfRecords();
Index: src/test/display/MdrSummary.java
===================================================================
--- src/test/display/MdrSummary.java	(revision 569)
+++ src/test/display/MdrSummary.java	(working copy)
@@ -101,8 +101,8 @@
 							s.getNumberOfRecords(),
 							s.getRecordSize());
 				else
-					System.out.printf("DataSize=%-9d(%08x) ", s.getLen(), s.getLen());
-				System.out.printf("magic=0x%x\n", s.getMagic());
+					System.out.printf("DS=%-9d(%08x)  ", s.getLen(), s.getLen());
+				System.out.printf("magic=0x%08x\n", s.getMagic());
 			}
 
 			number++;
@@ -110,12 +110,11 @@
 	}
 
 	private void readHeader() {
-		reader.get2u();
-
-		int unk1 = reader.get2u();
-		int unk2 = reader.get2u();
+		int codePage = reader.get2u();
+		int id1 = reader.get2u();
+		int id2 = reader.get2u();
 		int unk3 = reader.get2u();
-		System.out.printf("initial values %4x %4x %4x\n", unk1, unk2, unk3);
+		System.out.printf("codePage=%d id1=%d id2=%d unk=0x%04x\n", codePage, id1, id2, unk3);
 
 		addSection(1, true, true);
 		addSection(2, true, true);
@@ -132,7 +131,8 @@
 		addSection(13, true, true);
 		addSection(14, true, true);
 		addSection(15, false, false);
-		reader.get();
+		int flag = reader.get();
+		System.out.printf("Compressed strings flag=0x%04x\n", flag);
 		addSection(16, true, true);
 		addSection(17, false, true);
 		addSection(18, true, true);
@@ -148,6 +148,16 @@
 		addSection(28, true, true);
 		addSection(29, true, true);
 		addSection(30, true, true);
+		addSection(31, false, false);
+		addSection(32, true, true);
+		addSection(33, false, false);
+		addSection(34, true, true);
+		addSection(35, true, true);
+		addSection(36, true, true);
+		addSection(37, true, true);
+		addSection(38, true, true);
+		addSection(39, true, true);
+		addSection(40, true, true);
 	}
 
 	private Section addSection(int n, boolean withReclen, boolean withMagic) {

_______________________________________________
mkgmap-dev mailing list
mkgmap-dev@lists.mkgmap.org.uk
https://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev