Removed DataSetup, all Data() access now static

Author: mapcodefoundation

src/main/java/com/mapcode/Data.java

@@ -34,110 +34,7 @@ class Data {
             'A', 'E', 'U'
     };
 
-    private int flags;
-    private int codex;
-    private int codexLo;
-    private int codexHi;
-    private int codexLen;
-    private boolean nameless;
-    private boolean restricted;
-    private boolean specialShape;
-    private int pipeType;
-    @Nullable
-    private String pipeLetter;
-    @Nullable
-    private SubArea mapcoderRect;
-    private boolean initialized;
-
-    int getFlags() {
-        assert initialized;
-        return flags;
-    }
-
-    int getCodex() {
-        assert initialized;
-        return codex;
-    }
-
-    int getCodexLo() {
-        assert initialized;
-        return codexLo;
-    }
-
-    int getCodexHi() {
-        assert initialized;
-        return codexHi;
-    }
-
-    int getCodexLen() {
-        assert initialized;
-        return codexLen;
-    }
-
-    boolean isNameless() {
-        assert initialized;
-        return nameless;
-    }
-
-    boolean isRestricted() {
-        assert initialized;
-        return restricted;
-    }
-
-    boolean isSpecialShape() {
-        assert initialized;
-        return specialShape;
-    }
-
-    int getPipeType() {
-        assert initialized;
-        return pipeType;
-    }
-
-    @Nonnull
-    String getPipeLetter() {
-        assert initialized;
-        assert pipeLetter != null;
-        return pipeLetter;
-    }
-
-    @Nonnull
-    SubArea getMapcoderRect() {
-        assert initialized;
-        assert mapcoderRect != null;
-        return mapcoderRect;
-    }
-
-    Data(final int i) {
-        dataSetup(i);
-    }
-
     Data() {
-        initialized = false;
-    }
-
-    void dataSetup(final int i) {
-        flags = DataAccess.dataFlags(i);
-        codexHi = calcCodexHi(flags);
-        codexLo = calcCodexLo(flags);
-        codexLen = calcCodexLen(codexHi, codexLo);
-        codex = calcCodex(codexHi, codexLo);
-        nameless = isNameless(i);
-        restricted = (flags & 512) != 0;
-        specialShape = isSpecialShape(i);
-        pipeType = (flags >> 5) & 12; // 4=pipe 8=plus 12=star
-        if (pipeType == 4) {
-            pipeLetter = Character.toString(ENCODE_CHARS[(flags >> 11) & 31]);
-        } else {
-            pipeLetter = "";
-        }
-        if ((codex == 21) && !nameless) {
-            codex++;
-            codexLo++;
-            codexLen++;
-        }
-        mapcoderRect = SubArea.getArea(i);
-        initialized = true;
     }
 
     static boolean isNameless(final int i) {
@@ -152,33 +49,24 @@ static int recType(final int i) {
         return (DataAccess.dataFlags(i) >> 7) & 3; // 1=pipe 2=plus 3=star
     }
 
-    static int calcCodex(final int i) {
-        final int flags = DataAccess.dataFlags(i);
-        return calcCodex(calcCodexHi(flags), calcCodexLo(flags));
-    }
-
-    static int calcCodexLen(final int i) {
-        final int flags = DataAccess.dataFlags(i);
-        return calcCodexLen(calcCodexHi(flags), calcCodexLo(flags));
-    }
-
-    static boolean isAutoHeader(final int i) {
-        return (DataAccess.dataFlags(i) & (8 << 5)) != 0;
+    static boolean isRestricted(final int i) {
+        return (DataAccess.dataFlags(i) & 512) != 0;
     }
 
-    private static int calcCodexHi(final int flags) {
-        return (flags & 31) / 5;
-    }
-
-    private static int calcCodexLo(final int flags) {
-        return ((flags & 31) % 5) + 1;
+    static int calcCodex(final int i) {
+        final int codexflags = DataAccess.dataFlags(i) & 31;
+        return (10 * (codexflags / 5)) + (codexflags % 5) + 1;
     }
 
-    private static int calcCodex(final int codexhi, final int codexlo) {
-        return (10 * codexhi) + codexlo;
+    static String headerLetter(final int i) {
+        final int flags = DataAccess.dataFlags(i);
+        if (((flags >> 7) & 3) == 1) {
+            return Character.toString(ENCODE_CHARS[(flags >> 11) & 31]);
+        }
+        return "";
     }
 
-    private static int calcCodexLen(final int codexhi, final int codexlo) {
-        return codexhi + codexlo;
+    static SubArea getBoundaries(final int i) {
+        return SubArea.getArea(i);
     }
 }

src/main/java/com/mapcode/Decoder.java

@@ -82,63 +82,73 @@ static Point decode(@Nonnull final String argMapcode,
         final int ccode = territory.getNumber();
 
         final int from = DataAccess.dataFirstRecord(ccode);
-        if (DataAccess.dataFlags(from) == 0) {
+        if (DataAccess.dataFlags(from) == 0) { // no data for this territory?
             return Point.undefined(); // this territory is not in the current data
         }
         final int upto = DataAccess.dataLastRecord(ccode);
 
         final int incodexhi = mapcode.indexOf('.');
+        final int incodex = (incodexhi * 10) + (incodexlen - incodexhi);
 
         final Data mapcoderData = new Data();
 
         for (int i = from; i <= upto; i++) {
-            mapcoderData.dataSetup(i);
-            if ((mapcoderData.getPipeType() == 0) && !mapcoderData.isNameless()
-                    && (mapcoderData.getCodexLen() == incodexlen) && (mapcoderData.getCodexHi() == incodexhi)) {
-
-                result = decodeGrid(mapcode, mapcoderData.getMapcoderRect().getMinX(), mapcoderData.getMapcoderRect()
-                                .getMinY(), mapcoderData.getMapcoderRect().getMaxX(), mapcoderData.getMapcoderRect().getMaxY(),
-                        i, extrapostfix);
-                // RESTRICTUSELESS
-                if (mapcoderData.isRestricted() && result.isDefined()) {
-                    boolean fitssomewhere = false;
-                    int j;
-                    for (j = upto - 1; j >= from; j--) { // look in previous
-                        // rects
-                        mapcoderData.dataSetup(j);
-                        if (mapcoderData.isRestricted()) {
-                            continue;
-                        }
-                        final int xdiv8 = Common.xDivider(mapcoderData.getMapcoderRect().getMinY(),
-                                mapcoderData.getMapcoderRect().getMaxY()) / 4;
-                        if (mapcoderData.getMapcoderRect().extendBounds(xdiv8, 60).containsPoint(result)) {
-                            fitssomewhere = true;
+            final int codexi = mapcoderData.calcCodex(i);
+            if (mapcoderData.recType(i) == 0) {
+                if (mapcoderData.isNameless(i)) {
+                    // i = nameless
+                    if (((codexi == 21) && (incodex == 22)) ||
+                        ((codexi == 22) && (incodex == 32)) || 
+                        ((codexi == 13) && (incodex == 23))) {
+                            result = decodeNameless(mapcode, i, extrapostfix, mapcoderData);
                             break;
-                        }
                     }
-                    if (!fitssomewhere) {
-                        result.setUndefined();
+                } else {
+                    // i = grid without headerletter                    
+                    if ((codexi == incodex) || ((incodex == 22) && (codexi == 21))) {
+                        result = decodeGrid(mapcode, 
+                                mapcoderData.getBoundaries(i).getMinX(), mapcoderData.getBoundaries(i).getMinY(), 
+                                mapcoderData.getBoundaries(i).getMaxX(), mapcoderData.getBoundaries(i).getMaxY(),
+                                i, extrapostfix);
+                
+                        if (mapcoderData.isRestricted(i) && result.isDefined()) {
+                            boolean fitssomewhere = false;
+                            int j;
+                            for (j = upto - 1; j >= from; j--) {
+                                if (!mapcoderData.isRestricted(j)) {
+                                  final int xdiv8 = Common.xDivider(mapcoderData.getBoundaries(j).getMinY(),
+                                          mapcoderData.getBoundaries(j).getMaxY()) / 4;
+                                  if (mapcoderData.getBoundaries(j).extendBounds(xdiv8, 60).containsPoint(result)) {
+                                      fitssomewhere = true;
+                                      break;
+                                  }
+                                }
+                            }
+                            if (!fitssomewhere) {
+                                result.setUndefined();
+                            }
+                        }
+                        break;
                     }
                 }
-                break;
-            } else if ((mapcoderData.getPipeType() == 4) && ((mapcoderData.getCodexLen() + 1) == incodexlen)
-                    && ((mapcoderData.getCodexHi() + 1) == incodexhi)
-                    && (mapcoderData.getPipeLetter().charAt(0) == mapcode.charAt(0))) {
-                result = decodeGrid(mapcode.substring(1), mapcoderData.getMapcoderRect().getMinX(), mapcoderData
-                        .getMapcoderRect().getMinY(), mapcoderData.getMapcoderRect().getMaxX(), mapcoderData
-                        .getMapcoderRect().getMaxY(), i, extrapostfix);
-                break;
-            } else if (mapcoderData.isNameless()
-                    && (((mapcoderData.getCodex() == 21) && (incodexlen == 4) && (incodexhi == 2))
-                    || ((mapcoderData.getCodex() == 22) && (incodexlen == 5) && (incodexhi == 3)) || ((mapcoderData
-                    .getCodex() == 13) && (incodexlen == 5) && (incodexhi == 2)))) {
-                result = decodeNameless(mapcode, i, extrapostfix, mapcoderData);
-                break;
-            } else if ((mapcoderData.getPipeType() > 4) && (incodexlen == (incodexhi + 3))
-                    && ((mapcoderData.getCodexLen() + 1) == incodexlen)) {
-                result = decodeAutoHeader(mapcode, i, extrapostfix, mapcoderData);
-                break;
+            } else if (mapcoderData.recType(i) == 1) {
+                // i = grid with headerletter
+                if ((incodex == codexi + 10) && (mapcoderData.headerLetter(i).charAt(0) == mapcode.charAt(0))) {
+                        result = decodeGrid(mapcode.substring(1), 
+                            mapcoderData.getBoundaries(i).getMinX(), mapcoderData.getBoundaries(i).getMinY(), 
+                            mapcoderData.getBoundaries(i).getMaxX(), mapcoderData.getBoundaries(i).getMaxY(), 
+                            i, extrapostfix);
+                    break;
+                }
+            }
+            else {
+                // i = autoheader
+                if (((incodex == 23) && (codexi == 22)) || ((incodex == 33) && (codexi == 23))) {
+                    result = decodeAutoHeader(mapcode, i, extrapostfix, mapcoderData);
+                    break;
+                }
             }
+
         }
 
         if (result.isDefined()) {
@@ -150,7 +160,7 @@ static Point decode(@Nonnull final String argMapcode,
 
             // LIMIT_TO_OUTRECT : make sure it fits the country
             if (ccode != CCODE_EARTH) {
-                final SubArea mapcoderRect = SubArea.getArea(upto); // find
+                final SubArea mapcoderRect = mapcoderData.getBoundaries(upto); // find
                 // encompassing
                 // rect
                 final int xdiv8 = Common.xDivider(mapcoderRect.getMinY(), mapcoderRect.getMaxY()) / 4;
@@ -341,7 +351,7 @@ private static Point decodeGrid(final String str, final int minx, final int miny
     private static Point decodeNameless(final String str, final int firstrec, final String extrapostfix,
                                         final Data mapcoderData) {
         String result = str;
-        final int codexm = mapcoderData.getCodex();
+        final int codexm = mapcoderData.calcCodex(firstrec);
         if (codexm == 22) {
             result = result.substring(0, 3) + result.substring(4);
         } else {
@@ -405,19 +415,19 @@ private static Point decodeNameless(final String str, final int firstrec, final
             }
         }
 
-        mapcoderData.dataSetup(firstrec + nrX);
+        final int m = firstrec + nrX;
 
-        int side = DataAccess.smartDiv(firstrec + nrX);
+        int side = DataAccess.smartDiv(m);
         int xSIDE = side;
 
-        final int maxy = mapcoderData.getMapcoderRect().getMaxY();
-        final int minx = mapcoderData.getMapcoderRect().getMinX();
-        final int miny = mapcoderData.getMapcoderRect().getMinY();
+        final int maxy = mapcoderData.getBoundaries(m).getMaxY();
+        final int minx = mapcoderData.getBoundaries(m).getMinX();
+        final int miny = mapcoderData.getBoundaries(m).getMinY();
 
         final int dx;
         final int dy;
 
-        if (mapcoderData.isSpecialShape()) {
+        if (mapcoderData.isSpecialShape(m)) {
             xSIDE *= side;
             side = 1 + ((maxy - miny) / 90);
             xSIDE = xSIDE / side;
@@ -444,31 +454,28 @@ private static Point decodeNameless(final String str, final int firstrec, final
     }
 
     @Nonnull
-    private static Point decodeAutoHeader(final String input, final int firstindex, final String extrapostfix,
+    private static Point decodeAutoHeader(final String input, final int m, final String extrapostfix,
                                         @Nonnull final Data mapcoderData) {
         // returns Point.isUndefined() in case or error
         int storageStart = 0;
-        final int thiscodexlen = mapcoderData.getCodexLen();
+        final int codexm = mapcoderData.calcCodex(m);
 
         int value = decodeBase31(input); // decode top (before dot)
         value *= 961 * 31;
         final Point triple = decodeTriple(input.substring(input.length() - 3));
         // decode bottom 3 chars
 
         int i;
-        i = firstindex;
+        i = m;
         while (true) {
-            if (Data.calcCodexLen(i) != thiscodexlen) {
+            if ((mapcoderData.recType(i)<2) || (Data.calcCodex(i) != codexm)) {
                 return Point.undefined(); // return undefined
             }
-            if (i > firstindex) {
-                mapcoderData.dataSetup(i);
-            }
 
-            final int maxx = mapcoderData.getMapcoderRect().getMaxX();
-            final int maxy = mapcoderData.getMapcoderRect().getMaxY();
-            final int minx = mapcoderData.getMapcoderRect().getMinX();
-            final int miny = mapcoderData.getMapcoderRect().getMinY();
+            final int maxx = mapcoderData.getBoundaries(i).getMaxX();
+            final int maxy = mapcoderData.getBoundaries(i).getMaxY();
+            final int minx = mapcoderData.getBoundaries(i).getMinX();
+            final int miny = mapcoderData.getBoundaries(i).getMinY();
 
             int h = ((maxy - miny) + 89) / 90;
             final int xdiv = Common.xDivider(miny, maxy);
@@ -479,8 +486,8 @@ private static Point decodeAutoHeader(final String input, final int firstindex,
 
             int product = (w / 168) * (h / 176) * 961 * 31;
 
-            if (mapcoderData.getPipeType() == 8) {
-                final int goodRounder = (mapcoderData.getCodex() >= 23) ? (961 * 961 * 31) : (961 * 961);
+            if (mapcoderData.recType(i) == 2) {
+                final int goodRounder = (codexm >= 23) ? (961 * 961 * 31) : (961 * 961);
                 product = ((((storageStart + product + goodRounder) - 1) / goodRounder) * goodRounder) - storageStart;
             }