ffi-gdal 1.0.0.beta16 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (324) hide show
  1. checksums.yaml +4 -4
  2. data/.dockerignore +17 -0
  3. data/.github/workflows/codacy.yml +61 -0
  4. data/.github/workflows/codeql.yml +74 -0
  5. data/.github/workflows/continuous-integration.yml +36 -0
  6. data/.github/workflows/dependency-review.yml +20 -0
  7. data/.github/workflows/specs-in-docker.yml +27 -0
  8. data/.gitignore +3 -0
  9. data/.rspec +1 -0
  10. data/.rubocop.yml +10 -80
  11. data/.rubocop_todo.yml +23 -40
  12. data/.ruby-version +1 -1
  13. data/Changelog-0.x.md +512 -0
  14. data/Changelog.md +12 -0
  15. data/Dockerfile.gdal2 +110 -0
  16. data/Dockerfile.gdal3 +73 -0
  17. data/README.md +25 -14
  18. data/Rakefile +0 -8
  19. data/Tiltfile +91 -0
  20. data/bin/bundle +123 -0
  21. data/bin/docker-clean +8 -0
  22. data/bin/rake +29 -0
  23. data/bin/rspec +29 -0
  24. data/bin/rubocop +29 -0
  25. data/docker-compose.yml +25 -0
  26. data/examples/extract_and_colorize.rb +0 -13
  27. data/examples/geometries.rb +14 -14
  28. data/examples/ogr_layer_to_layer.rb +1 -3
  29. data/examples/raster_erasing.rb +1 -0
  30. data/examples/remove_small_polygons.rb +1 -1
  31. data/examples/testing_gdal.rb +20 -17
  32. data/examples/warping.rb +9 -7
  33. data/ffi-gdal.gemspec +12 -6
  34. data/lib/ext/ffi_library_function_checks.rb +2 -2
  35. data/lib/ext/to_bool.rb +5 -3
  36. data/lib/ffi/cpl/conv.rb +27 -25
  37. data/lib/ffi/cpl/error.rb +19 -20
  38. data/lib/ffi/cpl/hash_set.rb +4 -4
  39. data/lib/ffi/cpl/http.rb +3 -3
  40. data/lib/ffi/cpl/http_result.rb +8 -8
  41. data/lib/ffi/cpl/list.rb +1 -1
  42. data/lib/ffi/cpl/mime_part.rb +2 -2
  43. data/lib/ffi/cpl/minixml.rb +7 -7
  44. data/lib/ffi/cpl/progress.rb +8 -8
  45. data/lib/ffi/cpl/quad_tree.rb +14 -14
  46. data/lib/ffi/cpl/rect_obj.rb +3 -3
  47. data/lib/ffi/cpl/string.rb +17 -20
  48. data/lib/ffi/cpl/vsi.rb +13 -13
  49. data/lib/ffi/cpl/xml_node.rb +3 -3
  50. data/lib/ffi/extensions/gdal/extensions/all.rb +4 -0
  51. data/lib/ffi/extensions/gdal/extensions/version.rb +9 -0
  52. data/lib/ffi/extensions/gdal/extensions.rb +12 -0
  53. data/lib/ffi/extensions/rttopo/gbox.rb +19 -0
  54. data/lib/ffi/extensions/rttopo/geom.rb +16 -0
  55. data/lib/ffi/extensions/rttopo.rb +41 -0
  56. data/lib/ffi/gdal/alg.rb +277 -277
  57. data/lib/ffi/gdal/color_entry.rb +3 -3
  58. data/lib/ffi/gdal/gcp.rb +6 -6
  59. data/lib/ffi/gdal/gdal.rb +349 -349
  60. data/lib/ffi/gdal/grid.rb +134 -134
  61. data/lib/ffi/gdal/grid_data_metrics_options.rb +4 -4
  62. data/lib/ffi/gdal/grid_inverse_distance_to_a_power_options.rb +9 -9
  63. data/lib/ffi/gdal/grid_moving_average_options.rb +4 -4
  64. data/lib/ffi/gdal/grid_nearest_neighbor_options.rb +3 -3
  65. data/lib/ffi/gdal/matching.rb +3 -3
  66. data/lib/ffi/gdal/rpc_info.rb +17 -17
  67. data/lib/ffi/gdal/transformer_info.rb +4 -4
  68. data/lib/ffi/gdal/version.rb +1 -1
  69. data/lib/ffi/gdal/vrt.rb +39 -39
  70. data/lib/ffi/gdal/warp_options.rb +34 -34
  71. data/lib/ffi/gdal/warper.rb +90 -90
  72. data/lib/ffi/gdal.rb +2 -31
  73. data/lib/ffi/ogr/api.rb +175 -167
  74. data/lib/ffi/ogr/contour_writer_info.rb +4 -4
  75. data/lib/ffi/ogr/core.rb +107 -107
  76. data/lib/ffi/ogr/envelope.rb +3 -3
  77. data/lib/ffi/ogr/envelope_3d.rb +5 -5
  78. data/lib/ffi/ogr/featurestyle.rb +3 -3
  79. data/lib/ffi/ogr/field.rb +22 -22
  80. data/lib/ffi/ogr/geocoding.rb +4 -4
  81. data/lib/ffi/ogr/srs_api.rb +154 -155
  82. data/lib/ffi/ogr/style_param.rb +3 -3
  83. data/lib/ffi/ogr/style_value.rb +4 -4
  84. data/lib/gdal/color_entry.rb +1 -5
  85. data/lib/gdal/color_interpretation.rb +7 -3
  86. data/lib/gdal/color_table.rb +46 -27
  87. data/lib/gdal/cpl_error_handler.rb +26 -6
  88. data/lib/gdal/data_type.rb +10 -3
  89. data/lib/gdal/dataset.rb +171 -85
  90. data/lib/gdal/dataset_mixins/algorithm_methods.rb +44 -44
  91. data/lib/gdal/dataset_mixins/matching.rb +1 -1
  92. data/lib/gdal/dataset_mixins/warp_methods.rb +4 -2
  93. data/lib/gdal/driver.rb +38 -21
  94. data/lib/gdal/environment_methods.rb +6 -6
  95. data/lib/gdal/extensions/all.rb +3 -0
  96. data/lib/gdal/{color_entry_mixins → extensions/color_entry}/extensions.rb +4 -1
  97. data/lib/gdal/{color_table_mixins → extensions/color_table}/extensions.rb +3 -0
  98. data/lib/gdal/extensions/dataset/extensions.rb +205 -0
  99. data/lib/gdal/{driver_mixins → extensions/driver}/extensions.rb +6 -2
  100. data/lib/gdal/{geo_transform_mixins → extensions/geo_transform}/extensions.rb +10 -8
  101. data/lib/gdal/{gridder → extensions/gridder}/point_extracting.rb +7 -5
  102. data/lib/gdal/{gridder.rb → extensions/gridder.rb} +33 -33
  103. data/lib/gdal/{gridder_options.rb → extensions/gridder_options.rb} +13 -14
  104. data/lib/gdal/{raster_attribute_table_mixins → extensions/raster_attribute_table}/extensions.rb +8 -6
  105. data/lib/gdal/{raster_band_mixins → extensions/raster_band}/algorithm_extensions.rb +8 -6
  106. data/lib/gdal/{raster_band_mixins → extensions/raster_band}/coloring_extensions.rb +6 -4
  107. data/lib/gdal/{raster_band_mixins → extensions/raster_band}/extensions.rb +9 -5
  108. data/lib/gdal/{raster_band_mixins → extensions/raster_band}/io_extensions.rb +18 -14
  109. data/lib/gdal/{raster_band_classifier.rb → extensions/raster_band_classifier.rb} +3 -5
  110. data/lib/gdal/geo_transform.rb +1 -6
  111. data/lib/gdal/grid.rb +3 -2
  112. data/lib/gdal/grid_algorithms.rb +9 -9
  113. data/lib/gdal/internal_helpers.rb +46 -9
  114. data/lib/gdal/major_object.rb +11 -3
  115. data/lib/gdal/options.rb +26 -32
  116. data/lib/gdal/raster_attribute_table.rb +63 -37
  117. data/lib/gdal/raster_band.rb +164 -116
  118. data/lib/gdal/raster_band_mixins/algorithm_methods.rb +26 -25
  119. data/lib/gdal/rpc_info.rb +3 -2
  120. data/lib/gdal/transformers/approximate_transformer.rb +12 -3
  121. data/lib/gdal/transformers/base_general_image_projection_transformer.rb +15 -2
  122. data/lib/gdal/transformers/gcp_transformer.rb +27 -19
  123. data/lib/gdal/transformers/general_image_projection_transformer.rb +8 -6
  124. data/lib/gdal/transformers/general_image_projection_transformer2.rb +9 -6
  125. data/lib/gdal/transformers/general_image_projection_transformer3.rb +6 -2
  126. data/lib/gdal/transformers/geolocation_transformer.rb +12 -4
  127. data/lib/gdal/transformers/reprojection_transformer.rb +11 -3
  128. data/lib/gdal/transformers/rpc_transformer.rb +11 -2
  129. data/lib/gdal/transformers/tps_transformer.rb +12 -4
  130. data/lib/gdal/version_info.rb +2 -2
  131. data/lib/gdal/virtual_dataset.rb +2 -0
  132. data/lib/gdal/warp_operation.rb +65 -54
  133. data/lib/gdal/warp_options.rb +9 -11
  134. data/lib/ogr/coordinate_transformation.rb +23 -9
  135. data/lib/ogr/data_source.rb +68 -37
  136. data/lib/ogr/driver.rb +18 -17
  137. data/lib/ogr/envelope.rb +0 -3
  138. data/lib/ogr/error_handling.rb +22 -24
  139. data/lib/ogr/extensions/all.rb +3 -0
  140. data/lib/ogr/{data_source_mixins → extensions/data_source}/capability_methods.rb +2 -0
  141. data/lib/ogr/extensions/data_source/data_source_extensions.rb +16 -0
  142. data/lib/ogr/{driver_mixins → extensions/driver}/capability_methods.rb +5 -1
  143. data/lib/ogr/extensions/envelope/extensions.rb +114 -0
  144. data/lib/ogr/extensions/feature/extensions.rb +87 -0
  145. data/lib/ogr/extensions/feature_definition/extensions.rb +43 -0
  146. data/lib/ogr/extensions/geometries/point/extensions.rb +19 -0
  147. data/lib/ogr/extensions/geometry/container_mixins.rb +56 -0
  148. data/lib/ogr/extensions/geometry/ewkb_io_extensions.rb +44 -0
  149. data/lib/ogr/extensions/geometry/ewkb_record.rb +94 -0
  150. data/lib/ogr/{geometry_mixins → extensions/geometry}/extensions.rb +16 -9
  151. data/lib/ogr/extensions/geometry/rttopo_extensions.rb +48 -0
  152. data/lib/ogr/extensions/geometry/wkb_record.rb +63 -0
  153. data/lib/ogr/extensions/geometry_types/curve/extensions.rb +68 -0
  154. data/lib/ogr/{layer_mixins → extensions/layer}/capability_methods.rb +4 -0
  155. data/lib/ogr/{layer_mixins → extensions/layer}/extensions.rb +11 -6
  156. data/lib/ogr/extensions/spatial_reference/extensions.rb +38 -0
  157. data/lib/ogr/extensions/spatial_reference/initializers.rb +138 -0
  158. data/lib/ogr/extensions/style_table/extensions.rb +31 -0
  159. data/lib/ogr/feature.rb +173 -88
  160. data/lib/ogr/feature_definition.rb +53 -45
  161. data/lib/ogr/field.rb +17 -19
  162. data/lib/ogr/field_definition.rb +30 -18
  163. data/lib/ogr/geocoder.rb +11 -4
  164. data/lib/ogr/geometries/line_string.rb +1 -0
  165. data/lib/ogr/geometries/line_string_25d.rb +0 -9
  166. data/lib/ogr/geometries/linear_ring.rb +2 -2
  167. data/lib/ogr/geometries/point.rb +0 -9
  168. data/lib/ogr/geometry.rb +116 -49
  169. data/lib/ogr/geometry_field_definition.rb +31 -15
  170. data/lib/ogr/geometry_types/container.rb +26 -28
  171. data/lib/ogr/geometry_types/curve.rb +5 -61
  172. data/lib/ogr/geometry_types/surface.rb +1 -1
  173. data/lib/ogr/internal_helpers.rb +2 -2
  174. data/lib/ogr/layer.rb +12 -10
  175. data/lib/ogr/layer_mixins/ogr_feature_methods.rb +39 -27
  176. data/lib/ogr/layer_mixins/ogr_field_methods.rb +66 -50
  177. data/lib/ogr/layer_mixins/ogr_layer_method_methods.rb +17 -8
  178. data/lib/ogr/layer_mixins/ogr_query_filter_methods.rb +7 -6
  179. data/lib/ogr/layer_mixins/ogr_sql_methods.rb +15 -7
  180. data/lib/ogr/spatial_reference.rb +79 -42
  181. data/lib/ogr/spatial_reference_mixins/coordinate_system_getter_setters.rb +149 -118
  182. data/lib/ogr/spatial_reference_mixins/exporters.rb +87 -51
  183. data/lib/ogr/spatial_reference_mixins/importers.rb +88 -43
  184. data/lib/ogr/spatial_reference_mixins/morphers.rb +12 -8
  185. data/lib/ogr/spatial_reference_mixins/parameter_getter_setters.rb +27 -13
  186. data/lib/ogr/style_table.rb +15 -5
  187. data/lib/ogr/style_tool.rb +29 -15
  188. data/lib/ogr.rb +1 -0
  189. data/rakelib/docker.rake +10 -0
  190. data/sorbet/rbi/hidden-definitions/errors.txt +21790 -0
  191. data/tilt/gdal2.yml +22 -0
  192. data/tilt/gdal3.yml +22 -0
  193. metadata +116 -280
  194. data/History.md +0 -360
  195. data/lib/ext/error_symbols.rb +0 -7
  196. data/lib/gdal/dataset_mixins/extensions.rb +0 -380
  197. data/lib/gdal/merger.rb +0 -132
  198. data/lib/ogr/data_source_extensions.rb +0 -10
  199. data/lib/ogr/envelope_extensions.rb +0 -110
  200. data/lib/ogr/feature_definition_extensions.rb +0 -39
  201. data/lib/ogr/feature_extensions.rb +0 -87
  202. data/lib/ogr/geometry_mixins/container_mixins.rb +0 -25
  203. data/lib/ogr/spatial_reference_extensions.rb +0 -34
  204. data/lib/ogr/style_table_extensions.rb +0 -26
  205. data/spec/ffi-gdal_spec.rb +0 -24
  206. data/spec/integration/gdal/color_table_info_spec.rb +0 -78
  207. data/spec/integration/gdal/dataset_info_spec.rb +0 -342
  208. data/spec/integration/gdal/driver_info_spec.rb +0 -170
  209. data/spec/integration/gdal/geo_transform_info_spec.rb +0 -226
  210. data/spec/integration/gdal/gridder_spec.rb +0 -331
  211. data/spec/integration/gdal/raster_attribute_table_info_spec.rb +0 -229
  212. data/spec/integration/gdal/raster_band_algorithms_spec.rb +0 -35
  213. data/spec/integration/gdal/raster_band_info_spec.rb +0 -320
  214. data/spec/integration/ogr/layer_spec.rb +0 -95
  215. data/spec/spec_helper.rb +0 -116
  216. data/spec/support/images/123.tiff +0 -0
  217. data/spec/support/images/osgeo/gdal/data/hfa/float-rle.img +0 -0
  218. data/spec/support/images/osgeo/geotiff/GeogToWGS84GeoKey/GeogToWGS84GeoKey5.lgo +0 -31
  219. data/spec/support/images/osgeo/geotiff/GeogToWGS84GeoKey/GeogToWGS84GeoKey5.tif +0 -0
  220. data/spec/support/images/osgeo/geotiff/GeogToWGS84GeoKey/GeogToWGS84GeoKey5.tif.msk +0 -0
  221. data/spec/support/images/osgeo/geotiff/GeogToWGS84GeoKey/GeogToWGS84GeoKey5.txt +0 -10
  222. data/spec/support/images/osgeo/geotiff/gdal_eg/cea.tif +0 -0
  223. data/spec/support/images/osgeo/geotiff/gdal_eg/cea.txt +0 -84
  224. data/spec/support/images/osgeo/geotiff/zi_imaging/image0.lgo +0 -45
  225. data/spec/support/images/osgeo/geotiff/zi_imaging/image0.tif +0 -0
  226. data/spec/support/integration_help.rb +0 -34
  227. data/spec/support/shapefiles/states_21basic/states.dbf +0 -0
  228. data/spec/support/shapefiles/states_21basic/states.prj +0 -1
  229. data/spec/support/shapefiles/states_21basic/states.sbn +0 -0
  230. data/spec/support/shapefiles/states_21basic/states.sbx +0 -0
  231. data/spec/support/shapefiles/states_21basic/states.shp +0 -0
  232. data/spec/support/shapefiles/states_21basic/states.shp.xml +0 -3
  233. data/spec/support/shapefiles/states_21basic/states.shx +0 -0
  234. data/spec/support/shared_contexts.rb +0 -28
  235. data/spec/support/shared_examples/gdal/major_object_examples.rb +0 -55
  236. data/spec/support/shared_examples/ogr/a_25d_geometry.rb +0 -9
  237. data/spec/support/shared_examples/ogr/a_container_geometry.rb +0 -49
  238. data/spec/support/shared_examples/ogr/a_geometry.rb +0 -406
  239. data/spec/support/shared_examples/ogr/a_line_string.rb +0 -18
  240. data/spec/support/test_style_table.txt +0 -3
  241. data/spec/support/worldfiles/SR_50M/SR_50M.VERSION.txt +0 -1
  242. data/spec/support/worldfiles/SR_50M/SR_50M.prj +0 -1
  243. data/spec/support/worldfiles/SR_50M/SR_50M.tfw +0 -6
  244. data/spec/support/worldfiles/SR_50M/SR_50M.tif +0 -0
  245. data/spec/unit/ext/error_symbols_spec.rb +0 -69
  246. data/spec/unit/ext/numeric_as_data_type_spec.rb +0 -115
  247. data/spec/unit/ffi/gdal_spec.rb +0 -73
  248. data/spec/unit/gdal/color_entry_spec.rb +0 -8
  249. data/spec/unit/gdal/color_interpretation_spec.rb +0 -8
  250. data/spec/unit/gdal/color_table_mixins/extensions_spec.rb +0 -62
  251. data/spec/unit/gdal/color_table_spec.rb +0 -146
  252. data/spec/unit/gdal/data_type_spec.rb +0 -74
  253. data/spec/unit/gdal/dataset_mixins/warp_methods_spec.rb +0 -55
  254. data/spec/unit/gdal/dataset_spec.rb +0 -148
  255. data/spec/unit/gdal/driver_mixins/extensions_spec.rb +0 -24
  256. data/spec/unit/gdal/driver_spec.rb +0 -51
  257. data/spec/unit/gdal/environment_methods_spec.rb +0 -8
  258. data/spec/unit/gdal/geo_transform_mixins/extensions_spec.rb +0 -69
  259. data/spec/unit/gdal/geo_transform_spec.rb +0 -265
  260. data/spec/unit/gdal/grid_spec.rb +0 -98
  261. data/spec/unit/gdal/gridder/point_extracting_spec.rb +0 -101
  262. data/spec/unit/gdal/gridder_options_spec.rb +0 -185
  263. data/spec/unit/gdal/gridder_spec.rb +0 -182
  264. data/spec/unit/gdal/internal_helpers_spec.rb +0 -278
  265. data/spec/unit/gdal/major_object_spec.rb +0 -10
  266. data/spec/unit/gdal/options_spec.rb +0 -33
  267. data/spec/unit/gdal/raster_attribute_table_spec.rb +0 -7
  268. data/spec/unit/gdal/raster_band_classifier_spec.rb +0 -260
  269. data/spec/unit/gdal/raster_band_mixins/extensions_spec.rb +0 -73
  270. data/spec/unit/gdal/raster_band_mixins/io_extensions_spec.rb +0 -135
  271. data/spec/unit/gdal/raster_band_spec.rb +0 -8
  272. data/spec/unit/gdal/rpc_info_spec.rb +0 -8
  273. data/spec/unit/gdal/version_info_spec.rb +0 -10
  274. data/spec/unit/gdal/virtual_dataset_spec.rb +0 -34
  275. data/spec/unit/gdal/warp_operation_spec.rb +0 -8
  276. data/spec/unit/gdal/warp_options_spec.rb +0 -338
  277. data/spec/unit/ogr/coordinate_transformation_spec.rb +0 -104
  278. data/spec/unit/ogr/data_source_mixins/capability_methods_spec.rb +0 -32
  279. data/spec/unit/ogr/data_source_spec.rb +0 -223
  280. data/spec/unit/ogr/driver_mixins/capability_methods_spec.rb +0 -20
  281. data/spec/unit/ogr/driver_spec.rb +0 -152
  282. data/spec/unit/ogr/envelope_spec.rb +0 -324
  283. data/spec/unit/ogr/feature_definition_spec.rb +0 -296
  284. data/spec/unit/ogr/feature_extensions_spec.rb +0 -90
  285. data/spec/unit/ogr/feature_spec.rb +0 -363
  286. data/spec/unit/ogr/field_definition_spec.rb +0 -118
  287. data/spec/unit/ogr/field_spec.rb +0 -195
  288. data/spec/unit/ogr/geometries/geometry_collection_25d_spec.rb +0 -25
  289. data/spec/unit/ogr/geometries/geometry_collection_spec.rb +0 -188
  290. data/spec/unit/ogr/geometries/line_string_25d_spec.rb +0 -25
  291. data/spec/unit/ogr/geometries/line_string_spec.rb +0 -107
  292. data/spec/unit/ogr/geometries/linear_ring_spec.rb +0 -92
  293. data/spec/unit/ogr/geometries/multi_line_string_25d_spec.rb +0 -25
  294. data/spec/unit/ogr/geometries/multi_line_string_spec.rb +0 -16
  295. data/spec/unit/ogr/geometries/multi_point_25d_spec.rb +0 -25
  296. data/spec/unit/ogr/geometries/multi_point_spec.rb +0 -16
  297. data/spec/unit/ogr/geometries/multi_polygon_25d_spec.rb +0 -25
  298. data/spec/unit/ogr/geometries/multi_polygon_spec.rb +0 -43
  299. data/spec/unit/ogr/geometries/none_geometry_spec.rb +0 -14
  300. data/spec/unit/ogr/geometries/point_25d_spec.rb +0 -25
  301. data/spec/unit/ogr/geometries/point_spec.rb +0 -307
  302. data/spec/unit/ogr/geometries/polygon_25d_spec.rb +0 -25
  303. data/spec/unit/ogr/geometries/polygon_spec.rb +0 -19
  304. data/spec/unit/ogr/geometries/unknown_geometry_spec.rb +0 -12
  305. data/spec/unit/ogr/geometry_field_definition_spec.rb +0 -73
  306. data/spec/unit/ogr/geometry_spec.rb +0 -711
  307. data/spec/unit/ogr/internal_helpers_spec.rb +0 -70
  308. data/spec/unit/ogr/layer_mixins/capability_methods_spec.rb +0 -90
  309. data/spec/unit/ogr/layer_mixins/ogr_feature_methods_spec.rb +0 -155
  310. data/spec/unit/ogr/layer_mixins/ogr_field_methods_spec.rb +0 -434
  311. data/spec/unit/ogr/layer_mixins/ogr_layer_method_methods_spec.rb +0 -22
  312. data/spec/unit/ogr/layer_mixins/ogr_query_filter_methods_spec.rb +0 -44
  313. data/spec/unit/ogr/layer_mixins/ogr_sql_methods_spec.rb +0 -14
  314. data/spec/unit/ogr/layer_spec.rb +0 -98
  315. data/spec/unit/ogr/spatial_reference_mixins/coordinate_system_getter_setters_spec.rb +0 -48
  316. data/spec/unit/ogr/spatial_reference_mixins/exporters_spec.rb +0 -151
  317. data/spec/unit/ogr/spatial_reference_mixins/importers_spec.rb +0 -40
  318. data/spec/unit/ogr/spatial_reference_mixins/morphers_spec.rb +0 -38
  319. data/spec/unit/ogr/spatial_reference_mixins/parameter_getter_setters_spec.rb +0 -105
  320. data/spec/unit/ogr/spatial_reference_mixins/type_checks_spec.rb +0 -159
  321. data/spec/unit/ogr/spatial_reference_spec.rb +0 -44
  322. data/spec/unit/ogr/style_table_spec.rb +0 -108
  323. data/spec/unit/ogr/style_tool_spec.rb +0 -159
  324. data/spec/unit/version_info_spec.rb +0 -50
