rgeo 0.1.12 → 0.1.13

data/ext/geos_c_impl/preface.h

@@ -40,3 +40,11 @@
 #define RGEO_GEOS_SUPPORTED
 #endif
 #endif
+
+#ifdef __cplusplus
+#define RGEO_BEGIN_C extern "C" {
+#define RGEO_END_C }
+#else
+#define RGEO_BEGIN_C
+#define RGEO_END_C
+#endif

data/lib/rgeo.rb

@@ -34,27 +34,20 @@
 ;
 
 
-# The source files that should be required by default.
-paths_ = [
-  'version',
-  'errors',
-  'features',
-  'geos',
-  'geography',
-  'geo_json',
-]
-paths_.each{ |path_| require "rgeo/#{path_}" }
-
-
 # RGeo is a spatial data library for Ruby.
 # 
 # The RGeo::Features module contains interface specifications for spatial
 # objects implemented by RGeo. These interfaces closely follow the OGC
-# Simple Features Specifiation.
+# Simple Features Specifiation (SFS).
+# 
+# The RGeo::Cartesian module provides basic implementations of spatial
+# objects in a Cartesian (flat) coordinate system. There is a pure ruby
+# implementation that provides basic services, and there are bridges to
+# external implementations that support all the SFS operations.
 # 
-# The RGeo::Geos module contains a spatial implementation that wraps
-# the GEOS library. This is a full implementation that operates on
-# cartesian coordinates.
+# One of these external bridges is provided by the RGeo::Geos module,
+# which wraps the GEOS library to provide a full, high-performance
+# Cartesian geometry implementation.
 # 
 # The RGeo::Geography module contains spatial implementations that
 # operate in latitude-longitude coordinates. Several different
@@ -63,6 +56,31 @@ paths_.each{ |path_| require "rgeo/#{path_}" }
 # 
 # The RGeo::GeoJSON module contains tools for GeoJSON serialization of
 # spatial objects.
+# 
+# Future modules in development include:
+# 
+# * RGeo::Shapefile, which provides tools for reading and writing
+#   spatial objects in the ESRI shapefile format.
+# * RGeo::Rails, which provides close integration with Ruby On Rails
+#   for developing location-based web applications.
+# * RGeo::JTS, which provides a Cartesian SFS implementation backed by
+#   the JTS library (which can run natively in JRuby.)
+# * RGeo::Geography extensions to provide highly accurate ellipsoidal
+#   geometric calculations, and support arbitrary map projections.
 
 module RGeo
 end
+
+
+# The source files that should be required by default.
+paths_ = [
+  'version',
+  'errors',
+  'features',
+  'impl_helpers',
+  'geos',
+  'cartesian',
+  'geography',
+  'geo_json',
+]
+paths_.each{ |path_| require "rgeo/#{path_}" }

