rgeo 0.4.0 → 0.5.0

data/lib/rgeo/coord_sys/proj4.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module CoordSys
-
-
     # This is a Ruby wrapper around a Proj4 coordinate system.
     # It represents a single geographic coordinate system, which may be
     # a flat projection, a geocentric (3-dimensional) coordinate system,
@@ -21,23 +18,18 @@ module RGeo
     # coordinate transformations.
 
     class Proj4
-
-
-      def inspect  # :nodoc:
+      def inspect # :nodoc:
         "#<#{self.class}:0x#{object_id.to_s(16)} #{canonical_str.inspect}>"
       end
 
-
       def to_s  # :nodoc:
         canonical_str
       end
 
-
       def hash  # :nodoc:
         @hash ||= canonical_hash.hash
       end
 
-
       # Returns true if this Proj4 is equivalent to the given Proj4.
       #
       # Note: this tests for equivalence by comparing only the hash
@@ -52,34 +44,31 @@ module RGeo
       end
       alias_method :==, :eql?
 
-
       # Marshal support
 
-      def marshal_dump  # :nodoc:
-        {'rad' => radians?, 'str' => original_str || canonical_str}
+      def marshal_dump # :nodoc:
+        { "rad" => radians?, "str" => original_str || canonical_str }
       end
 
-      def marshal_load(data_)  # :nodoc:
-        _set_value(data_['str'], data_['rad'])
+      def marshal_load(data_) # :nodoc:
+        _set_value(data_["str"], data_["rad"])
       end
 
-
       # Psych support
 
-      def encode_with(coder_)  # :nodoc:
-        coder_['proj4'] = original_str || canonical_str
-        coder_['radians'] = radians?
+      def encode_with(coder_) # :nodoc:
+        coder_["proj4"] = original_str || canonical_str
+        coder_["radians"] = radians?
       end
 
-      def init_with(coder_)  # :nodoc:
+      def init_with(coder_) # :nodoc:
         if coder_.type == :scalar
           _set_value(coder_.scalar, false)
         else
-          _set_value(coder_['proj4'], coder_['radians'])
+          _set_value(coder_["proj4"], coder_["radians"])
         end
       end
 
-
       # Returns the "canonical" string definition for this coordinate
       # system, as reported by Proj4. This may be slightly different
       # from the definition used to construct this object.
@@ -88,13 +77,12 @@ module RGeo
         unless defined?(@canonical_str)
           @canonical_str = _canonical_str
           if @canonical_str.respond_to?(:force_encoding)
-            @canonical_str.force_encoding('US-ASCII')
+            @canonical_str.force_encoding("US-ASCII")
           end
         end
         @canonical_str
       end
 
-
       # Returns the "canonical" hash definition for this coordinate
       # system, as reported by Proj4. This may be slightly different
       # from the definition used to construct this object.
@@ -103,15 +91,12 @@ module RGeo
         unless defined?(@canonical_hash)
           @canonical_hash = {}
           canonical_str.strip.split(/\s+/).each do |elem_|
-            if elem_ =~ /^\+(\w+)(=(\S+))?$/
-              @canonical_hash[$1] = $3
-            end
+            @canonical_hash[Regexp.last_match(1)] = Regexp.last_match(3) if elem_ =~ /^\+(\w+)(=(\S+))?$/
           end
         end
         @canonical_hash
       end
 
-
       # Returns the string definition originally used to construct this
       # object. Returns nil if this object wasn't created by a string
       # definition; i.e. if it was created using get_geographic.
@@ -120,7 +105,6 @@ module RGeo
         _original_str
       end
 
-
       # Returns true if this Proj4 object is a geographic (lat-long)
       # coordinate system.
 
@@ -128,7 +112,6 @@ module RGeo
         _geographic?
       end
 
-
       # Returns true if this Proj4 object is a geocentric (3dz)
       # coordinate system.
 
@@ -136,7 +119,6 @@ module RGeo
         _geocentric?
       end
 
-
       # Returns true if this Proj4 object uses radians rather than degrees
       # if it is a geographic coordinate system.
 
@@ -144,7 +126,6 @@ module RGeo
         _radians?
       end
 
-
       # Get the geographic (unprojected lat-long) coordinate system
       # corresponding to this coordinate system; i.e. the one that uses
       # the same ellipsoid and datum.
@@ -153,10 +134,7 @@ module RGeo
         _get_geographic
       end
 
-
       class << self
-
-
         # Returns true if Proj4 is supported in this installation.
         # If this returns false, the other methods such as create
         # will not work.