@@ -1,11 +1,16 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../gdal'
3
4
  require_relative '../ogr'
4
- require_relative 'feature_definition_extensions'
5
5
 
6
6
  module OGR
7
7
  class FeatureDefinition
8
- include FeatureDefinitionExtensions
8
+ # @param pointer [FFI::Pointer]
9
+ def self.release(pointer)
10
+ return unless pointer && !pointer.null?
11
+
12
+ FFI::OGR::API.OGR_FD_Release(pointer)
13
+ end
9
14
 
10
15
  # @return [FFI::Pointer] C pointer of the C FeatureDefn.
11
16
  attr_reader :c_pointer
@@ -15,39 +20,45 @@ module OGR
15
20
  # FFI::Pointer, the new object will simply wrap the C FeatureDefinition
16
21
  # at that address.
17
22
  def initialize(name_or_pointer)
18
- @c_pointer = if name_or_pointer.is_a? String
19
- FFI::OGR::API.OGR_FD_Create(name_or_pointer)
20
- else
21
- name_or_pointer
22
- end
23
-
24
- return if @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
23
+ pointer = if name_or_pointer.is_a? String
24
+ FFI::OGR::API.OGR_FD_Create(name_or_pointer)
25
+ else
26
+ name_or_pointer
27
+ end
28
+
29
+ if !pointer.is_a?(FFI::Pointer) || pointer.null?
30
+ raise OGR::InvalidFeatureDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
31
+ end
25
32
 
