rgeo 0.4.0 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (176) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +29 -0
  3. data/ext/geos_c_impl/Makefile_2.2.3 +260 -0
  4. data/ext/geos_c_impl/coordinates.c +65 -0
  5. data/ext/geos_c_impl/coordinates.h +2 -0
  6. data/ext/geos_c_impl/extconf.rb +19 -43
  7. data/ext/geos_c_impl/geometry.c +24 -0
  8. data/ext/geos_c_impl/geometry_collection.c +99 -1
  9. data/ext/geos_c_impl/geos_c_impl_2.2.3.bundle +0 -0
  10. data/ext/geos_c_impl/line_string.c +38 -0
  11. data/ext/geos_c_impl/mkmf.log +123 -0
  12. data/ext/geos_c_impl/point.c +27 -0
  13. data/ext/geos_c_impl/polygon.c +26 -0
  14. data/ext/proj4_c_impl/Makefile_2.2.3 +260 -0
  15. data/ext/proj4_c_impl/extconf.rb +32 -32
  16. data/ext/proj4_c_impl/mkmf.log +47 -0
  17. data/ext/proj4_c_impl/proj4_c_impl_2.2.3.bundle +0 -0
  18. data/lib/rgeo.rb +10 -11
  19. data/lib/rgeo/cartesian.rb +7 -12
  20. data/lib/rgeo/cartesian/analysis.rb +13 -26
  21. data/lib/rgeo/cartesian/bounding_box.rb +45 -114
  22. data/lib/rgeo/cartesian/calculations.rb +3 -21
  23. data/lib/rgeo/cartesian/factory.rb +101 -122
  24. data/lib/rgeo/cartesian/feature_classes.rb +9 -59
  25. data/lib/rgeo/cartesian/feature_methods.rb +15 -45
  26. data/lib/rgeo/cartesian/interface.rb +6 -17
  27. data/lib/rgeo/coord_sys.rb +9 -15
  28. data/lib/rgeo/coord_sys/cs/entities.rb +84 -330
  29. data/lib/rgeo/coord_sys/cs/factories.rb +2 -32
  30. data/lib/rgeo/coord_sys/cs/wkt_parser.rb +52 -80
  31. data/lib/rgeo/coord_sys/proj4.rb +28 -67
  32. data/lib/rgeo/coord_sys/proj4_c_impl.bundle +0 -0
  33. data/lib/rgeo/coord_sys/srs_database/interface.rb +4 -24
  34. data/lib/rgeo/coord_sys/srs_database/proj4_data.rb +20 -38
  35. data/lib/rgeo/coord_sys/srs_database/sr_org.rb +6 -22
  36. data/lib/rgeo/coord_sys/srs_database/url_reader.rb +6 -21
  37. data/lib/rgeo/error.rb +0 -6
  38. data/lib/rgeo/feature.rb +18 -23
  39. data/lib/rgeo/feature/curve.rb +0 -14
  40. data/lib/rgeo/feature/factory.rb +13 -38
  41. data/lib/rgeo/feature/factory_generator.rb +4 -16
  42. data/lib/rgeo/feature/geometry.rb +18 -60
  43. data/lib/rgeo/feature/geometry_collection.rb +3 -17
  44. data/lib/rgeo/feature/line.rb +0 -10
  45. data/lib/rgeo/feature/line_string.rb +1 -13
  46. data/lib/rgeo/feature/linear_ring.rb +0 -9
  47. data/lib/rgeo/feature/mixins.rb +11 -36
  48. data/lib/rgeo/feature/multi_curve.rb +0 -11
  49. data/lib/rgeo/feature/multi_line_string.rb +0 -9
  50. data/lib/rgeo/feature/multi_point.rb +0 -9
  51. data/lib/rgeo/feature/multi_polygon.rb +0 -9
  52. data/lib/rgeo/feature/multi_surface.rb +0 -12
  53. data/lib/rgeo/feature/point.rb +0 -13
  54. data/lib/rgeo/feature/polygon.rb +1 -14
  55. data/lib/rgeo/feature/surface.rb +0 -12
  56. data/lib/rgeo/feature/types.rb +19 -61
  57. data/lib/rgeo/geographic.rb +10 -15
  58. data/lib/rgeo/geographic/factory.rb +126 -147
  59. data/lib/rgeo/geographic/interface.rb +67 -81
  60. data/lib/rgeo/geographic/proj4_projector.rb +13 -37
  61. data/lib/rgeo/geographic/projected_feature_classes.rb +7 -66
  62. data/lib/rgeo/geographic/projected_feature_methods.rb +15 -80
  63. data/lib/rgeo/geographic/projected_window.rb +15 -67
  64. data/lib/rgeo/geographic/simple_mercator_projector.rb +32 -56
  65. data/lib/rgeo/geographic/spherical_feature_classes.rb +9 -68
  66. data/lib/rgeo/geographic/spherical_feature_methods.rb +18 -51
  67. data/lib/rgeo/geographic/spherical_math.rb +26 -51
  68. data/lib/rgeo/geos.rb +23 -20
  69. data/lib/rgeo/geos/capi_factory.rb +125 -131
  70. data/lib/rgeo/geos/capi_feature_classes.rb +21 -88
  71. data/lib/rgeo/geos/ffi_factory.rb +90 -143
  72. data/lib/rgeo/geos/ffi_feature_classes.rb +8 -63
  73. data/lib/rgeo/geos/ffi_feature_methods.rb +46 -162
  74. data/lib/rgeo/geos/geos_c_impl.bundle +0 -0
  75. data/lib/rgeo/geos/interface.rb +4 -23
  76. data/lib/rgeo/geos/utils.rb +4 -19
  77. data/lib/rgeo/geos/zm_factory.rb +82 -131
  78. data/lib/rgeo/geos/zm_feature_classes.rb +8 -63
  79. data/lib/rgeo/geos/zm_feature_methods.rb +34 -107
  80. data/lib/rgeo/impl_helper.rb +8 -13
  81. data/lib/rgeo/impl_helper/basic_geometry_collection_methods.rb +27 -71
  82. data/lib/rgeo/impl_helper/basic_geometry_methods.rb +10 -28
  83. data/lib/rgeo/impl_helper/basic_line_string_methods.rb +21 -57
  84. data/lib/rgeo/impl_helper/basic_point_methods.rb +12 -30
  85. data/lib/rgeo/impl_helper/basic_polygon_methods.rb +9 -28
  86. data/lib/rgeo/impl_helper/math.rb +4 -10
  87. data/lib/rgeo/impl_helper/utils.rb +2 -10
  88. data/lib/rgeo/version.rb +1 -1
  89. data/lib/rgeo/wkrep.rb +4 -9
  90. data/lib/rgeo/wkrep/wkb_generator.rb +22 -46
  91. data/lib/rgeo/wkrep/wkb_parser.rb +25 -52
  92. data/lib/rgeo/wkrep/wkt_generator.rb +39 -69
  93. data/lib/rgeo/wkrep/wkt_parser.rb +52 -89
  94. data/lib/rgeo/yaml.rb +1 -7
  95. data/test/common/factory_tests.rb +4 -19
  96. data/test/common/geometry_collection_tests.rb +6 -39
  97. data/test/common/line_string_tests.rb +10 -39
  98. data/test/common/multi_line_string_tests.rb +10 -30
  99. data/test/common/multi_point_tests.rb +15 -34
  100. data/test/common/multi_polygon_tests.rb +26 -28
  101. data/test/common/point_tests.rb +37 -59
  102. data/test/common/polygon_tests.rb +16 -25
  103. data/test/coord_sys/tc_ogc_cs.rb +151 -186
  104. data/test/coord_sys/tc_proj4.rb +35 -60
  105. data/test/coord_sys/tc_proj4_srs_data.rb +15 -24
  106. data/test/coord_sys/tc_sr_org.rb +11 -19
  107. data/test/coord_sys/tc_url_reader.rb +13 -23
  108. data/test/geos_capi/tc_factory.rb +7 -16
  109. data/test/geos_capi/tc_geometry_collection.rb +6 -14
  110. data/test/geos_capi/tc_line_string.rb +7 -15
  111. data/test/geos_capi/tc_misc.rb +26 -41
  112. data/test/geos_capi/tc_multi_line_string.rb +6 -14
  113. data/test/geos_capi/tc_multi_point.rb +7 -15
  114. data/test/geos_capi/tc_multi_polygon.rb +8 -18
  115. data/test/geos_capi/tc_parsing_unparsing.rb +11 -21
  116. data/test/geos_capi/tc_point.rb +12 -26
  117. data/test/geos_capi/tc_polygon.rb +52 -17
  118. data/test/geos_capi/tc_zmfactory.rb +7 -18
  119. data/test/geos_ffi/tc_factory.rb +7 -16
  120. data/test/geos_ffi/tc_geometry_collection.rb +7 -15
  121. data/test/geos_ffi/tc_line_string.rb +7 -15
  122. data/test/geos_ffi/tc_misc.rb +8 -18
  123. data/test/geos_ffi/tc_multi_line_string.rb +7 -15
  124. data/test/geos_ffi/tc_multi_point.rb +8 -16
  125. data/test/geos_ffi/tc_multi_polygon.rb +9 -18
  126. data/test/geos_ffi/tc_parsing_unparsing.rb +14 -24
  127. data/test/geos_ffi/tc_point.rb +13 -28
  128. data/test/geos_ffi/tc_polygon.rb +7 -17
  129. data/test/geos_ffi/tc_zmfactory.rb +8 -19
  130. data/test/projected_geographic/tc_factory.rb +7 -15
  131. data/test/projected_geographic/tc_geometry_collection.rb +7 -15
  132. data/test/projected_geographic/tc_line_string.rb +7 -15
  133. data/test/projected_geographic/tc_multi_line_string.rb +7 -16
  134. data/test/projected_geographic/tc_multi_point.rb +8 -17
  135. data/test/projected_geographic/tc_multi_polygon.rb +8 -16
  136. data/test/projected_geographic/tc_point.rb +11 -23
  137. data/test/projected_geographic/tc_polygon.rb +7 -15
  138. data/test/simple_cartesian/tc_calculations.rb +6 -22
  139. data/test/simple_cartesian/tc_factory.rb +7 -16
  140. data/test/simple_cartesian/tc_geometry_collection.rb +6 -15
  141. data/test/simple_cartesian/tc_line_string.rb +6 -15
  142. data/test/simple_cartesian/tc_multi_line_string.rb +6 -15
  143. data/test/simple_cartesian/tc_multi_point.rb +7 -16
  144. data/test/simple_cartesian/tc_multi_polygon.rb +7 -16
  145. data/test/simple_cartesian/tc_point.rb +10 -21
  146. data/test/simple_cartesian/tc_polygon.rb +6 -15
  147. data/test/simple_mercator/tc_factory.rb +6 -14
  148. data/test/simple_mercator/tc_geometry_collection.rb +6 -14
  149. data/test/simple_mercator/tc_line_string.rb +6 -14
  150. data/test/simple_mercator/tc_multi_line_string.rb +6 -15
  151. data/test/simple_mercator/tc_multi_point.rb +7 -16
  152. data/test/simple_mercator/tc_multi_polygon.rb +7 -15
  153. data/test/simple_mercator/tc_point.rb +11 -24
  154. data/test/simple_mercator/tc_polygon.rb +6 -14
  155. data/test/simple_mercator/tc_window.rb +10 -34
  156. data/test/spherical_geographic/tc_calculations.rb +5 -32
  157. data/test/spherical_geographic/tc_factory.rb +6 -15
  158. data/test/spherical_geographic/tc_geometry_collection.rb +6 -15
  159. data/test/spherical_geographic/tc_line_string.rb +6 -15
  160. data/test/spherical_geographic/tc_multi_line_string.rb +6 -15
  161. data/test/spherical_geographic/tc_multi_point.rb +7 -16
  162. data/test/spherical_geographic/tc_multi_polygon.rb +7 -16
  163. data/test/spherical_geographic/tc_point.rb +10 -22
  164. data/test/spherical_geographic/tc_polygon.rb +6 -15
  165. data/test/tc_cartesian_analysis.rb +4 -16
  166. data/test/tc_cartesian_bbox.rb +7 -21
  167. data/test/tc_mixins.rb +8 -25
  168. data/test/tc_oneoff.rb +5 -13
  169. data/test/tc_types.rb +7 -16
  170. data/test/wkrep/tc_wkb_generator.rb +63 -97
  171. data/test/wkrep/tc_wkb_parser.rb +63 -100
  172. data/test/wkrep/tc_wkt_generator.rb +54 -92
  173. data/test/wkrep/tc_wkt_parser.rb +84 -133
  174. metadata +39 -9
  175. data/lib/rgeo/coord_sys/srs_database/active_record_table.rb +0 -166
  176. data/test/coord_sys/tc_active_record_table.rb +0 -79