@@ -165,14 +143,12 @@ module RGeo
           respond_to?(:_create)
         end
 
-
         # Returns the Proj library version as a string of the format "x.y.z".
 
         def version
           ::RGeo::VERSION
         end
 
-
         # Create a new Proj4 object, given a definition, which may be
         # either a string or a hash. Returns nil if the given definition
         # is invalid or Proj4 is not supported.
@@ -190,11 +166,11 @@ module RGeo
         #   coordinate system, this has no effect. Default is false.
         #   (That is all coordinates are in degrees by default.)
 
-        def create(defn_, opts_={})
+        def create(defn_, opts_ = {})
           result_ = nil
           if supported?
-            if defn_.kind_of?(::Hash)
-              defn_ = defn_.map{ |k_, v_| v_ ? "+#{k_}=#{v_}" : "+#{k_}" }.join(' ')
+            if defn_.is_a?(::Hash)
+              defn_ = defn_.map { |k_, v_| v_ ? "+#{k_}=#{v_}" : "+#{k_}" }.join(" ")
             end
             unless defn_ =~ /^\s*\+/
               defn_ = defn_.sub(/^(\s*)/, '\1+').gsub(/(\s+)([^+\s])/, '\1+\2')
@@ -205,7 +181,6 @@ module RGeo
           result_
         end
 
-
         # Create a new Proj4 object, given a definition, which may be
         # either a string or a hash. Raises Error::UnsupportedOperation
         # if the given definition is invalid or Proj4 is not supported.
@@ -223,7 +198,7 @@ module RGeo
         #   coordinate system, this has no effect. Default is false.
         #   (That is all coordinates are in degrees by default.)
 
-        def new(defn_, opts_={})
+        def new(defn_, opts_ = {})
           result_ = create(defn_, opts_)
           unless result_
             raise Error::UnsupportedOperation, "Proj4 not supported in this installation"
@@ -231,13 +206,12 @@ module RGeo
           result_
         end
 
-
         # Low-level coordinate transform method.
         # Transforms the given coordinate (x, y, [z]) from one proj4
         # coordinate system to another. Returns an array with either two
         # or three elements.
 
-        def transform_coords(from_proj_, to_proj_, x_, y_, z_=nil)
+        def transform_coords(from_proj_, to_proj_, x_, y_, z_ = nil)
           if !from_proj_._radians? && from_proj_._geographic?
             x_ *= ImplHelper::Math::RADIANS_PER_DEGREE
             y_ *= ImplHelper::Math::RADIANS_PER_DEGREE
@@ -250,7 +224,6 @@ module RGeo
           result_
         end
 
-
         # Low-level geometry transform method.
         # Transforms the given geometry between the given two projections.
         # The resulting geometry is constructed using the to_factory.
@@ -262,26 +235,25 @@ module RGeo
           when Feature::Point
             _transform_point(from_proj_, from_geometry_, to_proj_, to_factory_)
           when Feature::Line
