geos-extensions 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/geos-extensions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geos-extensions}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{J Smith}]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-07-12}
   s.description = %q{Extensions for the GEOS library.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [

data/lib/geos/active_record_extensions/geospatial_scopes.rb

@@ -235,7 +235,7 @@ module Geos
                 end
               end
 
-              def assert_arguments_length(args, min, max)
+              def assert_arguments_length(args, min, max = (1.0 / 0.0))
                 raise ArgumentError.new("wrong number of arguments (#{args.length} for #{min}-#{max})") unless
                   args.length.between?(min, max)
               end
@@ -270,6 +270,19 @@ module Geos
               ]
             }
           })
+
+          send(SCOPE_METHOD, :st_geometry_type, lambda { |*args|
+            assert_arguments_length(args, 1)
+            options = args.extract_options!
+            types = args
+
+            {
+              :conditions => [
+                "#{build_function_call('GeometryType', nil, options)} IN (?)",
+                types
+              ]
+            }
+          })
         end
 
         ZERO_ARGUMENT_MEASUREMENTS.each do |measurement|

data/lib/geos/google_maps/api_2.rb

@@ -1,6 +1,30 @@
 
 module Geos::GoogleMaps::Api2
   module Geometry
+    # Spit out Google's JSON geocoder Point format. The extra 0 is added
+    # on as Google's format seems to like including the Z coordinate.
+    def to_g_json_point_api2
+      {
+        :coordinates => (self.centroid.to_a << 0)
+      }
+    end
+
+    # Spit out Google's JSON geocoder ExtendedData LatLonBox format.
+    def to_g_lat_lon_box_api2
+      {
+        :north => self.north,
+        :east => self.east,
+        :south => self.south,
+        :west => self.west
+      }
+    end
+
+    # Spit out Google's toUrlValue format.
+    def to_g_url_value_api2(precision = 6)
+      c = self.centroid
+      "#{Geos::Helper.number_with_precision(c.lat, precision)},#{Geos::Helper.number_with_precision(c.lng, precision)}"
+    end
+
     # Returns a new GLatLngBounds object with the proper GLatLngs in place
     # for determining the geometry bounds.
     def to_g_lat_lng_bounds_api2(options = {})
@@ -15,7 +39,7 @@ module Geos::GoogleMaps::Api2
 
     # Returns a String in Google Maps' GLatLngBounds#toString() format.
     def to_g_lat_lng_bounds_string_api2(precision = 10)
-      "((#{self.lower_left.to_g_url_value_api2(precision)}), (#{self.upper_right.to_g_url_value_api2(precision)}))"
+      "((#{self.lower_left.to_g_url_value(precision)}), (#{self.upper_right.to_g_url_value(precision)}))"
     end
 
     # Returns a new GPolyline.

data/lib/geos/google_maps/api_3.rb

@@ -26,15 +26,44 @@ module Geos::GoogleMaps
   end
 
   module Api3::Geometry
+    # Spit out Google's JSON geocoder Point format. The extra 0 is added
+    # on as Google's format seems to like including the Z coordinate.
+    def to_g_json_point_api3
+      {
+        :coordinates => (self.centroid.to_a << 0)
+      }
+    end
+
+    # Spit out Google's JSON geocoder ExtendedData LatLonBox format.
+    def to_g_lat_lon_box_api3
+      {
+        :north => self.north,
+        :east => self.east,
+        :south => self.south,
+        :west => self.west
+      }
+    end
+
+    # Spit out Google's toUrlValue format.
+    def to_g_url_value_api3(precision = 6)
+      c = self.centroid
+      "#{Geos::Helper.number_with_precision(c.lat, precision)},#{Geos::Helper.number_with_precision(c.lng, precision)}"
+    end
+
     # Returns a new LatLngBounds object with the proper LatLngs in place
     # for determining the geometry bounds.
     def to_g_lat_lng_bounds_api3(options = {})
       "new google.maps.LatLngBounds(#{self.lower_left.to_g_lat_lng_api3(options)}, #{self.upper_right.to_g_lat_lng_api3(options)})"
     end
 