26
- raise OGR::InvalidFeatureDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
33
+ @c_pointer = FFI::AutoPointer.new(pointer, FeatureDefinition.method(:release))
34
+ @c_pointer.autorelease = false
27
35
  end
28
36
 
29
37
  def release!
30
- return unless @c_pointer
38
+ FeatureDefinition.release(@c_pointer)
31
39
 
32
- FFI::OGR::API.OGR_FD_Release(@c_pointer)
33
40
  @c_pointer = nil
34
41
  end
35
42
 
36
43
  # @return [String]
37
44
  def name
38
- FFI::OGR::API.OGR_FD_GetName(@c_pointer)
45
+ name, ptr = FFI::OGR::API.OGR_FD_GetName(@c_pointer)
46
+ ptr.autorelease = false
47
+
48
+ name
39
49
  end
40
50
 
41
- # @return [Fixnum]
51
+ # @return [Integer]
42
52
  def field_count
43
53
  FFI::OGR::API.OGR_FD_GetFieldCount(@c_pointer)
44
54
  end
45
55
 
46
- # @param index [Fixnum]
56
+ # @param index [Integer]
47
57
  # @return [OGR::FieldDefinition]
48
58
  def field_definition(index)
49
- field_definition_ptr =
50
- FFI::OGR::API.OGR_FD_GetFieldDefn(@c_pointer, index)
59
+ field_definition_ptr = FFI::OGR::API.OGR_FD_GetFieldDefn(@c_pointer, index)
60
+ field_definition_ptr.autorelease = false
61
+
51
62
  return nil if field_definition_ptr.null?
