proj4rb 4.1.1 → 5.0.0

data/test/network_api_test.rb

@@ -1,45 +1,33 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class NetworkApiTest < AbstractTest
-  def setup
-    super
-    # Make sure downloader callbacks are not GCed
-    #GC.stress = true
-  end
-
-  def teardown
-    super
-    GC.stress = false
-  end
-
-  def test_download
-    skip "This test causes a segfault due to the way Proj cleans up on shutdown"
-
-    context = Proj::Context.new
-    context.network_enabled = true
-
-    # Create a grid
-    grid = Proj::Grid.new("dk_sdfe_dvr90.tif", context)
-    grid.delete
-
-    context.cache.clear
-
-    # Install custom network api
-    context.set_network_api(Proj::NetworkApiImpl)
-
-    conversion = Proj::Conversion.new(<<~EOS, context)
-          +proj=pipeline
-          +step +proj=unitconvert +xy_in=deg +xy_out=rad
-          +step +proj=vgridshift +grids=dk_sdfe_dvr90.tif +multiplier=1
-          +step +proj=unitconvert +xy_in=rad +xy_out=deg
-        EOS
-
-    coord = Proj::Coordinate.new(lon: 12, lat: 56, z: 0)
-    new_coord = conversion.forward(coord)
-    assert_in_delta(12, new_coord.lon)
-    assert_in_delta(56, new_coord.lat)
-    assert_in_delta(36.5909996032715, new_coord.z, 1e-10)
-  end
-end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+require_relative './network_api_example'
+
+class NetworkApiTest < AbstractTest
+  def test_download
+    context = Proj::Context.new
+    context.network_enabled = true
+
+    # Create a grid
+    grid = Proj::Grid.new("dk_sdfe_dvr90.tif", context)
+    grid.delete
+
+    context.cache.clear
+
+    # Install custom network api
+    context.set_network_api(Proj::NetworkApiExample)
+
+    conversion = Proj::Conversion.new(<<~EOS, context)
+          +proj=pipeline
+          +step +proj=unitconvert +xy_in=deg +xy_out=rad
+          +step +proj=vgridshift +grids=dk_sdfe_dvr90.tif +multiplier=1
+          +step +proj=unitconvert +xy_in=rad +xy_out=deg
+        EOS
+
+    coord = Proj::Coordinate.new(lon: 12, lat: 56, z: 0)
+    new_coord = conversion.forward(coord)
+    assert_in_delta(12, new_coord.lon)
+    assert_in_delta(56, new_coord.lat)
+    assert_in_delta(36.5909996032715, new_coord.z, 1e-10)
+  end
+end

data/test/operation_factory_context_test.rb

