georuby 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4f8b3106e7d2ab362c2ec0adc1586e2d944855
-  data.tar.gz: a13bbeceb85ae96f24d484a5c63815f9aa00a3f7
+  metadata.gz: 5dd38fae8554f897092835e5e185ec4739777764
+  data.tar.gz: 11a04ca5adb946903ce550758105658a7636f1dd
 SHA512:
-  metadata.gz: 921c17e80d12c6175cebcb3dbecc98fe57aa8c87a49017bfa0839d6487b618c022b57d4418569c05a15a21c0e30bf7a2f7ddb537600900b88406f9d207ce0cac
-  data.tar.gz: 04d7b3314b08f2a5b7f084e21c68d2083f2318f16bf3bba9e632e600f753dd581a49ab0c67ce35042352fe675810060faf96a970ec0fced2f7a83ad32b5a70db
+  metadata.gz: 32a42777bd969c252b1b47d852ab9d28442148b8b8f8f7275c56cd6114271310ee80a020f64190bd63d2c365587bf9e729c9db9a2d50ab9a464a0570d56a97a9
+  data.tar.gz: d386fd14dcacc221719441f9ff5bd896012d386fcd787a68567694a86068d77bddcd17b7b0ec4be4bafa4c08c46c28bf3a9658cfb04a143b5af2b3d3eb5cf1f5

data/README.md

@@ -59,6 +59,7 @@ Optional, require if you need the functionality:
     require 'geo_ruby/georss'     # GeoRSS
     require 'geo_ruby/geojson'    # GeoJSON
 
+TODO: https://github.com/AnalyticalGraphicsInc/czml-writer
 
 Use
 ===
@@ -108,7 +109,7 @@ the altitude data will not be output even if present. Envelopes output a LatLonA
 For the output, the following geometric types are supported : Point, LineString, Polygon.
 
 
-SHP reading et writing
+SHP reading and writing
 ---
 
 Georuby has support for reading ESRI shapefiles (http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf).
@@ -221,4 +222,3 @@ can be sent to guilhem.vellut@gmail.com.
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/nofxx/georuby/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/geo_ruby/shp4r/dbf.rb

@@ -4,30 +4,29 @@ require 'rubygems'
 begin
   require 'dbf'
 rescue LoadError
-  puts "You've loaded GeoRuby SHP Support."
-  puts "Please install the gem 'dbf' to use it. `gem install dbf`"
+  puts 'You\'ve loaded GeoRuby SHP Support.'
+  puts 'Please install the gem "dbf" to use it. `gem install dbf`'
 end
 
 module GeoRuby
   # Ruby .shp files
   module Shp4r
-    Dbf = DBF
 
-    module Dbf
+    module DBF
       class Record
         def [](v)
           attributes[v]
         end
       end
 
-      class Field < Column::Base
-        def initialize(name, type, length, decimal = 0, version = 1, enc = nil)
-          super(name, type, length, decimal, version, enc)
-        end
-      end
+      # class Field < Column::Base
+      #   def initialize(name, type, length, decimal = 0, version = 1, enc = nil)
+      #     super(name, type, length, decimal, version, enc)
+      #   end
+      # end
 
       # Main DBF File Reader
-      class Reader < Table
+      class Reader < ::DBF::Table
         alias_method :fields, :columns
         def header_length
           @columns_count

data/lib/geo_ruby/shp4r/shp.rb

@@ -35,11 +35,13 @@ module GeoRuby
         # strip the shp out of the file if present
         @file_root = file.gsub(/.shp$/i, '')
         # check existence of shp, dbf and shx files
-        unless File.exist?(@file_root + '.shp') && File.exist?(@file_root + '.dbf') && File.exist?(@file_root + '.shx')
+        unless File.exist?(@file_root + '.shp') &&
+               File.exist?(@file_root + '.dbf') &&
+               File.exist?(@file_root + '.shx')
           fail MalformedShpException.new("Missing one of shp, dbf or shx for: #{@file}")
         end
 
-        @dbf = Dbf::Reader.open(@file_root + '.dbf')
+        @dbf = DBF::Reader.open(@file_root + '.dbf')
         @shx = File.open(@file_root + '.shx', 'rb')
         @shp = File.open(@file_root + '.shp', 'rb')
         read_index
@@ -65,7 +67,7 @@ module GeoRuby
       end
 
       # create a new Shapefile of the specified shp type (see ShpType) and
-      # with the attribute specified in the +fields+ array (see Dbf::Field).
+      # with the attribute specified in the +fields+ array (see DBF::Field).
       # If a block is given, the ShpFile object newly created is passed to it.
       def self.create(file, shp_type, fields, &proc)
         file_root = file.gsub(/.shp$/i, '')
@@ -425,30 +427,23 @@ module GeoRuby
 
       private
 
-      def to_shp_type(geom)
-        root = if geom.is_a? GeoRuby::SimpleFeatures::Point
-                 'POINT'
-               elsif geom.is_a? GeoRuby::SimpleFeatures::LineString
-                 'POLYLINE'
-               elsif geom.is_a? GeoRuby::SimpleFeatures::Polygon
-                 'POLYGON'
-               elsif geom.is_a? GeoRuby::SimpleFeatures::MultiPoint
-                 'MULTIPOINT'
-               elsif geom.is_a? GeoRuby::SimpleFeatures::MultiLineString
-                 'POLYLINE'
-               elsif geom.is_a? GeoRuby::SimpleFeatures::MultiPolygon
-                 'POLYGON'
-               else
-                 false
-               end
-        return false unless root
-
-        if geom.with_z
-          root = root + 'Z'
-        elsif geom.with_m
-          root = root + 'M'
+      def geom_type(geom)
+        case geom
+        when GeoRuby::SimpleFeatures::Point then 'POINT'
+        when GeoRuby::SimpleFeatures::LineString then 'POLYLINE'
+        when GeoRuby::SimpleFeatures::Polygon then 'POLYGON'
+        when GeoRuby::SimpleFeatures::MultiPoint then 'MULTIPOINT'
+        when GeoRuby::SimpleFeatures::MultiLineString then 'POLYLINE'
+        when GeoRuby::SimpleFeatures::MultiPolygon then 'POLYGON'
+        else false
         end
