rgeo-proj4 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f388f5389751fb4be6fd44e37b436c2a3465dc407346cb8c311c839af0e35f
-  data.tar.gz: 259d631dcf07572b4a99de70cef87156ea880bc2db54aeaea9cf6db4530772ed
+  metadata.gz: aa9c25a9c28360d481e136fd0d8da64c88a9c0f4018f496ddaee88d1ed5ffc75
+  data.tar.gz: 332437030fe6111853cf0d3384a267f15470f807ce548abb4f09ba7481cae275
 SHA512:
-  metadata.gz: c48f8cb2676bbc08309a6c103b7df1c7f121e586b300357bc278bccc3dcdfb72f597b9e89bf11603a749a329910685ee93adf719ab4f47db7b3676a9290911ac
-  data.tar.gz: 623d1af171edc6e69bc1d8967d9b9262f2a96dd560fcaa6cc5982be75d1e4d4177957255fd28895230c4645cc1ed778a0f77354d3b0b30d031cda8d9bc984687
+  metadata.gz: b4a5789391e027f5130877d638dd2013e0b4b144683c179877d50387797919d8998ef900d832a9664774a8633a483b91653fad0439e98481c95de014c790641a
+  data.tar.gz: a81cc3dabdec13ceb6b5839e0023a268dce470a25e8ee311a61f58f309e51058b14aa11c16ee1e3dd39ad93c82d501fff6103b937b190db39f7b9c5ef96338fe

data/ext/proj4_c_impl/main.c

@@ -32,6 +32,10 @@ typedef struct {
   PJ *crs_to_crs;
 } RGeo_CRSToCRSData;
 