data/test/tc_mixins.rb CHANGED
@@ -4,16 +4,12 @@
4
4
  #
5
5
  # -----------------------------------------------------------------------------
6
6
 
7
- require 'test/unit'
8
- require 'rgeo'
9
-
7
+ require "test/unit"
8
+ require "rgeo"
10
9
 
11
10
  module RGeo
12
- module Tests # :nodoc:
13
-
14
- class TestMixins < ::Test::Unit::TestCase # :nodoc:
15
-
16
-
11
+ module Tests # :nodoc:
12
+ class TestMixins < ::Test::Unit::TestCase # :nodoc:
17
13
  module Mixin1 # :nodoc:
18
14
  def mixin1_method
19
15
  end
@@ -28,7 +24,6 @@ module RGeo
28
24
  ::RGeo::Feature::MixinCollection::GLOBAL.for_type(::RGeo::Feature::GeometryCollection).add(Mixin1)
29
25
  ::RGeo::Feature::MixinCollection::GLOBAL.for_type(::RGeo::Feature::MultiCurve).add(Mixin2)
30
26
 
31
-
32
27
  def test_basic_mixin_cartesian
33
28
  factory_ = ::RGeo::Cartesian.simple_factory
34
29
  assert_equal(::RGeo::Cartesian::PointImpl, factory_.point(1, 1).class)