-        eval 'ShpType::' + root
+      end
+
+      def to_shp_type(geom)
+        return false unless klass = geom_type(geom)
+        klass += 'Z' if geom.with_z
+        klass += 'M' if geom.with_m
+        GeoRuby::Shp4r.const_get('ShpType::' + klass)
       end
 
       def commit_add(index)

data/lib/geo_ruby/version.rb

@@ -1,3 +1,3 @@
 module GeoRuby
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/spec/geo_ruby/shp4r/shp_spec.rb

@@ -51,7 +51,7 @@ describe GeoRuby::Shp4r do
     it 'should parse fields' do
       field = @shpfile.fields.first
       expect(field.name).to eql('Chipoto')
-      # GeoRuby::Shp4r::Dbf now uses the decimal to choose between int and float
+      # GeoRuby::Shp4r::DBF now uses the decimal to choose between int and float
       # So here is N instead of F
       expect(field.type).to eql('N')
     end
@@ -213,17 +213,24 @@ describe GeoRuby::Shp4r do
     end
 
     it 'test_creation' do
-      shpfile = GeoRuby::Shp4r::ShpFile.create(File.dirname(__FILE__) + '/../../data/point3.shp', GeoRuby::Shp4r::ShpType::POINT, [GeoRuby::Shp4r::Dbf::Field.new('Hoyoyo', 'C', 10, 0)])
+      shpfile = GeoRuby::Shp4r::ShpFile.create(
+        File.dirname(__FILE__) + '/../../data/point3.shp',
+        GeoRuby::Shp4r::ShpType::POINT,
+        [DBF::Column::Base.new('test', 'Hoyoyo', 'C', 10, 0)])
+
       shpfile.transaction do |tr|
-        tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::Point.from_x_y(123, 123.4), 'Hoyoyo' => 'HJHJJ'))
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(
+                GeoRuby::SimpleFeatures::Point.from_x_y(123, 123.4),
+                'Hoyoyo' => 'HJHJJ'))
       end
+
       expect(shpfile.record_count).to eql(1)
       shpfile.close
       rm_all_shp(File.dirname(__FILE__) + '/../../data/point3')
     end
 
     it 'test_creation_multipoint' do
-      shpfile = GeoRuby::Shp4r::ShpFile.create(File.dirname(__FILE__) + '/../../data/multipoint3.shp', GeoRuby::Shp4r::ShpType::MULTIPOINT, [GeoRuby::Shp4r::Dbf::Field.new('Hoyoyo', 'C', 10), GeoRuby::Shp4r::Dbf::Field.new('Hello', 'N', 10)])
+      shpfile = GeoRuby::Shp4r::ShpFile.create(File.dirname(__FILE__) + '/../../data/multipoint3.shp', GeoRuby::Shp4r::ShpType::MULTIPOINT, [GeoRuby::Shp4r::DBF::Field.new('Hoyoyo', 'C', 10), GeoRuby::Shp4r::DBF::Field.new('Hello', 'N', 10)])
       shpfile.transaction do |tr|
         tr.add(GeoRuby::Shp4r::ShpRecord.new(GeoRuby::SimpleFeatures::MultiPoint.from_coordinates([[123, 123.4], [345, 12.2]]), 'Hoyoyo' => 'HJHJJ', 'Hello' => 5))
       end
@@ -232,6 +239,24 @@ describe GeoRuby::Shp4r do
       rm_all_shp(File.dirname(__FILE__) + '/../../data/multipoint3')
     end
 
+    it 'should work fine with upcase filenames' do
+      shpfile = GeoRuby::Shp4r::ShpFile.open(
+        File.dirname(__FILE__) + '/../../data/POLYGON.SHP')
+
+      shpfile.transaction do |tr|
+        expect(tr).to be_instance_of GeoRuby::Shp4r::ShpTransaction
+        tr.delete(0)
+        tr.add(GeoRuby::Shp4r::ShpRecord.new(
+                GeoRuby::SimpleFeatures::Polygon.from_coordinates(
+                [[[0, 0], [40, 0], [40, 40], [0, 40], [0, 0]],
+                 [[10, 10], [10, 20], [20, 20], [10, 10]]]),
+                'Hello' => 'oook'))
+      end
+
+      expect(shpfile.record_count).to eql(1)
+
+      shpfile.close
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georuby
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Guilhem Vellut
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies: []
 description: GeoRuby provides geometric data types from the OGC 'Simple Features'
   specification.
@@ -49,6 +49,7 @@ files:
 - lib/geo_ruby/simple_features/polygon.rb
 - lib/geo_ruby/version.rb
 - lib/georuby.rb
+- spec/data/POLYGON.SHP
 - spec/data/geojson/feature.json
 - spec/data/geojson/feature_collection.json
 - spec/data/georss/atom.xml
@@ -114,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby data holder for OGC Simple Features