Allows use of territory names as well as codes

Author: rijnb

src/main/java/com/mapcode/Territory.java

@@ -646,7 +646,7 @@ static Territory fromNumber(final int number) throws UnknownTerritoryException {
     }
 
     /**
-     * Get a territory from a mapcode territory abbreviation. Note that the provided abbreviation is NOT an
+     * Get a territory from a mapcode territory abbreviation (or a territory name). Note that the provided abbreviation is NOT an
      * ISO code: it's a mapcode prefix. As local mapcodes for subdivisions have been optimized to prefer to use 2-character
      * subdivisions codes in local codes, subdivisions are preferred over countries in this case.
      *
@@ -658,7 +658,7 @@ static Territory fromNumber(final int number) throws UnknownTerritoryException {
      *
      * Brazilian mapcodes, on the other hand, would be specified as "BRA BDHP.JK39-1D", using the ISO 3 letter code.
      *
-     * @param alphaCode Territory, alphanumeric code.
+     * @param alphaCode Territory name or alphanumeric code.
      * @return Territory.
      * @throws UnknownTerritoryException Thrown if incorrect numeric or alphanumeric code.
      */
@@ -828,7 +828,7 @@ private Territory(
         int min = Integer.MAX_VALUE;
         int max = Integer.MIN_VALUE;
         final Set<Integer> territoryCodes = new HashSet<Integer>();
-        final Set<String> aliasesSet = new HashSet<String>();
+        final Set<String> namesSet = new HashSet<String>();
 
         for (final Territory territory : Territory.values()) {
             final int territoryNumber = territory.getNumber();
@@ -849,14 +849,33 @@ private Territory(
             if ((territory.parentTerritory != null) && !parentList.contains(territory.parentTerritory)) {
                 parentList.add(territory.parentTerritory);
             }
+
+            // Add territory codes and alias codes.
+            if (namesSet.contains(territory.toString())) {
+                throw new ExceptionInInitializerError(errorPrefix + "non-unique territory: " + territory.toString());
+            }
+            namesSet.add(territory.toString());
             addNameWithParentVariants(territory.toString(), territory);
             for (final String alias : territory.aliases) {
-                if (aliasesSet.contains(alias)) {
+                if (namesSet.contains(alias)) {
                     throw new ExceptionInInitializerError(errorPrefix + "non-unique alias: " + alias);
                 }
-                aliasesSet.add(alias);
+                namesSet.add(alias);
                 addNameWithParentVariants(alias, territory);
             }
+
+            // Add territory fullnames and aliases as well. Skip special case: territory name == territory code (e.g. USA).
+            if (namesSet.contains(territory.fullName.toUpperCase()) && !territory.toString().equals(territory.fullName.toUpperCase())) {
+                throw new ExceptionInInitializerError(errorPrefix + "non-unique fullName: " + territory.fullName.toUpperCase());
+            }
+            addNameWithParentVariants(territory.fullName.toUpperCase(), territory);
+            for (final String fullNameAlias : territory.fullNameAliases) {
+                if (namesSet.contains(fullNameAlias.toUpperCase())) {
+                    throw new ExceptionInInitializerError(errorPrefix + "non-unique fullName alias: " + fullNameAlias);
+                }
+                namesSet.add(fullNameAlias.toUpperCase());
+                addNameWithParentVariants(fullNameAlias.toUpperCase(), territory);
+            }
             min = Math.min(min, territory.number);
             max = Math.max(max, territory.number);
         }

src/site/apt/ReleaseNotes.apt.vm

@@ -16,6 +16,8 @@ Release Notes (Version ${project.version})
 
     * Use multi-threading for long running test to speed them up (uses all CPU cores now).
 
+    * Added the ability to use a country name for <<<Territory.fromString()>>>.
+
 * 2.0.0
 
     * Fixes to the data rectangles (primarily intended for ISO proposal).

src/test/java/com/mapcode/TerritoryTest.java

@@ -34,6 +34,17 @@ public void emptyTerritoryCodeTest() throws Exception {
         Territory.fromString("");
     }
 
+    @Test
+    public void checkFullName() throws Exception {
+        LOG.info("checkFullName");
+        assertEquals(Territory.AAA, Territory.fromString("International"));
+        assertEquals(Territory.AAA, Territory.fromString("Worldwide"));
+        assertEquals(Territory.AAA, Territory.fromString("Earth"));
+        assertEquals(Territory.NLD, Territory.fromString("Netherlands"));
+        assertEquals(Territory.CN_XZ, Territory.fromString("Xizang"));
+        assertEquals(Territory.CN_XZ, Territory.fromString("Tibet"));
+    }
+
     @Test
     public void checkDash() throws Exception {
         LOG.info("checkDash");
@@ -126,10 +137,4 @@ public void testFromStringError3() {
         LOG.info("testFromStringError3");
         Territory.fromString("999");
     }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testFromStringError4() {
-        LOG.info("testFromStringError4");
-        Territory.fromString("Netherlands");
-    }
 }