shp 0.0.3 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjNiZWRkYzhhNjE3OGQ5YWExMWRmNzM1ODg3OTIwM2RmZTAzMWEyYg==
-  data.tar.gz: !binary |-
-    MmFkMTAxZGFiMDU3MmU1NTJiMDQ2ZjcwMzE5M2Y0NjhjNGE2MmIwZg==
+SHA256:
+  metadata.gz: 6f0245123e61d38ed31b3afb1065b60193b20a5bce0161a66b8b6715e999ed26
+  data.tar.gz: 941133b419a71cc2ad5efefba01d0fb1a2e795ed4a75bc76db5e0c9745d19774
 SHA512:
-  metadata.gz: !binary |-
-    NmViNzUwY2FhYjBkZTVmNzMwYzc0NjhhYTY4N2VjMTU4ODY4NTY5N2E0ZGFj
-    NjIxZjE0MDczNmRiODQ4MzkwNzZmMDY3MjQ1N2IzM2EwODUwOGNjM2I4OWRj
-    NzM1NmViMTA5YTI2NWMxZGQ5NjJiOGRkMmY4YjVmOWQyNjA3YmU=
-  data.tar.gz: !binary |-
-    MmRkNjhjYmM5MjEyZmVkOTYzM2U5NjVmOWY2MTVjYjUxZGE0YjE3OGFkNzY2
-    OWEwMDIzMjhiNGJmZTEwYzg0ZGRlNjJhZDc4ZjhhZDBlOTJhMmJhY2E2NzE0
-    NTA3NjgzNGMxOTE2NjA1NDY3MmVlNDAxOWI5YTFjNWJlMjk1M2U=
+  metadata.gz: bf2fcf008c5b3514af14eb223f5db69df4887b535186358750540816de9cc0c12abb59290da99a498f2263fde89466b89aadb57cb0f9e511fb0d0e151d77d0af
+  data.tar.gz: 37aab89a44dbf8d8aab4dfe673d850d40b98b17c8cff5522e849d7c84ca6a6f6d27e81a065b6d3235f9818723d9897c482c32b81d0260a4f355e00af8627b16b

data/.travis.yml

@@ -2,3 +2,9 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0

data/ext/shp/shapefile.cpp

