TW-97 GeographicArea.find_by_lat_long, with spec finished.

SpeciesFileGroup · Jan 22, 2015 · a2373b6 · a2373b6
1 parent 23c0803
commit a2373b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/models/geographic_area.rb b/app/models/geographic_area.rb
@@ -190,8 +190,13 @@ def self.find_others_contained_in(geographic_area)
   # @param longitude [Double] Decimal degrees
   # @return [Scope] of all area which contain the point specified
   def self.find_by_lat_long(latitude = 0.0, longitude = 0.0)
-    point = GeographicItem.new(Georeference::FACTORY.point(longitude, latitude))
-    GeographicItem.is_contained_in('any_poly', point)
+    # point = GeographicItem.new(point: Georeference::FACTORY.point(longitude, latitude))
+    point = Georeference::FACTORY.point(longitude, latitude)
+    #GeographicItem.is_contained_in('any_poly', point)
+    # areas = GeographicItem.is_contained_in('any_poly', point)
+    where_clause = "ST_Contains(polygon::geometry, GeomFromEWKT('srid=4326;#{point}')) OR ST_Contains(multi_polygon::geometry, GeomFromEWKT('srid=4326;#{point}'))"
+    retval = GeographicArea.joins(:geographic_items).where(where_clause)
+    retval
   end
 
   def children_at_level1

diff --git a/spec/models/geographic_area_spec.rb b/spec/models/geographic_area_spec.rb
@@ -377,9 +377,10 @@
       expect(GeographicArea.find_others_contained_by(@area_old_boxia)).to include(@area_r)
     end
 
-    specify('find_by_lat_;ong') do
-      pending
-      expect(GeographicArea.find_by_lat_long(@area_old_boxia)).to include(@area_r)
+    specify('find_by_lat_long') do
+      # pending
+      point = @gr_n3_ob.geographic_item.geo_object
+      expect(GeographicArea.find_by_lat_long(point.y, point.x)).to include(@area_r, @area_rn3, @area_old_boxia, @area_n3, @area_land_mass)
     end
   end