rgeo 0.1.12 → 0.1.13

data/lib/rgeo/geography.rb

@@ -50,21 +50,11 @@ end
 # Dependency source files.
 paths_ = [
   'features',
-  'geography/common/helper',
-  'geography/common/geometry_methods',
-  'geography/common/point_methods',
-  'geography/common/line_string_methods',
-  'geography/common/polygon_methods',
-  'geography/common/geometry_collection_methods',
+  'cartesian',
+  'geography/helper',
   'geography/simple_spherical/calculations',
-  'geography/simple_spherical/geometry_methods',
-  'geography/simple_spherical/point_impl',
-  'geography/simple_spherical/line_string_impl',
-  'geography/simple_spherical/polygon_impl',
-  'geography/simple_spherical/geometry_collection_impl',
-  'geography/simple_spherical/multi_point_impl',
-  'geography/simple_spherical/multi_line_string_impl',
-  'geography/simple_spherical/multi_polygon_impl',
+  'geography/simple_spherical/feature_methods',
+  'geography/simple_spherical/feature_classes',
   'geography/simple_mercator/projector',
   'geography/simple_mercator/feature_methods',
   'geography/simple_mercator/feature_classes',

data/lib/rgeo/geography/factory.rb

@@ -45,7 +45,7 @@ module RGeo
     
     class Factory
       
-      include Features::Factory
+      include Features::Factory::Instance
       
       
       def initialize(namespace_, opts_={})  # :nodoc:
@@ -82,13 +82,13 @@ module RGeo
       # Projects the given geometry into the projected coordinate space,
       # and returns the projected geometry.
       # Returns nil if this factory does not support a projection.
-      # Raises Errors::IllegalGeometry if the given geometry is not of
+      # Raises Errors::InvalidGeometry if the given geometry is not of
       # this factory.
       
       def project(geometry_)
         return nil unless @projector
         unless geometry_.factory == self
-          raise Errors::IllegalGeometry, 'Wrong geometry type'
+          raise Errors::InvalidGeometry, 'Wrong geometry type'
         end
         @projector.project(geometry_)
       end
@@ -96,12 +96,12 @@ module RGeo
       
       # Reverse-projects the given geometry from the projected coordinate
       # space into lat-long space.
-      # Raises Errors::IllegalGeometry if the given geometry is not of
+      # Raises Errors::InvalidGeometry if the given geometry is not of
       # the projection defined by this factory.
       
       def unproject(geometry_)
         unless @projector && @projector.projection_factory == geometry_.factory
-          raise Errors::IllegalGeometry, 'You can unproject only features that are in the projected coordinate space.'
+          raise Errors::InvalidGeometry, 'You can unproject only features that are in the projected coordinate space.'
         end
         @projector.unproject(geometry_)
       end
@@ -129,14 +129,14 @@ module RGeo
       # See ::RGeo::Features::Factory#parse_wkt
       
       def parse_wkt(str_)
-        Common::Helper.parse_wkt(str_, self)
+        ImplHelpers::Serialization.parse_wkt(str_, self)
       end
       
       
       # See ::RGeo::Features::Factory#parse_wkb
       
       def parse_wkb(str_)
-        Common::Helper.parse_wkb(str_, self)
+        ImplHelpers::Serialization.parse_wkb(str_, self)
       end
       
       
@@ -164,9 +164,6 @@ module RGeo
       # See ::RGeo::Features::Factory#linear_ring
       
       def linear_ring(points_)
-        if points_.size > 1 && points_.first != points_.last
-          points_ << points_.first
-        end
         @namespace.const_get(:LinearRingImpl).new(self, points_) rescue nil
       end
       
@@ -174,7 +171,6 @@ module RGeo
       # See ::RGeo::Features::Factory#polygon
       
       def polygon(outer_ring_, inner_rings_=nil)
-        inner_rings_ = inner_rings_.to_a unless inner_rings_.kind_of?(::Array)
         @namespace.const_get(:PolygonImpl).new(self, outer_ring_, inner_rings_) rescue nil
       end
       
@@ -189,8 +185,6 @@ module RGeo
       # See ::RGeo::Features::Factory#multi_point
       
       def multi_point(elems_)
-        elems_ = _flatten(elems_, Features::Point)
-        return nil unless elems_
         @namespace.const_get(:MultiPointImpl).new(self, elems_) rescue nil
       end
       
@@ -198,8 +192,6 @@ module RGeo
       # See ::RGeo::Features::Factory#multi_line_string
       
       def multi_line_string(elems_)
-        elems_ = _flatten(elems_, Features::LineString)
-        return nil unless elems_
         @namespace.const_get(:MultiLineStringImpl).new(self, elems_) rescue nil
       end
       
@@ -207,59 +199,10 @@ module RGeo
       # See ::RGeo::Features::Factory#multi_polygon
       
       def multi_polygon(elems_)
-        elems_ = _flatten(elems_, Features::Polygon)
-        return nil unless elems_
         @namespace.const_get(:MultiPolygonImpl).new(self, elems_) rescue nil
       end
       
       
-      # See ::RGeo::Features::Factory#cast
-      
-      def cast(original_, force_new_=false)
-        if self == original_.factory
-          force_new_ ? original_.dup : original_
-        else
-          case original_
-          when Features::Point
-            @namespace.const_get(:PointImpl).new(self, original_.x, original_.y) rescue nil
-          when Features::Line
-            @namespace.const_get(:LineImpl).new(self, cast(original_.start_point), cast(original_.end_point)) rescue nil
-          when Features::LinearRing
-            @namespace.const_get(:LinearRingImpl).new(self, original_.points.map{ |g_| cast(g_) }) rescue nil
-          when Features::LineString
-            @namespace.const_get(:LineStringImpl).new(self, original_.points.map{ |g_| cast(g_) }) rescue nil
-          when Features::Polygon
-            @namespace.const_get(:PolygonImpl).new(self, cast(original_.exterior_ring), original_.interior_rings.map{ |g_| cast(g_) }) rescue nil
-          when Features::MultiPoint
-            @namespace.const_get(:MultiPointImpl).new(self, original_.to_a.map{ |g_| cast(g_) }) rescue nil
-          when Features::MultiLineString
-            @namespace.const_get(:MultiLineStringImpl).new(self, original_.to_a.map{ |g_| cast(g_) }) rescue nil
-          when Features::MultiPolygon
-            @namespace.const_get(:MultiPolygonImpl).new(self, original_.to_a.map{ |g_| cast(g_) }) rescue nil
-          when Features::GeometryCollection
-            @namespace.const_get(:GeometryCollectionImpl).new(self, original_.to_a.map{ |g_| cast(g_) }) rescue nil
-          else
-            nil
-          end
-        end
-      end
-      
-      
-      def _flatten(elems_, type_, array_=[])
-        elems_.each do |elem_|
-          case elem_
-          when type_
-            array_ << elem_
-          when Features::GeometryCollection
-            return nil unless _flatten(elem_, type_, array_)
-          else
-            return nil
-          end
-        end
-        array_
-      end
-      
-      
     end
     
   end

data/lib/rgeo/geography/{simple_spherical/geometry_methods.rb → helper.rb}

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 # 
-# Spherical base methods
+# Helper for geography implementations
 # 
 # -----------------------------------------------------------------------------
 # Copyright 2010 Daniel Azuma
@@ -38,19 +38,10 @@ module RGeo
   
   module Geography
     
-    module SimpleSpherical
-      
-      
-      module GeometryMethods
-        
-        
-        def srid
-          4326
-        end
-        
-        
-      end
+    module Helper  # :nodoc:
       
+      RADIANS_PER_DEGREE = ::Math::PI/180.0
+      DEGREES_PER_RADIAN = 180.0/::Math::PI
       
     end
     

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

@@ -38,22 +38,16 @@ module RGeo
   
   module Geography
     
-    module SimpleMercator
+    module SimpleMercator  # :nodoc:
       
       
-      class PointImpl
+      class PointImpl  # :nodoc:
         
         
         include Features::Point
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
-        include Common::PointMethods
-        
-        
-        def initialize(factory_, x_, y_)
-          _set_factory(factory_)
-          _setup(x_, y_)
-        end
+        include ImplHelpers::BasicPointMethods
         
         
         def _validate_geometry
@@ -64,7 +58,7 @@ module RGeo
         
         
         def _make_projection(projection_factory_)  # :nodoc:
-          rpd_ = Common::Helper::RADIANS_PER_DEGREE
+          rpd_ = Helper::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_)
@@ -72,7 +66,7 @@ module RGeo
         
         
         def scaling_factor
