Stricter unit test

Author: mapcodefoundation

src/main/java/com/mapcode/Mapcode.java

@@ -400,7 +400,7 @@ public static boolean containsTerritory(@Nonnull final String mapcode) throws Il
      */
     private static final double[] PRECISION_0_MAX_OFFSET_METERS = { 
         7.49,         // PRECISION_0: 7.49 meters or less       7.5 m
-        1.45,         // PRECISION_1: 1.45 meters or less       1.5 m
+        1.39,         // PRECISION_1: 1.39 meters or less       1.4 m
         0.251,        // PRECISION_2: 25.1 cm or less           25 cm
         0.0462,       // PRECISION_3: 4.62 cm or less           5 cm
         0.00837,      // PRECISION_4: 8.37 mm or less           1 cm

src/main/java/com/mapcode/MapcodeCodec.java

@@ -252,43 +252,43 @@ public static Point decode(
     }
 
     /**
-     * Is coordinate within a given territory?
+     * Is coordinate near multiple territory borders?
      *
      * @param point        Latitude/Longitude in degrees
      * @param territory    Territory
-     * @return true iff the coordinate is inside the specified territory.
+     * @return true iff the coordinate is near more than one territory border
+     *         (and thus encode(decode(M)) may not produce M)
      */
-    public static boolean isInsideTerritory(@Nonnull final Point point, @Nonnull final Territory territory) {
-        final int ccode = territory.getNumber();
-        final int from = DataAccess.dataFirstRecord(ccode);
-        final int upto = DataAccess.dataLastRecord(ccode);
-        if (Data.getBoundaries(upto).containsPoint(point)) {
-            for (int m = upto; m >= from; m--) {
-                if (!Data.isRestricted(m)) {
-                    if (Data.getBoundaries(m).containsPoint(point)) {
-                        return true;
+
+    public static boolean multipleBordersNearby(@Nonnull final Point point, @Nonnull final Territory territory) {
+        if (territory != territory.AAA) {
+            final int ccode = territory.getNumber();
+            if (territory.getParentTerritory() != null) {
+                // there is a parent! check its borders as well...
+                if (multipleBordersNearby(point, territory.getParentTerritory())) {
+                    return true;
+                }
+            }
+            {
+                int nrFound = 0;
+                final int from = DataAccess.dataFirstRecord(ccode);
+                final int upto = DataAccess.dataLastRecord(ccode);
+                for (int m = upto; m >= from; m--) {
+                    if (!Data.isRestricted(m)) {
+                        final SubArea boundaries = Data.getBoundaries(m);
+                        final int xdiv8 = Common.xDivider(boundaries.getMinY(),boundaries.getMaxY()) / 4; // @@@
+                        if (boundaries.extendBounds(xdiv8, 60).containsPoint(point)) {
+                            if (!boundaries.extendBounds(-xdiv8, -60).containsPoint(point)) {
+                                nrFound++;
+                                if (nrFound > 1) {
+                                    return true;
+                                }
+                            }
+                        }
                     }
                 }
             }
         }
         return false;
     }
-
-    /**
-     * Is coordinate "fully within" a given territory?
-     *
-     * @param point        Latitude/Longitude in degrees
-     * @param territory    Territory
-     * @return true iff the coordinate is inside the specified territory, and furthermore,
-     * IF the territory has a perent territory: inside the parent territory.
-     *
-     * Note that for the mapcode system, the following should hold: IF a point p has a 
-     * mapcode M, THEN decode(M) delivers a point q within maxErrorInMeters() of p.
-     * Furthermore, encode(q) must yield back M *unless* point q is not "fully inside"
-     * the mapcode territory.
-     */
-    public static boolean isFullyInsideTerritory(@Nonnull final Point point, @Nonnull final Territory territory) {
-        final Territory parentTerritory = territory.getParentTerritory();
-        return isInsideTerritory(point, territory) && ((parentTerritory == null) || isInsideTerritory(point, parentTerritory));
-    }
 }

src/test/java/com/mapcode/EncodeDecodeTest.java

@@ -128,20 +128,19 @@ public void run() {
                                                     break;
                                                 }
                                             }
-                                            if (!found) { // not found?
-                                                if (MapcodeCodec.isFullyInsideTerritory(decodeLocation, territory)) { // but should be found!
-                                                    // perhaps it was inherited from the parent?
-                                                    final Territory parentTerritory = territory.getParentTerritory();                                                
-                                                    if (parentTerritory != null) {                                                    
-                                                        final List<Mapcode> recodedMapcodesFromParent = MapcodeCodec.encode(decodeLocation,parentTerritory);
-                                                        for (final Mapcode candidate : recodedMapcodesFromParent) {
-                                                            if (codePrecision.equals(candidate.getCode(nrDigits))) {
-                                                                found = true;
-                                                                break;
-                                                            }
+                                            if (!found) {
+                                                // perhaps it was inherited from the parent?
+                                                final Territory parentTerritory = territory.getParentTerritory();                                                
+                                                if (parentTerritory != null) {                                                    
+                                                    final List<Mapcode> recodedMapcodesFromParent = MapcodeCodec.encode(decodeLocation,parentTerritory);
+                                                    for (final Mapcode candidate : recodedMapcodesFromParent) {
+                                                        if (codePrecision.equals(candidate.getCode(nrDigits))) {
+                                                            found = true;
+                                                            break;
                                                         }
                                                     }
-                                                    if (!found) {
+                                                }
+                                                if (!found) {
                                                         LOG.error("Re-encode{} of {} failed for {} {} from ({},{})", nrDigits, decodeLocation, territory, codePrecision, latDeg, lonDeg);
                                                         errors.getAndIncrement();
                                                         for (final Mapcode candidate : recodedMapcodes) {