rgeo 0.1.14 → 0.1.15

data/lib/rgeo/cartesian/{simple_feature_methods.rb → feature_methods.rb}

@@ -39,7 +39,7 @@ module RGeo
   module Cartesian
     
     
-    module SimpleGeometryMethods  # :nodoc:
+    module GeometryMethods  # :nodoc:
       
       
       def srid
@@ -50,7 +50,7 @@ module RGeo
     end
     
     
-    module SimpleLineStringMethods  # :nodoc:
+    module LineStringMethods  # :nodoc:
       
       
       def _segments
@@ -89,9 +89,13 @@ module RGeo
       end
       
       
+      def length
+        @segments.inject(0.0){ |sum_, seg_| sum_ + seg_.length }
+      end
+      
+      
     end
     
-    
   end
   
 end

data/lib/rgeo/cartesian/interface.rb

@@ -55,8 +55,8 @@ module RGeo
       # implementation. Unsupported options are ignored.
       
       def preferred_factory(opts_={})
-        if Geos.supported?
-          Geos.factory(opts_)
+        if ::RGeo::Geos.supported?
+          ::RGeo::Geos.factory(opts_)
         else
           simple_factory(opts_)
         end
@@ -72,9 +72,13 @@ module RGeo
       # <tt>:srid</tt>::
       #   Set the SRID returned by geometries created by this factory.
       #   Default is 0.
+      # <tt>:support_z_coordinate</tt>::
+      #   Support <tt>z_coordinate</tt>. Default is false.
+      # <tt>:support_m_coordinate</tt>::
+      #   Support <tt>m_coordinate</tt>. Default is false.
       
       def simple_factory(opts_={})
-        SimpleFactory.new(opts_)
+        Cartesian::Factory.new(opts_)
       end
       
       

data/lib/rgeo/errors.rb

@@ -34,6 +34,10 @@
 ;
 
 
+# Parent file
+require 'rgeo'
+
+
 module RGeo
   
   

data/lib/rgeo/features.rb

@@ -34,6 +34,10 @@
 ;
 
 
+# Parent file
+require 'rgeo'
+
+
 module RGeo
   
   
@@ -68,23 +72,24 @@ module RGeo
 end
 
 
-# Dependency source files.
-paths_ = [
-  'features/factory',
-  'features/types',
-  'features/geometry',
-  'features/point',
-  'features/curve',
-  'features/line_string',
-  'features/linear_ring',
-  'features/line',
-  'features/surface',
-  'features/polygon',
-  'features/geometry_collection',
-  'features/multi_point',
-  'features/multi_curve',
-  'features/multi_line_string',
-  'features/multi_surface',
-  'features/multi_polygon',
-]
-paths_.each{ |path_| require "rgeo/#{path_}" }
+# Dependency files
+require 'rgeo/errors'
+
+# Implementation files
+require 'rgeo/features/factory'
+require 'rgeo/features/types'
+require 'rgeo/features/geometry'
+require 'rgeo/features/point'
+require 'rgeo/features/curve'
+require 'rgeo/features/line_string'
+require 'rgeo/features/linear_ring'
+require 'rgeo/features/line'
+require 'rgeo/features/surface'
+require 'rgeo/features/polygon'
+require 'rgeo/features/geometry_collection'
+require 'rgeo/features/multi_point'
+require 'rgeo/features/multi_curve'
+require 'rgeo/features/multi_line_string'
+require 'rgeo/features/multi_surface'
+require 'rgeo/features/multi_polygon'
+

data/lib/rgeo/geo_json.rb

@@ -34,6 +34,10 @@
 ;
 
 
+# Parent file
+require 'rgeo'
+
+
 module RGeo
   
   
@@ -47,12 +51,10 @@ module RGeo
 end
 
 
-# Dependency source files.
-paths_ = [
-  'features',
-  'geo_json/entities',
-  'geo_json/coder',
-  'geo_json/interface',
-]
+# Dependency files
+require 'rgeo/features'
 
-paths_.each{ |path_| require "rgeo/#{path_}" }
+# Implementation files
+require 'rgeo/geo_json/entities'
+require 'rgeo/geo_json/coder'
+require 'rgeo/geo_json/interface'

data/lib/rgeo/geography.rb

@@ -34,6 +34,10 @@
 ;
 
 
+# Parent file
+require 'rgeo'
+
+
 module RGeo
   
   
@@ -41,25 +45,15 @@ module RGeo
   # latitude/longitude coordinates measured in degrees.
   
   module Geography
+    
+    autoload(:SimpleSpherical, 'rgeo/geography/simple_spherical')
+    autoload(:SimpleMercator, 'rgeo/geography/simple_mercator')
+    
   end
   
   
 end
 
 
