georuby 2.3.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f642a6426275ec6a200705f9314ac60b783ec66
-  data.tar.gz: ce8ae36da2895144752587caa3c0ddc9ad190a9b
+  metadata.gz: 8c4f8b3106e7d2ab362c2ec0adc1586e2d944855
+  data.tar.gz: a13bbeceb85ae96f24d484a5c63815f9aa00a3f7
 SHA512:
-  metadata.gz: eaa948c90a6d82850fd9aa0f571ea947b1cbc77d049faf6db86b855c93eea37e5e8dc3a5730ebcc8d8ee399ed73f81fc92dc20615e5e42e93ca392065969a688
-  data.tar.gz: 013276cf42be227087ae1ef62b54b8d25bddb1d91da560ac617903176482b62f258fcf853f22657facad18e974ccd6317665b34584f3cb47f02efb541fc43730
+  metadata.gz: 921c17e80d12c6175cebcb3dbecc98fe57aa8c87a49017bfa0839d6487b618c022b57d4418569c05a15a21c0e30bf7a2f7ddb537600900b88406f9d207ce0cac
+  data.tar.gz: 04d7b3314b08f2a5b7f084e21c68d2083f2318f16bf3bba9e632e600f753dd581a49ab0c67ce35042352fe675810060faf96a970ec0fced2f7a83ad32b5a70db

data/README.md

@@ -43,7 +43,6 @@ To install the latest version, just type:
 
     gem install georuby
 
-
 Or include on your projects`s Gemfile:
 
     gem 'georuby'
@@ -52,11 +51,13 @@ Or include on your projects`s Gemfile:
 Optional, require if you need the functionality:
 
 
-    require 'geo_ruby/shp4r/shp'    # Shapefile
-    require 'geo_ruby/gpx4r/gpx'    # GPX data
-    require 'geo_ruby/geojson'      # GeoJSON
-    require 'geo_ruby/georss'       # GeoRSS
-    require 'geo_ruby/kml'          # KML data
+    require 'georuby'
+    require 'geo_ruby/ewk'        # EWKT/EWKB
+    require 'geo_ruby/shp'        # Shapefile
+    require 'geo_ruby/gpx'        # GPX data
+    require 'geo_ruby/kml'        # KML data
+    require 'geo_ruby/georss'     # GeoRSS
+    require 'geo_ruby/geojson'    # GeoJSON
 
 
 Use
@@ -72,7 +73,13 @@ Creating a 3D Point:
 
 Creating a LineString:
 
-     LineString.from_coordinates([[1,1],[2,2]],4326))
+    LineString.from_coordinates([[1,1],[2,2]],4326))
+
+
+Creating a Polygon:
+
+    Polygon.from_coordinates([[1,1],[2,2]],4326))
+    LineString.from_linear_rings(rings)
 
 
 Input and output
@@ -155,7 +162,7 @@ thoroughly so caveat emptor and backup before performing any destructive operati
 
 
 GPX Reading
----
+-----------
 
 You can read and convert GPX Files to LineString/Polygon:
 
@@ -165,7 +172,7 @@ You can read and convert GPX Files to LineString/Polygon:
 
 
 GeoJSON Support