-            to_factory_.line(from_geometry_.points.map{ |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
+            to_factory_.line(from_geometry_.points.map { |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
           when Feature::LinearRing
             _transform_linear_ring(from_proj_, from_geometry_, to_proj_, to_factory_)
           when Feature::LineString
-            to_factory_.line_string(from_geometry_.points.map{ |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
+            to_factory_.line_string(from_geometry_.points.map { |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
           when Feature::Polygon
             _transform_polygon(from_proj_, from_geometry_, to_proj_, to_factory_)
           when Feature::MultiPoint
-            to_factory_.multi_point(from_geometry_.map{ |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
+            to_factory_.multi_point(from_geometry_.map { |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
           when Feature::MultiLineString
-            to_factory_.multi_line_string(from_geometry_.map{ |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
+            to_factory_.multi_line_string(from_geometry_.map { |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
           when Feature::MultiPolygon
-            to_factory_.multi_polygon(from_geometry_.map{ |p_| _transform_polygon(from_proj_, p_, to_proj_, to_factory_) })
+            to_factory_.multi_polygon(from_geometry_.map { |p_| _transform_polygon(from_proj_, p_, to_proj_, to_factory_) })
           when Feature::GeometryCollection
-            to_factory_.collection(from_geometry_.map{ |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
+            to_factory_.collection(from_geometry_.map { |g_| transform(from_proj_, g_, to_proj_, to_factory_) })
           end
         end
 
-
-        def _transform_point(from_proj_, from_point_, to_proj_, to_factory_)  # :nodoc:
+        def _transform_point(from_proj_, from_point_, to_proj_, to_factory_) # :nodoc:
           from_factory_ = from_point_.factory
           from_has_z_ = from_factory_.property(:has_z_coordinate)
           from_has_m_ = from_factory_.property(:has_m_coordinate)
@@ -303,30 +275,19 @@ module RGeo
             extras_ << coords_[2].to_f if to_has_z_
             extras_ << from_has_m_ ? from_point_.m : 0.0 if to_has_m_
             to_factory_.point(coords_[0], coords_[1], *extras_)
-          else
-            nil
           end
         end
 
-
-        def _transform_linear_ring(from_proj_, from_ring_, to_proj_, to_factory_)  # :nodoc:
-          to_factory_.linear_ring(from_ring_.points[0..-2].map{ |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
+        def _transform_linear_ring(from_proj_, from_ring_, to_proj_, to_factory_) # :nodoc:
+          to_factory_.linear_ring(from_ring_.points[0..-2].map { |p_| _transform_point(from_proj_, p_, to_proj_, to_factory_) })
         end
 
-
-        def _transform_polygon(from_proj_, from_polygon_, to_proj_, to_factory_)  # :nodoc:
+        def _transform_polygon(from_proj_, from_polygon_, to_proj_, to_factory_) # :nodoc:
           ext_ = _transform_linear_ring(from_proj_, from_polygon_.exterior_ring, to_proj_, to_factory_)
-          int_ = from_polygon_.interior_rings.map{ |r_| _transform_linear_ring(from_proj_, r_, to_proj_, to_factory_) }
+          int_ = from_polygon_.interior_rings.map { |r_| _transform_linear_ring(from_proj_, r_, to_proj_, to_factory_) }
           to_factory_.polygon(ext_, int_)
         end
-
-
       end
-
-
     end
-
-
   end
-
 end

data/lib/rgeo/coord_sys/srs_database/interface.rb

@@ -5,10 +5,7 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module CoordSys
-
-
     # This module contains tools for accessing spatial reference
     # databases. These are databases (either local or remote) from which
     # you can look up coordinate system specifications, typically in
@@ -19,42 +16,32 @@ module RGeo
     # spatialreference.org site.
 
     module SRSDatabase
-
-
       # Interface specification for spatial reference system databases.
       # This module exists primarily for the sake of documentation.
       # Database implementations need not actually include this module,
       # but at least need to duck-type its methods.
 
       module Interface
-
-
         # Retrieve an Entry given an identifier. The identifier is usually
         # a numeric spatial reference ID (SRID), but could be a string
         # value for certain database types.
 
-        def get(ident_)
+        def get(_ident_)
           nil
         end
 
-
         # Clears any cache utilized by this database.
 
         def clear_cache
           nil
         end
-
-
       end
 
-
       # An entry in a spatial reference system database.
       # Every entry has an identifier, but all the other attributes are
       # optional and may or may not be present depending on the database.
 
       class Entry
-
-
         # Create an entry.
         # You must provide an identifier, which may be numeric or a
         # string. The data hash should contain any other attributes,
@@ -77,19 +64,19 @@ module RGeo
         #   If the authority code is not provided directly, it is taken
         #   from the coord_sys.
 
-        def initialize(ident_, data_={})
+        def initialize(ident_, data_ = {})
           @identifier = ident_
           @authority = data_[:authority]
           @authority_code = data_[:authority_code]
           @name = data_[:name]
           @description = data_[:description]
           @coord_sys = data_[:coord_sys]
-          if @coord_sys.kind_of?(::String)
+          if @coord_sys.is_a?(::String)
             @coord_sys = CS.create_from_wkt(@coord_sys)
           end
           @proj4 = data_[:proj4]
           if Proj4.supported?
-            if @proj4.kind_of?(::String) || @proj4.kind_of?(::Hash)
+            if @proj4.is_a?(::String) || @proj4.is_a?(::Hash)
               @proj4 = Proj4.create(@proj4)
             end
           else
@@ -102,7 +89,6 @@ module RGeo
           end
         end
 
-
         # The database key or identifier.
         attr_reader :identifier
 
@@ -123,13 +109,7 @@ module RGeo
 
         # The Proj4 object.
         attr_reader :proj4
-
-
       end
-
-
     end
-
   end
-
 end

data/lib/rgeo/coord_sys/srs_database/proj4_data.rb

@@ -5,20 +5,14 @@
 # -----------------------------------------------------------------------------
 
 module RGeo
-
   module CoordSys
-
     module SRSDatabase
-
-
       # A spatial reference database implementation backed by coordinate
       # system files installed as part of the proj4 library. For a given
       # Proj4Data object, you specify a single file (e.g. the epsg data
       # file), and you can retrieve records by ID number.
 
       class Proj4Data
-
-
         # Connect to one of the proj4 data files. You should provide the
         # file name, optionally the installation directory if it is not
         # in a typical location, and several additional options.
@@ -48,12 +42,12 @@ module RGeo
         #   entries. The authority code will be set to the identifier. If
         #   not set, then the authority fields of entries will be blank.
 
-        def initialize(filename_, opts_={})
+        def initialize(filename_, opts_ = {})
           dir_ = nil
           if opts_.include?(:dir)
             dir_ = opts_[:dir]
           else
-            ['/usr/local/share/proj', '/usr/local/proj/share/proj', '/usr/local/proj4/share/proj', '/opt/local/share/proj', '/opt/proj/share/proj', '/opt/proj4/share/proj', '/opt/share/proj', '/usr/share/proj'].each do |d_|
+            ["/usr/local/share/proj", "/usr/local/proj/share/proj", "/usr/local/proj4/share/proj", "/opt/local/share/proj", "/opt/proj/share/proj", "/opt/proj4/share/proj", "/opt/share/proj", "/usr/share/proj"].each do |d_|
               if ::File.directory?(d_) && ::File.readable?(d_)
                 dir_ = d_
                 break
@@ -79,7 +73,6 @@ module RGeo
           end
         end
 
-
         # Retrieve the Entry for the given ID number.
 
         def get(ident_)
@@ -88,7 +81,7 @@ module RGeo
           result_ = nil
           if @populate_state == 0
             data_ = _search_file(ident_)
-            result_ = Entry.new(ident_, :authority => @authority, :authority_code => @authority ? ident_ : nil, :name => data_[1], :proj4 => data_[2]) if data_
+            result_ = Entry.new(ident_, authority: @authority, authority_code: @authority ? ident_ : nil, name: data_[1], proj4: data_[2]) if data_
             @cache[ident_] = result_ if @cache
           elsif @populate_state == 1
             _search_file(nil)
@@ -98,7 +91,6 @@ module RGeo
           result_
         end
 
-
         # Clear the cache if one exists.
 
         def clear_cache
@@ -106,8 +98,7 @@ module RGeo
           @populate_state = 1 if @populate_state == 2
         end
 
-
-        def _search_file(ident_)  # :nodoc:
+        def _search_file(ident_) # :nodoc:
           ::File.open(@path) do |file_|
             cur_name_ = nil
             cur_ident_ = nil
@@ -115,44 +106,35 @@ module RGeo
             file_.each do |line_|
               line_.strip!
               if (comment_delim_ = line_.index('#'))
-                cur_name_ = line_[comment_delim_+1..-1].strip
-                line_ = line_[0..comment_delim_-1].strip
+                cur_name_ = line_[comment_delim_ + 1..-1].strip
+                line_ = line_[0..comment_delim_ - 1].strip
               end
               unless cur_ident_
                 if line_ =~ /^<(\w+)>(.*)/
-                  cur_ident_ = $1
+                  cur_ident_ = Regexp.last_match(1)
                   cur_text_ = []
-                  line_ = $2.strip
+                  line_ = Regexp.last_match(2).strip
                 end
               end
-              if cur_ident_
-                if line_[-2..-1] == '<>'
-                  cur_text_ << line_[0..-3].strip
-                  cur_text_ = cur_text_.join(' ')
-                  if ident_.nil?
-                    @cache[ident_] = Entry.new(ident_, :authority => @authority, :authority_code => @authority ? id_ : nil, :name => cur_name_, :proj4 => cur_text_)
-                  end
-                  if cur_ident_ == ident_
-                    return [ident_, cur_name_, cur_text_]
-                  end
-                  cur_ident_ = nil
-                  cur_name_ = nil
-                  cur_text_ = nil
-                else
-                  cur_text_ << line_
+              next unless cur_ident_
+              if line_[-2..-1] == "<>"
+                cur_text_ << line_[0..-3].strip
+                cur_text_ = cur_text_.join(" ")
+                if ident_.nil?
+                  @cache[ident_] = Entry.new(ident_, authority: @authority, authority_code: @authority ? id_ : nil, name: cur_name_, proj4: cur_text_)
                 end
+                return [ident_, cur_name_, cur_text_] if cur_ident_ == ident_
+                cur_ident_ = nil
+                cur_name_ = nil
+                cur_text_ = nil
+              else
+                cur_text_ << line_
               end
             end
           end
           nil
         end
-
-
       end
-
-
     end
-
   end
-
 end