-# Dependency source files.
-paths_ = [
-  'features',
-  'cartesian',
-  'geography/helper',
-  'geography/simple_spherical/calculations',
-  'geography/simple_spherical/feature_methods',
-  'geography/simple_spherical/feature_classes',
-  'geography/simple_mercator/projector',
-  'geography/simple_mercator/feature_methods',
-  'geography/simple_mercator/feature_classes',
-  'geography/factory',
-  'geography/projected_window',
-  'geography/factories',
-]
-paths_.each{ |path_| require "rgeo/#{path_}" }
+# Implementation files.
+require 'rgeo/geography/interface'

data/lib/rgeo/geography/all.rb

@@ -0,0 +1,40 @@
+# -----------------------------------------------------------------------------
+# 
+# All files in the Cartesian module for RGeo
+# 
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'rgeo/geography'
+
+require 'rgeo/geography/simple_spherical'
+require 'rgeo/geography/simple_mercator'

data/lib/rgeo/geography/factory.rb

@@ -149,14 +149,14 @@ module RGeo
       # See ::RGeo::Features::Factory#parse_wkt
       
       def parse_wkt(str_)
-        WKRep::WKTParser.new(self, :support_higher_dimensions => true).parse(str_)
+        WKRep::WKTParser.new(:default_factory => self).parse(str_)
       end
       
       
       # See ::RGeo::Features::Factory#parse_wkb
       
       def parse_wkb(str_)
-        WKRep::WKBParser.new(self).parse(str_)
+        WKRep::WKBParser.new(:default_factory => self).parse(str_)
       end
       
       

data/lib/rgeo/geography/{factories.rb → interface.rb}

@@ -100,7 +100,8 @@ module RGeo
       #   most support one or the other.
       
       def simple_spherical(opts_={})