52
63
 
53
64
  OGR::FieldDefinition.new(field_definition_ptr, nil)
@@ -64,23 +75,23 @@ module OGR
64
75
  FFI::OGR::API.OGR_FD_AddFieldDefn(@c_pointer, field_definition_ptr)
65
76
  end
66
77
 
67
- # @param index [Fixnum] Index of the field definition to delete.
68
- # @return [Boolean]
78
+ # @param index [Integer] Index of the field definition to delete.
79
+ # @raise [OGR::Failure]
69
80
  def delete_field_definition(index)
70
- ogr_err = FFI::OGR::API.OGR_FD_DeleteFieldDefn(
71
- @c_pointer,
72
- index
73
- )
74
-
75
- ogr_err.handle_result "Unable to delete field definition at index #{index}"
81
+ OGR::ErrorHandling.handle_ogr_err("Unable to delete field definition at index #{index}") do
82
+ FFI::OGR::API.OGR_FD_DeleteFieldDefn(
83
+ @c_pointer,
84
+ index
85
+ )
86
+ end
76
87
  end
77
88
 
78
89
  # @param name [String]
79
- # @return [Fixnum] nil if no match found
90
+ # @return [Integer] nil if no match found
80
91
  def field_index(name)
81
92
  result = FFI::OGR::API.OGR_FD_GetFieldIndex(@c_pointer, name)
