ffi-gdal 1.0.0.beta5 → 1.0.0.beta6

data/spec/unit/ogr/geometries/multi_line_string_25d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'ogr'
+
+RSpec.describe OGR::MultiLineString25D do
+  describe '#type' do
+    context 'when created with data' do
+      subject { OGR::Geometry.create_from_wkt(wkt) }
+      let(:wkt) { 'MULTILINESTRING((1 2 3, 2 2 3),(9 9 9, 10 10 10))' }
+
+      it 'returns :wkbMultiLineString25D' do
+        expect(subject.type).to eq :wkbMultiLineString25D
+      end
+    end
+
+    context 'when created without data' do
+      subject { described_class.new }
+
+      it 'returns :wkbMultiLineString' do
+        expect(subject.type).to eq :wkbMultiLineString
+      end
+    end
+  end
+end

data/spec/unit/ogr/geometries/multi_point_25d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'ogr'
+
+RSpec.describe OGR::MultiPoint25D do
+  describe '#type' do
+    context 'when created with data' do
+      subject { OGR::Geometry.create_from_wkt(wkt) }
+      let(:wkt) { 'MULTIPOINT((1 2 3),(2 2 3))' }
+
+      it 'returns :wkbPoint25D' do
+        expect(subject.type).to eq :wkbMultiPoint25D
+      end
+    end
+
+    context 'when created without data' do
+      subject { described_class.new }
+
+      it 'returns :wkbPoint' do
+        expect(subject.type).to eq :wkbMultiPoint
+      end
+    end
+  end
+end

data/spec/unit/ogr/geometries/multi_polygon_25d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'ogr'
+
+RSpec.describe OGR::MultiPolygon25D do
+  describe '#type' do
+    context 'when created with data' do
+      subject { OGR::Geometry.create_from_wkt(wkt) }
+      let(:wkt) { 'MULTIPOLYGON(((0 0 1,0 1 1,1 1 1,0 0 1)),((0 0 5,1 1 5,1 0 5,0 0 5)))' }
+
+      it 'returns :wkbMultiPolygon25D' do
+        expect(subject.type).to eq :wkbMultiPolygon25D
+      end
+    end
+
+    context 'when created without data' do
+      subject { described_class.new }
+
+      it 'returns :wkbMultiPolygon' do
+        expect(subject.type).to eq :wkbMultiPolygon
+      end
+    end
+  end
+end

data/spec/unit/ogr/geometries/point_25d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'ogr'
+
+RSpec.describe OGR::Point25D do
+  describe '#type' do
+    context 'when created with data' do
+      subject { OGR::Geometry.create_from_wkt(wkt) }
+      let(:wkt) { 'POINT(1 2 3)' }
+
+      it 'returns :wkbPoint25D' do
+        expect(subject.type).to eq :wkbPoint25D
+      end
+    end
+
+    context 'when created without data' do
+      subject { described_class.new }
+
+      it 'returns :wkbPoint' do
+        expect(subject.type).to eq :wkbPoint
+      end
+    end
+  end
+end

data/spec/unit/ogr/geometries/point_spec.rb

@@ -203,36 +203,30 @@ RSpec.describe OGR::Point do
       end
     end
 
-    describe '#point' do
+    describe '#point_value' do
       it 'returns x & y as an array' do
-        expect(subject.point).to eq([1, 2])
+        expect(subject.point_value).to eq([1.0, 2.0])
       end
     end
 
     describe '#set_point' do
       it 'changes the x & y values' do
-        expect do
-          subject.set_point(5, 6)
-        end.to change { subject.points }.
-          from([[1, 2]]).to([[5.0, 6.0, 0.0]])
+        expect { subject.set_point(5, 6) }.to change { subject.point_value }.
+          from([1.0, 2.0]).to([5.0, 6.0])
       end
     end
 
     describe '#add_point' do
       it 'changes the x & y values' do
-        expect do
-          subject.add_point(5, 6)
-        end.to change { subject.points }.
-          from([[1, 2]]).to([[5.0, 6.0, 0.0]])
+        expect { subject.add_point(5, 6) }.to change { subject.point_value }.
+          from([1.0, 2.0]).to([5.0, 6.0])
       end
     end
 
     describe '#empty!' do
       it 'clears the point' do