--------
+---------------
 
 Basic GeoJSON support has been implemented per v1.0 of the {spec}[http://geojson.org/geojson-spec.html].
 

data/Rakefile

@@ -1,33 +1,32 @@
 require 'bundler'
 Bundler.setup
 
-require "rspec"
-require "rspec/core/rake_task"
+require 'rspec'
+require 'rspec/core/rake_task'
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "geo_ruby/version"
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'geo_ruby/version'
 
-desc "Builds the gem"
-task :gem => :build
+desc 'Builds the gem'
+task gem: :build
 task :build do
-  system "gem build georuby.gemspec"
-  Dir.mkdir("pkg") unless Dir.exists?("pkg")
+  system 'gem build georuby.gemspec'
+  Dir.mkdir('pkg') unless Dir.exist?('pkg')
   system "mv georuby-#{GeoRuby::VERSION}.gem pkg/"
 end
 
-task :install => :build do
+task install: :build do
   system "sudo gem install pkg/georuby-#{GeoRuby::VERSION}.gem"
 end
 
-task :release => :build do
+task release: :build do
   system "git tag -a v#{GeoRuby::VERSION} -m 'Tagging #{GeoRuby::VERSION}'"
-  system "git push --tags"
+  system 'git push --tags'
   system "gem push pkg/georuby-#{GeoRuby::VERSION}.gem"
 end
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => [:spec]
-
+task default: [:spec]

data/lib/geo_ruby/ewk.rb

@@ -0,0 +1,2 @@
+require 'geo_ruby/ewk/ewkb_parser'
+require 'geo_ruby/ewk/ewkt_parser'

data/lib/geo_ruby/{simple_features → ewk}/ewkb_parser.rb

@@ -1,218 +1,206 @@
-require 'geo_ruby/simple_features/point'
-require 'geo_ruby/simple_features/line_string'
-require 'geo_ruby/simple_features/linear_ring'
-require 'geo_ruby/simple_features/polygon'
-require 'geo_ruby/simple_features/multi_point'
-require 'geo_ruby/simple_features/multi_line_string'
-require 'geo_ruby/simple_features/multi_polygon'
-require 'geo_ruby/simple_features/geometry_collection'
-
-module GeoRuby
-  module SimpleFeatures
-
-    #Raised when an error in the EWKB string is detected
-    class EWKBFormatError < StandardError
-    end
-
-    #Parses EWKB strings and notifies of events (such as the beginning of the definition of geometry, the value of the SRID...) the factory passed as argument to the constructor.
-    #
-    #=Example
-    # factory = GeometryFactory::new
-    # ewkb_parser = EWKBParser::new(factory)
-    # ewkb_parser.parse(<EWKB String>)
-    # geometry = @factory.geometry
-    #
-    #You can also use directly the static method Geometry.from_ewkb
-    class EWKBParser
-
-      def initialize(factory)
-        @factory = factory
-      end
-
-      #Parses the ewkb string passed as argument and notifies the factory of events
-      def parse(ewkb)
-        @factory.reset
-        @with_z = false
-        @with_m = false
-        @unpack_structure = UnpackStructure::new(ewkb)
-        parse_geometry
-        @unpack_structure.done
-        @srid = nil
-      end
-
-      private
-
-      def parse_geometry
-        @unpack_structure.endianness = @unpack_structure.read_byte
-        geometry_type = @unpack_structure.read_uint
-
-        if (geometry_type & Z_MASK) != 0
-          @with_z = true
-          geometry_type = geometry_type & ~Z_MASK
-        end
-        if (geometry_type & M_MASK) != 0
-          @with_m = true
-          geometry_type = geometry_type & ~M_MASK
-        end
-        if (geometry_type & SRID_MASK) != 0
-          @srid = @unpack_structure.read_uint
-          geometry_type = geometry_type & ~SRID_MASK
-        else
-          #to manage multi geometries : the srid is not present in sub_geometries, therefore we take the srid of the parent ; if it is the root, we take the default srid
-          @srid ||= DEFAULT_SRID
-        end
-
-        case geometry_type
-        when 1
-          parse_point
-        when 2
-          parse_line_string
-        when 3
-          parse_polygon
-        when 4
-          parse_multi_point
-        when 5
-          parse_multi_line_string
-        when 6
-          parse_multi_polygon
-        when 7
-          parse_geometry_collection
-        else
-          raise EWKBFormatError::new("Unknown geometry type")
-        end
-      end
-
-      def parse_geometry_collection
-        parse_multi_geometries(GeometryCollection)
-      end
-
-      def parse_multi_polygon
-        parse_multi_geometries(MultiPolygon)
-      end
-
-      def parse_multi_line_string
-        parse_multi_geometries(MultiLineString)
-      end
-
-      def parse_multi_point
-        parse_multi_geometries(MultiPoint)
-      end
-
-      def parse_multi_geometries(geometry_type)
-        @factory.begin_geometry(geometry_type,@srid)
-        num_geometries = @unpack_structure.read_uint
-        1.upto(num_geometries) { parse_geometry }
-        @factory.end_geometry(@with_z,@with_m)
-      end
-
-      def parse_polygon
-        @factory.begin_geometry(Polygon,@srid)
-        num_linear_rings = @unpack_structure.read_uint
-        1.upto(num_linear_rings) {parse_linear_ring}
-        @factory.end_geometry(@with_z,@with_m)
-      end
-
-      def parse_linear_ring
-        parse_point_list(LinearRing)
-      end
-
-      def parse_line_string
-        parse_point_list(LineString)
-      end
-
-      #used to parse line_strings and linear_rings
-      def parse_point_list(geometry_type)
-        @factory.begin_geometry(geometry_type,@srid)
-        num_points = @unpack_structure.read_uint
-        1.upto(num_points) {parse_point}
-        @factory.end_geometry(@with_z,@with_m)
-      end
-
-      def parse_point
-        @factory.begin_geometry(Point,@srid)
-        x, y = *@unpack_structure.read_point
-        if ! (@with_z or @with_m) #most common case probably
-          @factory.add_point_x_y(x,y)
-        elsif @with_m and @with_z
-          z = @unpack_structure.read_double
-          m = @unpack_structure.read_double
-          @factory.add_point_x_y_z_m(x,y,z,m)
-        elsif @with_z
-          z = @unpack_structure.read_double
-          @factory.add_point_x_y_z(x,y,z)
-        else
-          m = @unpack_structure.read_double
-          @factory.add_point_x_y_m(x,y,m)
-        end
-
-        @factory.end_geometry(@with_z,@with_m)
-      end
-    end
-
-    #Parses HexEWKB strings. In reality, it just transforms the HexEWKB string into the equivalent EWKB string and lets the EWKBParser do the actual parsing.
-    class HexEWKBParser < EWKBParser
-
-      #parses an HexEWKB string
-      def parse(hexewkb)
-        super(decode_hex(hexewkb))
-      end
-
-      #transforms a HexEWKB string into an EWKB string
-      def decode_hex(hexewkb)
-        [hexewkb].pack("H*")
-      end
-    end
-
-    class UnpackStructure #:nodoc:
-      NDR = 1
-      XDR = 0
-
-      def initialize(ewkb)
-        @position = 0
-        @ewkb = ewkb
-      end
-
-      def done
-        raise EWKBFormatError::new("Trailing data") if @position != @ewkb.length
-      end
-
-      def read_point
-        i = @position
-        @position += 16
-        raise EWKBFormatError::new("Truncated data") if @ewkb.length < @position
-        @ewkb.unpack("@#{i}#@double_mark#@double_mark@*")
-      end
-
-      def read_double
-        i = @position
-        @position += 8
-        raise EWKBFormatError::new("Truncated data") if @ewkb.length < @position
-        @ewkb.unpack("@#{i}#@double_mark@*").first
-      end
-
-      def read_uint
-        i = @position
-        @position += 4
-        raise EWKBFormatError::new("Truncated data") if @ewkb.length < @position
-        @ewkb.unpack("@#{i}#@uint_mark@*").first
-      end
-
-      def read_byte
-        i = @position
-        @position += 1
-        raise EWKBFormatError::new("Truncated data") if @ewkb.length < @position
-        @ewkb.unpack("@#{i}C@*").first
-      end
-
-      def endianness=(byte_order)
-        if(byte_order == NDR)
-          @uint_mark="V"
-          @double_mark="E"
-        elsif(byte_order == XDR)
-          @uint_mark="N"
-          @double_mark="G"
-        end
-      end
-    end
-  end
-end
+module GeoRuby
+  module SimpleFeatures
+    # Raised when an error in the EWKB string is detected
+    class EWKBFormatError < StandardError
+    end
+
+    # Parses EWKB strings and notifies of events (such as the beginning of the definition of geometry, the value of the SRID...) the factory passed as argument to the constructor.
+    #
+    # =Example
+    # factory = GeometryFactory::new
+    # ewkb_parser = EWKBParser::new(factory)
+    # ewkb_parser.parse(<EWKB String>)
+    # geometry = @factory.geometry
+    #
+    # You can also use directly the static method Geometry.from_ewkb
+    class EWKBParser
+      def initialize(factory)
+        @factory = factory
+      end
+
+      # Parses the ewkb string passed as argument and notifies the factory of events
+      def parse(ewkb)
+        @factory.reset
+        @with_z = false
+        @with_m = false
+        @unpack_structure = UnpackStructure.new(ewkb)
+        parse_geometry
+        @unpack_structure.done
+        @srid = nil
+      end
+
+      private
+
+      def parse_geometry
+        @unpack_structure.endianness = @unpack_structure.read_byte
+        geometry_type = @unpack_structure.read_uint
+
+        if (geometry_type & Z_MASK) != 0
+          @with_z = true
+          geometry_type = geometry_type & ~Z_MASK
+        end
+        if (geometry_type & M_MASK) != 0
+          @with_m = true
+          geometry_type = geometry_type & ~M_MASK
+        end
+        if (geometry_type & SRID_MASK) != 0
+          @srid = @unpack_structure.read_uint
+          geometry_type = geometry_type & ~SRID_MASK
+        else
+          # to manage multi geometries : the srid is not present in sub_geometries, therefore we take the srid of the parent ; if it is the root, we take the default srid
+          @srid ||= DEFAULT_SRID
+        end
+
+        case geometry_type
+        when 1
+          parse_point
+        when 2
+          parse_line_string
+        when 3
+          parse_polygon
+        when 4
+          parse_multi_point
+        when 5
+          parse_multi_line_string
+        when 6
+          parse_multi_polygon
+        when 7
+          parse_geometry_collection
+        else
+          fail EWKBFormatError.new('Unknown geometry type')
+        end
+      end
+
+      def parse_geometry_collection
+        parse_multi_geometries(GeometryCollection)
+      end
+
+      def parse_multi_polygon
+        parse_multi_geometries(MultiPolygon)
+      end
+
+      def parse_multi_line_string
+        parse_multi_geometries(MultiLineString)
+      end
+
+      def parse_multi_point
+        parse_multi_geometries(MultiPoint)
+      end
+
+      def parse_multi_geometries(geometry_type)
+        @factory.begin_geometry(geometry_type, @srid)
+        num_geometries = @unpack_structure.read_uint
+        1.upto(num_geometries) { parse_geometry }
+        @factory.end_geometry(@with_z, @with_m)
+      end
+
+      def parse_polygon
+        @factory.begin_geometry(Polygon, @srid)
+        num_linear_rings = @unpack_structure.read_uint
+        1.upto(num_linear_rings) { parse_linear_ring }
+        @factory.end_geometry(@with_z, @with_m)
+      end
+
+      def parse_linear_ring
+        parse_point_list(LinearRing)
+      end
+
+      def parse_line_string
+        parse_point_list(LineString)
+      end
+
+      # used to parse line_strings and linear_rings
+      def parse_point_list(geometry_type)
+        @factory.begin_geometry(geometry_type, @srid)
+        num_points = @unpack_structure.read_uint
+        1.upto(num_points) { parse_point }
+        @factory.end_geometry(@with_z, @with_m)
+      end
+
+      def parse_point
+        @factory.begin_geometry(Point, @srid)
+        x, y = *@unpack_structure.read_point
+        if ! (@with_z || @with_m) # most common case probably
+          @factory.add_point_x_y(x, y)
+        elsif @with_m && @with_z
+          z = @unpack_structure.read_double
+          m = @unpack_structure.read_double
+          @factory.add_point_x_y_z_m(x, y, z, m)
+        elsif @with_z
+          z = @unpack_structure.read_double
+          @factory.add_point_x_y_z(x, y, z)
+        else
+          m = @unpack_structure.read_double
+          @factory.add_point_x_y_m(x, y, m)
+        end
+
+        @factory.end_geometry(@with_z, @with_m)
+      end
+    end
+
+    # Parses HexEWKB strings. In reality, it just transforms the HexEWKB string into the equivalent EWKB string and lets the EWKBParser do the actual parsing.
+    class HexEWKBParser < EWKBParser
+      # parses an HexEWKB string
+      def parse(hexewkb)
+        super(decode_hex(hexewkb))
+      end
+
+      # transforms a HexEWKB string into an EWKB string
+      def decode_hex(hexewkb)
+        [hexewkb].pack('H*')
+      end
+    end
+
+    class UnpackStructure #:nodoc:
+      NDR = 1
+      XDR = 0
+
+      def initialize(ewkb)
+        @position = 0
+        @ewkb = ewkb
+      end
+
+      def done
+        fail EWKBFormatError.new('Trailing data') if @position != @ewkb.length
+      end
+
+      def read_point
+        i = @position
+        @position += 16
+        fail EWKBFormatError.new('Truncated data') if @ewkb.length < @position
+        @ewkb.unpack("@#{i}#{@double_mark}#{@double_mark}@*")
+      end
+
+      def read_double
+        i = @position
+        @position += 8
+        fail EWKBFormatError.new('Truncated data') if @ewkb.length < @position
+        @ewkb.unpack("@#{i}#{@double_mark}@*").first
+      end
+
+      def read_uint
+        i = @position
+        @position += 4
+        fail EWKBFormatError.new('Truncated data') if @ewkb.length < @position
+        @ewkb.unpack("@#{i}#{@uint_mark}@*").first
+      end
+
+      def read_byte
+        i = @position
+        @position += 1
+        fail EWKBFormatError.new('Truncated data') if @ewkb.length < @position
+        @ewkb.unpack("@#{i}C@*").first
+      end
+
+      def endianness=(byte_order)
+        if (byte_order == NDR)
+          @uint_mark = 'V'
+          @double_mark = 'E'
+        elsif (byte_order == XDR)
+          @uint_mark = 'N'
+          @double_mark = 'G'
+        end
+      end
+    end
+  end
+end