82
93
 
83
- result < 0 ? nil : result
94
+ result.negative? ? nil : result
84
95
  end
85
96
 
86
97
  # @return [FFI::OGR::API::WKBGeometryType]
@@ -99,7 +110,7 @@ module OGR
99
110
  end
100
111
 
101
112
  # @param ignore [Boolean]
102
- def ignore_geometry!(ignore = true)
113
+ def ignore_geometry!(ignore: true)
103
114
  FFI::OGR::API.OGR_FD_SetGeometryIgnored(@c_pointer, ignore)
104
115
  end
105
116
 
@@ -109,48 +120,45 @@ module OGR
109
120
  end
110
121
 
111
122
  # @param ignore [Boolean]
112
- def ignore_style!(ignore = true)
123
+ def ignore_style!(ignore: true)
113
124
  FFI::OGR::API.OGR_FD_SetStyleIgnored(@c_pointer, ignore)
114
125
  end
115
126
 
116
- # @return [Fixnum]
127
+ # @return [Integer]
117
128
  def geometry_field_count
118
129
  FFI::OGR::API.OGR_FD_GetGeomFieldCount(@c_pointer)
119
130
  end
120
131
 
121
- # @param index [Fixnum]
132
+ # @param index [Integer]
122
133
  # @return [OGR::GeometryFieldDefinition]