-        expect do
-          subject.empty!
-        end.to change { subject.points }.
-          from([[1, 2]]).to([[]])
+        expect { subject.empty! }.to change { subject.point_value }.
+          from([1.0, 2.0]).to([])
       end
     end
   end
@@ -282,27 +276,23 @@ RSpec.describe OGR::Point do
       end
     end
 
-    describe '#point' do
+    describe '#point_value' do
       it 'returns an empty array' do
-        expect(subject.point).to eq([])
+        expect(subject.point_value).to eq([])
       end
     end
 
     describe '#set_point' do
       it 'changes the x & y values' do
-        expect do
-          subject.set_point(5, 6)
-        end.to change { subject.points }.
-          from([[]]).to([[5.0, 6.0, 0.0]])
+        expect { subject.set_point(5, 6) }.to change { subject.point_value }.
+          from([]).to([5.0, 6.0])
       end
     end
 
     describe '#add_point' do
       it 'changes the x & y values' do
-        expect do
-          subject.add_point(5, 6)
-        end.to change { subject.points }.
-          from([[]]).to([[5.0, 6.0, 0.0]])
+        expect { subject.add_point(5, 6) }.to change { subject.point_value }.
+          from([]).to([5.0, 6.0])
       end
     end
 

data/spec/unit/ogr/geometries/polygon_25d_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'ogr'
+
+RSpec.describe OGR::Polygon25D do
+  describe '#type' do
+    context 'when created with data' do
+      subject { OGR::Geometry.create_from_wkt(wkt) }
+      let(:wkt) { 'POLYGON((0 0 1,0 1 1,1 1 1,0 0 1))' }
+
+      it 'returns :wkbPolygon25D' do
+        expect(subject.type).to eq :wkbPolygon25D
+      end
+    end
+
+    context 'when created without data' do
+      subject { described_class.new }
+
+      it 'returns :wkbPolygon' do
+        expect(subject.type).to eq :wkbPolygon
+      end
+    end
+  end
+end

data/spec/unit/ogr/geometries/polygon_spec.rb

@@ -3,7 +3,7 @@ require 'ogr/geometry'
 
 RSpec.describe OGR::Polygon do
   subject(:polygon) { OGR::Geometry.create_from_wkt(wkt) }
-  let(:wkt) { 'POLYGON((100 100, 200 200, 300 300))' }
+  let(:wkt) { 'POLYGON((10 10, 20 20, 30 30))' }
 
   it_behaves_like 'a geometry' do
     let(:geometry) { polygon }

data/spec/unit/ogr/geometry_field_definition_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe OGR::GeometryFieldDefinition do
   describe '#destroy!' do
     it 'sets the c_pointer to nil' do
       subject.destroy!
-      expect(subject.instance_variable_get(:@geometry_field_definition_pointer)).
+      expect(subject.instance_variable_get(:@c_pointer)).
         to be_nil
     end
   end

data/spec/unit/ogr/geometry_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe OGR::Geometry do
 
     context 'a 2.5D Point' do
       let(:wkt) { 'POINT(1 32 100)' }
-      it { is_expected.to be_a OGR::Point }
+      it { is_expected.to be_a OGR::Point25D }
     end
 
     context 'a 2D LineString' do
@@ -22,7 +22,7 @@ RSpec.describe OGR::Geometry do
 
     context 'a 2.5D LineString' do
       let(:wkt) { 'LINESTRING(3 4 19,12 23 20)' }
-      it { is_expected.to be_a OGR::LineString }
+      it { is_expected.to be_a OGR::LineString25D }
     end
 
     context 'a 2D Polygon' do
@@ -32,7 +32,7 @@ RSpec.describe OGR::Geometry do
 
     context 'a 2.5D Polygon' do
       let(:wkt) { 'POLYGON((1 1 1,2 2 2,3 3 3))' }
