rgeo 0.1.13 → 0.1.14

data/lib/rgeo/geography/factories.rb

@@ -71,9 +71,36 @@ module RGeo
       # may generate slightly different results from geodesic calculations 
       # than those generated by, e.g., PostGIS (unless you direct PostGIS
       # to use spherical geodesics).
+      # 
+      # Options include:
+      # 
+      # <tt>:lenient_multi_polygon_assertions</tt>::
+      #   If set to true, assertion checking on MultiPolygon is disabled.
+      #   This may speed up creation of MultiPolygon objects, at the
+      #   expense of not doing the proper checking for OGC MultiPolygon
+      #   compliance. See RGeo::Features::MultiPolygon for details on
+      #   the MultiPolygon assertions. Default is false.
+      # <tt>:buffer_resolution</tt>::
+      #   The resolution of buffers around geometries created by this
+      #   factory. This controls the number of line segments used to
+      #   approximate curves. The default is 1, which causes, for
+      #   example, the buffer around a point to be approximated by a
+      #   4-sided polygon. A resolution of 2 would cause that buffer
+      #   to be approximated by an 8-sided polygon. The exact behavior
+      #   for different kinds of buffers is defined by GEOS.
+      # <tt>:support_z_coordinate</tt>::
+      #   Support <tt>z_coordinate</tt>. Default is false.
+      #   Note that simple_mercator factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   most support one or the other.
+      # <tt>:support_m_coordinate</tt>::
+      #   Support <tt>m_coordinate</tt>. Default is false.
+      #   Note that simple_mercator factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   most support one or the other.
       
       def simple_spherical(opts_={})
-        Geography::Factory.new(Geography::SimpleSpherical)
+        Geography::Factory.new(Geography::SimpleSpherical, :support_z_coordinate => opts_[:support_z_coordinate], :support_m_coordinate => opts_[:support_m_coordinate])
       end
       
       
@@ -121,7 +148,7 @@ module RGeo
       # visualization APIs, so we've decided to fudge on this in the
       # interest of being true to our expected application use cases.
       # 
-      # Supported options include:
+      # Options include:
       # 
       # <tt>:lenient_multi_polygon_assertions</tt>::
       #   If set to true, assertion checking on MultiPolygon is disabled.
@@ -137,9 +164,19 @@ module RGeo
       #   4-sided polygon. A resolution of 2 would cause that buffer
       #   to be approximated by an 8-sided polygon. The exact behavior
       #   for different kinds of buffers is defined by GEOS.
+      # <tt>:support_z_coordinate</tt>::
+      #   Support <tt>z_coordinate</tt>. Default is false.
+      #   Note that simple_mercator factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   most support one or the other.
+      # <tt>:support_m_coordinate</tt>::
+      #   Support <tt>m_coordinate</tt>. Default is false.
+      #   Note that simple_mercator factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   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])
+        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])
       end
       
       

data/lib/rgeo/geography/factory.rb

@@ -51,7 +51,13 @@ module RGeo
       def initialize(namespace_, opts_={})  # :nodoc:
         @namespace = namespace_
         @opts = opts_.dup
-        @projector = @namespace.const_get(:Projector).new(self, opts_) rescue nil
+        if @namespace.const_defined?(:Projector)
+          @projector = @namespace.const_get(:Projector).new(self, opts_)
+        else
+          @projector = nil
+        end
+        @support_z = opts_[:support_z_coordinate] ? true : false
+        @support_m = opts_[:support_m_coordinate] ? true : false
       end
       
       
@@ -126,24 +132,38 @@ module RGeo
       end
       
       
+      # See ::RGeo::Features::Factory#has_capability?
+      
+      def has_capability?(name_)
+        case name_
+        when :z_coordinate
+          @support_z
+        when :m_coordinate
+          @support_m
+        else
+          nil
+        end
+      end
+      
+      
       # See ::RGeo::Features::Factory#parse_wkt
       
       def parse_wkt(str_)
-        ImplHelpers::Serialization.parse_wkt(str_, self)
+        WKRep::WKTParser.new(self, :support_higher_dimensions => true).parse(str_)
       end
       
       
       # See ::RGeo::Features::Factory#parse_wkb
       
       def parse_wkb(str_)
-        ImplHelpers::Serialization.parse_wkb(str_, self)
+        WKRep::WKBParser.new(self).parse(str_)
       end
       
       
       # See ::RGeo::Features::Factory#point
       
-      def point(x_, y_)
-        @namespace.const_get(:PointImpl).new(self, x_, y_) rescue nil
+      def point(x_, y_, *extra_)
+        @namespace.const_get(:PointImpl).new(self, x_, y_, *extra_) rescue nil
       end
       
       

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

