rgeo-proj4 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e899f9ec9d4cb7036400cb716e4d414c87adf5b1b20fbcf081666d869af48ad
-  data.tar.gz: 423a52b4b72050a519b8df4c63f01058b608c9345cb0abc5e1bf2a33729c381b
+  metadata.gz: 9135e04b9e8911c2ce6c1c0f39be9edbe80d8adcbfa661dc57116320c616ff2d
+  data.tar.gz: da0f069d9d7314c35a396fa0a2d2797944cc830a8f408b5ebdf577bba8c6a7c2
 SHA512:
-  metadata.gz: 59fda580463933b22228f0748d7ddbb38deefe04c2b01ea2979d1a2f15a2d565bfad6b3056f0f4ab9a27fa147df69e8eae9dec8dd1cd075c48c108bcce96858b
-  data.tar.gz: 1cd3d716d7c9ba6c832d3703abb2c6ddefa87985e75034ed38458bd447f6afd32e02a72547ff2014db52db0bd0d3c3709c776e97698dc0e0a792eb33168b0314
+  metadata.gz: a9e9d80f1df22a9fb3f1564ed622f008a53cacad669af211766c6b43e1654e7b589bce9b95ba0c2018e501b2625a43208f2195b47dda472e7daee45faa21bd5c
+  data.tar.gz: d26e2e71aa7fab5737a70463f5a4689507707a9910eb874ae44e74df90899d4b3c52b88bef81b5d66298c28e0a22f6602c45fbcfa6c02633074e0351ee4e68e5

data/ext/proj4_c_impl/extconf.rb

@@ -22,6 +22,7 @@ else
       "/opt/proj/include",
       "/opt/proj4/include",
       "/opt/include",
+      "/opt/homebrew/include",
       "/Library/Frameworks/PROJ.framework/unix/include",
       "/usr/include"
     ]
@@ -36,6 +37,7 @@ else
       "/opt/proj/lib",
       "/opt/proj4/lib",
       "/opt/lib",
+      "/opt/homebrew/lib",
       "/Library/Frameworks/PROJ.framework/unix/lib",
       "/usr/lib",
       "/usr/lib64"

data/ext/proj4_c_impl/main.c

@@ -51,6 +51,10 @@ typedef struct {
   char uses_radians;
 } RGeo_Proj4Data;
 
+typedef struct {
+  PJ *crs_to_crs;
+} RGeo_CRSToCRSData;
+
 
 // Destroy function for proj data.
 static void rgeo_proj4_free(void *ptr)
@@ -62,6 +66,17 @@ static void rgeo_proj4_free(void *ptr)
   free(data);
 }
 
+// Destroy function for crs_to_crs data.
+static void rgeo_crs_to_crs_free(void *ptr)
+{
+  RGeo_CRSToCRSData *data = (RGeo_CRSToCRSData *)ptr;
+  if(data->crs_to_crs){
+    proj_destroy(data->crs_to_crs);
+  }
+  free(data);
+}
+
+
 static size_t rgeo_proj4_memsize(const void *ptr)
 {
   size_t size = 0;
@@ -74,6 +89,17 @@ static size_t rgeo_proj4_memsize(const void *ptr)
   return size;
 }
 