-      it { is_expected.to be_a OGR::Polygon }
+      it { is_expected.to be_a OGR::Polygon25D }
     end
 
     context 'a 2D MultiPoint' do
@@ -40,24 +40,24 @@ RSpec.describe OGR::Geometry do
       it { is_expected.to be_a OGR::MultiPoint }
     end
 
-    context 'a 2D MultiPoint' do
+    context 'a 2.5D MultiPoint' do
       let(:wkt) { 'MULTIPOINT((1 1 1),(2 2 2))' }
-      it { is_expected.to be_a OGR::MultiPoint }
+      it { is_expected.to be_a OGR::MultiPoint25D }
     end
 
     context 'a 2D MultiLineString' do
-      let(:wkt) { 'MULTILINESTRING((3 4),(100 200))' }
+      let(:wkt) { 'MULTILINESTRING((3 4),(100 20))' }
       it { is_expected.to be_a OGR::MultiLineString }
     end
 
     context 'a 2.5D MultiLineString' do
-      let(:wkt) { 'MULTILINESTRING((3 4 19),(100 200 400))' }
-      it { is_expected.to be_a OGR::MultiLineString }
+      let(:wkt) { 'MULTILINESTRING((3 4 19),(100 20 40))' }
+      it { is_expected.to be_a OGR::MultiLineString25D }
     end
 
     context 'a 2D MultiPolygon' do
       let(:wkt) do
-        'MULTIPOLYGON(((1 1,2 2,3 3)),((100 100, 200 200, 300 300)))'
+        'MULTIPOLYGON(((1 1,2 2,3 3)),((100 100, 20 20, 30 30)))'
       end
 
       it { is_expected.to be_a OGR::MultiPolygon }
@@ -65,10 +65,10 @@ RSpec.describe OGR::Geometry do
 
     context 'a 2.5D MultiPolygon' do
       let(:wkt) do
-        'MULTIPOLYGON(((1 1 1,2 2 2,3 3 3)),((100 100 100, 200 200 200, 300 300 300)))'
+        'MULTIPOLYGON(((1 1 1,2 2 2,3 3 3)),((100 100 100, 20 20 20, 30 30 30)))'
       end
 
-      it { is_expected.to be_a OGR::MultiPolygon }
+      it { is_expected.to be_a OGR::MultiPolygon25D }
     end
   end
 
@@ -88,7 +88,7 @@ RSpec.describe OGR::Geometry do
         { type: :Point, coordinates: [1.0, 2.0, 3.0] }.to_json
       end
 
-      it { is_expected.to be_a OGR::Point }
+      it { is_expected.to be_a OGR::Point25D }
     end
 
     context 'a 2D LineString' do
@@ -114,7 +114,7 @@ RSpec.describe OGR::Geometry do
         }.to_json
       end
 
-      it { is_expected.to be_a OGR::LineString }
+      it { is_expected.to be_a OGR::LineString25D }
     end
 
     context 'a 2D Polygon' do
@@ -144,7 +144,7 @@ RSpec.describe OGR::Geometry do
         }.to_json
       end
 
-      it { is_expected.to be_a OGR::Polygon }
+      it { is_expected.to be_a OGR::Polygon25D }
     end
 
     context 'a 2D MultiPoint' do
@@ -170,7 +170,7 @@ RSpec.describe OGR::Geometry do
         }.to_json
       end
 
-      it { is_expected.to be_a OGR::MultiPoint }
+      it { is_expected.to be_a OGR::MultiPoint25D }
     end
 
     context 'a 2D MultiLineString' do
@@ -181,7 +181,7 @@ RSpec.describe OGR::Geometry do
             [
               [3.0, 4.0], [21.0, 27.0], [2.0, 5.0]
             ], [
-              [100.0, 200.0], [982.0, 6.0]
+              [100.0, 20.0], [982.0, 6.0]
             ]
           ]
         }.to_json
@@ -198,13 +198,13 @@ RSpec.describe OGR::Geometry do
             [
               [3.0, 4.0, 19.0], [21.0, 27.0, 30.0]
             ], [
-              [100.0, 200.0, 400.0], [982.0, 6.0, 47.1]
+              [100.0, 20.0, 400.0], [92.0, 6.0, 47.1]
             ]
           ]
         }.to_json
       end
 
