add ancestry to geonames lookup

mediacloud · Jun 24, 2015 · 1278721 · 1278721
1 parent f7e6e94
commit 1278721
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.mediameter</groupId>
   <artifactId>CLIFF</artifactId>
   <packaging>war</packaging>
-  <version>2.1.1</version>
+  <version>2.2.0</version>
 
   <name>CLIFF</name>
   <url>http://cliff.mediameter.org/</url>

diff --git a/src/main/java/org/mediameter/cliff/ParseManager.java b/src/main/java/org/mediameter/cliff/ParseManager.java
@@ -40,7 +40,7 @@ public class ParseManager {
      * Minor: small new features, changes to the json result format, or changes to the disambiguation algorithm
      * Revision: minor change or bug fix
      */
-    static final String PARSER_VERSION = "2.1.1";
+    static final String PARSER_VERSION = "2.2.0";
 
     private static final Logger logger = LoggerFactory.getLogger(ParseManager.class);
 
@@ -74,9 +74,26 @@ public static GeoName getGeoName(int id) throws UnknownGeoNameIdException{
 
     @SuppressWarnings({ "rawtypes" })
     public static HashMap getGeoNameInfo(int id) {
+        return getGeoNameInfo(id, true);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static HashMap getGeoNameInfo(int id, boolean withAncestry) {
         try {
             GeoName geoname = getGeoName(id);
-            HashMap response = getResponseMap( writeGeoNameToHash(geoname) );
+            HashMap info = writeGeoNameToHash(geoname);
+            if(withAncestry){
+                HashMap childInfo = info;
+                GeoName child = geoname; 
+                while(child.getParent()!=null){
+                    GeoName parent = child.getParent();
+                    HashMap parentInfo = writeGeoNameToHash(parent);
+                    childInfo.put("parent", parentInfo);
+                    child = parent;
+                    childInfo = parentInfo;
+                }
+            }
+            HashMap response = getResponseMap( info );
             return response;
         } catch (UnknownGeoNameIdException e) {
             logger.warn(e.getMessage());

diff --git a/src/test/java/org/mediameter/cliff/test/places/GeoNameAncestryTest.java b/src/test/java/org/mediameter/cliff/test/places/GeoNameAncestryTest.java
@@ -27,6 +27,8 @@ public void test() {
             assertEquals(GEONAME_MASSACHUSETTS_STATE,mitParent2.getGeonameID());
             GeoName mitParent3 = mitParent2.getParent();
             assertEquals(GEONAME_USA,mitParent3.getGeonameID());
+            GeoName mitParent4 = mitParent3.getParent();
+            assertEquals(null,mitParent4);
         } catch (UnknownGeoNameIdException e) {
             e.printStackTrace();
         }