rgeo 0.3.18 → 0.3.19

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.19 / 2012-09-20
+
+* The Geos factories, as well as the projected geographic convenience factories such as simple_mercator, now support the :uses_lenient_assertions option.
+* RGeo::Geographic::ProjectedWindow#height was incorrectly aliased to x_span rather than y_span. Fixed.
+
 === 0.3.18 / 2012-09-19
 
 * The coordinate system WKT parser now recognizes the nonstandard "EXTENSION" node. This node is not part of the WKT, but it is present in some data sets, including the coordinate systems shipped with Proj 4.8, so we now support it.

data/Version

@@ -1 +1 @@
-0.3.18
+0.3.19

data/lib/rgeo/cartesian/factory.rb

@@ -122,6 +122,8 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Standard hash code
+
       def hash
         @hash ||= [@srid, @has_z, @has_m, @proj4].hash
       end

data/lib/rgeo/coord_sys/cs/entities.rb

@@ -178,7 +178,9 @@ module RGeo
       class Base
 
 
-        def inspect  # :nodoc:
+        # Standard object inspection output
+
+        def inspect
           "#<#{self.class}:0x#{object_id.to_s(16)} #{to_wkt}>"
         end
 
@@ -192,6 +194,8 @@ module RGeo
         alias_method :==, :eql?
 
 
+        # Standard hash code
+
         def hash
           @hash ||= self.to_wkt.hash
         end

data/lib/rgeo/coord_sys/cs/wkt_parser.rb

@@ -50,7 +50,7 @@ module RGeo
         end
 
 
-        def parse(containing_type_=nil)
+        def parse(containing_type_=nil)  # :nodoc:
           if @cur_token.kind_of?(QuotedString) ||
             @cur_token.kind_of?(::Numeric) ||
             (containing_type_ == 'AXIS' && @cur_token.kind_of?(TypeString))
@@ -231,12 +231,12 @@ module RGeo
 
         class AuthorityClause  # :nodoc:
 
-          def initialize(name_, code_)
+          def initialize(name_, code_)  # :nodoc:
             @name = name_
             @code = code_
           end
 
-          def to_a
+          def to_a  # :nodoc:
             [@name, @code]
           end
 
@@ -245,28 +245,28 @@ module RGeo
 
         class ExtensionClause  # :nodoc:
 
-          def initialize(key_, value_)
+          def initialize(key_, value_)  # :nodoc:
             @key = key_
             @value = value_
           end
 
-          attr_reader :key
-          attr_reader :value
+          attr_reader :key  # :nodoc:
+          attr_reader :value  # :nodoc:
 
         end
 
 
         class ArgumentList  # :nodoc:
 
-          def initialize
+          def initialize  # :nodoc:
             @values = []
           end
 
-          def <<(value_)
+          def <<(value_)  # :nodoc:
             @values << value_
           end
 
-          def assert_empty
+          def assert_empty  # :nodoc:
             if @values.size > 0
               names_ = @values.map do |val_|
                 val_.kind_of?(Base) ? val_._wkt_typename : val_.inspect
@@ -275,7 +275,7 @@ module RGeo
             end
           end
 
-          def find_first(klass_)
+          def find_first(klass_)  # :nodoc:
             @values.each_with_index do |val_, index_|
               if val_.kind_of?(klass_)
                 @values.slice!(index_)
@@ -285,7 +285,7 @@ module RGeo
             nil
           end
 
-          def find_all(klass_)
+          def find_all(klass_)  # :nodoc:
             results_ = []
             nvalues_ = []
             @values.each do |val_|
@@ -299,13 +299,13 @@ module RGeo
             results_
           end
 
-          def create_optionals
+          def create_optionals  # :nodoc:
             hash_ = {}
             find_all(ExtensionClause).each{ |ec_| hash_[ec_.key] = ec_.value }
             (find_first(AuthorityClause) || [nil, nil]).to_a + [nil, nil, nil, hash_]
           end
 
-          def shift(klass_=nil)
+          def shift(klass_=nil)  # :nodoc:
             val_ = @values.shift
             unless val_
               raise Error::ParseError, "No arguments left... expected #{klass_}"

data/lib/rgeo/geographic/factory.rb

@@ -127,6 +127,8 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Standard hash code
+
       def hash
         @hash ||= [@impl_prefix, @support_z, @support_m, @proj4].hash
       end

data/lib/rgeo/geographic/interface.rb