-      it { is_expected.to be_a OGR::MultiLineString }
+      it { is_expected.to be_a OGR::MultiLineString25D }
     end
 
     context 'a 2D MultiPolygon' do
@@ -220,7 +220,7 @@ RSpec.describe OGR::Geometry do
               ]
             ], [
               [
-                [100.0, 100.0], [200.0, 200.0], [300.0, 300.0]
+                [100.0, 100.0], [20.0, 20.0], [30.0, 30.0]
               ], [
                 [10.0, 10.0], [20.0, 20.0], [30.0, 30.0]
               ]
@@ -245,7 +245,7 @@ RSpec.describe OGR::Geometry do
               ]
             ], [
               [
-                [100.0, 100.0, 100.0], [200.0, 200.0, 200.0], [300.0, 300.0, 300.0]
+                [100.0, 100.0, 100.0], [20.0, 20.0, 20.0], [30.0, 30.0, 30.0]
               ], [
                 [10.0, 10.0, 10.0], [20.0, 20.0, 20.0], [30.0, 30.0, 30.0]
               ]
@@ -254,7 +254,7 @@ RSpec.describe OGR::Geometry do
         }.to_json
       end
 
-      it { is_expected.to be_a OGR::MultiPolygon }
+      it { is_expected.to be_a OGR::MultiPolygon25D }
     end
   end
 
@@ -274,7 +274,7 @@ RSpec.describe OGR::Geometry do
         '<gml:Point><gml:coordinates>1,7,25</gml:coordinates></gml:Point>'
       end
 
-      it { is_expected.to be_a OGR::Point }
+      it { is_expected.to be_a OGR::Point25D }
     end
 
     context 'a 2D LineString' do
@@ -290,7 +290,7 @@ RSpec.describe OGR::Geometry do
         '<gml:LineString><gml:coordinates>3,4,19</gml:coordinates></gml:LineString>'
       end
 
-      it { is_expected.to be_a OGR::LineString }
+      it { is_expected.to be_a OGR::LineString25D }
     end
 
     context 'a 2D Polygon' do
@@ -322,7 +322,7 @@ RSpec.describe OGR::Geometry do
         GML
       end
 
-      it { is_expected.to be_a OGR::Polygon }
+      it { is_expected.to be_a OGR::Polygon25D }
     end
 
     context 'a 2D MultiPoint' do
@@ -384,7 +384,7 @@ RSpec.describe OGR::Geometry do
         GML
       end
 
-      it { is_expected.to be_a OGR::MultiPoint }
+      it { is_expected.to be_a OGR::MultiPoint25D }
     end
 
     context 'a 2D MultiLineString' do
@@ -398,7 +398,7 @@ RSpec.describe OGR::Geometry do
     </gml:lineStringMember>
     <gml:lineStringMember>
       <gml:LineString>
-        <gml:coordinates>100,200</gml:coordinates>
+        <gml:coordinates>100,20</gml:coordinates>
       </gml:LineString>
     </gml:lineStringMember>
   </gml:MultiLineString>
@@ -419,14 +419,14 @@ RSpec.describe OGR::Geometry do
     </gml:lineStringMember>
     <gml:lineStringMember>
       <gml:LineString>
-        <gml:coordinates>100,200,400</gml:coordinates>
+        <gml:coordinates>100,20,40</gml:coordinates>
       </gml:LineString>
     </gml:lineStringMember>
   </gml:MultiLineString>
         GML
       end
 
-      it { is_expected.to be_a OGR::MultiLineString }
+      it { is_expected.to be_a OGR::MultiLineString25D }
     end
 
     context 'a 2D MultiPolygon' do
@@ -446,7 +446,7 @@ RSpec.describe OGR::Geometry do
       <gml:Polygon>
         <gml:outerBoundaryIs>
           <gml:LinearRing>
-            <gml:coordinates>100,100 200,200 300,300</gml:coordinates>
+            <gml:coordinates>100,100 20,20 30,30</gml:coordinates>
           </gml:LinearRing>
         </gml:outerBoundaryIs>
       </gml:Polygon>
