Minor improvements

Author: mapcodefoundation

src/main/java/com/mapcode/Boundary.java

@@ -72,13 +72,12 @@ public Boundaries extendBounds(final int xExtension, final int yExtension) {
 
     public boolean containsPoint(@Nonnull final Point p) {
         final int y = p.getLatMicroDeg();
-        if ((miny <= y) && (y < maxy)) {
-            int x = p.getLonMicroDeg();
-            if ((minx <= x) && (x < maxx)) { return true; }
-            if (x < minx) { x += 360000000; } else { x -= 360000000; }
-            if ((minx <= x) && (x < maxx)) { return true; }
-        }
-        return false;
+        if ((miny > y) || (y >= maxy)) { return false; }
+        final int x = p.getLonMicroDeg();
+        // longitude boundaries can extend (slightly) outside the [-180,180) range
+        if (x < minx) { return (minx <= x + 360000000) && (x + 360000000 < maxx); } 
+        if (x >= maxx) { return (minx <= x - 360000000) && (x - 360000000 < maxx); }
+        return true;
     }
 
     public String toString() {

src/main/java/com/mapcode/DataAccess.java

@@ -62,19 +62,24 @@ class DataAccess {
                     final byte[] bytes = outputStream.toByteArray();
                     assert total == bytes.length;
 
-                    // read 8-byte header: SIGNATURE "MC", VERSION, NR TERRITORIES, NR RECTRANGLE RECORD
-                    assert total > 8;
+                    // read SIGNATURE "MC", VERSION
+                    assert total > 12;
                     assert (char) bytes[0] == 'M';
                     assert (char) bytes[1] == 'C';
                     final int dataVersion = (bytes[2] & 255) + ((bytes[3] & 255) << 8);
+                    assert (dataVersion >= 220);
+                    final int HEADER_SIZE = 8;
+
+                    // read header: NR TERRITORIES, NR RECTRANGLE RECORD
                     nrTerritoryRecords = (bytes[4] & 255) + ((bytes[5] & 255) << 8);
                     nrTerritories = (bytes[6] & 255) + ((bytes[7] & 255) << 8);
                     LOG.info("version={} nrTerritories={} nrTerritoryRecords={}",dataVersion,nrTerritories,nrTerritoryRecords);
-                    assert (8 + ((nrTerritories + 1) * 2) + (nrTerritoryRecords * 20) == total);
+                    final int expectedsize = HEADER_SIZE + ((nrTerritories + 1) * 2) + (nrTerritoryRecords * 20);
+                    assert (expectedsize == total);
 
                     // read DATA+START array (2 bytes per territory, plus closing record)
                     DATA_START = new int[nrTerritories + 1];
-                    int i = 8;
+                    int i = HEADER_SIZE;
                     for (int k=0; k <= nrTerritories; k++) {
                         DATA_START[k] = (bytes[i] & 255) + ((bytes[i + 1] & 255) << 8);
                         i += 2;