georuby-ext 0.0.1 → 0.0.2

data/.jrubyrc

@@ -0,0 +1 @@
+compat.version=1.8

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - jruby-18mode
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
+matrix:
+  exclude: 
+    - rvm:  1.8.7
+      jdk: openjdk7
+    - rvm:  1.9.3
+      jdk: openjdk7
+    - rvm:  1.8.7
+      jdk: oraclejdk7
+    - rvm:  1.9.3
+      jdk: oraclejdk7
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install libproj-dev libgeos-dev libffi-dev libsparsehash-dev
+script: "rake spec"

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in georuby-ext.gemspec
 gemspec
+
+group :development do
+  gem 'rb-inotify', ">= 0.8.8", :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'libnotify', ">= 0.8.0", :require => RUBY_PLATFORM.include?('linux') && 'libnotify'
+  gem 'rb-fsevent', ">= 0.9.3", :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+end

data/Guardfile

@@ -6,8 +6,18 @@ guard 'bundler' do
   watch(/^.+\.gemspec/)
 end
 
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :notification => false do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,4 +1,4 @@
-== georuby-ext
+== Georuby-ext {<img src="https://travis-ci.org/dryade/georuby-ext.png?branch=master" alt="Build Status" />}[https://travis-ci.org/dryade/georuby-ext] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/dryade/georuby-ext]
 
 georuby-ext is an extension to Ruby geometry libraries
 
@@ -8,30 +8,4 @@ GeoRuby, rgeo, geokit, proj4j (...) are nice ruby libraries which cover the same
 
 === License
 
-Copyright 2011 Dryade SAS
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of the copyright holder, nor the names of any other
-  contributors to this software, may be used to endorse or promote products
-  derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+This project uses MIT-LICENSE.

data/georuby-ext.gemspec

@@ -3,15 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "georuby-ext"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Marc Florisson", "Luc Donnet", "Alban Peignier"]
-  s.email       = ["marc@dryade.net", "luc@dryade.net", "alban@dryade.net"]
+  s.email       = ["mflorisson@cityway.fr", "ldonnet@cityway.fr", "alban@tryphon.eu"]
   s.homepage    = "http://github.com/dryade/georuby-ext"
   s.summary     = %q{Extension to Ruby geometry libraries}
   s.description = %q{Use together GeoRuby, rgeo, geokit, proj4j (and others)}
 
-  s.rubyforge_project = "georuby-ext"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -19,13 +17,18 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
-  s.add_development_dependency "guard"
-  s.add_development_dependency "rcov"
+  s.add_development_dependency "guard", ">= 1.3.3"  
+  s.add_development_dependency "guard-rspec"      
+  s.add_development_dependency "guard-bundler"
 
-  s.add_runtime_dependency "GeoRuby"
-  s.add_runtime_dependency "geokit"
-  s.add_runtime_dependency "rgeo"
-  s.add_runtime_dependency "proj4rb"
+  s.add_dependency "georuby", "1.9.8"  
+  s.add_dependency "dbf"
+  s.add_dependency "nokogiri"      
+  s.add_dependency "geokit"
+  s.add_dependency "rgeo", "0.3.20"  
+  s.add_dependency "json_pure"
+  s.add_dependency "ffi-geos", "0.1.1" 
+  s.add_dependency "dr-ffi-proj4", "0.0.1" 
 
-  s.add_runtime_dependency "activesupport"
+  s.add_dependency "activesupport"
 end

data/lib/georuby-ext.rb

@@ -1,17 +1,32 @@
+require 'ffi-proj4'
 require 'geo_ruby'
 require 'geokit'
 require 'rgeo'
-require 'proj4'
 
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
+require 'active_support/deprecation'
+require 'active_support/memoizable'
+
+require 'georuby-ext/core_ext'
+
+require 'georuby-ext/rgeo/feature/geometry'
+require 'georuby-ext/rgeo/feature/geometry_collection'
+require 'georuby-ext/rgeo/geos/ffi_feature_methods'
 
-require 'georuby-ext/rgeo'
 require 'georuby-ext/geokit'
 require 'georuby-ext/proj4'
 
+require 'georuby-ext/georuby/rtree'
+require 'georuby-ext/georuby/srid'
+require 'georuby-ext/georuby/geometry'
 require 'georuby-ext/georuby/point'
 require 'georuby-ext/georuby/line_string'
+require 'georuby-ext/georuby/linear_ring'
 require 'georuby-ext/georuby/polygon'
 require 'georuby-ext/georuby/multi_polygon'
 require 'georuby-ext/georuby/envelope'
 require 'georuby-ext/georuby/locators'
+
+require 'georuby-ext/georuby/ewkt_parser'

data/lib/georuby-ext/core_ext.rb

@@ -0,0 +1,11 @@
+class Numeric
+
+  def deg2rad
+    to_f / 180.0 * Math::PI
+  end
+
+  def rad2deg
+    to_f * 180.0 / Math::PI 
+  end
+
+end

data/lib/georuby-ext/geokit.rb

@@ -2,15 +2,22 @@ module GeoKit
   class LatLng
 
     def valid?
-      self.lat and self.lng
+      self.lat and self.lng and
+        self.lat >= -90 and self.lat <= 90 and
+        self.lng >= -180 and self.lng <= 180
     end
 
+    # DEPRECATED
+    # Use Point geometry which supports srid
+
     def wgs84_to_google
-      self.class.from_pro4j Proj4::Projection.wgs84.transform Proj4::Projection.google, self.proj4_point(Math::PI / 180)
+      ActiveSupport::Deprecation.warn "use Point geometry which supports srid"
+      self.class.from_pro4j Proj4::Projection.wgs84.transform Proj4::Projection.google, self.proj4_point(Math::PI / 180).x, self.proj4_point(Math::PI / 180).y
     end
 
     def google_to_wgs84
-      self.class.from_pro4j Proj4::Projection.google.transform(Proj4::Projection.wgs84, self.proj4_point), 180 / Math::PI  
+      ActiveSupport::Deprecation.warn "use Point geometry which supports srid"
+      self.class.from_pro4j Proj4::Projection.google.transform(Proj4::Projection.wgs84, self.proj4_point.x, self.proj4_point.y), 180 / Math::PI 
     end
 
     def proj4_point(ratio = 1)

data/lib/georuby-ext/georuby/envelope.rb

@@ -1,10 +1,45 @@
 class GeoRuby::SimpleFeatures::Envelope
+
+  def contains_point?(point)
+    (lower_corner.x...upper_corner.x).include?(point.x) and
+      (lower_corner.y...upper_corner.y).include?(point.y) 
+  end
+
+  def overlaps?(bound)
+    contains_point?(bound.upper_corner) or contains_point?(bound.lower_corner) or bound.contains_point?(upper_corner) or bound.contains_point?(lower_corner)   
+  end
+
+  def self.bounds(geometries)
+    return nil if geometries.blank?
+
+    geometries.inject(geometries.first.envelope) do |envelope, geometry|
+      envelope.extend!(geometry.envelope)
+    end
+  end
+
+  alias_method :contains?, :contains_point?
+
+  def sql_box
+    "SetSRID('BOX3D(#{upper_corner.lng} #{upper_corner.lat}, #{lower_corner.lng} #{lower_corner.lat})'::box3d, #{srid})"
+  end
+
+  alias_method :to_sql, :sql_box
+
   def to_openlayers
     OpenLayers::Bounds.new lower_corner.x, lower_corner.y, upper_corner.x, upper_corner.y
   end
 
   def to_google
-    Envelope.from_points [lower_corner.to_google, upper_corner.to_google],srid, with_z
+    GeoRuby::SimpleFeatures::Envelope.from_points [lower_corner.to_google, upper_corner.to_google], 900913, with_z
+  end
+
+  def to_polygon
+    GeoRuby::SimpleFeatures::Polygon.from_coordinates( [ [ [lower_corner.x, lower_corner.y], [lower_corner.x, upper_corner.y], [upper_corner.x, upper_corner.y], [upper_corner.x, lower_corner.y] ] ] ) 
+  end
+
+  def to_rgeo
+    self.to_polygon.to_rgeo
   end
+
 end
       

data/lib/georuby-ext/georuby/ewkb_parser.rb

@@ -0,0 +1,11 @@
+class GeoRuby::SimpleFeatures::EWKBParser
+
+  private
+
+  def parse_linear_ring_with_close_support
+    parse_linear_ring_without_close_support 
+    @factory.geometry.close!
+  end
+  alias_method_chain :parse_linear_ring, :close_support
+
+end

data/lib/georuby-ext/georuby/ewkt_parser.rb

@@ -0,0 +1,11 @@
+class GeoRuby::SimpleFeatures::EWKTParser
+
+  private
+
+  def parse_linear_ring_with_close_support
+    parse_linear_ring_without_close_support 
+    @factory.geometry.close!
+  end
+  alias_method_chain :parse_linear_ring, :close_support
+
+end

data/lib/georuby-ext/georuby/geometry.rb

@@ -1,9 +1,53 @@
-module GeoRuby::SimpleFeatures::Geometry
+class GeoRuby::SimpleFeatures::Geometry
 
   def inspect
-    "#<#{self.class}:#{object_id} \"#{as_ewkt}>\""
+    "#<#{self.class}:#{object_id} \"#{to_ewkt}>\""
   end
   
   alias_method :to_ewkt, :as_ewkt
 
+  def wgs84?
+    srid == 4326
+  end
+
+  def to_wgs84
+    project_to 4326
+  end
+
+  def to_google
+    project_to 900913
+  end
+
+  def to_geometry
+    self
+  end
+
+  def self.srid!(geometries)
+    geometries.first.srid.tap do |srid|
+      raise "SRIDs are not uniq in #{geometries.inspect}" if geometries.any? { |geometry| geometry.srid != srid }
+    end unless geometries.blank?
+  end
+
+  def srid_instance
+    @srid_instance ||= GeoRuby::SimpleFeatures::Srid.new(srid)
+  end
+  delegate :rgeo_factory, :to => :srid_instance
+
+  alias_method :bounds, :envelope
+
+  def self.to_kml(*geometries)
+    <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+    <Document>
+      <Placemark>
+      <MultiGeometry>
+      #{geometries.map(&:kml_representation).join("\n")}
+      </MultiGeometry>
+    </Placemark>
+    </Document>
+</kml>
+EOF
+  end
+
 end

data/lib/georuby-ext/georuby/line_string.rb

@@ -12,30 +12,42 @@ class GeoRuby::SimpleFeatures::LineString
     change :points => points.reverse
   end
 
-  def to_wgs84
-    change :points => points.map(&:to_wgs84), :srid => 4326
+  def project_to(target_srid)
+    return self if srid == target_srid
+    change :points => points.map { |point| point.project_to(target_srid) }, :srid => target_srid
   end
 
   def self.merge(lines)
+    # FIXME flatten.uniq can break crossing lines
     merged_points = lines.map(&:points).flatten.uniq
     if merged_points.size > 1
-      from_points merged_points, lines.first.srid, lines.first.with_z, lines.first.with_m
+      from_points merged_points, srid!(lines), lines.first.with_z, lines.first.with_m
     end
   end
   
   def to_rgeo
-    RGeo::Geos::factory(:srid => srid).line_string(points.collect(&:to_rgeo))
+    rgeo_factory.line_string(points.collect(&:to_rgeo))
+   end
+
+  def side_count
+    size - 1
   end
 
   def ==(other)
     other.respond_to?(:points) and points == other.points
   end
 
-  alias_method :closed?, :is_closed
+  def close!
+    points << points.first unless closed?
+    self
+  end
 
   def to_ring
-    ring_points = closed? ? points : points + [first]
-    GeoRuby::SimpleFeatures::LinearRing.from_points ring_points, srid, with_z, with_m
+    GeoRuby::SimpleFeatures::LinearRing.from_points points, srid, with_z, with_m
+  end
+
+  def to_kml
+    GeoRuby::SimpleFeatures::Geometry.to_kml self
   end
 
 end

data/lib/georuby-ext/georuby/linear_ring.rb

@@ -0,0 +1,15 @@
+class GeoRuby::SimpleFeatures::LinearRing
+
+  class << self
+    def from_points_with_close_support(*arguments)
+      from_points_without_close_support(*arguments).close!
+    end
+    alias_method_chain :from_points, :close_support
+
+    def from_coordinates_with_close_support(*arguments)
+      from_coordinates_without_close_support(*arguments).close!
+    end
+    alias_method_chain :from_coordinates, :close_support
+  end
+
+end

data/lib/georuby-ext/georuby/locators.rb

@@ -1,6 +1,3 @@
-require 'active_support/memoizable'
-require 'active_support/core_ext/module/delegation'
-
 class GeoRuby::SimpleFeatures::MultiLineString
 
   alias_method :lines, :geometries
@@ -12,7 +9,9 @@ class GeoRuby::SimpleFeatures::MultiLineString
 
   def interpolate_point(location)
     line_index, line_location = location.to_i, location % 1
-    lines[line_index].interpolate_point(line_location)
+    if line = lines[line_index]
+      line.interpolate_point(line_location)
+    end
   end
 
   def nearest_locator(target)
@@ -56,7 +55,7 @@ end
 class GeoRuby::SimpleFeatures::LineString
 
   def locate_point(target)
-    distance_on_line(target) / distance
+    distance_on_line(target) / spherical_distance
   end
 
   def distance_on_line(target)
@@ -76,14 +75,17 @@ class GeoRuby::SimpleFeatures::LineString
     segments.collect { |segment| segment.locator(point) }
   end
 
-  def segments
+  def segments_without_cache
     previous_point = nil
     distance_from_departure = 0
 
+    
     points.inject([]) do |segments, point|
       Segment.new(previous_point, point).tap do |segment|
         segment.line = self
-        segment.line_distance_at_departure = segments.sum(&:distance)
+        segment.line_distance_at_departure = distance_from_departure
+
+        distance_from_departure += segment.distance
         
         segments << segment
       end if previous_point
@@ -93,15 +95,16 @@ class GeoRuby::SimpleFeatures::LineString
     end
   end
 
-  def distance
-    segments.sum(&:distance)
+  def segments_with_cache
+    @segments ||= segments_without_cache
   end
+  alias_method :segments, :segments_with_cache
 
   def interpolate_point(location)
     return points.last if location >= 1
     return points.first if location <= 0
 
-    distance_on_line = location * distance
+    distance_on_line = location * spherical_distance
 
     segment = segments.find do |segment|
       segment.line_distance_at_arrival > distance_on_line
@@ -138,11 +141,11 @@ class GeoRuby::SimpleFeatures::LineString
     end
 
     def square_of_distance
-      (arrival.x - departure.x)**2 + (arrival.y - departure.y)**2
+      distance**2
     end
 
     def distance
-      departure.euclidian_distance(arrival)
+      @distance ||= departure.spherical_distance(arrival)
     end
 
     def to_s
@@ -177,6 +180,8 @@ class GeoRuby::SimpleFeatures::LineString
     end
 
     def distance_from_segment
+      return 0 if [segment.departure, segment.arrival].include?(target)
+        
       sin_angle * target_distance_from_departure
     end
 
@@ -190,8 +195,16 @@ class GeoRuby::SimpleFeatures::LineString
       scalar_product / square_of_segment_distance
     end
 
+    # def scalar_product
+    #   (target.x-departure.x)*(arrival.x-departure.x) + (target.y-departure.y)*(arrival.y-departure.y).to_f
+    # end
+
     def scalar_product
-      (target.x-departure.x)*(arrival.x-departure.x) + (target.y-departure.y)*(arrival.y-departure.y).to_f
+      departure_target_metric_delta = departure.metric_delta(target)
+      departure_arrival_metric_delta = departure.metric_delta(arrival)
+
+      departure_target_metric_delta[0]*departure_arrival_metric_delta[0] +
+        departure_target_metric_delta[1]*departure_arrival_metric_delta[1]
     end
     memoize :scalar_product
 
@@ -204,20 +217,20 @@ class GeoRuby::SimpleFeatures::LineString
     end
 
     def cos_angle
-      scalar_product / segment_distance / target_distance_from_departure
+      [-1, [1, scalar_product / segment_distance / target_distance_from_departure].min].max
     end
 
     def square_of_segment_distance
-      (arrival.x - departure.x)**2 + (arrival.y - departure.y)**2
+      segment_distance ** 2
     end
     memoize :square_of_segment_distance
 
     def segment_distance
-      sqrt square_of_segment_distance
+      segment.distance
     end
 
     def target_distance_from_departure
-      sqrt((target.x - departure.x)**2 + (target.y - departure.y)**2)
+      departure.spherical_distance target
     end
 
   end