@@ -259,6 +259,7 @@ module RGeo
         projector_ = Geographic::SimpleMercatorProjector.new(factory_,
           :buffer_resolution => opts_[:buffer_resolution],
           :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+          :uses_lenient_assertions => opts_[:uses_lenient_assertions],
           :has_z_coordinate => opts_[:has_z_coordinate],
           :has_m_coordinate => opts_[:has_m_coordinate])
         factory_._set_projector(projector_)
@@ -482,6 +483,7 @@ module RGeo
             :coord_sys => projection_coord_sys_,
             :buffer_resolution => opts_[:buffer_resolution],
             :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+            :uses_lenient_assertions => opts_[:uses_lenient_assertions],
             :has_z_coordinate => opts_[:has_z_coordinate],
             :has_m_coordinate => opts_[:has_m_coordinate],
             :wkt_parser => opts_[:wkt_parser], :wkt_generator => opts_[:wkt_generator],

data/lib/rgeo/geographic/proj4_projector.rb

@@ -92,6 +92,7 @@ module RGeo
             :coord_sys => opts_[:coord_sys], :srid => opts_[:srid],
             :buffer_resolution => opts_[:buffer_resolution],
             :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+            :uses_lenient_assertions => opts_[:uses_lenient_assertions],
             :has_z_coordinate => opts_[:has_z_coordinate],
             :has_m_coordinate => opts_[:has_m_coordinate],
             :wkt_parser => opts_[:wkt_parser], :wkt_generator => opts_[:wkt_generator],

data/lib/rgeo/geographic/projected_window.rb

@@ -181,7 +181,7 @@ module RGeo
       def y_span
         @y_max - @y_min
       end
-      alias_method :height, :x_span
+      alias_method :height, :y_span
 
 
       # Returns a two-element array containing the x and y coordinates

data/lib/rgeo/geographic/simple_mercator_projector.rb

@@ -51,6 +51,7 @@ module RGeo
           :coord_sys => SimpleMercatorProjector._coordsys_3785,
           :buffer_resolution => opts_[:buffer_resolution],
           :lenient_multi_polygon_assertions => opts_[:lenient_multi_polygon_assertions],
+          :uses_lenient_assertions => opts_[:uses_lenient_assertions],
           :has_z_coordinate => opts_[:has_z_coordinate],
           :has_m_coordinate => opts_[:has_m_coordinate])
       end

data/lib/rgeo/geographic/spherical_feature_methods.rb

@@ -181,7 +181,7 @@ module RGeo
     end
 
 
-    module SphericalMultiLineStringMethods
+    module SphericalMultiLineStringMethods  # :nodoc:
 
 
       def length

data/lib/rgeo/geos/capi_factory.rb

@@ -61,7 +61,7 @@ module RGeo
 
           # Get flags to pass to the C extension
           flags_ = 0
-          flags_ |= 1 if opts_[:lenient_multi_polygon_assertions] || opts_[:uses_lenient_multi_polygon_assertions]
+          flags_ |= 1 if opts_[:uses_lenient_assertions] || opts_[:lenient_multi_polygon_assertions] || opts_[:uses_lenient_multi_polygon_assertions]
           flags_ |= 2 if opts_[:has_z_coordinate]
           flags_ |= 4 if opts_[:has_m_coordinate]
           if flags_ & 6 == 6
@@ -150,7 +150,9 @@ module RGeo
       end
 
 
-      def inspect  # :nodoc:
+      # Standard object inspection output
+
+      def inspect
         "#<#{self.class}:0x#{object_id.to_s(16)} srid=#{_srid} bufres=#{_buffer_resolution} flags=#{_flags}>"
       end
 
@@ -165,6 +167,8 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Standard hash code
+
       def hash
         @hash ||= [_srid, _buffer_resolution, _flags, _proj4].hash
       end

data/lib/rgeo/geos/ffi_factory.rb

@@ -54,8 +54,8 @@ module RGeo
 
       def initialize(opts_={})
         # Main flags
-        @uses_lenient_multi_polygon_assertions = opts_[:lenient_multi_polygon_assertions] ||
-          opts_[:uses_lenient_multi_polygon_assertions]
+        @uses_lenient_multi_polygon_assertions = opts_[:uses_lenient_assertions] ||
+          opts_[:lenient_multi_polygon_assertions] || opts_[:uses_lenient_multi_polygon_assertions]
         @has_z = opts_[:has_z_coordinate] ? true : false
         @has_m = opts_[:has_m_coordinate] ? true : false
         if @has_z && @has_m
@@ -144,7 +144,9 @@ module RGeo
       end
 
 
