geos-extensions 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDdiYzQwZjU5MjYzNDMzNDI4ZGZjOTI5NmI0Yzc2NDJjOTYxNzE1Zg==
-  data.tar.gz: !binary |-
-    NDc0MWJiM2RmOTJiMzE5NTA2NGM3ZmZhMmQ3MDk1YWZjZTEwNmRkNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGM2NDQ3ODUzYTBkM2Y3OGViZGZkNWE3OTc2OTA4NWE1NTc3OTc5ZTM2MTZj
-    MGMwNDA0OTY2Nzg4MTQ5OWRiMDlkODYwMjc4ZDhlZmJjMTQxMjFjMjVkZTAx
-    MzRmYTFmNmY2ZTk2NTdjZTI3Zjc4NTFlNWI0Y2UzMWYyZjFkZDA=
-  data.tar.gz: !binary |-
-    YTkxYzA1NTMzYTdjNzU4NmFkZTY4YTEwNjM5MjhjYWE1MWMzNTJmOWM1MTNi
-    ZTE5YjJhZDU3MDY2M2JjMzUyZGIyYWQxM2E5OGM2MGNkZTRhMDQ1ZTVjYTc1
-    MDg4YjdhY2VjOWFkMzNjNzM4NWRjZjRiOTRlM2QxZTI5YmY2Yjc=
+SHA1:
+  metadata.gz: 4c33ac11ab83bfa9dad9078c5fbf3dce2f37b651
+  data.tar.gz: 7f0abba994f7b1027d06b9e7f08ed0959488e863
+SHA512:
+  metadata.gz: f2336461ca7276b8daa7ebe4c12093f8ef6998c2c9ac4df1120a69a0e05f2b7386586269a0c4f73f781731ed2871ace9d842d3cec7915063d354f16f7264ed4c
+  data.tar.gz: b4630e4ad25a59f061bc548f0d6097803ed42b7d4d703b4fe2607ca87c28b8bc74a7b2f73107a14edd03376e4b3dbd86086f483e24a08291591591c84a122b3a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
+Copyright (c) 2014 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/geos-extensions.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.description = "Extensions for the GEOS library."
   s.summary = s.description
   s.email = "code@zoocasa.com"
+  s.license = "MIT"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]

data/lib/geos/extensions/version.rb

@@ -1,7 +1,7 @@
 
 module Geos
   module Extensions
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end
 

data/lib/geos/google_maps/api_common.rb

@@ -26,6 +26,13 @@ module Geos
           c = self.centroid
           "#{Geos::Helper.number_with_precision(c.lat, precision)},#{Geos::Helper.number_with_precision(c.lng, precision)}"
         end
+        alias_method :to_g_url_value_point, :to_g_url_value
+
+        # Force to Google's toUrlValue as a set of bounds.
+        def to_g_url_value_bounds(precision = 6)
+          url_value = self.to_g_url_value(precision)
+          "#{url_value},#{url_value}"
+        end
       end
 
       module UrlValueBounds
@@ -34,6 +41,12 @@ module Geos
           e = self.envelope
           "#{e.southwest.to_g_url_value(precision)},#{e.northeast.to_g_url_value(precision)}"
         end
+        alias_method :to_g_url_value_bounds, :to_g_url_value
+
+        # Force to Google's toUrlValue as a point.
+        def to_g_url_value_point(precision = 6)
+          self.centroid.to_g_url_value(precision)
+        end
       end
     end
   end

data/test/google_maps_api_2_tests.rb

@@ -42,36 +42,106 @@ class GoogleMapsApi2Tests < MiniTest::Unit::TestCase
     assert_equal('10.010,10.000', @point.to_g_url_value(3))
   end
 