@@ -38,7 +33,6 @@ module RGeo
38
33
  assert(!factory_.point(1, 1).respond_to?(:mixin2_method))
39
34
  end
40
35
 
41
-
42
36
  def test_inherited_mixin_cartesian
43
37
  factory_ = ::RGeo::Cartesian.simple_factory
44
38
  assert(factory_.collection([]).class.include?(Mixin1))
@@ -51,11 +45,10 @@ module RGeo
51
45
  assert(factory_.multi_line_string([]).respond_to?(:mixin2_method))
52
46
  end
53
47
 
54
-
55
48
  if ::RGeo::Geos.capi_supported?
56
49
 
57
50
  def test_basic_mixin_geos_capi
58
- factory_ = ::RGeo::Geos.factory(:native_interface => :capi)
51
+ factory_ = ::RGeo::Geos.factory(native_interface: :capi)
59
52
  assert_equal(::RGeo::Geos::CAPIPointImpl, factory_.point(1, 1).class)
60
53
  assert(factory_.point(1, 1).class.include?(Mixin1))
61
54
  assert(!factory_.point(1, 1).class.include?(Mixin2))
@@ -63,9 +56,8 @@ module RGeo
63
56
  assert(!factory_.point(1, 1).respond_to?(:mixin2_method))
64
57
  end