@@ -475,7 +475,7 @@ RSpec.describe OGR::Geometry do
       <gml:Polygon>
         <gml:outerBoundaryIs>
           <gml:LinearRing>
-            <gml:coordinates>100,100,9 200,200,9 300,300,9</gml:coordinates>
+            <gml:coordinates>100,100,9 20,20,9 30,30,9</gml:coordinates>
           </gml:LinearRing>
         </gml:outerBoundaryIs>
       </gml:Polygon>
@@ -484,8 +484,143 @@ RSpec.describe OGR::Geometry do
         GML
       end
 
+      it { is_expected.to be_a OGR::MultiPolygon25D }
+    end
+  end
+
+  describe '.create_from_wkb' do
+    subject { OGR::Geometry.create_from_wkb(wkb) }
+
+    context 'a 2D Point' do
+      # POINT(1 32)
+      let(:wkb) { ['0101000000000000000000f03f0000000000004040'].pack('H*') }
+      it { is_expected.to be_a OGR::Point }
+    end
+
+    context 'a 2.5D Point' do
+      # POINT(1 32 100)
+      let(:wkb) { ['01e9030000000000000000f03f00000000000040400000000000005940'].pack('H*') }
+      it { is_expected.to be_a OGR::Point }
+    end
+
+    context 'a 2D LineString' do
+      # LINESTRING(3 19,12 20)
+      let(:wkb) do
+        ['0102000000020000000000000000000840000000000000334000000000000028400000000000003440'].pack('H*')
+      end
+      it { is_expected.to be_a OGR::LineString }
+    end
+
+    context 'a 2.5D LineString' do
+      # LINESTRING(3 4 19,12 13 20)
+      let(:wkb) do
+        hex = '01ea030000020000000000000000000840000000000000104000000000000' \
+          '03340000000000000284000000000000037400000000000003440'
+        [hex].pack('H*')
+      end
+
+      it { is_expected.to be_a OGR::LineString25D }
+    end
+
+    context 'a 2D Polygon' do
+      # 'POLYGON((1 1,2 1,3 0,1 1))'
+      let(:wkb) do
+        hex = '01030000000100000004000000000000000000f03f000000000000f03f0000' \
+          '000000000040000000000000f03f00000000000008400000000000000000000000' \
+          '000000f03f000000000000f03f'
+        [hex].pack('H*')
+      end
+
+      it { is_expected.to be_a OGR::Polygon }
+    end
+
+    context 'a 2.5D Polygon' do
+      let(:wkb) do
+        # 'POLYGON((1 1 1,2 1 1,2 0 1,1 1 1))'
+        hex = '01eb0300000100000004000000000000000000f03f000000000000f03f0000' \
+          '00000000f03f0000000000000040000000000000f03f000000000000f03f000000' \
+          '00000000400000000000000000000000000000f03f000000000000f03f00000000' \
+          '0000f03f000000000000f03f'
+        [hex].pack('H*')
+      end
+      it { is_expected.to be_a OGR::Polygon25D }
+    end
+
+    context 'a 2D MultiPoint' do
+      let(:wkb) do
+        # 'MULTIPOINT((0 0),(1 1))'
+        hex = '01040000000200000001010000000000000000000000000000000000000001' \
+          '01000000000000000000f03f000000000000f03f'
+        [hex].pack('H*')
+      end
+      it { is_expected.to be_a OGR::MultiPoint }
+    end
+
+    context 'a 2.5D MultiPoint' do
+      let(:wkb) do
+        # 'MULTIPOINT((0 0 0),(1 1 1))'
+        hex = '01ec0300000200000001e90300000000000000000000000000000000000000' \
+          '0000000000000001e9030000000000000000f03f000000000000f03f0000000000' \
+          '00f03f'
+        [hex].pack('H*')
+      end
+      it { is_expected.to be_a OGR::MultiPoint25D }
+    end
+
+    context 'a 2D MultiLineString' do
+      let(:wkb) do
+        # 'MULTILINESTRING((1 1,2 2, 3 3),(10 10,20 20,30 30))'
+        hex = '010500000002000000010200000003000000000000000000f03f0000000000' \
+          '00f03f000000000000004000000000000000400000000000000840000000000000' \
+          '084001020000000300000000000000000024400000000000002440000000000000' \
+          '344000000000000034400000000000003e400000000000003e40'
+        [hex].pack('H*')
+      end
+      it { is_expected.to be_a OGR::MultiLineString }
+    end
+
+    context 'a 2.5D MultiLineString' do
+      let(:wkb) do
+        # MULTILINESTRING((3 4 19,100 20 40),(5 5 5,6 6 6,7 7 7))
+        hex = '01ed0300000200000001ea0300000200000000000000000008400000000000' \
+          '001040000000000000334000000000000059400000000000003440000000000000' \
+          '444001ea0300000300000000000000000014400000000000001440000000000000' \
+          '14400000000000001840000000000000184000000000000018400000000000001c' \
+          '400000000000001c400000000000001c40'
+        [hex].pack('H*')
+      end
+      it { is_expected.to be_a OGR::MultiLineString25D }
+    end
+
+    context 'a 2D MultiPolygon' do
+      # 'MULTIPOLYGON(((1 1,2 1,2 0,1 1)),((100 100,20 20,30 30,100 100)))'
+      let(:wkb) do
+        hex = '01060000000200000001030000000100000004000000000000000000f03f00' \
+          '0000000000f03f0000000000000040000000000000f03f00000000000000400000' \
+          '000000000000000000000000f03f000000000000f03f0103000000010000000400' \
+          '000000000000000059400000000000005940000000000000344000000000000034' \
+          '400000000000003e400000000000003e4000000000000059400000000000005940'
+        [hex].pack('H*')
+      end
+
       it { is_expected.to be_a OGR::MultiPolygon }
     end
