pick states over tiny cities (Oklahoma), but pick big cities over sta…

…tes (Sao Paulo) #28

src/main/java/org/mediameter/cliff/places/disambiguation/ExactAdmin1MatchPass.java

@@ -28,9 +28,15 @@ protected List<List<ResolvedLocation>> disambiguate(
         return possibilitiesToRemove;
     }
 
+    /**
+     * Tuned to skip tiny cities that are populated to solve the Oklahoma problem
+     * and the Sao Paulo problem.
+     * @param candidates
+     * @return
+     */
     private boolean containsPopulatedCityExactMatch(List<ResolvedLocation> candidates) {
         for(ResolvedLocation loc:candidates){
-            if(loc.geoname.population>0 && isCity(loc) && isExactMatch(loc)){
+            if(loc.geoname.population>10000 && isCity(loc) && isExactMatch(loc)){
                 return true;
             }
         }

src/test/java/org/mediameter/cliff/test/places/disambiguation/OklahomaPlaceTest.java

@@ -0,0 +1,26 @@
+package org.mediameter.cliff.test.places.disambiguation;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.mediameter.cliff.ParseManager;
+import org.mediameter.cliff.test.util.TestPlaces;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bericotech.clavin.resolver.ResolvedLocation;
+
+public class OklahomaPlaceTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(OklahomaPlaceTest.class);
+
+    @Test
+    public void testOklahoma() throws Exception {
+        List<ResolvedLocation> results = ParseManager.extractAndResolve("Oklahoma say Common Core tests are too costly.").getResolvedLocations();
+        assertEquals("Found "+results.size()+" places, should have been 1!",1,results.size());
+        assertEquals(TestPlaces.STATE_OKLAHOMA, results.get(0).geoname.geonameID);
+    }
+
+}

src/test/java/org/mediameter/cliff/test/util/TestPlaces.java

@@ -26,5 +26,6 @@ public class TestPlaces {
     public static final int STATE_MAINE = 4971068;
     public static final int CITY_BANGOR = 4957280;
     public static final int COUNTRY_RUSSIA = 2017370;
+    public static final int STATE_OKLAHOMA = 4544379;
 
 }