-      def inspect  # :nodoc:
+      # Standard object inspection output
+
+      def inspect
         "#<#{self.class}:0x#{object_id.to_s(16)} srid=#{srid}>"
       end
 
@@ -161,6 +163,8 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Standard hash code
+
       def hash
         @hash ||= [@srid, @has_z, @has_m, @buffer_resolution, @proj4].hash
       end

data/lib/rgeo/geos/zm_factory.rb

@@ -287,6 +287,8 @@ module RGeo
       alias_method :==, :eql?
 
 
+      # Standard hash code
+
       def hash
         @hash ||= [@zfactory, @mfactory].hash
       end

data/lib/rgeo/geos.rb

@@ -63,48 +63,54 @@ end
 
 # :stopdoc:
 
-# Implementation files
-require 'rgeo/geos/utils'
-require 'rgeo/geos/interface'
-begin
-  require 'rgeo/geos/geos_c_impl'
-rescue ::LoadError; end
-::RGeo::Geos::CAPI_SUPPORTED = ::RGeo::Geos.const_defined?(:CAPIGeometryMethods)
-if ::RGeo::Geos::CAPI_SUPPORTED
-  require 'rgeo/geos/capi_feature_classes'
-  require 'rgeo/geos/capi_factory'
-end
-require 'rgeo/geos/ffi_feature_methods'
-require 'rgeo/geos/ffi_feature_classes'
-require 'rgeo/geos/ffi_factory'
-require 'rgeo/geos/zm_feature_methods'
-require 'rgeo/geos/zm_feature_classes'
-require 'rgeo/geos/zm_factory'
-
-# Determine ffi support.
-begin
-  require 'ffi-geos'
-  # An additional check to make sure FFI loaded okay. This can fail on
-  # some versions of ffi-geos and some versions of Rubinius.
-  raise 'Problem loading FFI' unless ::FFI::AutoPointer
-  ::RGeo::Geos::FFI_SUPPORTED = true
-  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = nil
-rescue ::LoadError => ex_
-  ::RGeo::Geos::FFI_SUPPORTED = false
-  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = ex_
-rescue => ex_
-  ::RGeo::Geos::FFI_SUPPORTED = false
-  ::RGeo::Geos::FFI_SUPPORT_EXCEPTION = ex_
-end
+module RGeo
+  module Geos
 
-# Determine preferred native interface
-if ::RGeo::Geos::CAPI_SUPPORTED
-  ::RGeo::Geos.preferred_native_interface = :capi
-elsif ::RGeo::Geos::FFI_SUPPORTED
-  ::RGeo::Geos.preferred_native_interface = :ffi
-end
+    # Implementation files
+    require 'rgeo/geos/utils'
+    require 'rgeo/geos/interface'
+    begin
+      require 'rgeo/geos/geos_c_impl'
+    rescue ::LoadError; end
+    CAPI_SUPPORTED = ::RGeo::Geos.const_defined?(:CAPIGeometryMethods)
+    if CAPI_SUPPORTED
+      require 'rgeo/geos/capi_feature_classes'
+      require 'rgeo/geos/capi_factory'
+    end
+    require 'rgeo/geos/ffi_feature_methods'
+    require 'rgeo/geos/ffi_feature_classes'
+    require 'rgeo/geos/ffi_factory'
+    require 'rgeo/geos/zm_feature_methods'
+    require 'rgeo/geos/zm_feature_classes'
+    require 'rgeo/geos/zm_factory'
 
-# Init internal utilities
-::RGeo::Geos::Utils._init
+    # Determine ffi support.
+    begin
+      require 'ffi-geos'
+      # An additional check to make sure FFI loaded okay. This can fail on
+      # some versions of ffi-geos and some versions of Rubinius.
+      raise 'Problem loading FFI' unless ::FFI::AutoPointer
+      FFI_SUPPORTED = true
+      FFI_SUPPORT_EXCEPTION = nil
+    rescue ::LoadError => ex_
+      FFI_SUPPORTED = false
+      FFI_SUPPORT_EXCEPTION = ex_
+    rescue => ex_
+      FFI_SUPPORTED = false
+      FFI_SUPPORT_EXCEPTION = ex_
+    end
+
+    # Default preferred native interface
+    if CAPI_SUPPORTED
+      self.preferred_native_interface = :capi
+    elsif FFI_SUPPORTED
+      self.preferred_native_interface = :ffi
+    end
+
+    # Init internal utilities
+    Utils._init
+
+  end
+end
 
 # :startdoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies: []
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most