+  def test_to_g_url_value_point_bounds
+    assert_equal('10.010000,10.000000,10.010000,10.000000', @point.to_g_url_value_bounds)
+    assert_equal('10.010,10.000,10.010,10.000', @point.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_point_point
+    assert_equal('10.010000,10.000000', @point.to_g_url_value_point)
+    assert_equal('10.010,10.000', @point.to_g_url_value_point(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_polygon_bounds
+    assert_equal('0.000000,0.000000,2.500000,5.000000', @polygon.to_g_url_value_bounds)
+    assert_equal('0.000,0.000,2.500,5.000', @polygon.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_polygon_point
+    assert_equal('1.523810,2.023810', @polygon.to_g_url_value_point)
+    assert_equal('1.524,2.024', @polygon.to_g_url_value_point(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_line_string_bounds
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value_bounds)
+    assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_line_string_point
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value_point)
+    assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value_point(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_line_string_bounds
+    assert_equal('0.000000,0.000000,10.000000,10.000000', @multipoint.to_g_url_value_bounds)
+    assert_equal('0.000,0.000,10.000,10.000', @multipoint.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_line_string_point
+    assert_equal('5.000000,5.000000', @multipoint.to_g_url_value_point)
+    assert_equal('5.000,5.000', @multipoint.to_g_url_value_point(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_polygon_bounds
+    assert_equal('0.000000,0.000000,15.000000,15.000000', @multipolygon.to_g_url_value_bounds)
+    assert_equal('0.000,0.000,15.000,15.000', @multipolygon.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_multi_polygon_point
+    assert_equal('7.500000,7.500000', @multipolygon.to_g_url_value_point)
+    assert_equal('7.500,7.500', @multipolygon.to_g_url_value_point(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_g_url_value_multi_line_string_bounds
+    assert_equal('-20.000000,-20.000000,30.000000,30.000000', @multilinestring.to_g_url_value_bounds)
+    assert_equal('-20.000,-20.000,30.000,30.000', @multilinestring.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_multi_line_string_point
+    assert_equal('5.000000,5.000000', @multilinestring.to_g_url_value_point)
+    assert_equal('5.000,5.000', @multilinestring.to_g_url_value_point(3))
+  end
+
   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
 
+  def test_to_g_url_value_geometry_collection_bounds
+    assert_equal('0.000000,0.000000,14.000000,14.000000', @geometrycollection.to_g_url_value_bounds)
+    assert_equal('0.000,0.000,14.000,14.000', @geometrycollection.to_g_url_value_bounds(3))
+  end
+
+  def test_to_g_url_value_geometry_collection_point
+    assert_equal('6.712121,6.712121', @geometrycollection.to_g_url_value_point)
+    assert_equal('6.712,6.712', @geometrycollection.to_g_url_value_point(3))
+  end
+
   if defined?(JSON)
     def test_to_g_polygon
       assert_equal(

data/test/google_maps_api_3_tests.rb

@@ -42,41 +42,6 @@ class GoogleMapsApi3Tests < MiniTest::Unit::TestCase
     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_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 poly_tester(type, expected, poly)
       json = poly.gsub(/new google.maps.LatLng\(([^)]+)\)/, '[ \1 ]').gsub(/"map":\s*map/, %{"map": "map"})

data/test/google_maps_api_common_tests.rb

@@ -0,0 +1,148 @@
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+begin
+  require 'json'
+rescue LoadError
+  # do nothing
+end
+
+class GoogleMapsApiCommonTests
+  module Tests
+    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 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_point_bounds
+      assert_equal('10.010000,10.000000,10.010000,10.000000', @point.to_g_url_value_bounds)
+      assert_equal('10.010,10.000,10.010,10.000', @point.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_point_point
+      assert_equal('10.010000,10.000000', @point.to_g_url_value_point)
+      assert_equal('10.010,10.000', @point.to_g_url_value_point(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_polygon_bounds
+      assert_equal('0.000000,0.000000,2.500000,5.000000', @polygon.to_g_url_value_bounds)
+      assert_equal('0.000,0.000,2.500,5.000', @polygon.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_polygon_point
+      assert_equal('1.523810,2.023810', @polygon.to_g_url_value_point)
+      assert_equal('1.524,2.024', @polygon.to_g_url_value_point(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_line_string_bounds
+      assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value_bounds)
+      assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_line_string_point
+      assert_equal('0.000000,0.000000,10.000000,10.000000', @linestring.to_g_url_value_point)
+      assert_equal('0.000,0.000,10.000,10.000', @linestring.to_g_url_value_point(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_line_string_bounds
+      assert_equal('0.000000,0.000000,10.000000,10.000000', @multipoint.to_g_url_value_bounds)
+      assert_equal('0.000,0.000,10.000,10.000', @multipoint.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_line_string_point
+      assert_equal('5.000000,5.000000', @multipoint.to_g_url_value_point)
+      assert_equal('5.000,5.000', @multipoint.to_g_url_value_point(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_polygon_bounds
+      assert_equal('0.000000,0.000000,15.000000,15.000000', @multipolygon.to_g_url_value_bounds)
+      assert_equal('0.000,0.000,15.000,15.000', @multipolygon.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_multi_polygon_point
+      assert_equal('7.500000,7.500000', @multipolygon.to_g_url_value_point)
+      assert_equal('7.500,7.500', @multipolygon.to_g_url_value_point(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_g_url_value_multi_line_string_bounds
+      assert_equal('-20.000000,-20.000000,30.000000,30.000000', @multilinestring.to_g_url_value_bounds)
+      assert_equal('-20.000,-20.000,30.000,30.000', @multilinestring.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_multi_line_string_point
+      assert_equal('5.000000,5.000000', @multilinestring.to_g_url_value_point)
+      assert_equal('5.000,5.000', @multilinestring.to_g_url_value_point(3))
+    end
+
+    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
+
+    def test_to_g_url_value_geometry_collection_bounds
+      assert_equal('0.000000,0.000000,14.000000,14.000000', @geometrycollection.to_g_url_value_bounds)
+      assert_equal('0.000,0.000,14.000,14.000', @geometrycollection.to_g_url_value_bounds(3))
+    end
+
+    def test_to_g_url_value_geometry_collection_point
+      assert_equal('6.712121,6.712121', @geometrycollection.to_g_url_value_point)
+      assert_equal('6.712,6.712', @geometrycollection.to_g_url_value_point(3))
+    end
+  end
+
+  class Api2Tests < MiniTest::Unit::TestCase
+    include Tests
+
+    def setup
+      Geos::GoogleMaps.use_api(2)
+    end
+  end
+
+  class Api3Tests < MiniTest::Unit::TestCase
+    include Tests
+
+    def setup
+      Geos::GoogleMaps.use_api(3)
+    end
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: geos-extensions
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi-geos
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :runtime
-  prerelease: false
-  name: ffi-geos
 description: Extensions for the GEOS library.
 email: code@zoocasa.com
 executables: []
@@ -31,7 +31,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -61,6 +61,7 @@ files:
 - lib/geos_extensions.rb
 - test/google_maps_api_2_tests.rb
 - test/google_maps_api_3_tests.rb
+- test/google_maps_api_common_tests.rb
 - test/google_maps_polyline_encoder_tests.rb
 - test/helper_tests.rb
 - test/misc_tests.rb
@@ -69,7 +70,8 @@ files:
 - test/writer_tests.rb
 - test/yaml_tests.rb
 homepage: http://github.com/zoocasa/geos-extensions
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -77,23 +79,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extensions for the GEOS library.
 test_files:
 - test/google_maps_api_2_tests.rb
 - test/google_maps_api_3_tests.rb
+- test/google_maps_api_common_tests.rb
 - test/google_maps_polyline_encoder_tests.rb
 - test/helper_tests.rb
 - test/misc_tests.rb