+// PROJ context for multithreaded environments. This avoids segfaults or
+// hanging processes on fork. We only use one context, initialized on load.
+static PJ_CONTEXT *local_proj_context;
+
 // Destroy function for proj data.
 static void rgeo_proj4_free(void *ptr) {
   RGeo_Proj4Data *data = (RGeo_Proj4Data *)ptr;
@@ -153,11 +157,12 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig) {
   // Copy value from orig
   TypedData_Get_Struct(orig, RGeo_Proj4Data, &rgeo_proj4_data_type, orig_data);
   if (!NIL_P(orig_data->original_str)) {
-    self_data->pj =
-        proj_create(PJ_DEFAULT_CTX, StringValuePtr(orig_data->original_str));
+    self_data->pj = proj_create(local_proj_context,
+                                StringValuePtr(orig_data->original_str));
   } else {
-    str = proj_as_proj_string(PJ_DEFAULT_CTX, orig_data->pj, PJ_PROJ_4, NULL);
-    self_data->pj = proj_create(PJ_DEFAULT_CTX, str);
+    str =
+        proj_as_proj_string(local_proj_context, orig_data->pj, PJ_PROJ_4, NULL);
+    self_data->pj = proj_create(local_proj_context, str);
   }
   self_data->original_str = orig_data->original_str;
   self_data->uses_radians = orig_data->uses_radians;
@@ -175,7 +180,7 @@ static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians) {
   rgeo_proj4_clear_struct(self_data);
 
   // Set new data
-  self_data->pj = proj_create(PJ_DEFAULT_CTX, StringValuePtr(str));
+  self_data->pj = proj_create(local_proj_context, StringValuePtr(str));
   self_data->original_str = str;
   self_data->uses_radians = RTEST(uses_radians) ? 1 : 0;
 
@@ -194,7 +199,8 @@ static VALUE method_proj4_get_geographic(VALUE self) {
     TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type,
                          self_data);
 
-    geographic_proj = proj_crs_get_geodetic_crs(PJ_DEFAULT_CTX, self_data->pj);
+    geographic_proj =
+        proj_crs_get_geodetic_crs(local_proj_context, self_data->pj);
     if (geographic_proj == 0) {
       FREE(new_data);
       rb_raise(rb_eRGeoInvalidProjectionError,
@@ -233,7 +239,7 @@ static VALUE method_proj4_canonical_str(VALUE self) {
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   pj = data->pj;
   if (pj) {
-    str = proj_as_proj_string(PJ_DEFAULT_CTX, pj, PJ_PROJ_4, NULL);
+    str = proj_as_proj_string(local_proj_context, pj, PJ_PROJ_4, NULL);
     if (str) {
       result = rb_str_new2(str);
     }
@@ -252,7 +258,7 @@ static VALUE method_proj4_wkt_str(VALUE self) {
   pj = data->pj;
   if (pj) {
     const char *const options[] = {"MULTILINE=NO", NULL};
-    str = proj_as_wkt(PJ_DEFAULT_CTX, pj, WKT_TYPE, options);
+    str = proj_as_wkt(local_proj_context, pj, WKT_TYPE, options);
     if (str) {
       result = rb_str_new2(str);
     }
@@ -297,9 +303,9 @@ static VALUE method_proj4_axis_and_unit_info_str(VALUE self, VALUE dimension) {
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   pj = data->pj;
   if (pj) {
-    pj_cs = proj_crs_get_coordinate_system(PJ_DEFAULT_CTX, pj);
+    pj_cs = proj_crs_get_coordinate_system(local_proj_context, pj);
     if (pj_cs) {
-      if (proj_cs_get_axis_info(PJ_DEFAULT_CTX, pj_cs, dimension_index,
+      if (proj_cs_get_axis_info(local_proj_context, pj_cs, dimension_index,
                                 &axis_info, NULL, NULL, NULL, &unit_name, NULL,
                                 NULL)) {
         result = rb_sprintf("%s:%s", axis_info, unit_name);
@@ -322,9 +328,9 @@ static VALUE method_proj4_axis_count(VALUE self) {
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   pj = data->pj;
   if (pj) {
-    pj_cs = proj_crs_get_coordinate_system(PJ_DEFAULT_CTX, pj);
+    pj_cs = proj_crs_get_coordinate_system(local_proj_context, pj);
     if (pj_cs) {
-      count = proj_cs_get_axis_count(PJ_DEFAULT_CTX, pj_cs);
+      count = proj_cs_get_axis_count(local_proj_context, pj_cs);
       result = INT2FIX(count);
 
       proj_destroy(pj_cs);
@@ -412,7 +418,7 @@ static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians) {
   Check_Type(str, T_STRING);
   data = ALLOC(RGeo_Proj4Data);
   if (data) {
-    data->pj = proj_create(PJ_DEFAULT_CTX, StringValuePtr(str));
+    data->pj = proj_create(local_proj_context, StringValuePtr(str));
     data->original_str = str;
     data->uses_radians = RTEST(uses_radians) ? 1 : 0;
     result = TypedData_Wrap_Struct(klass, &rgeo_proj4_data_type, data);
@@ -435,8 +441,8 @@ static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to) {
   TypedData_Get_Struct(to, RGeo_Proj4Data, &rgeo_proj4_data_type, to_data);
   from_pj = from_data->pj;
   to_pj = to_data->pj;
-  crs_to_crs =
-      proj_create_crs_to_crs_from_pj(PJ_DEFAULT_CTX, from_pj, to_pj, 0, NULL);
+  crs_to_crs = proj_create_crs_to_crs_from_pj(local_proj_context, from_pj,
+                                              to_pj, 0, NULL);
 
   // check for invalid transformation
   if (crs_to_crs == 0) {
@@ -447,7 +453,7 @@ static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to) {
   // necessary to use proj_normalize_for_visualization so that we
   // do not have to worry about the order of coordinates in every
   // coord system
-  gis_pj = proj_normalize_for_visualization(PJ_DEFAULT_CTX, crs_to_crs);
+  gis_pj = proj_normalize_for_visualization(local_proj_context, crs_to_crs);
   if (gis_pj) {
     proj_destroy(crs_to_crs);
     crs_to_crs = gis_pj;
@@ -503,7 +509,7 @@ static VALUE method_crs_to_crs_wkt_str(VALUE self) {
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
   if (crs_to_crs_pj) {
     const char *const options[] = {"MULTILINE=NO", NULL};
-    str = proj_as_wkt(PJ_DEFAULT_CTX, crs_to_crs_pj, WKT_TYPE, options);
+    str = proj_as_wkt(local_proj_context, crs_to_crs_pj, WKT_TYPE, options);
     if (str) {
       result = rb_str_new2(str);
     }
@@ -522,8 +528,8 @@ static VALUE method_crs_to_crs_area_of_use_str(VALUE self) {
                        crs_to_crs_data);
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
   if (crs_to_crs_pj) {
-    if (proj_get_area_of_use(PJ_DEFAULT_CTX, crs_to_crs_pj, NULL, NULL, NULL,
-                             NULL, &str)) {
+    if (proj_get_area_of_use(local_proj_context, crs_to_crs_pj, NULL, NULL,
+                             NULL, NULL, &str)) {
       result = rb_str_new2(str);
     }
   }
@@ -639,6 +645,7 @@ static void rgeo_init_proj4() {
 
 void Init_proj4_c_impl() {
 #ifdef RGEO_PROJ4_SUPPORTED
+  local_proj_context = proj_context_create();
   rgeo_init_proj4();
   rgeo_init_proj_errors();
 #endif

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "4.0.0"
+    VERSION = "5.0.0"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Tee Parham, Daniel Azuma, Keith Doggett, Ulysse Buonomo
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2026-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: ffi-geos
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.82.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.82.1
 - !ruby/object:Gem::Dependency
   name: ruby_memcheck
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +130,6 @@ homepage: https://github.com/rgeo/rgeo-proj4
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,15 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.4
 specification_version: 4
 summary: Proj4 extension for rgeo.
 test_files: []