65
58
 
66
-
67
59
  def test_inherited_mixin_geos_capi
68
- factory_ = ::RGeo::Geos.factory(:native_interface => :capi)
60
+ factory_ = ::RGeo::Geos.factory(native_interface: :capi)
69
61
  assert(factory_.collection([]).class.include?(Mixin1))
70
62
  assert(!factory_.collection([]).class.include?(Mixin2))
71
63
  assert(factory_.collection([]).respond_to?(:mixin1_method))
@@ -78,11 +70,10 @@ module RGeo
78
70
 
79
71
  end
80
72
 
81
-
82
73
  if ::RGeo::Geos.ffi_supported?
83
74
 
84
75
  def test_basic_mixin_geos_ffi
85
- factory_ = ::RGeo::Geos.factory(:native_interface => :ffi)
76
+ factory_ = ::RGeo::Geos.factory(native_interface: :ffi)
86
77
  assert_equal(::RGeo::Geos::FFIPointImpl, factory_.point(1, 1).class)
87
78
  assert(factory_.point(1, 1).class.include?(Mixin1))
88
79
  assert(!factory_.point(1, 1).class.include?(Mixin2))
@@ -90,9 +81,8 @@ module RGeo
90
81
  assert(!factory_.point(1, 1).respond_to?(:mixin2_method))
91
82
  end
92
83
 
93
-
94
84
  def test_inherited_mixin_geos_ffi
95
- factory_ = ::RGeo::Geos.factory(:native_interface => :ffi)
85
+ factory_ = ::RGeo::Geos.factory(native_interface: :ffi)
96
86
  assert(factory_.collection([]).class.include?(Mixin1))
97
87
  assert(!factory_.collection([]).class.include?(Mixin2))
98
88
  assert(factory_.collection([]).respond_to?(:mixin1_method))
@@ -105,7 +95,6 @@ module RGeo
105
95
 
106
96
  end
107
97
 
108
-
109
98
  def test_basic_mixin_spherical
110
99
  factory_ = ::RGeo::Geographic.spherical_factory
111
100
  assert_equal(::RGeo::Geographic::SphericalPointImpl, factory_.point(1, 1).class)
@@ -115,7 +104,6 @@ module RGeo
115
104
  assert(!factory_.point(1, 1).respond_to?(:mixin2_method))
116
105
  end
117
106
 
118
-
119
107
  def test_inherited_mixin_spherical
120
108
  factory_ = ::RGeo::Geographic.spherical_factory
121
109
  assert(factory_.collection([]).class.include?(Mixin1))
@@ -128,7 +116,6 @@ module RGeo
128
116
  assert(factory_.multi_line_string([]).respond_to?(:mixin2_method))
129
117
  end
130
118
 
131
-
132
119
  def test_basic_mixin_simple_mercator
133
120
  factory_ = ::RGeo::Geographic.simple_mercator_factory
134
121
  assert_equal(::RGeo::Geographic::ProjectedPointImpl, factory_.point(1, 1).class)