123
134
  def geometry_field_definition(index)
124
- geometry_field_definition_ptr =
125
- FFI::OGR::API.OGR_FD_GetGeomFieldDefn(@c_pointer, index)
135
+ geometry_field_definition_ptr = FFI::OGR::API.OGR_FD_GetGeomFieldDefn(@c_pointer, index)
136
+
126
137
  return nil if geometry_field_definition_ptr.null?
127
138
 
128
139
  OGR::GeometryFieldDefinition.new(geometry_field_definition_ptr)
129
140
  end
130
141
 
131
142
  # @param name [String]
132
- # @return [Fixnum]
143
+ # @return [Integer]
133
144
  def geometry_field_index(name)
134
145
  result = FFI::OGR::API.OGR_FD_GetGeomFieldIndex(@c_pointer, name)
135
146
 
136
- result < 0 ? nil : result
147
+ result.negative? ? nil : result
137
148
  end
138
149
 
139
150
  # @param geometry_field_definition [OGR::GeometryFieldDefinition, FFI::Pointer]
140
151
  def add_geometry_field_definition(geometry_field_definition)
141
- geometry_field_definition_ptr = GDAL._pointer(OGR::GeometryFieldDefinition,
142
- geometry_field_definition)
143
- FFI::OGR::API.OGR_FD_AddGeomFieldDefn(@c_pointer,
144
- geometry_field_definition_ptr)
152
+ geometry_field_definition_ptr = GDAL._pointer(OGR::GeometryFieldDefinition, geometry_field_definition)
153
+ FFI::OGR::API.OGR_FD_AddGeomFieldDefn(@c_pointer, geometry_field_definition_ptr)
145
154
  end
146
155
 
147
- # @param index [Fixnum]
148
- # @return [Boolean]
156
+ # @param index [Integer]
157
+ # @raise [OGR::Failure]
149
158
  def delete_geometry_field_definition(index)
150
- ogr_err = FFI::OGR::API.OGR_FD_DeleteGeomFieldDefn(@c_pointer,
151
- index)
152
-
153
- ogr_err.handle_result "Unable to delete geometry field definition at index #{index}"
159
+ OGR::ErrorHandling.handle_ogr_err("Unable to delete geometry field definition at index #{index}") do
160
+ FFI::OGR::API.OGR_FD_DeleteGeomFieldDefn(@c_pointer, index)
161
+ end
154
162
  end
155
163
 
156
164
  # @param other_feature_definition [OGR::Feature, FFI::Pointer]
data/lib/ogr/field.rb CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  require 'date'
4
4
  require_relative '../ogr'
5
+ require_relative '../gdal'
5
6
 
6
7
  module OGR
7
8
  class Field
@@ -18,23 +19,23 @@ module OGR
18
19
  @c_struct.to_ptr
19
20
  end
20
21
 
21
- # @return [Fixnum]
22
+ # @return [Integer]
22
23
  def integer
23
24
  @c_struct[:integer]
24
25
  end
25
26
  alias to_i integer
26
27
 
27
- # @param new_int [Fixnum]
28
+ # @param new_int [Integer]
28
29
  def integer=(new_int)
29
30
  @c_struct[:integer] = new_int
30
31
  end
31
32
 
32
- # @return [Bignum]
33
+ # @return [Integer]
33
34
  def integer64
34
35
  @c_struct[:integer64]
35
36
  end
36
37
 
37
- # @param new_int64 [Bignum]
38
+ # @param new_int64 [Integer]
38
39
  def integer64=(new_int64)
39
40
  @c_struct[:integer64] = new_int64
40
41
  end
@@ -61,7 +62,7 @@ module OGR
61
62
  @c_struct[:string] = FFI::MemoryPointer.from_string(new_string)
62
63
  end
63
64
 
64
- # @return [Array<Fixnum>]
65
+ # @return [Array<Integer>]
65
66
  def integer_list
66
67
  il = @c_struct[:integer_list]
67
68
  return [] if il[:count].zero?
@@ -69,7 +70,7 @@ module OGR
69
70
  il[:list].read_array_of_int(il[:count])
70
71
  end
71
72
 
72
- # @param new_integer_list [Array<Fixnum>]
73
+ # @param new_integer_list [Array<Integer>]
73
74
  def integer_list=(new_integer_list)
74
75
  list_ptr = FFI::MemoryPointer.new(:int, new_integer_list.length)
75
76
  list_ptr.write_array_of_int(new_integer_list)
@@ -81,7 +82,7 @@ module OGR
81
82
  @c_struct[:integer_list] = il
82
83
  end
83
84
 
84
- # @return [Array<Bignum>]
85
+ # @return [Array<Integer>]
85
86
  def integer64_list
86
87
  il = @c_struct[:integer_list]
87
88
  return [] if il[:count].zero?
@@ -90,7 +91,7 @@ module OGR
90
91
  end
91
92
  alias to_bignum integer64_list
92
93
 
93
- # @param new_integer64_list [Array<Bignum>]
94
+ # @param new_integer64_list [Array<Integer>]
94
95
  def integer64_list=(new_integer64_list)
95
96
  list_ptr = FFI::MemoryPointer.new(:int64, new_integer64_list.size)
96
97
  list_ptr.write_array_of_int64(new_integer64_list)
@@ -149,7 +150,7 @@ module OGR
149
150
  def binary
150
151
  b = @c_struct[:binary]
151
152
 
152
- b[:count] > 0 ? b[:data].read_bytes(b[:count]) : ''
153
+ b[:count].positive? ? b[:data].read_bytes(b[:count]) : ''
153
154
  end
154
155
 
155
156
  # @param new_binary [String] Binary string of 8-bit, unsigned data (uchar).
@@ -170,7 +171,7 @@ module OGR
170
171
  { marker1: @c_struct[:set][:marker1], marker2: @c_struct[:set][:marker2] }
171
172
  end
172
173
 
173
- # @param new_set [Hash{marker1 => Fixnum, marker2 => Fixnum}]
174
+ # @param new_set [Hash{marker1 => Integer, marker2 => Integer}]
174
175
  def set=(new_set)
175
176
  set = FFI::OGR::FieldTypes::Set.new
176
177
  set[:marker1] = new_set[:marker1]
@@ -185,16 +186,13 @@ module OGR
185
186
  return if c_date[:year].zero? || c_date[:month].zero? || c_date[:day].zero?
186
187
 
187
188
  formatted_tz = OGR._format_time_zone_for_ruby(c_date[:tz_flag].to_i)
188
-
189
- # rubocop:disable Style/DateTime
190
189
  DateTime.new(c_date[:year],
191
- c_date[:month],
192
- c_date[:day],
193
- c_date[:hour],
194
- c_date[:minute],
195
- c_date[:second],
196
- formatted_tz)
197
- # rubocop:enable Style/DateTime
190
+ c_date[:month],
191
+ c_date[:day],
192
+ c_date[:hour],
193
+ c_date[:minute],
194
+ c_date[:second],
195
+ formatted_tz)
198
196
  end
199
197
 
200
198
  # @param new_date [Date, Time, DateTime]
@@ -4,27 +4,36 @@ require_relative '../ogr'
4
4
 
5
5
  module OGR
6
6
  class FieldDefinition
7
+ # @param pointer [FFI::Pointer]
8
+ def self.release(pointer)
9
+ return unless pointer && !pointer.null?
10
+
11
+ FFI::OGR::API.OGR_Fld_Destroy(pointer)
12
+ end
13
+
7
14
  # @return [FFI::Pointer] C pointer to the C FieldDefn.
8
15
  attr_reader :c_pointer
9
16
 
10
17
  # @param name_or_pointer [String, FFI::Pointer]
11
18
  # @param type [FFI::OGR::FieldType]
12
19
  def initialize(name_or_pointer, type)
13
- @c_pointer = if name_or_pointer.is_a? String
14
- FFI::OGR::API.OGR_Fld_Create(name_or_pointer, type)
15
- else
16
- name_or_pointer
17
- end
18
-
19
- return if @c_pointer.is_a?(FFI::Pointer) && !@c_pointer.null?
20
-
21
- raise OGR::InvalidFieldDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
20
+ pointer = if name_or_pointer.is_a? String
21
+ FFI::OGR::API.OGR_Fld_Create(name_or_pointer, type)
22
+ else
23
+ name_or_pointer
24
+ end
25
+
26
+ if !pointer.is_a?(FFI::Pointer) || pointer.null?
27
+ raise OGR::InvalidFieldDefinition, "Unable to create #{self.class.name} from #{name_or_pointer}"
28
+ end
29
+
30
+ @c_pointer = FFI::AutoPointer.new(pointer, FieldDefinition.method(:release))
31
+ @c_pointer.autorelease = false
22
32
  end
23
33
 
24
34
  def destroy!
25
- return unless @c_pointer
35
+ FieldDefinition.release(@c_pointer)
26
36
 
27
- FFI::OGR::API.OGR_Fld_Destroy(@c_pointer)
28
37
  @c_pointer = nil
29
38
  end
30
39
 
@@ -32,8 +41,8 @@ module OGR
32
41
  #
33
42
  # @param name [String]
34
43
  # @param type [FFI::OGR::FieldType]
35
- # @param width [Fixnum]
36
- # @param precision [Fixnum]
44
+ # @param width [Integer]
45
+ # @param precision [Integer]
37
46
  # @param justification [FFI::OGR::Justification]
38
47
  def set(name, type, width, precision, justification)
