Minor change

Author: mapcodefoundation

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

@@ -225,6 +225,10 @@ static Point decode(@Nonnull final String argMapcode,
                                 Data.getBoundaries(i).getMaxX(), Data.getBoundaries(i).getMaxY(),
                                 i, extrapostfix);
 
+                        // first of all, make sure the zone fits the country
+                        if (!mapcodeZone.isEmpty() && (territory != territory.AAA)) {
+                            mapcodeZone = mapcodeZone.restrictZoneTo(Data.getBoundaries(upto));
+                        }
 
                         if (Data.isRestricted(i) && !mapcodeZone.isEmpty()) {
                             int nrZoneOverlaps = 0;
@@ -233,8 +237,6 @@ static Point decode(@Nonnull final String argMapcode,
                             // see if midpoint of mapcode zone is in any sub-area...
                             for (j = i - 1; j >= from; j--) {
                                 if (!Data.isRestricted(j)) {
-                                  final int xdiv8 = Common.xDivider(Data.getBoundaries(j).getMinY(),
-                                          Data.getBoundaries(j).getMaxY()) / 4;
                                   if (Data.getBoundaries(j).containsPoint(result)) {
                                       nrZoneOverlaps++;
                                       break;
@@ -292,15 +294,10 @@ static Point decode(@Nonnull final String argMapcode,
             }
         }
 
-        final Point result;
-        if (mapcodeZone.isEmpty()) {
-            result = Point.undefined();
-        } else if (territory == territory.AAA) {
-            result = mapcodeZone.midPoint().wrap();
-        } else {
+        if (territory != territory.AAA) {
             mapcodeZone = mapcodeZone.restrictZoneTo(Data.getBoundaries(upto));
-            result = mapcodeZone.midPoint().wrap();
         }
+        final Point result = mapcodeZone.midPoint().wrap();
 
         LOG.trace("decode: result=({}, {})",
                 result.isDefined() ? result.getLatDeg() : Double.NaN,
@@ -551,6 +548,10 @@ private static MapcodeZone decodeNameless(final String str, final int firstrec,
             }
         }
 
+        if (nrX > a) {  // past end!
+            return MapcodeZone.empty();
+        }
+
         final int m = firstrec + nrX;
 
         int side = DataAccess.smartDiv(m);
@@ -910,8 +911,8 @@ private static MapcodeZone decodeExtension(final int y, final int x, final int d
             processor *= 30;
         }
 
-        double lon4 = (x * 4 * Point.MAX_PRECISION_FACTOR) + ((lon32 * dividerx4)) + (lon_offset4 * Point.MAX_PRECISION_FACTOR);
-        double lat1 = (y     * Point.MAX_PRECISION_FACTOR) + ((lat32 * dividery ));
+        double lon4 = (x * 4 * Point.MAX_PRECISION_FACTOR) + (lon32 * dividerx4) + (lon_offset4 * Point.MAX_PRECISION_FACTOR);
+        double lat1 = (y     * Point.MAX_PRECISION_FACTOR) + (lat32 * dividery );
 
         // determine the range of coordinates that are encode to this mapcode
         if (odd) { // odd