data/lib/rgeo/{geography/simple_spherical/geometry_collection_impl.rb → cartesian.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical GeometryCollection implementation
+# Cartesian features for RGeo
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -36,31 +36,24 @@
 
 module RGeo
   
-  module Geography
-    
-    module SimpleSpherical
-      
-      
-      class GeometryCollectionImpl
-        
-        
-        include Features::GeometryCollection
-        include Common::GeometryMethods
-        include GeometryMethods
-        include Common::GeometryCollectionMethods
-        
-        
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
-        
-        
-      end
-      
-      
-    end
-    
+  
+  # The cartesian features module
+  
+  module Cartesian
   end
   
+  
 end
+
+
+# Dependency source files.
+paths_ = [
+  'features',
+  'geos',
+  'cartesian/calculations',
+  'cartesian/simple_feature_methods',
+  'cartesian/simple_feature_classes',
+  'cartesian/simple_factory',
+  'cartesian/interface',
+]
+paths_.each{ |path_| require "rgeo/#{path_}" }

data/lib/rgeo/cartesian/calculations.rb

@@ -0,0 +1,129 @@
+# -----------------------------------------------------------------------------
+# 
+# Core calculations in the plane
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module Cartesian
+    
+    
+    # Represents a line segment in the plane.
+    
+    class Segment  # :nodoc:
+      
+      def initialize(start_, end_)
+        @s = start_
+        @e = end_
+        @sx = @s.x
+        @sy = @s.y
+        @ex = @e.x
+        @ey = @e.y
+        @dx = @ex - @sx
+        @dy = @ey - @sy
+        @lensq = @dx * @dx + @dy * @dy
+      end
+      
+      
+      attr_reader :s
+      attr_reader :e
+      attr_reader :dx
+      attr_reader :dy
+      
+      
+      def to_s
+        "#{@s} - #{@e}"
+      end
+      
+      
+      def eql?(rhs_)
+        rhs_.kind_of?(Segment) && @s == rhs_.s && @e == rhs_.e
+      end
+      alias_method :==, :eql?
+      
+      
+      def degenerate?
+        @lensq == 0
+      end
+      
+      
+      def side(p_)
+        px_ = p_.x
+        py_ = p_.y
+        (@sx - px_) * (@ey - py_) - (@sy - py_) * (@ex - px_)
+      end
+      
+      
+      def tproj(p_)
+        if @lensq == 0
+          nil
+        else
+          px_ = @sx - p_.x
+          py_ = @sy - p_.y
+          - (@dx * px_ + @dy * py_) / @lensq
+        end
+      end
+      
+      
+      def contains_point?(p_)
+        if side(p_) == 0
+          t_ = tproj(p_)
+          t_ && t_ >= 0.0 && t_ <= 1.0
+        else
+          false
+        end
+      end
+      
+      
+      def intersects_segment?(seg_)
+        s2_ = seg_.s
+        sx2_ = s2_.x
+        sy2_ = s2_.y
+        dx2_ = seg_.dx
+        dy2_ = seg_.dy
+        denom_ = @dx*dy2_ - @dy*dx2_
+        return side(s2_) == 0 if denom_ == 0
+        t_ = (dy2_ * (sx2_ - @sx) + dx2_ * (@sy - sy2_)) / denom_
+        return false if t_ < 0.0 || t_ > 1.0
+        t2_ = (@dy * (sx2_ - @sx) + @dx * (@sy - sy2_)) / denom_
+        t2_ >= 0.0 && t2_ <= 1.0
+      end
+      
+      
+    end
+    
+    
+  end
+  
+end

data/lib/rgeo/cartesian/interface.rb

@@ -0,0 +1,85 @@
+# -----------------------------------------------------------------------------
+# 
+# Cartesian toplevel interface
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module Cartesian
+    
+    class << self
+      
+      
+      # Creates and returns a cartesian factory of the preferred
+      # implementation.
+      # 
+      # The actual implementation returned depends on which ruby
+      # interpreter is running and what libraries are available.
+      # RGeo will try to provide a fully-functional and performant
+      # implementation if possible. If not, the simple cartesian
+      # implementation will be returned.
+      # 
+      # The given options are passed to the factory's constructor.
+      # What options are available depends on the particular
+      # implementation. Unsupported options are ignored.
+      
+      def preferred_factory(opts_={})
+        if Geos.supported?
+          Geos.factory(opts_)
+        else
+          simple_factory(opts_)
+        end
+      end
+      alias_method :factory, :preferred_factory
+      
+      
+      # Returns a factory for the simple cartesian implementation.
+      # This implementation is always available.
+      # 
+      # Options include:
+      # 
+      # <tt>:srid</tt>::
+      #   Set the SRID returned by geometries created by this factory.
+      #   Default is 0.
+      
+      def simple_factory(opts_={})
+        SimpleFactory.new(opts_)
+      end
+      
+      
+    end
+    
+  end
+  
+end

data/lib/rgeo/cartesian/simple_factory.rb

@@ -0,0 +1,159 @@
+# -----------------------------------------------------------------------------
+# 
+# Geographic data factory implementation
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module Cartesian
+    
+    
+    # This class implements the factory for the simple cartesian
+    # implementation.
+    
+    class SimpleFactory
+      
+      include Features::Factory::Instance
+      
+      
+      # Create a new simple cartesian factory.
+      # 
+      # Options supported are:
+      # 
+      # <tt>:srid</tt>::
+      #   The SRID reported by features created by this factory.
+      #   Default is 0.
+      
+      def initialize(opts_={})
+        @srid = opts_[:srid].to_i
+      end
+      
+      
+      # Equivalence test.
+      
+      def eql?(rhs_)
+        rhs_.is_a?(self.class) && @srid == rhs_.srid
+      end
+      alias_method :==, :eql?
+      
+      
+      # Returns the SRID.
+      
+      def srid
+        @srid
+      end
+      
+      
+      # See ::RGeo::Features::Factory#parse_wkt
+      
+      def parse_wkt(str_)
+        ImplHelpers::Serialization.parse_wkt(str_, self)
+      end
+      
+      
+      # See ::RGeo::Features::Factory#parse_wkb
+      
+      def parse_wkb(str_)
+        ImplHelpers::Serialization.parse_wkb(str_, self)
+      end
+      
+      
+      # See ::RGeo::Features::Factory#point
+      
+      def point(x_, y_)
+        SimplePointImpl.new(self, x_, y_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#line_string
+      
+      def line_string(points_)
+        SimpleLineStringImpl.new(self, points_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#line
+      
+      def line(start_, end_)
+        SimpleLineImpl.new(self, start_, end_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#linear_ring
+      
+      def linear_ring(points_)
+        SimpleLinearRingImpl.new(self, points_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#polygon
+      
+      def polygon(outer_ring_, inner_rings_=nil)
+        SimplePolygonImpl.new(self, outer_ring_, inner_rings_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#collection
+      
+      def collection(elems_)
+        SimpleGeometryCollectionImpl.new(self, elems_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#multi_point
+      
+      def multi_point(elems_)
+        SimpleMultiPointImpl.new(self, elems_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#multi_line_string
+      
+      def multi_line_string(elems_)
+        SimpleMultiLineStringImpl.new(self, elems_) rescue nil
+      end
+      
+      
+      # See ::RGeo::Features::Factory#multi_polygon
+      
+      def multi_polygon(elems_)
+        SimpleMultiPolygonImpl.new(self, elems_) rescue nil
+      end
+      
+      
+    end
+    
+  end
+  
+end