+
+    context 'a 2.5D MultiPolygon' do
+      # 'MULTIPOLYGON(((1 1 1,2 1 2,2 0 3,1 1 1)),((100 100 100,20 20 20,30 30 30,100 100 100)))'
+      let(:wkb) do
+        hex = '01ee0300000200000001eb0300000100000004000000000000000000f03f00' \
+          '0000000000f03f000000000000f03f0000000000000040000000000000f03f0000' \
+          '000000000040000000000000004000000000000000000000000000000840000000' \
+          '000000f03f000000000000f03f000000000000f03f01eb03000001000000040000' \
+          '000000000000005940000000000000594000000000000059400000000000003440' \
+          '000000000000344000000000000034400000000000003e400000000000003e4000' \
+          '00000000003e40000000000000594000000000000059400000000000005940'
+        [hex].pack('H*')
+      end
+
+      it { is_expected.to be_a OGR::MultiPolygon25D }
+    end
   end
 
   describe '.type_to_name' do
@@ -539,4 +674,35 @@ RSpec.describe OGR::Geometry do
       it { is_expected.to eq 'Unrecognised: 101' }
     end
   end
+
+  describe '#utm_zone' do
+    let(:geom) { OGR::Geometry.create_from_wkt(wkt) }
+
+    let(:wkt) do
+      'LINESTRING(100 100, 20 20, 30 30, 100 100)'
+    end
+
+    context 'no spatial_reference' do
+      subject { geom.utm_zone }
+      it { is_expected.to be_nil }
+    end
+
+    context 'SRID is 4326' do
+      subject { geom.utm_zone }
+      before { geom.spatial_reference = OGR::SpatialReference.new_from_epsg(4326) }
+      it { is_expected.to eq(36) }
+    end
+
+    context 'SRID is not 4326' do
+      before { geom.spatial_reference = OGR::SpatialReference.new_from_epsg(3857) }
+
+      it 'transforms to 4326 then figures out the zone' do
+        duped_subject = geom.dup
+        expect(geom).to receive(:dup).and_return(duped_subject)
+        expect(duped_subject).to receive(:transform_to!).and_call_original
+
+        geom.utm_zone
+      end
+    end
+  end
 end