@@ -121,9 +121,6 @@ VALUE shapefile::create_object(VALUE klass, VALUE shapeType, VALUE shapeIndex, V
   double *zVertices = NULL;
   double *mVertices = NULL;
 
-  int *nativeArrayOfPartStarts = NULL;
-  int *nativeArrayOfPartTypes  = NULL;
-
   if (!NIL_P(arrayOfZ)) {
     CHECK_ARGUMENT_ARRAY(arrayOfZ);
     zVertices = new double[FIX2INT(numberOfVertices)];
@@ -134,6 +131,22 @@ VALUE shapefile::create_object(VALUE klass, VALUE shapeType, VALUE shapeIndex, V
     mVertices = new double[FIX2INT(numberOfVertices)];
   }
 
+  for (int i = 0; i < FIX2INT(numberOfVertices); ++i) {
+    xVertices[i] = NUM2DBL(rb_ary_entry(arrayOfX, i));
+    yVertices[i] = NUM2DBL(rb_ary_entry(arrayOfY, i));
+
+    if (zVertices) {
+      zVertices[i] = NUM2DBL(rb_ary_entry(arrayOfZ, i));
+    }
+
+    if (mVertices) {
+      mVertices[i] = NUM2DBL(rb_ary_entry(arrayOfM, i));
+    }
+  }
+
+  int *nativeArrayOfPartStarts = NULL;
+  int *nativeArrayOfPartTypes  = NULL;
+
   if (!NIL_P(arrayOfPartStarts)) {
     CHECK_ARGUMENT_ARRAY(arrayOfPartStarts);
     nativeArrayOfPartStarts = new int[FIX2INT(numberOfParts)];
@@ -305,7 +318,7 @@ void shapefile::define(VALUE module)
   rb_define_singleton_method(shapefile::_klass, "open", SHP_METHOD(shapefile::open), 2);
   rb_define_singleton_method(shapefile::_klass, "create", SHP_METHOD(shapefile::create), 2);
   rb_define_singleton_method(shapefile::_klass, "create_simple_object", SHP_METHOD(shapefile::create_simple_object), 5);
-  rb_define_singleton_method(shapefile::_klass, "create_object", SHP_METHOD(shapefile::create_simple_object), 10);
+  rb_define_singleton_method(shapefile::_klass, "create_object", SHP_METHOD(shapefile::create_object), 10);
   rb_define_method(shapefile::_klass, "write_object", SHP_METHOD(shapefile::write_object), 2);
   rb_define_method(shapefile::_klass, "close", SHP_METHOD(shapefile::close), 0);
   rb_define_method(shapefile::_klass, "get_info", SHP_METHOD(shapefile::get_info), 0);

data/lib/shp/version.rb

@@ -1,3 +1,3 @@
 module SHP
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/shp_spec.rb

@@ -128,7 +128,7 @@ describe "SHP" do
     lambda { file.get_info }.should raise_error
   end
 
-  context 'shp' do
+  context 'single part polygon' do
     before(:each) do
       sni_office = [ [ -82.72932529449463, 27.93789618055838 ],
                      [ -82.72932529449463, 27.93768765436987 ],
@@ -221,4 +221,107 @@ describe "SHP" do
       @obj.get_m_max.should eq(0)
     end
   end
+
+  context 'multipart polygon' do
+    before(:each) do
+      multipolygon = [
+        [0, 0], [5, 0], [5, 4], [0, 4], [0, 0],           # outer ring 1
+        [1, 1], [2, 1], [2, 2], [1, 2], [1, 1],           # inner ring
+        [-1, -1], [-1, -3], [-2, -3], [-2, -1], [-1, -1], # outer ring 2
+      ]
+      x_values = multipolygon.map { |v| v[0] }
+      y_values = multipolygon.map { |v| v[1] }
+      nparts = 3
+      pan_part_start = [0, 5, 10]
+      n_vertices = x_values.length
+
+      @shp = SHP::Shapefile.create('testfile_multipolygons', 5)
+      @shape = SHP::Shapefile.create_object(
+        5,              # ShpType ID(5=POLYGON)
+        -1,             # iShape
+        nparts,
+        pan_part_start,
+        nil,            # panPartType
+        n_vertices,
+        x_values,
+        y_values,
+        nil,            # z_values
+        nil             # M values
+      )
+      @shp.write_object(-1, @shape)
+      @obj = @shp.read_object(0)
+    end
+
+    it 'should return the shape type' do
+      @obj.get_shape_type.should eq(5)
+    end
+
+    it 'should return the shape id' do
+      @obj.get_shape_id.should eq(0)
+    end
+
+    it 'should return the shape part count' do
+      @obj.get_shape_parts.should eq(3)
+    end
+
+    it 'should return the shape part start offsets' do
+      @obj.get_shape_part_starts.should eq([0, 5, 10])
+    end
+
+    it 'should return the shape part types' do
+      @obj.get_shape_part_types.should eq([5, 5, 5]) # [SHPP_RING]
+    end
+
+    it 'should return the vertex count' do
+      @obj.get_vertex_count.should eq(15)
+    end
+
+    it 'should return the x values' do
+      @obj.get_x.should eq([0, 5, 5, 0, 0, 1, 2, 2, 1, 1, -1, -1, -2, -2, -1].map(&:to_f))
+    end
+
+    it 'should return the y values' do
+      @obj.get_y.should eq([0, 0, 4, 4, 0, 1, 1, 2, 2, 1, -1, -3, -3, -1, -1].map(&:to_f))
+    end
+
+    it 'should return the z values' do
+      @obj.get_z.should eq(Array.new(15, 0))
+    end
+
+    it 'should return the m values' do
+      @obj.get_m.should eq(Array.new(15, 0))
+    end
+
+    it 'should return the x min' do
+      @obj.get_x_min.should eq(-2.0)
+    end
+
+    it 'should return the y min' do
+      @obj.get_y_min.should eq(-3.0)
+    end
+
+    it 'should return the z min' do
+      @obj.get_z_min.should eq(0)
+    end
+
+    it 'should return the m min' do
+      @obj.get_m_min.should eq(0)
+    end
+
+    it 'should return the x max' do
+      @obj.get_x_max.should eq(5.0)
+    end
+
+    it 'should return the y max' do
+      @obj.get_y_max.should eq(4.0)
+    end
+
+    it 'should return the z max' do
+      @obj.get_z_max.should eq(0)
+    end
+
+    it 'should return the m max' do
+      @obj.get_m_max.should eq(0)
+    end
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: shp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Zac McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ESRI Shapefile bindings for ruby using shapelib
@@ -60,8 +60,8 @@ extensions:
 - ext/shp/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -156,21 +156,20 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: ESRI Shapefile bindings for ruby using shapelib. Currently contains native
   extensions for ShapeLib 1.3
 test_files:
 - spec/shp_spec.rb
-has_rdoc: