geos-extensions 0.2.2 → 0.3.0

data/test/google_maps_api_2_tests.rb

@@ -8,14 +8,23 @@ rescue LoadError
   # do nothing
 end
 
-class GoogleMapsApi2Tests < Test::Unit::TestCase
+class GoogleMapsApi2Tests < MiniTest::Unit::TestCase
   include TestHelper
 
+  def initialize(*args)
+    @point = Geos.read(POINT_WKT)
+    @polygon = Geos.read(POLYGON_WKT)
+    @linestring = Geos.read(LINESTRING_WKT)
+    @multipoint = Geos.read(MULTIPOINT_WKT)
+    @multipolygon = Geos.read(MULTIPOLYGON_WKT)
+    @multilinestring = Geos.read(MULTILINESTRING_WKT)
+    @geometrycollection = Geos.read(GEOMETRYCOLLECTION_WKT)
+
+    super
+  end
+
   def setup
     Geos::GoogleMaps.use_api(2)
-
-    @point = Geos.read(POINT_EWKB)
-    @polygon = Geos.read(POLYGON_EWKB)
   end
 
   def test_to_g_lat_lng
@@ -25,45 +34,58 @@ class GoogleMapsApi2Tests < Test::Unit::TestCase
 
   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)
+    assert_equal('((0.0000000000,0.0000000000), (2.5000000000,5.0000000000))', @polygon.to_g_lat_lng_bounds_string)
+  end
+
+  def test_to_g_url_value_point
+    assert_equal('10.010000,10.000000', @point.to_g_url_value)
+    assert_equal('10.010,10.000', @point.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_polygon
+    assert_equal('0.000000,0.000000,2.500000,5.000000', @polygon.to_g_url_value)
+    assert_equal('0.000,0.000,2.500,5.000', @polygon.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_line_string
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value)
+    assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_point
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @multipoint.to_g_url_value)
+    assert_equal('0.000,0.000,10.000,10.000', @multipoint.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_polygon
+    assert_equal('0.000000,0.000000,15.000000,15.000000', @multipolygon.to_g_url_value)
+    assert_equal('0.000,0.000,15.000,15.000', @multipolygon.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_line_string
+    assert_equal('-20.000000,-20.000000,30.000000,30.000000', @multilinestring.to_g_url_value)
+    assert_equal('-20.000,-20.000,30.000,30.000', @multilinestring.to_g_url_value(3))
   end
 
-  def test_to_jsonable
-    assert_equal({
-      :type => "point",
-      :lat => 10.01,
-      :lng => 10.0
-    }, @point.to_jsonable)
-
-    assert_equal({
-      :type => "polygon",
-      :polylines => [{
-        :points => "??_ibE_ibE_~cH_~cH_hgN_hgN~po]~po]",
-        :bounds => {
-          :sw => [ 0.0, 0.0 ],
-          :ne => [ 5.0, 5.0 ]
-        },
-        :levels=>"BBBBB"
-      }],
-      :options => {},
-      :encoded => true
-    }, @polygon.to_jsonable)
+  def test_to_g_url_value_geometry_collection
+    assert_equal('0.000000,0.000000,14.000000,14.000000', @geometrycollection.to_g_url_value)
+    assert_equal('0.000,0.000,14.000,14.000', @geometrycollection.to_g_url_value(3))
   end
 
   if defined?(JSON)
     def test_to_g_polygon
       assert_equal(
-        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null, null, null)",
+        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 0.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(2.5, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null, null, null)",
         @polygon.to_g_polygon
       )
 
       assert_equal(
-        "new GPolygon([new GLatLng(0.0, 0.0), new GLatLng(1.0, 1.0), new GLatLng(2.5, 2.5), new GLatLng(5.0, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null, null, null)",
+        "new GPolygon([new GLatLng(0.0, 0.0), new GLatLng(1.0, 0.0), new GLatLng(2.5, 2.5), new GLatLng(2.5, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null, null, null)",
         @polygon.to_g_polygon({}, :short_class => true)
       )
 
       assert_equal(
-        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, '#b00b1e', null, {\"mouseOutTolerence\":5})",
+        "new google.maps.Polygon([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 0.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(2.5, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, '#b00b1e', null, {\"mouseOutTolerence\":5})",
         @polygon.to_g_polygon(
           :stroke_color => '#b00b1e',
           :stroke_weight => 5,
@@ -78,17 +100,17 @@ class GoogleMapsApi2Tests < Test::Unit::TestCase
 
     def test_to_g_polyline
       assert_equal(
-        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null)",
+        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 0.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(2.5, 5.0), new google.maps.LatLng(0.0, 0.0)], null, null, null, null)",
         @polygon.to_g_polyline
       )
 
       assert_equal(
-        "new GPolyline([new GLatLng(0.0, 0.0), new GLatLng(1.0, 1.0), new GLatLng(2.5, 2.5), new GLatLng(5.0, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null)",
+        "new GPolyline([new GLatLng(0.0, 0.0), new GLatLng(1.0, 0.0), new GLatLng(2.5, 2.5), new GLatLng(2.5, 5.0), new GLatLng(0.0, 0.0)], null, null, null, null)",
         @polygon.to_g_polyline({}, :short_class => true)
       )
 
       assert_equal(
-        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 1.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(5.0, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, {\"mouseOutTolerence\":5})",
+        "new google.maps.Polyline([new google.maps.LatLng(0.0, 0.0), new google.maps.LatLng(1.0, 0.0), new google.maps.LatLng(2.5, 2.5), new google.maps.LatLng(2.5, 5.0), new google.maps.LatLng(0.0, 0.0)], '#b00b1e', 5, 0.5, {\"mouseOutTolerence\":5})",
         @polygon.to_g_polyline(
           :color => '#b00b1e',
           :weight => 5,
@@ -182,7 +204,7 @@ class GoogleMapsApi2Tests < Test::Unit::TestCase
 
     def test_to_g_lat_lon_box
       assert_equal(
-        { :east => 5.0, :west => 0.0, :north => 5.0, :south => 0.0},
+        { :east => 5.0, :west => 0.0, :north => 2.5, :south => 0.0},
         @polygon.to_g_lat_lon_box
       )
     end

data/test/google_maps_api_3_tests.rb

@@ -8,14 +8,23 @@ rescue LoadError
   # do nothing
 end
 
-class GoogleMapsApi3Tests < Test::Unit::TestCase
+class GoogleMapsApi3Tests < MiniTest::Unit::TestCase
   include TestHelper
 
+  def initialize(*args)
+    @point = Geos.read(POINT_WKT)
+    @polygon = Geos.read(POLYGON_WKT)
+    @linestring = Geos.read(LINESTRING_WKT)
+    @multipoint = Geos.read(MULTIPOINT_WKT)
+    @multipolygon = Geos.read(MULTIPOLYGON_WKT)
+    @multilinestring = Geos.read(MULTILINESTRING_WKT)
+    @geometrycollection = Geos.read(GEOMETRYCOLLECTION_WKT)
+
+    super
+  end
+
   def setup
     Geos::GoogleMaps.use_api(3)
-
-    @point = Geos.read(POINT_EWKB)
-    @polygon = Geos.read(POLYGON_EWKB)
   end
 
   def test_to_g_lat_lng
@@ -25,34 +34,47 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
 
   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)
+    assert_equal('((0.0000000000,0.0000000000), (2.5000000000,5.0000000000))', @polygon.to_g_lat_lng_bounds_string)
   end
 
-  def test_to_g_geocoder_bounds_api3
+  def test_to_g_geocoder_bounds
     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)
+    assert_equal('0.000000,0.000000|2.500000,5.000000', @polygon.to_g_geocoder_bounds)
+  end
+
+  def test_to_g_url_value_point
+    assert_equal('10.010000,10.000000', @point.to_g_url_value)
+    assert_equal('10.010,10.000', @point.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_polygon
+    assert_equal('0.000000,0.000000,2.500000,5.000000', @polygon.to_g_url_value)
+    assert_equal('0.000,0.000,2.500,5.000', @polygon.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_line_string
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value)
+    assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_point
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @multipoint.to_g_url_value)
+    assert_equal('0.000,0.000,10.000,10.000', @multipoint.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_polygon
+    assert_equal('0.000000,0.000000,15.000000,15.000000', @multipolygon.to_g_url_value)
+    assert_equal('0.000,0.000,15.000,15.000', @multipolygon.to_g_url_value(3))
+  end
+
+  def test_to_g_url_value_multi_line_string
+    assert_equal('-20.000000,-20.000000,30.000000,30.000000', @multilinestring.to_g_url_value)
+    assert_equal('-20.000,-20.000,30.000,30.000', @multilinestring.to_g_url_value(3))
   end
 
-  def test_to_jsonable
-    assert_equal({
-      :type => "point",
-      :lat => 10.01,
-      :lng => 10.0
-    }, @point.to_jsonable)
-
-    assert_equal({
-      :type => "polygon",
-      :polylines => [{
-        :points => "??_ibE_ibE_~cH_~cH_hgN_hgN~po]~po]",
-        :bounds => {
-          :sw => [ 0.0, 0.0 ],
-          :ne => [ 5.0, 5.0 ]
-        },
-        :levels=>"BBBBB"
-      }],
-      :options => {},
-      :encoded => true
-    }, @polygon.to_jsonable)
+  def test_to_g_url_value_geometry_collection
+    assert_equal('0.000000,0.000000,14.000000,14.000000', @geometrycollection.to_g_url_value)
+    assert_equal('0.000,0.000,14.000,14.000', @geometrycollection.to_g_url_value(3))
   end
 
   if defined?(JSON)
@@ -67,7 +89,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
     def test_to_g_polygon
       poly_tester('Polygon', {
         "paths" => [
-          [0.0, 0.0], [1.0, 1.0], [2.5, 2.5], [5.0, 5.0], [0.0, 0.0]
+          [0.0, 0.0], [1.0, 0.0], [2.5, 2.5], [2.5, 5.0], [0.0, 0.0]
         ]
       }, @polygon.to_g_polygon)
 
@@ -78,11 +100,11 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
         'fillColor' => '#b00b1e',
         'map' => 'map',
         'paths' => [
-          [ 0.0, 0.0 ],
-          [ 1.0, 1.0 ],
-          [ 2.5, 2.5 ],
-          [ 5.0, 5.0 ],
-          [ 0.0, 0.0 ]
+          [0.0, 0.0],
+          [1.0, 0.0],
+          [2.5, 2.5],
+          [2.5, 5.0],
+          [0.0, 0.0]
         ]
       }, @polygon.to_g_polygon(
         :stroke_color => '#b00b1e',
@@ -169,7 +191,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
     def test_to_g_polyline
       poly_tester("Polyline", {
         "path" => [
-          [0.0, 0.0], [1.0, 1.0], [2.5, 2.5], [5.0, 5.0], [0.0, 0.0]
+          [0.0, 0.0], [1.0, 0.0], [2.5, 2.5], [2.5, 5.0], [0.0, 0.0]
         ]
       }, @polygon.to_g_polyline)
 
@@ -179,7 +201,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
         "strokeOpacity" => 0.5,
         "map" => "map",
         "path" => [
-          [0.0, 0.0], [1.0, 1.0], [2.5, 2.5], [5.0, 5.0], [0.0, 0.0]
+          [0.0, 0.0], [1.0, 0.0], [2.5, 2.5], [2.5, 5.0], [0.0, 0.0]
         ]
       }, @polygon.to_g_polyline(
         :stroke_color => '#b00b1e',
@@ -241,7 +263,7 @@ class GoogleMapsApi3Tests < Test::Unit::TestCase
 
     def test_to_g_lat_lon_box
       assert_equal(
-        { :east => 5.0, :west => 0.0, :north => 5.0, :south => 0.0},
+        { :east => 5.0, :west => 0.0, :north => 2.5, :south => 0.0},
         @polygon.to_g_lat_lon_box
       )
     end

data/test/google_maps_polyline_encoder_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class GoogleMapsPolylineEncoderTests < Test::Unit::TestCase
+class GoogleMapsPolylineEncoderTests < MiniTest::Unit::TestCase
   include TestHelper
 
   ENCODED = '_p~iF~ps|U_ulLnnqC_mqNvxq`@'

data/test/helper_tests.rb

@@ -0,0 +1,28 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+class HelperTests
+  class ArrayWrapTests < MiniTest::Unit::TestCase
+    include TestHelper
+
+    def test_array
+      ary = %w(foo bar)
+      assert_same ary, Geos::Helper.array_wrap(ary)
+    end
+
+    def test_nil
+      assert_equal [], Geos::Helper.array_wrap(nil)
+    end
+
+    def test_object
+      o = Object.new
+      assert_equal [ o ], Geos::Helper.array_wrap(o)
+    end
+
+    def test_string
+      assert_equal [ "foo" ], Geos::Helper.array_wrap("foo")
+    end
+  end
+end
+

data/test/misc_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class GeosMiscTests < Test::Unit::TestCase
+class GeosMiscTests < MiniTest::Unit::TestCase
   include TestHelper
 
   def initialize(*args)
@@ -15,25 +15,55 @@ class GeosMiscTests < Test::Unit::TestCase
     g.to_wkt(:rounding_precision => 0)
   end
 
+  def test_sanity_of_test_geometries
+    %w{
+      POINT_WKT
+      POINT_EWKT
+      POINT_WKB
+      POINT_WKB_BIN
+      POINT_EWKB
+      POINT_EWKB_BIN
+      POINT_G_LAT_LNG
+      POINT_G_LAT_LNG_URL_VALUE
+      POLYGON_WKT
+      POLYGON_EWKT
+      POLYGON_WKB
+      POLYGON_WKB_BIN
+      POLYGON_EWKB
+      POLYGON_EWKB_BIN
+      POLYGON_WITH_INTERIOR_RING
+      LINESTRING_WKT
+      GEOMETRYCOLLECTION_WKT
+      MULTIPOINT_WKT
+      MULTIPOLYGON_WKT
+      MULTILINESTRING_WKT
+      BOUNDS_G_LAT_LNG
+      BOUNDS_G_LAT_LNG_URL_VALUE
+    }.each do |constant_name|
+      geom = Geos.read(self.class.const_get(constant_name))
+      assert_equal("Valid Geometry", geom.valid_reason)
+    end
+  end
+
   def test_upper_left
-    assert_equal('POINT (0 5)', write(@polygon.upper_left))
+    assert_equal('POINT (0 2)', write(@polygon.upper_left))
     assert_equal('POINT (10 10)', write(@point.upper_left))
 
-    assert_equal('POINT (0 5)', write(@polygon.northwest))
+    assert_equal('POINT (0 2)', write(@polygon.northwest))
     assert_equal('POINT (10 10)', write(@point.northwest))
 
-    assert_equal('POINT (0 5)', write(@polygon.nw))
+    assert_equal('POINT (0 2)', write(@polygon.nw))
     assert_equal('POINT (10 10)', write(@point.nw))
   end
 
   def test_upper_right
-    assert_equal('POINT (5 5)', write(@polygon.upper_right))
+    assert_equal('POINT (5 2)', write(@polygon.upper_right))
     assert_equal('POINT (10 10)', write(@point.upper_right))
 
-    assert_equal('POINT (5 5)', write(@polygon.northeast))
+    assert_equal('POINT (5 2)', write(@polygon.northeast))
     assert_equal('POINT (10 10)', write(@point.northeast))
 
-    assert_equal('POINT (5 5)', write(@polygon.ne))
+    assert_equal('POINT (5 2)', write(@polygon.ne))
     assert_equal('POINT (10 10)', write(@point.ne))
   end
 
@@ -60,13 +90,13 @@ class GeosMiscTests < Test::Unit::TestCase
   end
 
   def test_top
-    assert_equal(5.0, @polygon.top)
+    assert_equal(2.5, @polygon.top)
     assert_equal(10.01, @point.top)
 
-    assert_equal(5.0, @polygon.north)
+    assert_equal(2.5, @polygon.north)
     assert_equal(10.01, @point.north)
 
-    assert_equal(5.0, @polygon.n)
+    assert_equal(2.5, @polygon.n)
     assert_equal(10.01, @point.n)
   end
 
@@ -102,4 +132,94 @@ class GeosMiscTests < Test::Unit::TestCase
     assert_equal(5.0, @polygon.e)
     assert_equal(10.0, @point.e)
   end
+
+  def test_lat_lng
+    linestring = Geos.read('LINESTRING(0 0, 20 25)')
+
+    %w{
+      lat_lng
+      latlng
+      latlong
+      lat_lon
+      latlon
+    }.each do |m|
+      assert_equal([ 10.01, 10.0 ], @point.send(m))
+      assert_equal([ 12.5, 10.0 ], linestring.envelope.send(m))
+    end
+  end
+
+  def test_lng_lat
+    linestring = Geos.read('LINESTRING(0 0, 20 25)')
+
+    %w{
+      long_lat
+      lnglat
+      longlat
+      lon_lat
+      lonlat
+    }.each do |m|
+      assert_equal([ 10.0, 10.01 ], @point.send(m))
+      assert_equal([ 10.0, 12.5 ], linestring.envelope.send(m))
+    end
+  end
+
+  def test_to_bbox_with_point
+    point_bbox = @point.to_bbox
+
+    assert_equal(10.01, point_bbox[:north])
+    assert_equal(10.0, point_bbox[:east])
+    assert_equal(10.01, point_bbox[:south])
+    assert_equal(10, point_bbox[:west])
+  end
+
+  def test_to_bbox_with_point_with_explicit_long_names
+    point_bbox = @point.to_bbox(:long)
+
+    assert_equal(10.01, point_bbox[:north])
+    assert_equal(10.0, point_bbox[:east])
+    assert_equal(10.01, point_bbox[:south])
+    assert_equal(10, point_bbox[:west])
+  end
+
+  def test_to_bbox_with_point_with_short_names
+    point_bbox = @point.to_bbox(:short)
+
+    assert_equal(10.01, point_bbox[:n])
+    assert_equal(10.0, point_bbox[:e])
+    assert_equal(10.01, point_bbox[:s])
+    assert_equal(10, point_bbox[:w])
+  end
+
+  def test_to_bbox_with_polygon
+    polygon_bbox = @polygon.to_bbox
+
+    assert_equal(2.5, polygon_bbox[:north])
+    assert_equal(5.0, polygon_bbox[:east])
+    assert_equal(0, polygon_bbox[:south])
+    assert_equal(0, polygon_bbox[:west])
+  end
+
+  def test_to_bbox_with_polygon_explicit_long_names
+    polygon_bbox = @polygon.to_bbox(:long)
+
+    assert_equal(2.5, polygon_bbox[:north])
+    assert_equal(5.0, polygon_bbox[:east])
+    assert_equal(0, polygon_bbox[:south])
+    assert_equal(0, polygon_bbox[:west])
+  end
+
+  def test_to_bbox_with_polygon_with_short_names
+    polygon_bbox = @polygon.to_bbox(:short)
+
+    assert_equal(2.5, polygon_bbox[:n])
+    assert_equal(5.0, polygon_bbox[:e])
+    assert_equal(0, polygon_bbox[:s])
+    assert_equal(0, polygon_bbox[:w])
+  end
+
+  def test_to_bbox_with_invalid_long_or_short_value
+    assert_raises(ArgumentError) do
+      @point.to_bbox(:blart)
+    end
+  end
 end