@@ -50,13 +50,9 @@ module RGeo
         
         
         def projection
-          unless @projection
+          if @projection.nil?
             projection_factory_ = @factory.projection_factory
-            if projection_factory_
-              @projection = _make_projection(projection_factory_)
-            else
-              @projection = nil
-            end
+            @projection = projection_factory_ ? _make_projection(projection_factory_) : nil
             @projection = false unless @projection
           end
           @projection ? @projection : nil

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

@@ -48,7 +48,7 @@ module RGeo
         
         def initialize(geography_factory_, opts_={})
           @geography_factory = geography_factory_
-          @projection_factory = Cartesian.preferred_factory(:srid => 3857, :buffer_resolution => opts_[:buffer_resolution], :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions])
+          @projection_factory = Cartesian.preferred_factory(:srid => 3857, :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/geos/factory.rb

@@ -52,30 +52,17 @@ module RGeo
         # Create a new factory. Returns nil if the GEOS implementation is
         # not supported.
         # 
-        # Options include:
-        # 
-        # <tt>:lenient_multi_polygon_assertions</tt>::
-        #   If set to true, assertion checking on MultiPolygon is disabled.
-        #   This may speed up creation of MultiPolygon objects, at the
-        #   expense of not doing the proper checking for OGC MultiPolygon
-        #   compliance. See RGeo::Features::MultiPolygon for details on
-        #   the MultiPolygon assertions. Default is false.
-        # <tt>:buffer_resolution</tt>::
-        #   The resolution of buffers around geometries created by this
-        #   factory. This controls the number of line segments used to
-        #   approximate curves. The default is 1, which causes, for
-        #   example, the buffer around a point to be approximated by a
-        #   4-sided polygon. A resolution of 2 would cause that buffer
-        #   to be approximated by an 8-sided polygon. The exact behavior
-        #   for different kinds of buffers is defined by GEOS.
-        # <tt>:srid</tt>::
-        #   Set the SRID returned by geometries created by this factory.
-        #   Default is 0.
+        # See ::RGeo::Geos::factory for a list of supported options.
         
         def create(opts_={})
           return nil unless respond_to?(:_create)
           flags_ = 0
           flags_ |= 1 if opts_[:lenient_multi_polygon_assertions]
+          flags_ |= 2 if opts_[:support_z_coordinate]
+          flags_ |= 4 if opts_[:support_m_coordinate]
+          if flags_ & 6 == 6
+            raise Errors::UnsupportedCapability, "GEOS cannot support both Z and M coordinates at the same time."
+          end
           buffer_resolution_ = opts_[:buffer_resolution].to_i
           buffer_resolution_ = 1 if buffer_resolution_ < 1
           _create(flags_, opts_[:srid].to_i, buffer_resolution_)
@@ -116,6 +103,20 @@ module RGeo
       alias_method :==, :eql?
       
       
+      # See ::RGeo::Features::Factory#has_capability?
+      
+      def has_capability?(name_)
+        case name_
+        when :z_coordinate
+          _flags & 0x2 != 0
+        when :m_coordinate
+          _flags & 0x4 != 0
+        else
+          nil
+        end
+      end
+      
+      
       # See ::RGeo::Features::Factory#parse_wkt
       
       def parse_wkt(str_)
@@ -132,8 +133,12 @@ module RGeo
       
       # See ::RGeo::Features::Factory#point
       
-      def point(x_, y_)
-        PointImpl.create(self, x_, y_) rescue nil
+      def point(x_, y_, *extra_)
+        if extra_.length > (_flags & 6 == 0 ? 0 : 1)
+          nil
+        else
+          PointImpl.create(self, x_, y_, extra_[0].to_f) rescue nil
+        end
       end
       
       
@@ -204,41 +209,30 @@ module RGeo
       
       def override_cast(original_, ntype_, keep_subtype_, force_new_)
         return nil unless Geos.supported?
-        type_ = original_.geometry_type
-        ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
-        if original_.factory != self && ntype_ == type_
-          if GeometryImpl === original_
+        if GeometryImpl === original_
+          type_ = original_.geometry_type
+          ntype_ = type_ if keep_subtype_ && type_.include?(ntype_)
+          if original_.factory != self && ntype_ == type_
             result_ = original_.dup
             result_._set_factory(self)
             return result_
           end
-          if type_ == Features::Point && original_.respond_to?(:z)
-            z_ = original_.z
-            return PointImpl.create(self, original_.x, original_.y, z_) if z_
-          end
-        end
-        if GeometryImpl === original_ && (original_.factory != self || ntype_ != type_) &&
-            (type_ == Features::LineString || type_ == Features::Line || type_ == Features::LinearRing)
-        then
-          if ntype_ == Features::LineString
-            return LineStringImpl._copy_from(self, original_)
-          elsif ntype_ == Features::Line
-            return LineImpl._copy_from(self, original_)
-          elsif ntype_ == Features::LinearRing
-            return LinearRingImpl._copy_from(self, original_)
+          if (original_.factory != self || ntype_ != type_) &&
+              (type_ == Features::LineString || type_.include?(Features::LineString))
+          then
+            if ntype_ == Features::LineString
+              return LineStringImpl._copy_from(self, original_)
+            elsif ntype_ == Features::Line
+              return LineImpl._copy_from(self, original_)
+            elsif ntype_ == Features::LinearRing
+              return LinearRingImpl._copy_from(self, original_)
+            end
           end
         end
         false
       end
       
       
-      # A GEOS extension that creates a 3-D point with a Z coordinate.
-      
-      def point3d(x_, y_, z_)
-        PointImpl.create3d(self, x_, y_, z_) rescue nil
-      end
-      
-      
     end
     
     

data/lib/rgeo/geos/interface.rb

@@ -81,6 +81,16 @@ 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.
+      #   Note that GEOS factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   most support one or the other.
+      # <tt>:support_m_coordinate</tt>::
+      #   Support <tt>m_coordinate</tt>. Default is false.
+      #   Note that GEOS factories cannot support both
+      #   <tt>z_coordinate</tt> and <tt>m_coordinate</tt>. They may at
+      #   most support one or the other.
       
       def factory(opts_={})
         supported? ? Factory.create(opts_) : nil

data/lib/rgeo/impl_helpers.rb

@@ -51,6 +51,5 @@ paths_ = [
   'impl_helpers/basic_point_methods',
   'impl_helpers/basic_line_string_methods',
   'impl_helpers/basic_polygon_methods',
-  'impl_helpers/serialization',
 ]
 paths_.each{ |path_| require "rgeo/#{path_}" }

data/lib/rgeo/impl_helpers/basic_geometry_methods.rb

@@ -73,12 +73,12 @@ module RGeo
       
       
       def as_text
-        Serialization.unparse_wkt(self)
+        WKRep::WKTGenerator.new.generate(self)
       end
       
       
       def as_binary
-        Serialization.unparse_wkb(self)
+        WKRep::WKBGenerator.new.generate(self)
       end
       
       

data/lib/rgeo/impl_helpers/basic_point_methods.rb

@@ -42,10 +42,12 @@ module RGeo
     module BasicPointMethods  # :nodoc:
       
       
-      def initialize(factory_, x_, y_)
+      def initialize(factory_, x_, y_, *extra_)
         _set_factory(factory_)
         @x = x_.to_f
         @y = y_.to_f
+        @z = factory_.has_capability?(:z_coordinate) ? extra_.shift.to_f : nil
+        @m = factory_.has_capability?(:m_coordinate) ? extra_.shift.to_f : nil
         _validate_geometry
       end
       
@@ -60,22 +62,18 @@ module RGeo
       end
       
       
-      def eql?(rhs_)
-        rhs_.is_a?(self.class) && rhs_.factory.eql?(@factory) && @x == rhs_.x && @y == rhs_.y
+      def z
+        @z
       end
       
       
-      def cast(type_)
-        case type_
-        when Features::Point
-          self
-        when Features::GeometryCollection
-          factory.collection([self]) rescue nil
-        when Features::MultiPoint
-          factory.multi_point([self]) rescue nil
-        else
-          super
-        end
+      def m
+        @m
+      end
+      
+      
+      def eql?(rhs_)
+        rhs_.is_a?(self.class) && rhs_.factory.eql?(@factory) && @x == rhs_.x && @y == rhs_.y && @z == rhs_.z && @m == rhs_.m
       end
       
       

data/lib/rgeo/wkrep.rb

@@ -0,0 +1,59 @@
+# -----------------------------------------------------------------------------
+# 
+# Well-known representation 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  
+  # Implementations of the OpenGIS well-known representation
+  # (i.e. the WKT/WKB) and its variants (e.g. the EWKT/EWKB used by
+  # PostGIS). Provides generation and parsing facilities.
+  
+  module WKRep
+  end
+  
+  
+end
+
+
+# Dependency source files.
+paths_ = [
+  'features',
+  'wkrep/wkt_parser',
+  'wkrep/wkt_generator',
+  'wkrep/wkb_parser',
+  'wkrep/wkb_generator',
+]
+paths_.each{ |path_| require "rgeo/#{path_}" }

data/lib/rgeo/wkrep/wkb_generator.rb

@@ -0,0 +1,181 @@
+# -----------------------------------------------------------------------------
+# 
+# Well-known binary generator 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module WKRep
+    
+    
+    class WKBGenerator
+      
+      
+      TYPE_CODES = {
+        Features::Point => 1,
+        Features::LineString => 2,
+        Features::LinearRing => 2,
+        Features::Line => 2,
+        Features::Polygon => 3,
+        Features::MultiPoint => 4,
+        Features::MultiLineString => 5,
+        Features::MultiPolygon => 6,
+        Features::GeometryCollection => 7,
+      }
+      
+      
+      def initialize(opts_={})
+        @type_format = opts_[:type_format]
+        @emit_ewkb_srid = opts_[:emit_ewkb_srid] if @type_format == :ewkb
+        @hex_format = opts_[:hex_format]
+        @little_endian = opts_[:little_endian]
+      end
+      
+      
+      def generate(obj_)
+        factory_ = obj_.factory
+        if @type_format == :ewkb || @type_format == :wkb12
+          @cur_has_z = factory_.has_capability?(:z_coordinate)
+          @cur_has_m = factory_.has_capability?(:m_coordinate)
+        else
+          @cur_has_z = nil
+          @cur_has_m = nil
+        end
+        @cur_dims = 2 + (@cur_has_z ? 1 : 0) + (@cur_has_m ? 1 : 0)
+        _start_emitter
+        _generate_feature(obj_, true)
+        _finish_emitter
+      end
+      
+      
+      def _generate_feature(obj_, toplevel_=false)  # :nodoc:
+        _emit_byte(@little_endian ? 1 : 0)
+        type_ = obj_.geometry_type
+        type_code_ = TYPE_CODES[type_]
+        unless type_code_
+          raise Errors::ParseError, "Unrecognized Geometry Type: #{type_}"
+        end
+        emit_srid_ = false
+        if @emit_ewkb_srid && toplevel_
+          type_code |= 0x20000000
+          emit_srid_ = true
+        end
+        if @type_format == :ewkb
+          type_code_ |= 0x80000000 if @cur_has_z
+          type_code_ |= 0x40000000 if @cur_has_m
+        elsif @type_format == :wkb12
+          type_code_ += 1000 if @cur_has_z
+          type_code_ += 2000 if @cur_has_m
+        end
+        _emit_integer(type_code_)
+        _emit_integer(obj_.srid) if emit_srid_
+        if type_ == Features::Point
+          _emit_doubles(_point_coords(obj_))
+        elsif type_.subtype_of?(Features::LineString)
+          _emit_line_string_coords(obj_)
+        elsif type_ == Features::Polygon
+          exterior_ring_ = obj_.exterior_ring
+          if exterior_ring_.is_empty?
+            _emit_integer(0)
+          else
+            _emit_integer(1 + obj_.num_interior_rings)
+            _emit_line_string_coords(exterior_ring_)
+            obj_.interior_rings.each{ |r_| _emit_line_string_coords(r_) }
+          end
+        elsif type_ == Features::GeometryCollection
+          _emit_integer(obj_.num_geometries)
+          obj_.each{ |g_| _generate_feature(g_) }
+        elsif type_ == Features::MultiPoint
+          _emit_integer(obj_.num_geometries)
+          obj_.each{ |g_| _generate_feature(g_) }
+        elsif type_ == Features::MultiLineString
+          _emit_integer(obj_.num_geometries)
+          obj_.each{ |g_| _generate_feature(g_) }
+        elsif type_ == Features::MultiPolygon
+          _emit_integer(obj_.num_geometries)
+          obj_.each{ |g_| _generate_feature(g_) }
+        end
+      end
+      
+      
+      def _point_coords(obj_, array_=[])  # :nodoc:
+        array_ << obj_.x
+        array_ << obj_.y
+        array_ << obj_.z if @cur_has_z
+        array_ << obj_.m if @cur_has_m
+        array_
+      end
+      
+      
+      def _emit_line_string_coords(obj_)  # :nodoc:
+        array_ = []
+        obj_.points.each{ |p_| _point_coords(p_, array_) }
+        _emit_integer(obj_.num_points)
+        _emit_doubles(array_)
+      end
+      
+      
+      def _start_emitter  # :nodoc:
+        @cur_array = []
+      end
+      
+      
+      def _emit_byte(value_)  # :nodoc:
+        @cur_array << [value_].pack("C")
+      end
+      
+      
+      def _emit_integer(value_)  # :nodoc:
+        @cur_array << [value_].pack(@little_endian ? 'V' : 'N')
+      end
+      
+      
+      def _emit_doubles(array_)  # :nodoc:
+        @cur_array << array_.pack(@little_endian ? 'E*' : 'G*')
+      end
+      
+      
+      def _finish_emitter  # :nodoc:
+        str_ = @cur_array.join
+        @cur_array = nil
+        str_
+      end
+      
+      
+    end
+    
+    
+  end
+  
+end