@@ -138,7 +125,6 @@ module RGeo
138
125
  assert(!factory_.point(1, 1).respond_to?(:mixin2_method))
139
126
  end
140
127
 
141
-
142
128
  def test_inherited_mixin_simple_mercator
143
129
  factory_ = ::RGeo::Geographic.simple_mercator_factory
144
130
  assert(factory_.collection([]).class.include?(Mixin1))
@@ -150,9 +136,6 @@ module RGeo
150
136
  assert(factory_.multi_line_string([]).respond_to?(:mixin1_method))
151
137
  assert(factory_.multi_line_string([]).respond_to?(:mixin2_method))
152
138
  end
153
-
154
-
155
139
  end
156
-
157
140
  end
158
141
  end
data/test/tc_oneoff.rb CHANGED
@@ -4,17 +4,13 @@
4
4
  #
5
5
  # -----------------------------------------------------------------------------
6
6
 
7
- require 'test/unit'
8
- require 'rgeo'
9
- require 'ffi-geos'
10
-
7
+ require "test/unit"
8
+ require "rgeo"
9
+ require "ffi-geos"
11
10
 
12
11
  module RGeo
13
- module Tests # :nodoc:
14
-
15
- class TestOneOff < ::Test::Unit::TestCase # :nodoc:
16
-
17
-
12
+ module Tests # :nodoc:
13
+ class TestOneOff < ::Test::Unit::TestCase # :nodoc:
18
14
  def setup
19
15
  # @mercator_factory = ::RGeo::Geographic.simple_mercator_factory
20
16
  # @spherical_factory = ::RGeo::Geographic.spherical_factory(:buffer_resolution => 2)
@@ -23,12 +19,8 @@ module RGeo
23
19
  # @cartesian_factory = ::RGeo::Cartesian.simple_factory(:buffer_resolution => 2)
24
20
  end
25
21
 
26
-
27
22
  def test_dummy
28
23
  end
29
-
30
-
31
24
  end
32
-
33
25
  end
34
26
  end
data/test/tc_types.rb CHANGED
@@ -4,45 +4,36 @@
4
4
  #
5
5
  # -----------------------------------------------------------------------------
6
6
 
7
- require 'test/unit'
8
- require 'rgeo'
9
-
7
+ require "test/unit"
8
+ require "rgeo"
10
9
 
11
10
  module RGeo
12
- module Tests # :nodoc:
13
-
14
- class TestTypes < ::Test::Unit::TestCase # :nodoc:
15
-
16
-
11
+ module Tests # :nodoc:
12
+ class TestTypes < ::Test::Unit::TestCase # :nodoc:
17
13
  def test_geometry
18
- assert_equal('Geometry', ::RGeo::Feature::Geometry.type_name)
14
+ assert_equal("Geometry", ::RGeo::Feature::Geometry.type_name)
19
15
  assert_nil(::RGeo::Feature::Geometry.supertype)
20
16
  assert(::RGeo::Feature::Geometry.subtype_of?(::RGeo::Feature::Geometry))
21
17
  assert(!::RGeo::Feature::Geometry.subtype_of?(::RGeo::Feature::Point))
22
18
  end
23
19
 
24
-
25
20
  def test_point
26
- assert_equal('Point', ::RGeo::Feature::Point.type_name)
21
+ assert_equal("Point", ::RGeo::Feature::Point.type_name)
27
22
  assert_equal(::RGeo::Feature::Geometry, ::RGeo::Feature::Point.supertype)
28
23
  assert(::RGeo::Feature::Point.subtype_of?(::RGeo::Feature::Point))
29
24
  assert(::RGeo::Feature::Point.subtype_of?(::RGeo::Feature::Geometry))
30
25
  assert(!::RGeo::Feature::Point.subtype_of?(::RGeo::Feature::LineString))
31
26
  end
32
27
 
33
-
34
28
  def test_line_string
35
- assert_equal('LineString', ::RGeo::Feature::LineString.type_name)
29
+ assert_equal("LineString", ::RGeo::Feature::LineString.type_name)
36
30
  assert_equal(::RGeo::Feature::Curve, ::RGeo::Feature::LineString.supertype)
37
31
  assert(::RGeo::Feature::LineString.subtype_of?(::RGeo::Feature::LineString))
38
32
  assert(::RGeo::Feature::LineString.subtype_of?(::RGeo::Feature::Curve))
39
33
  assert(::RGeo::Feature::LineString.subtype_of?(::RGeo::Feature::Geometry))
40
34
  assert(!::RGeo::Feature::LineString.subtype_of?(::RGeo::Feature::Line))
41
35
  end