@@ -1,205 +1,225 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class OperationFactoryContextTest < AbstractTest
-  def test_create
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    assert(context.to_ptr)
-  end
-
-  def test_finalize
-    100.times do
-      context = Proj::Context.new
-      factory_context = Proj::OperationFactoryContext.new(context)
-      assert(context.to_ptr)
-      GC.start
-    end
-    assert(true)
-  end
-
-  def test_create_operations
-    context = Proj::Context.new
-    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4269", :PJ_CATEGORY_CRS)
-
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
-    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
-
-    operations = factory_context.create_operations(source, target)
-    assert_equal(10, operations.count)
-
-    operation = operations[0]
-    assert_equal("NAD27 to NAD83 (4)", operation.name)
-    refute(operation.ballpark_transformation?)
-  end
-
-  def test_suggested_operation
-    context = Proj::Context.new
-    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4269", :PJ_CATEGORY_CRS)
-
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
-    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
-
-    operations = factory_context.create_operations(source, target)
-
-    coord = Proj::Coordinate.new(x: 40, y: -100)
-    index = operations.suggested_operation(:PJ_FWD, coord)
-
-    expected = case
-                 when Proj::Api::PROJ_VERSION >= '9.3.0'
-                   3
-                 when Proj::Api::PROJ_VERSION >= '9.0.0'
-                   2
-                 else
-                   7
-               end
-    assert_equal(expected, index)
-
-    operation = operations[index]
-
-    expected = case
-                 when Proj::Api::PROJ_VERSION >= '9.3.0'
-                   "NAD27 to NAD83 (7)"
-                 when Proj::Api::PROJ_VERSION >= '9.0.0'
-                   "NAD27 to NAD83 (1)"
-                 else
-                   "Ballpark geographic offset from NAD27 to NAD83"
-               end
-
-    assert_equal(expected, operation.name)
-  end
-
-  def test_ballpark_transformations
-    context = Proj::Context.new
-    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4258", :PJ_CATEGORY_CRS)
-
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
-    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
-
-    # Allowed implicitly
-    operations = factory_context.create_operations(source, target)
-    assert_equal(1, operations.count)
-
-    # Allow explicitly
-    factory_context.ballpark_transformations = true
-    operations = factory_context.create_operations(source, target)
-    assert_equal(1, operations.count)
-
-    # Disallow
-    factory_context.ballpark_transformations = false
-    operations = factory_context.create_operations(source, target)
-    assert_equal(0, operations.count)
-  end
-
-  def test_desired_accuracy
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.desired_accuracy = 5
-  end
-
-  def test_set_area_of_interest
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.set_area_of_interest(10, 10, 10, 10)
-  end
-
-  def test_crs_extent_use
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.crs_extent_use = :PJ_CRS_EXTENT_SMALLEST
-  end
-
-  def test_spatial_criterion
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_STRICT_CONTAINMENT
-  end
-
-  def test_grid_availability
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_USE
-  end
-
-  def test_use_proj_alternative_grid_names
-    context = Proj::Context.new
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.use_proj_alternative_grid_names = true
-  end
-
-  def test_allow_use_intermediate_crs
-    context = Proj::Context.new
-    # There is no direct transformations between both
-    source = Proj::Crs.create_from_database("EPSG", "4230", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4171", :PJ_CATEGORY_CRS)
-
-    # Default behavior: allow any pivot
-    factory_context = Proj::OperationFactoryContext.new(context)
-    operations = factory_context.create_operations(source, target)
-    assert_equal(1, operations.count)
-
-    operation = operations[0]
-    assert_equal("ED50 to ETRS89 (10) + Inverse of RGF93 v1 to ETRS89 (1)", operation.name)
-    refute(operation.ballpark_transformation?)
-
-    # Disallow pivots
-    factory_context.allow_use_intermediate_crs = :PROJ_INTERMEDIATE_CRS_USE_NEVER
-    operations = factory_context.create_operations(source, target)
-    assert_equal(1, operations.count)
-
-    operation = operations[0]
-    assert_equal("Ballpark geographic offset from ED50 to RGF93 v1", operation.name)
-    assert(operation.ballpark_transformation?)
-  end
-
-  def test_allowed_intermediate_crs
-    context = Proj::Context.new
-
-    # There is no direct transformations between both
-    source = Proj::Crs.create_from_database("EPSG", "4230", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4171", :PJ_CATEGORY_CRS)
-
-    # Restrict pivot to ETRS89
-    factory_context = Proj::OperationFactoryContext.new(context, authority: "EPSG")
-    factory_context.allowed_intermediate_crs = ["EPSG", "4258"]
-
-    operations = factory_context.create_operations(source, target)
-    assert_equal(1, operations.count)
-
-    operation = operations[0]
-    assert_equal("ED50 to ETRS89 (10) + Inverse of RGF93 v1 to ETRS89 (1)", operation.name)
-  end
-
-  def test_discard_superseded
-    context = Proj::Context.new
-    source = Proj::Crs.create_from_database("EPSG", "4203", :PJ_CATEGORY_CRS)
-    target = Proj::Crs.create_from_database("EPSG", "4326", :PJ_CATEGORY_CRS)
-
-    factory_context = Proj::OperationFactoryContext.new(context)
-    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
-    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
-
-    factory_context.discard_superseded = true
-    operations = factory_context.create_operations(source, target)
-    assert_equal(4, operations.count)
-
-    factory_context.discard_superseded = false
-    operations = factory_context.create_operations(source, target)
-    assert_equal(5, operations.count)
-  end
-
-  if Proj::Api::PROJ_VERSION >= '9.0.0'
-    def test_set_area_of_interest_name
-      context = Proj::Context.new
-      factory_context = Proj::OperationFactoryContext.new(context)
-      factory_context.area_of_interest_name = 'test'
-    end
-  end
-end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+
+class OperationFactoryContextTest < AbstractTest
+  def test_create
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    assert(factory_context)
+  end
+
+  def test_retains_passed_context
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    assert_same(context, factory_context.context)
+  end
+
+  def test_finalize
+    100.times do
+      context = Proj::Context.new
+      factory_context = Proj::OperationFactoryContext.new(context)
+      assert(factory_context)
+      GC.start
+    end
+  end
+
+  def test_create_operations
+    context = Proj::Context.new
+    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4269", :PJ_CATEGORY_CRS)
+
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
+    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
+
+    operations = factory_context.create_operations(source, target)
+    assert_equal(10, operations.count)
+
+    operation = operations[0]
+    assert_equal("NAD27 to NAD83 (4)", operation.name)
+    refute(operation.ballpark_transformation?)
+  end
+
+  def test_suggested_operation
+    context = Proj::Context.new
+    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4269", :PJ_CATEGORY_CRS)
+
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
+    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
+
+    operations = factory_context.create_operations(source, target)
+
+    coord = Proj::Coordinate.new(x: 40, y: -100)
+    index = operations.suggested_operation(:PJ_FWD, coord)
+
+    expected = case
+                 when Proj::Api::PROJ_VERSION >= '9.3.0'
+                   3
+                 when Proj::Api::PROJ_VERSION >= '9.0.0'
+                   2
+                 else
+                   7
+               end
+    assert_equal(expected, index)
+
+    operation = operations[index]
+
+    expected = case
+                 when Proj::Api::PROJ_VERSION >= '9.3.0'
+                   "NAD27 to NAD83 (7)"
+                 when Proj::Api::PROJ_VERSION >= '9.0.0'
+                   "NAD27 to NAD83 (1)"
+                 else
+                   "Ballpark geographic offset from NAD27 to NAD83"
+               end
+
+    assert_equal(expected, operation.name)
+  end
+
+  def test_ballpark_transformations
+    context = Proj::Context.new
+    source = Proj::Crs.create_from_database("EPSG", "4267", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4258", :PJ_CATEGORY_CRS)
+
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
+    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
+
+    # Allowed implicitly
+    operations = factory_context.create_operations(source, target)
+    assert_equal(1, operations.count)
+
+    # Allow explicitly
+    factory_context.ballpark_transformations = true
+    operations = factory_context.create_operations(source, target)
+    assert_equal(1, operations.count)
+
+    # Disallow
+    factory_context.ballpark_transformations = false
+    operations = factory_context.create_operations(source, target)
+    assert_equal(0, operations.count)
+  end
+
+  def test_desired_accuracy
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.desired_accuracy = 5
+  end
+
+  def test_set_area_of_interest
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.set_area_of_interest(10, 10, 10, 10)
+  end
+
+  def test_crs_extent_use
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.crs_extent_use = :PJ_CRS_EXTENT_SMALLEST
+  end
+
+  def test_spatial_criterion
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_STRICT_CONTAINMENT
+  end
+
+  def test_grid_availability
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_USED_FOR_SORTING
+  end
+
+  def test_use_proj_alternative_grid_names
+    context = Proj::Context.new
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.use_proj_alternative_grid_names = true
+  end
+
+  def test_allow_use_intermediate_crs
+    context = Proj::Context.new
+    # There is no direct transformations between both
+    source = Proj::Crs.create_from_database("EPSG", "4230", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4171", :PJ_CATEGORY_CRS)
+
+    # Default behavior: allow any pivot
+    factory_context = Proj::OperationFactoryContext.new(context)
+    operations = factory_context.create_operations(source, target)
+    assert_equal(1, operations.count)
+
+    operation = operations[0]
+    expected_name = if Proj::Api::PROJ_VERSION >= Gem::Version.new('9.8.0')
+                      "ED50 to ETRS89 (10) + ETRS89 to ETRS89-FRA [RGF93 v1]"
+                    else
+                      "ED50 to ETRS89 (10) + Inverse of RGF93 v1 to ETRS89 (1)"
+                    end
+    assert_equal(expected_name, operation.name)
+    refute(operation.ballpark_transformation?)
+
+    # Disallow pivots
+    factory_context.allow_use_intermediate_crs = :PROJ_INTERMEDIATE_CRS_USE_NEVER
+    operations = factory_context.create_operations(source, target)
+    assert_equal(1, operations.count)
+
+    operation = operations[0]
+    expected_name = if Proj::Api::PROJ_VERSION >= Gem::Version.new('9.8.0')
+                      "Ballpark geographic offset from ED50 to ETRS89-FRA [RGF93 v1]"
+                    else
+                      "Ballpark geographic offset from ED50 to RGF93 v1"
+                    end
+    assert_equal(expected_name, operation.name)
+    assert(operation.ballpark_transformation?)
+  end
+
+  def test_allowed_intermediate_crs
+    context = Proj::Context.new
+
+    # There is no direct transformations between both
+    source = Proj::Crs.create_from_database("EPSG", "4230", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4171", :PJ_CATEGORY_CRS)
+
+    # Restrict pivot to ETRS89
+    factory_context = Proj::OperationFactoryContext.new(context, authority: "EPSG")
+    factory_context.allowed_intermediate_crs = ["EPSG", "4258"]
+
+    operations = factory_context.create_operations(source, target)
+    assert_equal(1, operations.count)
+
+    operation = operations[0]
+    expected_name = if Proj::Api::PROJ_VERSION >= Gem::Version.new('9.8.0')
+                      "Ballpark geographic offset from ED50 to ETRS89-FRA [RGF93 v1]"
+                    else
+                      "ED50 to ETRS89 (10) + Inverse of RGF93 v1 to ETRS89 (1)"
+                    end
+    assert_equal(expected_name, operation.name)
+  end
+
+  def test_discard_superseded
+    context = Proj::Context.new
+    source = Proj::Crs.create_from_database("EPSG", "4203", :PJ_CATEGORY_CRS)
+    target = Proj::Crs.create_from_database("EPSG", "4326", :PJ_CATEGORY_CRS)
+
+    factory_context = Proj::OperationFactoryContext.new(context)
+    factory_context.spatial_criterion = :PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION
+    factory_context.grid_availability = :PROJ_GRID_AVAILABILITY_IGNORED
+
+    factory_context.discard_superseded = true
+    operations = factory_context.create_operations(source, target)
+    assert_equal(4, operations.count)
+
+    factory_context.discard_superseded = false
+    operations = factory_context.create_operations(source, target)
+    assert_equal(5, operations.count)
+  end
+
+  if Proj::Api::PROJ_VERSION >= '9.0.0'
+    def test_set_area_of_interest_name
+      context = Proj::Context.new
+      factory_context = Proj::OperationFactoryContext.new(context)
+      factory_context.area_of_interest_name = 'test'
+    end
+  end
+end

data/test/operation_test.rb

@@ -1,29 +1,40 @@
-# encoding: UTF-8
-
-require_relative './abstract_test'
-
-class OperationTest < AbstractTest
-  def test_get_all
-    operations = Proj::Operation.list.map {|operation| operation.id}
-    assert(operations.include?('aea'))
-    assert(operations.include?('wintri'))
-  end
-
-  def test_one
-    operation = Proj::Operation.get('rouss')
-    assert_kind_of(Proj::Operation, operation)
-    assert_equal('rouss', operation.id)
-    assert_equal("Roussilhe Stereographic\n\tAzi, Ell", operation.description)
-  end
-
-  def test_equal
-    e1 = Proj::Operation.get('rouss')
-    e2 = Proj::Operation.get('rouss')
-    assert(e1 == e2)
-  end
-
-  def test_failed_get
-    operation = Proj::Operation.get('foo')
-    assert_nil(operation)
-  end
-end
+# encoding: UTF-8
+
+require_relative './abstract_test'
+
+class OperationTest < AbstractTest
+  def test_get_all
+    operations = Proj::Operation.list.map {|operation| operation.id}
+    assert(operations.include?('aea'))
+    assert(operations.include?('wintri'))
+  end
+
+  def test_one
+    operation = Proj::Operation.get('rouss')
+    assert_kind_of(Proj::Operation, operation)
+    assert_equal('rouss', operation.id)
+    assert_equal("Roussilhe Stereographic\n\tAzi, Ell", operation.description)
+  end
+
+  def test_equal
+    e1 = Proj::Operation.get('rouss')
+    e2 = Proj::Operation.get('rouss')
+    assert(e1 == e2)
+  end
+
+  def test_failed_get
+    operation = Proj::Operation.get('foo')
+    assert_nil(operation)
+  end
+
+  def test_to_s
+    operation = Proj::Operation.get('aea')
+    assert_equal('aea', operation.to_s)
+  end
+
+  def test_inspect
+    operation = Proj::Operation.get('aea')
+    assert_match(/id="aea"/, operation.inspect)
+    assert_match(/description=/, operation.inspect)
+  end
+end

data/test/options_test.rb

@@ -0,0 +1,17 @@
+require_relative './abstract_test'
+
+class OptionsTest < AbstractTest
+  def test_builds_null_terminated_pointer_array
+    options = Proj::Options.new("MULTILINE": "YES", "INDENTATION_WIDTH": 4)
+    pointers = options.to_ptr.get_array_of_pointer(0, 3)
+
+    refute(pointers[0].null?)
+    refute(pointers[1].null?)
+    assert(pointers[2].null?)
+  end
+
+  def test_empty_options_returns_null_pointer
+    options = Proj::Options.new({})
+    assert(options.to_ptr.null?)
+  end
+end