39
48
  FFI::OGR::API.OGR_Fld_Set(
@@ -48,7 +57,10 @@ module OGR
48
57
 
49
58
  # @return [String]
50
59
  def name
51
- FFI::OGR::API.OGR_Fld_GetNameRef(@c_pointer)
60
+ name, ptr = FFI::OGR::API.OGR_Fld_GetNameRef(@c_pointer)
61
+ ptr.autorelease = false
62
+
63
+ name
52
64
  end
53
65
 
54
66
  # @param new_value [String]
@@ -66,12 +78,12 @@ module OGR
66
78
  FFI::OGR::API.OGR_Fld_SetJustify(@c_pointer, new_value)
67
79
  end
68
80
 
69
- # @return [Fixnum]
81
+ # @return [Integer]
70
82
  def precision
71
83
  FFI::OGR::API.OGR_Fld_GetPrecision(@c_pointer)
72
84
  end
73
85
 
74
- # @param new_value [Fixnum]
86
+ # @param new_value [Integer]
75
87
  def precision=(new_value)
76
88
  FFI::OGR::API.OGR_Fld_SetPrecision(@c_pointer, new_value)
77
89
  end
@@ -86,12 +98,12 @@ module OGR
86
98
  FFI::OGR::API.OGR_Fld_SetType(@c_pointer, new_value)
87
99
  end
88
100
 
89
- # @return [Fixnum]
101
+ # @return [Integer]
90
102
  def width
91
103
  FFI::OGR::API.OGR_Fld_GetWidth(@c_pointer)
92
104
  end
93
105
 
94
- # @param new_value [Fixnum]
106
+ # @param new_value [Integer]
95
107
  def width=(new_value)
96
108
  FFI::OGR::API.OGR_Fld_SetWidth(@c_pointer, new_value)
97
109
  end
data/lib/ogr/geocoder.rb CHANGED
@@ -5,6 +5,13 @@ require_relative '../ogr'
5
5
  module OGR
6
6
  # Geocode things! http://www.gdal.org/ogr__geocoding_8h.html
7
7
  class Geocoder
8
+ # @param pointer [FFI::Pointer]
9
+ def self.release(pointer)
10
+ return unless pointer && !pointer.null?
11
+
12
+ FFI::GDAL::GDAL.OGRGeocodeDestroySession(pointer)
13
+ end
14
+
8
15
  # @return [FFI::Pointer] C pointer to the C geocoding session.
9
16
  attr_reader :c_pointer
10
17
 
@@ -36,13 +43,13 @@ module OGR
36
43
 
37
44
  options_ptr = GDAL::Options.pointer(converted_options)
38
45
 
39
- @c_pointer = FFI::GDAL::GDAL.OGRGeocodeCreateSession(options_ptr)
46
+ pointer = FFI::GDAL::GDAL.OGRGeocodeCreateSession(options_ptr)
47
+ @c_pointer = FFI::AutoPointer.new(pointer, Geocoder.method(:release))
40
48
  end
41
49
 
42
50
  def destroy!
43
- return unless @c_pointer
51
+ Geocoder.release(@c_pointer)
44
52
 
45
- FFI::GDAL::GDAL.OGRGeocodeDestroySession(@c_pointer)
46
53
  @c_pointer = nil
47
54
  end
48
55
 
@@ -52,7 +59,7 @@ module OGR
52
59
  # the address into elements. Only works with some geocoding services.
53
60
  # @option options countrycodes [Array<String, Symbol>] Limit the search to a
54
61
  # specific country or countries. Only works with some geocoding services.
55
- # @option options limit [Fixnum] Limit the number of records returned. Only
62
+ # @option options limit [Integer] Limit the number of records returned. Only
56
63
  # works with some geocoding services.
57
64
  # @option options raw_feature ["YES"] Adds a raw feature to the returned
58
65
  # feature that includes that raw XML response body.
@@ -6,6 +6,7 @@ module OGR
6
6
  class LineString
7
7
  include OGR::Geometry
8
8
  include GeometryTypes::Curve
9
+
9
10
  def self.approximate_arc_angles(center_x, center_y, z, primary_radius, secondary_radius,
10
11
  rotation, start_angle, end_angle, max_angle_step_size_degrees = 0)
11
12
  geometry_ptr = FFI::GDAL::GDAL.OGR_G_ApproximateArcAngles(
@@ -10,14 +10,5 @@ module OGR
10
10
  geometry_ptr ||= OGR::Geometry.create(:wkbLineString25D)
11
11
  super(geometry_ptr, spatial_reference: spatial_reference)
12
12
  end
13
-
14
- # Adds a point to a LineString or Point geometry.
15
- #
16
- # @param x [Float]
17
- # @param y [Float]
18
- # @param z [Float]
19
- def add_point(x, y, z)
20
- super(x, y, z)
21
- end
22
13
  end
23
14
  end
@@ -7,8 +7,8 @@ module OGR
7
7
  # @param [FFI::Pointer] geometry_ptr
8
8
  def initialize(geometry_ptr = nil, spatial_reference: nil)
9
9
  geometry_ptr ||= OGR::Geometry.create(:wkbLinearRing)
10
- initialize_from_pointer(geometry_ptr)
11
- self.spatial_reference = spatial_reference if spatial_reference
10
+
11
+ super(geometry_ptr, spatial_reference: spatial_reference)
12
12
  end
13
13
 
14
14
  def to_line_string
@@ -38,15 +38,6 @@ module OGR
38
38
  end
39
39
  alias point_value point
40
40
 
41
- # Wrapper around {#point_value} to provide API parity with other geometries
42
- # that can have multiple points.
43
- #
44
- # @return [Array<Array<Float, Float>>]
45
- # TODO: move to an extension
46
- def point_values
47
- [point]
48
- end
49
-
50
41
  # @param x [Number]
51
42
  # @param y [Number]
52
43
  def set_point(x, y)