42
-
43
-
44
36
  end
45
-
46
37
  end
47
38
  end
48
39
 
@@ -4,216 +4,182 @@
4
4
  #
5
5
  # -----------------------------------------------------------------------------
6
6
 
7
- require 'test/unit'
8
- require 'rgeo'
9
-
7
+ require "test/unit"
8
+ require "rgeo"
10
9
 
11
10
  module RGeo
12
- module Tests # :nodoc:
13
- module WKRep # :nodoc:
14
-
15
- class TestWKBGenerator < ::Test::Unit::TestCase # :nodoc:
16
-
17
-
11
+ module Tests # :nodoc:
12
+ module WKRep # :nodoc:
13
+ class TestWKBGenerator < ::Test::Unit::TestCase # :nodoc:
18
14
  def setup
19
- @factory = ::RGeo::Cartesian.preferred_factory(:srid => 1000)
20
- @factoryz = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :has_z_coordinate => true)
21
- @factorym = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :has_m_coordinate => true)
22
- @factoryzm = ::RGeo::Cartesian.preferred_factory(:srid => 1000, :has_z_coordinate => true, :has_m_coordinate => true)
15
+ @factory = ::RGeo::Cartesian.preferred_factory(srid: 1000)
16
+ @factoryz = ::RGeo::Cartesian.preferred_factory(srid: 1000, has_z_coordinate: true)
17
+ @factorym = ::RGeo::Cartesian.preferred_factory(srid: 1000, has_m_coordinate: true)
18
+ @factoryzm = ::RGeo::Cartesian.preferred_factory(srid: 1000, has_z_coordinate: true, has_m_coordinate: true)
23
19
  end
24
20
 
25
-
26
21
  def test_point_basic_xdr
27
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
22
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
28
23
  obj_ = @factory.point(1, 2)
29
- assert_equal('00000000013ff00000000000004000000000000000', generator_.generate(obj_))
24
+ assert_equal("00000000013ff00000000000004000000000000000", generator_.generate(obj_))
30
25
  end
31
26
 
32
-
33
27
  def test_point_basic_ndr
34
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :little_endian => true)
28
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, little_endian: true)
35
29
  obj_ = @factory.point(1, 2)
36
- assert_equal('0101000000000000000000f03f0000000000000040', generator_.generate(obj_))
30
+ assert_equal("0101000000000000000000f03f0000000000000040", generator_.generate(obj_))
37
31
  end
38
32
 
39
-
40
33
  def test_point_2d_ewkb
41
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
34
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
42
35
  obj_ = @factory.point(1, 2)
43
- assert_equal('00000000013ff00000000000004000000000000000', generator_.generate(obj_))
36
+ assert_equal("00000000013ff00000000000004000000000000000", generator_.generate(obj_))
44
37
  end
45
38
 
46
-
47
39
  def test_point_2d_wkb12
48
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :wkb12)
40
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :wkb12)
49
41
  obj_ = @factory.point(1, 2)
50
- assert_equal('00000000013ff00000000000004000000000000000', generator_.generate(obj_))
42
+ assert_equal("00000000013ff00000000000004000000000000000", generator_.generate(obj_))
51
43
  end
52
44
 
53
-
54
45
  def test_point_2d_ewkb_with_srid
55
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true)
46
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true)
56
47
  obj_ = @factory.point(1, 2)
57
- assert_equal('0020000001000003e83ff00000000000004000000000000000', generator_.generate(obj_))
48
+ assert_equal("0020000001000003e83ff00000000000004000000000000000", generator_.generate(obj_))
58
49
  end
59
50
 
60
-
61
51
  def test_point_with_ewkb_z
62
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
52
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
63
53
  obj_ = @factoryz.point(1, 2, 3)
64
- assert_equal('00800000013ff000000000000040000000000000004008000000000000', generator_.generate(obj_))
54
+ assert_equal("00800000013ff000000000000040000000000000004008000000000000", generator_.generate(obj_))
65
55
  end
66
56
 
67
-
68
57
  def test_point_with_ewkb_m
69
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
58
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
70
59
  obj_ = @factorym.point(1, 2, 3)
71
- assert_equal('00400000013ff000000000000040000000000000004008000000000000', generator_.generate(obj_))
60
+ assert_equal("00400000013ff000000000000040000000000000004008000000000000", generator_.generate(obj_))
72
61
  end
73
62
 
74
-
75
63
  def test_point_with_ewkb_zm
76
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
64
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
77
65
  obj_ = @factoryzm.point(1, 2, 3, 4)
78
- assert_equal('00c00000013ff0000000000000400000000000000040080000000000004010000000000000', generator_.generate(obj_))
66
+ assert_equal("00c00000013ff0000000000000400000000000000040080000000000004010000000000000", generator_.generate(obj_))
79
67
  end