+    # Returns a bounds parameter for the Google Maps API 3 geocoder service.
+    def to_g_geocoder_bounds_api3(precision = 6)
+      "#{self.lower_left.to_g_url_value_api3(precision)}|#{self.upper_right.to_g_url_value_api3(precision)}"
+    end
+
     # Returns a String in Google Maps' LatLngBounds#toString() format.
     def to_g_lat_lng_bounds_string_api3(precision = 10)
-      "((#{self.lower_left.to_g_url_value_api3(precision)}), (#{self.upper_right.to_g_url_value_api3(precision)}))"
+      "((#{self.lower_left.to_g_url_value(precision)}), (#{self.upper_right.to_g_url_value(precision)}))"
     end
 
     # Returns a new Polyline.

data/lib/geos_extensions.rb

@@ -295,30 +295,6 @@ module Geos
     alias :w :left
     alias :west :left
 
-    # Spit out Google's JSON geocoder Point format. The extra 0 is added
-    # on as Google's format seems to like including the Z coordinate.
-    def to_g_json_point
-      {
-        :coordinates => (self.centroid.to_a << 0)
-      }
-    end
-
-    # Spit out Google's JSON geocoder ExtendedData LatLonBox format.
-    def to_g_lat_lon_box
-      {
-        :north => self.north,
-        :east => self.east,
-        :south => self.south,
-        :west => self.west
-      }
-    end
-
-    # Spit out Google's toUrlValue format.
-    def to_g_url_value(precision = 6)
-      c = self.centroid
-      "#{Geos::Helper.number_with_precision(c.lat, precision)},#{Geos::Helper.number_with_precision(c.lng, precision)}"
-    end
-
     # Spits out a bounding box the way Flickr likes it. You can set the
     # precision of the rounding using the :precision option. In order to
     # ensure that the box is indeed a box and not merely a point, the

data/test/geospatial_scopes_test.rb

@@ -67,6 +67,12 @@ if ENV['TEST_ACTIVERECORD']
       ids_tester(:st_dwithin, [ 'POINT(5 5)', 10 ], [ 1, 2, 3 ])
     end
 
+    def test_geometry_type
+      ids_tester(:st_geometry_type, 'ST_Point', [ 1, 2 ])
+      ids_tester(:st_geometry_type, [ 'ST_Point', 'ST_Polygon' ], [ 1, 2, 3 ])
+      ids_tester(:st_geometry_type, [ 'ST_MultiLineString' ], [])
+    end
+
     def test_allow_null
       begin
         foo = Foo.create(:name => 'four')

data/test/google_maps_api_2_test.rb

@@ -23,6 +23,11 @@ class GoogleMapsApi2Tests < Test::Unit::TestCase
     assert_equal("new GLatLng(10.01, 10.0)", @point.to_g_lat_lng(:short_class => true))
   end
 
+  def test_to_g_lat_lng_bounds_string
+    assert_equal('((10.0100000000,10.0000000000), (10.0100000000,10.0000000000))', @point.to_g_lat_lng_bounds_string)
+    assert_equal('((0.0000000000,0.0000000000), (5.0000000000,5.0000000000))', @polygon.to_g_lat_lng_bounds_string)
+  end
+
   def test_to_jsonable
     assert_equal({
       :type => "point",

data/test/google_maps_api_3_test.rb

@@ -23,6 +23,16 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
     assert_equal("new google.maps.LatLng(10.01, 10.0, true)", @point.to_g_lat_lng(:no_wrap => true))
   end
 
+  def test_to_g_lat_lng_bounds_string
+    assert_equal('((10.0100000000,10.0000000000), (10.0100000000,10.0000000000))', @point.to_g_lat_lng_bounds_string)
+    assert_equal('((0.0000000000,0.0000000000), (5.0000000000,5.0000000000))', @polygon.to_g_lat_lng_bounds_string)
+  end
+
+  def test_to_g_geocoder_bounds_api3
+    assert_equal('10.010000,10.000000|10.010000,10.000000', @point.to_g_geocoder_bounds)
+    assert_equal('0.000000,0.000000|5.000000,5.000000', @polygon.to_g_geocoder_bounds)
+  end
+
   def test_to_jsonable
     assert_equal({
       :type => "point",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-11 00:00:00.000000000Z
+date: 2011-07-12 00:00:00.000000000Z
 dependencies: []
 description: Extensions for the GEOS library.
 email: code@zoocasa.com