+static size_t rgeo_crs_to_crs_memsize(const void *ptr)
+{
+  size_t size = 0;
+  const RGeo_CRSToCRSData *data = (const RGeo_CRSToCRSData *)ptr;
+  size += sizeof(*data);
+  if(data->crs_to_crs){
+    size += sizeof(data->crs_to_crs);
+  }
+  return size;
+}
+
 static void rgeo_proj4_mark(void *ptr)
 {
   RGeo_Proj4Data *data = (RGeo_Proj4Data *)ptr;
@@ -111,6 +137,12 @@ static const rb_data_type_t rgeo_proj4_data_type = {
     0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY};
 
+static const rb_data_type_t rgeo_crs_to_crs_data_type = {
+    "RGeo::CoordSys::CRSToCRS",
+    {0, rgeo_crs_to_crs_free, rgeo_crs_to_crs_memsize},
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY};
+
 static VALUE rgeo_proj4_data_alloc(VALUE self)
 {
   VALUE result;
@@ -127,6 +159,21 @@ static VALUE rgeo_proj4_data_alloc(VALUE self)
   return result;
 }
 
+
+static VALUE rgeo_crs_to_crs_data_alloc(VALUE self)
+{
+  VALUE result;
+  RGeo_CRSToCRSData *data = ALLOC(RGeo_CRSToCRSData);
+
+  result = Qnil;
+
+  if(data){
+    data->crs_to_crs = NULL;
+    result = TypedData_Wrap_Struct(self, &rgeo_crs_to_crs_data_type, data);
+  }
+  return result;
+}
+
 static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
 {
   RGeo_Proj4Data *self_data;
@@ -321,85 +368,99 @@ static VALUE cmethod_proj4_version(VALUE module)
   return rb_sprintf("%d.%d.%d", PROJ_VERSION_MAJOR, PROJ_VERSION_MINOR, PROJ_VERSION_PATCH);
 }
 
+static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
+{
+  VALUE result;
+  RGeo_Proj4Data* data;
 
-static VALUE cmethod_proj4_transform(VALUE module, VALUE from, VALUE to, VALUE x, VALUE y, VALUE z)
+  result = Qnil;
+  Check_Type(str, T_STRING);
+  data = ALLOC(RGeo_Proj4Data);
+  if (data) {
+    data->pj = proj_create(PJ_DEFAULT_CTX, StringValuePtr(str));
+    data->original_str = str;
+    data->uses_radians = RTEST(uses_radians) ? 1 : 0;
+    result = TypedData_Wrap_Struct(klass, &rgeo_proj4_data_type, data);
+  }
+  return result;
+}
+
+static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to)
 {
   VALUE result;
   RGeo_Proj4Data *from_data;
   RGeo_Proj4Data *to_data;
+  result = Qnil;
   PJ *from_pj;
   PJ *to_pj;
-  PJ *crs_to_crs;
   PJ *gis_pj;
-  double xval, yval, zval;
-  PJ_COORD input;
-  PJ_COORD output;
+  PJ *crs_to_crs;
+  RGeo_CRSToCRSData* data;
 
-  result = Qnil;
   TypedData_Get_Struct(from, RGeo_Proj4Data, &rgeo_proj4_data_type, from_data);
   TypedData_Get_Struct(to, RGeo_Proj4Data, &rgeo_proj4_data_type, to_data);
   from_pj = from_data->pj;
   to_pj = to_data->pj;
-  if (from_pj && to_pj) {
-    crs_to_crs = proj_create_crs_to_crs_from_pj(PJ_DEFAULT_CTX, from_pj, to_pj, 0, NULL);
-    if(crs_to_crs){
-      // 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);
-      if(gis_pj){
-        proj_destroy(crs_to_crs);
-        crs_to_crs = gis_pj;
-
-        xval = rb_num2dbl(x);
-        yval = rb_num2dbl(y);
-        zval = NIL_P(z) ? 0.0 : rb_num2dbl(z);
-
-        input = proj_coord(xval, yval, zval, HUGE_VAL);
-        output = proj_trans(crs_to_crs, PJ_FWD, input);
-
-        result = rb_ary_new2(NIL_P(z) ? 2 : 3);
-        rb_ary_push(result, DBL2NUM(output.xyz.x));
-        rb_ary_push(result, DBL2NUM(output.xyz.y));
-        if(!NIL_P(z)){
-          rb_ary_push(result, DBL2NUM(output.xyz.z));
-        }
-      }
-      proj_destroy(crs_to_crs);
-    }
+  crs_to_crs = proj_create_crs_to_crs_from_pj(PJ_DEFAULT_CTX, from_pj, to_pj, 0, NULL);
+
+  // 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);
+  if(gis_pj){
+    proj_destroy(crs_to_crs);
+    crs_to_crs = gis_pj;
+  }
+  data = ALLOC(RGeo_CRSToCRSData);
+  if (data){
+    data->crs_to_crs = crs_to_crs;
+    result = TypedData_Wrap_Struct(klass, &rgeo_crs_to_crs_data_type, data);
   }
   return result;
 }
 
 
-static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
+static VALUE method_crs_to_crs_transform(VALUE self, VALUE x, VALUE y, VALUE z)
 {
   VALUE result;
-  RGeo_Proj4Data* data;
+  RGeo_CRSToCRSData *crs_to_crs_data;
+  PJ *crs_to_crs_pj;
+  double xval, yval, zval;
+  PJ_COORD input;
+  PJ_COORD output;
 
   result = Qnil;
-  Check_Type(str, T_STRING);
-  data = ALLOC(RGeo_Proj4Data);
-  if (data) {
-    data->pj = proj_create(PJ_DEFAULT_CTX, StringValuePtr(str));
-    data->original_str = str;
-    data->uses_radians = RTEST(uses_radians) ? 1 : 0;
-    result = TypedData_Wrap_Struct(klass, &rgeo_proj4_data_type, data);
+  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type, crs_to_crs_data);
+  crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
+  if(crs_to_crs_pj){
+    xval = rb_num2dbl(x);
+    yval = rb_num2dbl(y);
+    zval = NIL_P(z) ? 0.0 : rb_num2dbl(z);
+
+    input = proj_coord(xval, yval, zval, HUGE_VAL);
+    output = proj_trans(crs_to_crs_pj, PJ_FWD, input);
+
+    result = rb_ary_new2(NIL_P(z) ? 2 : 3);
+    rb_ary_push(result, DBL2NUM(output.xyz.x));
+    rb_ary_push(result, DBL2NUM(output.xyz.y));
+    if(!NIL_P(z)){
+      rb_ary_push(result, DBL2NUM(output.xyz.z));
+    }
   }
   return result;
 }
 
-
 static void rgeo_init_proj4()
 {
   VALUE rgeo_module;
   VALUE coordsys_module;
   VALUE proj4_class;
+  VALUE crs_to_crs_class;
 
   rgeo_module = rb_define_module("RGeo");
   coordsys_module = rb_define_module_under(rgeo_module, "CoordSys");
-  proj4_class = rb_define_class_under(coordsys_module, "Proj4", rb_cObject);
 
+  proj4_class = rb_define_class_under(coordsys_module, "Proj4", rb_cObject);
   rb_define_alloc_func(proj4_class, rgeo_proj4_data_alloc);
   rb_define_module_function(proj4_class, "_create", cmethod_proj4_create, 2);
   rb_define_method(proj4_class, "initialize_copy", method_proj4_initialize_copy, 1);
@@ -413,8 +474,13 @@ static void rgeo_init_proj4()
   rb_define_method(proj4_class, "_geocentric?", method_proj4_is_geocentric, 0);
   rb_define_method(proj4_class, "_radians?", method_proj4_uses_radians, 0);
   rb_define_method(proj4_class, "_get_geographic", method_proj4_get_geographic, 0);
-  rb_define_module_function(proj4_class, "_transform_coords", cmethod_proj4_transform, 5);
   rb_define_module_function(proj4_class, "_proj_version", cmethod_proj4_version, 0);
+
+
+  crs_to_crs_class = rb_define_class_under(coordsys_module, "CRSToCRS", rb_cObject);
+  rb_define_alloc_func(crs_to_crs_class, rgeo_crs_to_crs_data_alloc);
+  rb_define_module_function(crs_to_crs_class, "_create", cmethod_crs_to_crs_create, 2);
+  rb_define_method(crs_to_crs_class, "_transform_coords", method_crs_to_crs_transform, 3);
 }
 
 

data/lib/rgeo/coord_sys/crs_to_crs.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "singleton"
+module RGeo
+  module CoordSys
+    # This is a Ruby wrapper around a proj crs_to_crs
+    # A crs_to_crs transformation object is a pipeline between two known coordinate reference systems.
+    # https://proj.org/development/reference/functions.html#c.proj_create_crs_to_crs
+    class CRSToCRS
+      # transform the coordinates from the initial CRS to the destination CRS
+      def transform_coords(x, y, z)
+        _transform_coords(x, y, z)
+      end
+
+      class << self
+        def create(from, to)
+          _create(from, to)
+        end
+      end
+    end
+
+    # Store of all the created CRSToCRS
+    class CRSStore
+      include Singleton
+      class << self
+        def get(from, to)
+          instance.get(from, to)
+        end
+      end
+
+      Key = Struct.new(:from, :to)
+
+      def initialize
+        @store = Hash.new { |h, k| h[k] = CRSToCRS.create(k.from, k.to) }
+        @semaphore = Mutex.new
+      end
+
+      def get(from, to)
+        @semaphore.synchronize do
+          @store[Key.new(from, to)]
+        end
+      end
+    end
+  end
+end

data/lib/rgeo/coord_sys/proj4.rb

@@ -221,14 +221,14 @@ module RGeo
         # Transforms the given coordinate (x, y, [z]) from one proj4
         # coordinate system to another. Returns an array with either two
         # or three elements.
-
         def transform_coords(from_proj_, to_proj_, x_, y_, z_ = nil)
           if from_proj_._radians? && from_proj_._geographic?
             x_ *= ImplHelper::Math::DEGREES_PER_RADIAN
             y_ *= ImplHelper::Math::DEGREES_PER_RADIAN
           end
 
-          result_ = _transform_coords(from_proj_, to_proj_, x_, y_, z_)
+          crs_to_crs = CRSStore.get(from_proj_, to_proj_)
+          result_ = crs_to_crs.transform_coords(x_, y_, z_)
           if result_ && to_proj_._radians? && to_proj_._geographic?
             result_[0] *= ImplHelper::Math::RADIANS_PER_DEGREE
             result_[1] *= ImplHelper::Math::RADIANS_PER_DEGREE
@@ -273,19 +273,8 @@ module RGeo
           from_has_m_ = from_factory_.property(:has_m_coordinate)
           to_has_z_ = to_factory_.property(:has_z_coordinate)
           to_has_m_ = to_factory_.property(:has_m_coordinate)
-          x_ = from_point_.x
-          y_ = from_point_.y
-          if from_proj_._radians? && from_proj_._geographic?
-            x_ *= ImplHelper::Math::DEGREES_PER_RADIAN
-            y_ *= ImplHelper::Math::DEGREES_PER_RADIAN
-          end
-          coords_ = _transform_coords(from_proj_, to_proj_, x_, y_, from_has_z_ ? from_point_.z : nil)
+          coords_ = transform_coords(from_proj_, to_proj_, from_point_.x, from_point_.y, from_has_z_ ? from_point_.z : nil)
           return unless coords_
-
-          if to_proj_._radians? && to_proj_._geographic?
-            coords_[0] *= ImplHelper::Math::RADIANS_PER_DEGREE
-            coords_[1] *= ImplHelper::Math::RADIANS_PER_DEGREE
-          end
           extras_ = []
           extras_ << coords_[2].to_f if to_has_z_
           if to_has_m_

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "3.0.1"
+    VERSION = "3.1.0"
   end
 end

data/lib/rgeo/proj4.rb

@@ -2,6 +2,7 @@
 
 require "rgeo"
 require "rgeo/proj4/version"
+require "rgeo/coord_sys/crs_to_crs"
 require "rgeo/coord_sys/proj4"
 require "rgeo/coord_sys/srs_database/proj4_data"
 require "rgeo/coord_sys/proj4_c_impl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Tee Parham, Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -105,6 +105,7 @@ files:
 - LICENSE.txt
 - ext/proj4_c_impl/extconf.rb
 - ext/proj4_c_impl/main.c
+- lib/rgeo/coord_sys/crs_to_crs.rb
 - lib/rgeo/coord_sys/proj4.rb
 - lib/rgeo/coord_sys/srs_database/proj4_data.rb
 - lib/rgeo/proj4.rb