80
68
 
81
-
82
69
  def test_point_with_wkb12_z
83
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :wkb12)
70
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :wkb12)
84
71
  obj_ = @factoryz.point(1, 2, 3)
85
- assert_equal('00000003e93ff000000000000040000000000000004008000000000000', generator_.generate(obj_))
72
+ assert_equal("00000003e93ff000000000000040000000000000004008000000000000", generator_.generate(obj_))
86
73
  end
87
74
 
88
-
89
75
  def test_point_with_wkb12_m
90
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :wkb12)
76
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :wkb12)
91
77
  obj_ = @factorym.point(1, 2, 3)
92
- assert_equal('00000007d13ff000000000000040000000000000004008000000000000', generator_.generate(obj_))
78
+ assert_equal("00000007d13ff000000000000040000000000000004008000000000000", generator_.generate(obj_))
93
79
  end
94
80
 
95
-
96
81
  def test_point_with_wkb12_zm
97
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :wkb12)
82
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :wkb12)
98
83
  obj_ = @factoryzm.point(1, 2, 3, 4)
99
- assert_equal('0000000bb93ff0000000000000400000000000000040080000000000004010000000000000', generator_.generate(obj_))
84
+ assert_equal("0000000bb93ff0000000000000400000000000000040080000000000004010000000000000", generator_.generate(obj_))
100
85
  end
101
86
 
102
-
103
87
  def test_linestring_basic
104
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
88
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
105
89
  obj_ = @factory.line_string([@factory.point(1, 2), @factory.point(3, 4), @factory.point(5, 6)])
106
- assert_equal('0000000002000000033ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000', generator_.generate(obj_))
90
+ assert_equal("0000000002000000033ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000", generator_.generate(obj_))
107
91
  end
108
92
 
109
-
110
93
  def test_linestring_with_ewkb_z
111
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
94
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
112
95
  obj_ = @factoryz.line_string([@factoryz.point(1, 2, 3), @factoryz.point(4, 5, 6)])
113
- assert_equal('0080000002000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000', generator_.generate(obj_))
96
+ assert_equal("0080000002000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000", generator_.generate(obj_))
114
97
  end
115
98
 
116
-
117
99
  def test_linestring_with_ewkb_z_and_srid
118
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true)
100
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true)
119
101
  obj_ = @factoryz.line_string([@factoryz.point(1, 2, 3), @factoryz.point(4, 5, 6)])
120
- assert_equal('00a0000002000003e8000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000', generator_.generate(obj_))
102
+ assert_equal("00a0000002000003e8000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000", generator_.generate(obj_))
121
103
  end
122
104
 
123
-
124
105
  def test_linestring_with_wkb12_m
125
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :wkb12)
106
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :wkb12)
126
107
  obj_ = @factorym.line_string([@factorym.point(1, 2, 3), @factorym.point(4, 5, 6)])
127
- assert_equal('00000007d2000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000', generator_.generate(obj_))
108
+ assert_equal("00000007d2000000023ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000", generator_.generate(obj_))
128
109
  end
129
110
 
130
-
131
111
  def test_linestring_empty
132
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
112
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
133
113
  obj_ = @factory.line_string([])
134
- assert_equal('000000000200000000', generator_.generate(obj_))
114
+ assert_equal("000000000200000000", generator_.generate(obj_))
135
115
  end
136
116
 
137
-
138
117
  def test_polygon_basic
139
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
118
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
140
119
  obj_ = @factory.polygon(@factory.linear_ring([@factory.point(1, 2), @factory.point(3, 4), @factory.point(6, 5), @factory.point(1, 2)]))
141
- assert_equal('000000000300000001000000043ff0000000000000400000000000000040080000000000004010000000000000401800000000000040140000000000003ff00000000000004000000000000000', generator_.generate(obj_))
120
+ assert_equal("000000000300000001000000043ff0000000000000400000000000000040080000000000004010000000000000401800000000000040140000000000003ff00000000000004000000000000000", generator_.generate(obj_))
142
121
  end
143
122
 
144
-
145
123
  def test_polygon_empty
146
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
124
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
147
125
  obj_ = @factory.polygon(@factory.linear_ring([]))
148
- assert_equal('000000000300000000', generator_.generate(obj_))
126
+ assert_equal("000000000300000000", generator_.generate(obj_))
149
127
  end
150
128
 
151
-
152
129
  def test_multipoint_basic
153
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
130
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
154
131
  obj_ = @factory.multi_point([@factory.point(1, 2), @factory.point(3, 4)])