-        Geography::Factory.new(Geography::SimpleSpherical, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+        namespace_ = Geography::SimpleSpherical
+        Geography::Factory.new(namespace_, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
       end
       
       
@@ -176,7 +177,8 @@ module RGeo
       #   most support one or the other.
       
       def simple_mercator(opts_={})
-        Geography::Factory.new(Geography::SimpleMercator, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
+        namespace_ = Geography::SimpleMercator
+        Geography::Factory.new(namespace_, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions], :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
       end
       
       

data/lib/rgeo/geography/simple_mercator.rb

@@ -0,0 +1,69 @@
+# -----------------------------------------------------------------------------
+# 
+# Simple spherical geography implementation for RGeo
+# 
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'rgeo/geography'
+
+
+module RGeo
+  
+  module Geography
+    
+    
+    # This namespace contains the simple mercator implementation.
+    
+    module SimpleMercator
+    end
+    
+    
+  end
+  
+  
+end
+
+
+# Dependency source files.
+paths_ = [
+  'features',
+  'wkrep',
+  'impl_helpers',
+  'cartesian',
+  'geography/simple_mercator/projector',
+  'geography/simple_mercator/feature_methods',
+  'geography/simple_mercator/feature_classes',
+  'geography/factory',
+  'geography/projected_window',
+]
+paths_.each{ |path_| require "rgeo/#{path_}" }

data/lib/rgeo/geography/simple_mercator/feature_classes.rb

@@ -44,10 +44,10 @@ module RGeo
       class PointImpl  # :nodoc:
         
         
-        include Features::Point
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include ImplHelpers::BasicPointMethods
+        include ::RGeo::Features::Point
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::ImplHelpers::BasicPointMethods
         
         
         def _validate_geometry
@@ -58,7 +58,7 @@ module RGeo
         
         
         def _make_projection(projection_factory_)  # :nodoc:
-          rpd_ = Helper::RADIANS_PER_DEGREE
+          rpd_ = ::RGeo::ImplHelpers::Math::RADIANS_PER_DEGREE
           mpr_ = EQUATORIAL_RADIUS
           projection_factory_.point(@x * rpd_ * mpr_,
             ::Math.log(::Math.tan(::Math::PI / 4.0 + @y * rpd_ / 2.0)) * mpr_)
@@ -66,7 +66,7 @@ module RGeo
         
         
         def scaling_factor
-          1.0 / ::Math.cos(Helper::RADIANS_PER_DEGREE * @y)
+          1.0 / ::Math.cos(::RGeo::ImplHelpers::Math::RADIANS_PER_DEGREE * @y)
         end
         
         
@@ -87,13 +87,13 @@ module RGeo
       class LineStringImpl  # :nodoc:
         
         
-        include Features::LineString
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NCurveMethods
-        include SimpleMercator::CurveMethods
-        include ImplHelpers::BasicLineStringMethods
-        include SimpleMercator::LineStringMethods
+        include ::RGeo::Features::LineString
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NCurveMethods
+        include ::RGeo::Geography::SimpleMercator::CurveMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::Geography::SimpleMercator::LineStringMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -107,14 +107,14 @@ module RGeo
       class LinearRingImpl  # :nodoc:
         
         
-        include Features::Line
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NCurveMethods
-        include SimpleMercator::CurveMethods
-        include ImplHelpers::BasicLineStringMethods
-        include SimpleMercator::LineStringMethods
-        include ImplHelpers::BasicLinearRingMethods
+        include ::RGeo::Features::Line
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NCurveMethods
+        include ::RGeo::Geography::SimpleMercator::CurveMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::Geography::SimpleMercator::LineStringMethods
+        include ::RGeo::ImplHelpers::BasicLinearRingMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -128,14 +128,14 @@ module RGeo
       class LineImpl  # :nodoc:
         
         
-        include Features::Line
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NCurveMethods
-        include SimpleMercator::CurveMethods
-        include ImplHelpers::BasicLineStringMethods
-        include SimpleMercator::LineStringMethods
-        include ImplHelpers::BasicLineMethods
+        include ::RGeo::Features::Line
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NCurveMethods
+        include ::RGeo::Geography::SimpleMercator::CurveMethods
+        include ::RGeo::ImplHelpers::BasicLineStringMethods
+        include ::RGeo::Geography::SimpleMercator::LineStringMethods
+        include ::RGeo::ImplHelpers::BasicLineMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -149,18 +149,18 @@ module RGeo
       class PolygonImpl  # :nodoc:
         
         
-        include Features::Polygon
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NSurfaceMethods
-        include SimpleMercator::SurfaceMethods
-        include ImplHelpers::BasicPolygonMethods
+        include ::RGeo::Features::Polygon
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NSurfaceMethods
+        include ::RGeo::Geography::SimpleMercator::SurfaceMethods
+        include ::RGeo::ImplHelpers::BasicPolygonMethods
         
         
         def _validate_geometry
           super
           unless projection
-            raise Errors::InvalidGeometry, 'Polygon failed assertions'
+            raise ::RGeo::Errors::InvalidGeometry, 'Polygon failed assertions'
           end
         end
         
@@ -177,11 +177,11 @@ module RGeo
       class GeometryCollectionImpl  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include ImplHelpers::BasicGeometryCollectionMethods
-        include SimpleMercator::GeometryCollectionMethods
+        include ::RGeo::Features::GeometryCollection
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -195,12 +195,12 @@ module RGeo
       class MultiPointImpl  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include ImplHelpers::BasicGeometryCollectionMethods
-        include SimpleMercator::GeometryCollectionMethods
-        include ImplHelpers::BasicMultiPointMethods
+        include ::RGeo::Features::GeometryCollection
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
+        include ::RGeo::ImplHelpers::BasicMultiPointMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -214,13 +214,13 @@ module RGeo
       class MultiLineStringImpl  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NCurveMethods
-        include ImplHelpers::BasicGeometryCollectionMethods
-        include SimpleMercator::GeometryCollectionMethods
-        include ImplHelpers::BasicMultiLineStringMethods
+        include ::RGeo::Features::GeometryCollection
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NCurveMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
+        include ::RGeo::ImplHelpers::BasicMultiLineStringMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -234,19 +234,19 @@ module RGeo
       class MultiPolygonImpl  # :nodoc:
         
         
-        include Features::GeometryCollection
-        include ImplHelpers::BasicGeometryMethods
-        include SimpleMercator::GeometryMethods
-        include SimpleMercator::NSurfaceMethods
-        include ImplHelpers::BasicGeometryCollectionMethods
-        include SimpleMercator::GeometryCollectionMethods
-        include ImplHelpers::BasicMultiPolygonMethods
+        include ::RGeo::Features::GeometryCollection
+        include ::RGeo::ImplHelpers::BasicGeometryMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryMethods
+        include ::RGeo::Geography::SimpleMercator::NSurfaceMethods
+        include ::RGeo::ImplHelpers::BasicGeometryCollectionMethods
+        include ::RGeo::Geography::SimpleMercator::GeometryCollectionMethods
+        include ::RGeo::ImplHelpers::BasicMultiPolygonMethods
         
         
         def _validate_geometry
           super
           unless projection
-            raise Errors::InvalidGeometry, 'MultiPolygon failed assertions'
+            raise ::RGeo::Errors::InvalidGeometry, 'MultiPolygon failed assertions'
           end
         end