-          1.0 / ::Math.cos(Common::Helper::RADIANS_PER_DEGREE * @y)
+          1.0 / ::Math.cos(Helper::RADIANS_PER_DEGREE * @y)
         end
         
         
@@ -90,24 +84,18 @@ module RGeo
       end
       
       
-      class LineStringImpl
+      class LineStringImpl  # :nodoc:
         
         
         include Features::LineString
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NCurveMethods
         include SimpleMercator::CurveMethods
-        include Common::LineStringMethods
+        include ImplHelpers::BasicLineStringMethods
         include SimpleMercator::LineStringMethods
         
         
-        def initialize(factory_, points_)
-          _set_factory(factory_)
-          _setup(points_)
-        end
-        
-        
         def _make_projection(projection_factory_)  # :nodoc:
           projection_factory_.line_string(@points.map{ |p_| p_.projection })
         end
@@ -116,23 +104,17 @@ module RGeo
       end
       
       
-      class LinearRingImpl
+      class LinearRingImpl  # :nodoc:
         
         
         include Features::Line
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NCurveMethods
         include SimpleMercator::CurveMethods
-        include Common::LineStringMethods
+        include ImplHelpers::BasicLineStringMethods
         include SimpleMercator::LineStringMethods
-        include Common::LinearRingMethods
-        
-        
-        def initialize(factory_, points_)
-          _set_factory(factory_)
-          _setup(points_)
-        end
+        include ImplHelpers::BasicLinearRingMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -143,23 +125,17 @@ module RGeo
       end
       
       
-      class LineImpl
+      class LineImpl  # :nodoc:
         
         
         include Features::Line
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NCurveMethods
         include SimpleMercator::CurveMethods
-        include Common::LineStringMethods
+        include ImplHelpers::BasicLineStringMethods
         include SimpleMercator::LineStringMethods
-        include Common::LineMethods
-        
-        
-        def initialize(factory_, start_, end_)
-          _set_factory(factory_)
-          _setup([start_, end_])
-        end
+        include ImplHelpers::BasicLineMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -170,21 +146,15 @@ module RGeo
       end
       
       
-      class PolygonImpl
+      class PolygonImpl  # :nodoc:
         
         
         include Features::Polygon
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NSurfaceMethods
         include SimpleMercator::SurfaceMethods
-        include Common::PolygonMethods
-        
-        
-        def initialize(factory_, exterior_ring_, interior_rings_)
-          _set_factory(factory_)
-          _setup(exterior_ring_, interior_rings_)
-        end
+        include ImplHelpers::BasicPolygonMethods
         
         
         def _validate_geometry
@@ -204,22 +174,16 @@ module RGeo
       end
       
       
-      class GeometryCollectionImpl
+      class GeometryCollectionImpl  # :nodoc:
         
         
         include Features::GeometryCollection
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
-        include Common::GeometryCollectionMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
         include SimpleMercator::GeometryCollectionMethods
         
         
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
-        
-        
         def _make_projection(projection_factory_)  # :nodoc:
           projection_factory_.collection(@elements.map{ |p_| p_.projection })
         end
@@ -228,21 +192,15 @@ module RGeo
       end
       
       
-      class MultiPointImpl
+      class MultiPointImpl  # :nodoc:
         
         
         include Features::GeometryCollection
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
-        include Common::GeometryCollectionMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
         include SimpleMercator::GeometryCollectionMethods
-        include Common::MultiPointMethods
-        
-        
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
+        include ImplHelpers::BasicMultiPointMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -253,22 +211,16 @@ module RGeo
       end
       
       
-      class MultiLineStringImpl
+      class MultiLineStringImpl  # :nodoc:
         
         
         include Features::GeometryCollection
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NCurveMethods
-        include Common::GeometryCollectionMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
         include SimpleMercator::GeometryCollectionMethods
-        include Common::MultiLineStringMethods
-        
-        
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
+        include ImplHelpers::BasicMultiLineStringMethods
         
         
         def _make_projection(projection_factory_)  # :nodoc:
@@ -279,22 +231,16 @@ module RGeo
       end
       
       
-      class MultiPolygonImpl
+      class MultiPolygonImpl  # :nodoc:
         
         
         include Features::GeometryCollection
-        include Common::GeometryMethods
+        include ImplHelpers::BasicGeometryMethods
         include SimpleMercator::GeometryMethods
         include SimpleMercator::NSurfaceMethods
-        include Common::GeometryCollectionMethods
+        include ImplHelpers::BasicGeometryCollectionMethods
         include SimpleMercator::GeometryCollectionMethods
-        include Common::MultiPolygonMethods
-        
-        
-        def initialize(factory_, elements_)
-          _set_factory(factory_)
-          _setup(elements_)
-        end
+        include ImplHelpers::BasicMultiPolygonMethods
         
         
         def _validate_geometry