Adding tests

Author: Josh Devins

src/main/scala/net/joshdevins/gis/geocoder/ReverseGeocoder.scala

@@ -20,7 +20,7 @@ class ReverseGeocoder(private val dataDirecotory: String) extends Logging {
     new ShapefileIndex("admin-1", "data/build/naturalearth-admin-1/10m_admin_1_states_provinces_shp.shp"),
     new ShapefileIndex("admin-0", "data/build/naturalearth-admin-0/10m_admin_0_countries.shp"))
 
-  def mkString: String = indices.iterator.mkString
+  def mkString: String = indices.mkString(", ")
 
   /**
    * Gets the lowest-level WOEIDs for the shapes that contain the lat/lon provided. A subsequent lookup of the WOEID's will find the point

src/main/scala/net/joshdevins/gis/geocoder/ShapefileIndex.scala

@@ -59,6 +59,8 @@ class ShapefileIndex(val name: String, private val shapefile: String) extends Lo
     log.info("Index built in: %.2f seconds\n", duration / 1000F)
   }
 
+  override def toString: String = name
+
   /**
    * Gets the WOEIDs for the shapes that contain the lat/lon provided.
    */

src/test/scala/net/joshdevins/gis/geocoder/ReverseGeocoderTestSuite.scala

@@ -8,9 +8,26 @@ import org.scalatest.junit.JUnitRunner
 @RunWith(classOf[JUnitRunner])
 class ReverseGeocoderTestSuite extends FunSuite with ShouldMatchers {
 
+  val reverseGeocoder = new ReverseGeocoder("build/data")
+
   test("basic indexing of all the shapefiles") {
-    val reverseGeocoder = new ReverseGeocoder("build/data")
+    reverseGeocoder.mkString should be("neighbourhood, county, admin-1, admin-0")
+  }
+
+  test("lookup lat/lon that is not in any index") {
+
+    val option = reverseGeocoder.getLowestLevelWOEIDSetForCoordinates(0, 0)
+    option.isEmpty should be(true)
+  }
+
+  test("lookup lat/lon that is only in country index") {
+
+    val option = reverseGeocoder.getLowestLevelWOEIDSetForCoordinates(53, -125)
+    option.isEmpty should be(false)
+    option.get._1 should be("admin-1")
 
-    System.out.println(reverseGeocoder.mkString)
+    val list = option.get._2
+    list.size should be(1)
+    list.head should be(0) // FIXME: this is because there are no WOEID's on these shapefiles yet
   }
 }