155
- assert_equal('00000000040000000200000000013ff00000000000004000000000000000000000000140080000000000004010000000000000', generator_.generate(obj_))
132
+ assert_equal("00000000040000000200000000013ff00000000000004000000000000000000000000140080000000000004010000000000000", generator_.generate(obj_))
156
133
  end
157
134
 
158
-
159
135
  def test_multipoint_with_ewkb_z
160
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb)
136
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb)
161
137
  obj_ = @factoryz.multi_point([@factoryz.point(1, 2, 5), @factoryz.point(3, 4, 6)])
162
- assert_equal('00800000040000000200800000013ff0000000000000400000000000000040140000000000000080000001400800000000000040100000000000004018000000000000', generator_.generate(obj_))
138
+ assert_equal("00800000040000000200800000013ff0000000000000400000000000000040140000000000000080000001400800000000000040100000000000004018000000000000", generator_.generate(obj_))
163
139
  end
164
140
 
165
-
166
141
  def test_multipoint_empty
167
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
142
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
168
143
  obj_ = @factory.multi_point([])
169
- assert_equal('000000000400000000', generator_.generate(obj_))
144
+ assert_equal("000000000400000000", generator_.generate(obj_))
170
145
  end
171
146
 
172
-
173
147
  def test_multilinestring_basic
174
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
148
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
175
149
  obj_ = @factory.multi_line_string([@factory.line_string([@factory.point(1, 2), @factory.point(3, 4), @factory.point(5, 6)]), @factory.line_string([@factory.point(-1, -2), @factory.point(-3, -4)])])
176
- assert_equal('0000000005000000020000000002000000033ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000000000000200000002bff0000000000000c000000000000000c008000000000000c010000000000000', generator_.generate(obj_))
150
+ assert_equal("0000000005000000020000000002000000033ff000000000000040000000000000004008000000000000401000000000000040140000000000004018000000000000000000000200000002bff0000000000000c000000000000000c008000000000000c010000000000000", generator_.generate(obj_))
177
151
  end
178
152
 
179
-
180
153
  def test_multilinestring_empty
181
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
154
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
182
155
  obj_ = @factory.multi_line_string([])
183
- assert_equal('000000000500000000', generator_.generate(obj_))
156
+ assert_equal("000000000500000000", generator_.generate(obj_))
184
157
  end
185
158
 
186
-
187
159
  def test_multipolygon_basic
188
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
160
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
189
161
  obj_ = @factory.multi_polygon([@factory.polygon(@factory.linear_ring([@factory.point(1, 2), @factory.point(3, 4), @factory.point(6, 5), @factory.point(1, 2)])), @factory.polygon(@factory.linear_ring([]))])
190
- assert_equal('000000000600000002000000000300000001000000043ff0000000000000400000000000000040080000000000004010000000000000401800000000000040140000000000003ff00000000000004000000000000000000000000300000000', generator_.generate(obj_))
162
+ assert_equal("000000000600000002000000000300000001000000043ff0000000000000400000000000000040080000000000004010000000000000401800000000000040140000000000003ff00000000000004000000000000000000000000300000000", generator_.generate(obj_))
191
163
  end
192
164
 
193
-
194
165
  def test_multipolygon_empty
195
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
166
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
196
167
  obj_ = @factory.multi_polygon([])
197
- assert_equal('000000000600000000', generator_.generate(obj_))
168
+ assert_equal("000000000600000000", generator_.generate(obj_))
198
169
  end
199
170
 
200
-
201
171
  def test_collection_basic
202
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
172
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
203
173
  obj_ = @factory.collection([@factory.line_string([@factory.point(1, 2), @factory.point(3, 4), @factory.point(5, 6)]), @factory.point(-1, -2)])
204
- assert_equal('0000000007000000020000000002000000033ff0000000000000400000000000000040080000000000004010000000000000401400000000000040180000000000000000000001bff0000000000000c000000000000000', generator_.generate(obj_))
174
+ assert_equal("0000000007000000020000000002000000033ff0000000000000400000000000000040080000000000004010000000000000401400000000000040180000000000000000000001bff0000000000000c000000000000000", generator_.generate(obj_))
205
175
  end
206
176
 
207
-
208
177
  def test_collection_empty
209
- generator_ = ::RGeo::WKRep::WKBGenerator.new(:hex_format => true)
178
+ generator_ = ::RGeo::WKRep::WKBGenerator.new(hex_format: true)
210
179
  obj_ = @factory.collection([])
211
- assert_equal('000000000700000000', generator_.generate(obj_))
180
+ assert_equal("000000000700000000", generator_.generate(obj_))
212
181
  end
213
-
214
-
215
182
  end
216
-
217
183
  end
218
184
  end
219
185
  end