simple-proj 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e3c3bb3834d7d494e1e0dc220c5ca30e6a9387e0cfea7a30223535ad44e6ec9
-  data.tar.gz: 96148f842f3f3334424705f1256acbd46699cbe3a11f4c492033f371967a7b70
+  metadata.gz: 47aef9c67ff6e5451d16b1c97332a444d558b2b22e8bf2c00f7f9556e3c932ba
+  data.tar.gz: 34652c6bdeb579d5b94460efa2b8ad06262093f6b767773efae8aa60659b15db
 SHA512:
-  metadata.gz: 9359cd9bf7da8619a17d04ad615e713e70c89ccf56bf44f1f967b9324343481294de4dc5ba707a277f380784862cffce79dcb91d2bc466b75b0d938fb14fb4bb
-  data.tar.gz: e384f056f0a3a919dbc5e2d63d441a2c1222eff579583a442bbd327c974de1afcad4f4c2a88899f8b101268fb318b72edef5d32b99b49a3f65aa93b51c8550d4
+  metadata.gz: 7b84374f89291e98cc4ae8efb79054a8ff19674a0f94f52f81ff0e33c5d7704c5acf5ba812cb6965e004dafd8cc4b8faf752a08ac846dee5d8ac929688316ce5
+  data.tar.gz: 82d7106b6746d6ed9eadc68d80f241f6af30fd448f23ffd64322e50a93c59fbfa2a84866e93a24ad24b4a39587f1283c4262cf85115bbe4f0597843452e15c3e

data/Rakefile

@@ -5,4 +5,7 @@ task :install do
   system %{
     gem build #{GEMSPEC}; gem install #{spec.full_name}.gem
   }
-end
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/ext/extconf.rb

@@ -6,7 +6,7 @@ dir_config("proj", possible_includes, possible_libs)
 
 if have_header("proj.h") and have_library("proj")
   have_carray()
-  create_makefile("simple_proj")
+  create_makefile("simple_proj_ext")
 end
 
 

data/ext/mkmf.log

@@ -0,0 +1,18 @@
+"clang -o conftest -I/Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0/x86_64-darwin21 -I/Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0/ruby/backward -I/Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0 -I. -I/usr/local/include -I/Users/himotoyoshi/.rbenv/versions/2.7.5/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT   -g -O2 -fno-common -pipe conftest.c  -L. -L/Users/himotoyoshi/.rbenv/versions/2.7.5/lib -L/Users/himotoyoshi/lib -L/usr/local/lib -L/usr/lib -L. -L/Users/himotoyoshi/.rbenv/versions/2.7.5/lib  -fstack-protector-strong     -lruby.2.7   "
+In file included from conftest.c:1:
+In file included from /Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0/ruby.h:33:
+In file included from /Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0/ruby/ruby.h:29:
+/Users/himotoyoshi/.rbenv/versions/2.7.5/include/ruby-2.7.0/ruby/defines.h:126:10: fatal error: 'stdio.h' file not found
+#include <stdio.h>
+         ^~~~~~~~~
+1 error generated.
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return !!argv[argc];
+6: }
+/* end */
+

data/ext/rb_proj.c

@@ -51,12 +51,19 @@ The arguments should be PROJ::CRS objects or String objects one of
  * a WKT string,
  * an object code (like “EPSG:4326”, “urn:ogc:def:crs:EPSG::4326”, 
    “urn:ogc:def:coordinateOperation:EPSG::1671”),
+ * an Object name. e.g “WGS 84”, “WGS 84 / UTM zone 31N”. 
+   In that case as uniqueness is not guaranteed, 
+   heuristics are applied to determine the appropriate best match.
  * a OGC URN combining references for compound coordinate reference 
    systems (e.g “urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717” or 
    custom abbreviated syntax “EPSG:2393+5717”),
  * a OGC URN combining references for concatenated operations (e.g. 
    “urn:ogc:def:coordinateOperation,coordinateOperation:EPSG::3895,
    coordinateOperation:EPSG::1618”)
+ * a PROJJSON string. 
+   The jsonschema is at https://proj.org/schemas/v0.4/projjson.schema.json (added in PROJ 6.2)
+ * a compound CRS made from two object names separated with ” + “. 
+   e.g. “WGS 84 + EGM96 height” (added in 7.1)
 
 If two arguments are given, the first is the source CRS definition and the
 second is the target CRS definition. If only one argument is given, the
@@ -257,7 +264,7 @@ rb_proj_angular_input (VALUE self, VALUE direction)
 /*
 Checks if an operation returns output in radians or not.
 
-@return [Boolean]
+@return [Boolean] 
 */
 
 static VALUE
@@ -321,6 +328,7 @@ rb_proj_factors (VALUE self, VALUE vlon, VALUE vlat)
 Transforms coordinates forwardly from (lat1, lon1, z1) to (x1, y2, z2).
 The order of coordinates arguments should be longitude, latitude, and height.
 The input longitude and latitude should be in units 'degrees'.
+If the returned coordinates are angles, they are converted in units `degrees`.
 
 @overload forward(lon1, lat1, z1 = nil)
   @param lon1 [Numeric] longitude in degrees.
@@ -368,6 +376,81 @@ rb_proj_forward (int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eRuntimeError, "%s", proj_errno_string(errno));
   }
 
+  if (  proj_angular_output(proj->ref, PJ_FWD) == 1 ) {    
+    if ( NIL_P(vz) ) {
+      return rb_assoc_new(rb_float_new(proj_todeg(data_out.lpz.lam)), 
+                          rb_float_new(proj_todeg(data_out.lpz.phi)));
+    } else {
+      return rb_ary_new3(3, rb_float_new(proj_todeg(data_out.lpz.lam)), 
+                            rb_float_new(proj_todeg(data_out.lpz.phi)),
+                            rb_float_new(data_out.lpz.z));
+    }
+  }
+  else {
+    if ( NIL_P(vz) ) {
+      return rb_assoc_new(rb_float_new(data_out.xyz.x), 
+                          rb_float_new(data_out.xyz.y));    
+    } else {
+      return rb_ary_new3(3, rb_float_new(data_out.xyz.x), 
+                            rb_float_new(data_out.xyz.y),
+                            rb_float_new(data_out.xyz.z));        
+    }
+  }
+  
+}
+
+/*
+Transforms coordinates forwardly from (lat1, lon1, z1) to (x1, y2, z2).
+The order of coordinates arguments should be longitude, latitude, and height.
+The input longitude and latitude should be in units 'degrees'.
+If the returned coordinates are angles, they are treated as in units `radians`.
+
+@overload forward(lon1, lat1, z1 = nil)
+  @param lon1 [Numeric] longitude in degrees.
+  @param lat1 [Numeric] latitude in degrees.
+  @param z1 [Numeric, nil] vertical coordinate.
+
+@return x2, y2[, z2]
+
+@example
+  x2, y2 = pj.forward(lon1, lat1)
+  x2, y2, z2 = pj.forward(lon1, lat1, z1)
+
+*/
+static VALUE
+rb_proj_forward_bang (int argc, VALUE *argv, VALUE self)
+{
+  volatile VALUE vlon, vlat, vz;
+  Proj *proj;
+  PJ_COORD data_in, data_out;
+  int errno;
+
+  rb_scan_args(argc, argv, "21", (VALUE*) &vlon, (VALUE*) &vlat, (VALUE*) &vz);
+
+  Data_Get_Struct(self, Proj, proj);
+
+  if ( ! proj->is_src_latlong ) {
+    rb_raise(rb_eRuntimeError, "requires latlong src crs. use #transform_forward instead of #forward.");
+  }
+
+  if ( proj_angular_input(proj->ref, PJ_FWD) == 1 ) {
+    data_in.lpz.lam = proj_torad(NUM2DBL(vlon));
+    data_in.lpz.phi = proj_torad(NUM2DBL(vlat));
+    data_in.lpz.z   = NIL_P(vz) ? 0.0 : NUM2DBL(vz);
+  }
+  else {
+    data_in.xyz.x = NUM2DBL(vlon);
+    data_in.xyz.y = NUM2DBL(vlat);
+    data_in.xyz.z = NIL_P(vz) ? 0.0 : NUM2DBL(vz);    
+  }
+
+  data_out = proj_trans(proj->ref, PJ_FWD, data_in);
+
+  if ( data_out.xyz.x == HUGE_VAL ) {
+    errno = proj_context_errno(PJ_DEFAULT_CTX);
+    rb_raise(rb_eRuntimeError, "%s", proj_errno_string(errno));
+  }
+
   if ( NIL_P(vz) ) {
     return rb_assoc_new(rb_float_new(data_out.xyz.x), 
                         rb_float_new(data_out.xyz.y));    
@@ -376,11 +459,13 @@ rb_proj_forward (int argc, VALUE *argv, VALUE self)
                           rb_float_new(data_out.xyz.y),
                           rb_float_new(data_out.xyz.z));        
   }
+  
 }
 
 /*
 Transforms coordinates inversely from (x1, y1, z1) to (lon2, lat2, z2).
 The order of output coordinates is longitude, latitude and height.
+If the input coordinates are angles, they are treated as being in units `degrees`.
 The returned longitude and latitude are in units 'degrees'.
 
 @overload inverse(x1, y1, z1 = nil)
@@ -410,6 +495,79 @@ rb_proj_inverse (int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eRuntimeError, "requires latlong src crs. use #transform_inverse instead of #inverse.");
   }
 
+  if ( proj_angular_input(proj->ref, PJ_INV) == 1 ) {
+    data_in.lpz.lam = proj_torad(NUM2DBL(vx));
+    data_in.lpz.phi = proj_torad(NUM2DBL(vy));
+    data_in.lpz.z   = NIL_P(vz) ? 0.0 : NUM2DBL(vz);
+  }
+  else {
+    data_in.xyz.x = NUM2DBL(vx);
+    data_in.xyz.y = NUM2DBL(vy);
+    data_in.xyz.z = NIL_P(vz) ? 0.0 : NUM2DBL(vz);
+  }
+
+  data_out = proj_trans(proj->ref, PJ_INV, data_in);
+
+  if ( data_out.lpz.lam == HUGE_VAL ) {
+    errno = proj_errno(proj->ref);
+    rb_raise(rb_eRuntimeError, "%s", proj_errno_string(errno));
+  }
+
+  if (  proj_angular_output(proj->ref, PJ_INV) == 1 ) {    
+    if ( NIL_P(vz) ) {
+      return rb_assoc_new(rb_float_new(proj_todeg(data_out.lpz.lam)), 
+                          rb_float_new(proj_todeg(data_out.lpz.phi)));
+    } else {
+      return rb_ary_new3(3, rb_float_new(proj_todeg(data_out.lpz.lam)), 
+                            rb_float_new(proj_todeg(data_out.lpz.phi)),
+                            rb_float_new(data_out.lpz.z));
+    }
+  }
+  else {
+    if ( NIL_P(vz) ) {
+      return rb_assoc_new(rb_float_new(data_out.xyz.x), 
+                          rb_float_new(data_out.xyz.y));
+    } else {
+      return rb_ary_new3(3, rb_float_new(data_out.xyz.x), 
+                            rb_float_new(data_out.xyz.y),
+                            rb_float_new(data_out.xyz.z));
+    }    
+  }
+}
+
+/*
+Transforms coordinates inversely from (x1, y1, z1) to (lon2, lat2, z2).
+The order of output coordinates is longitude, latitude and height.
+If the input coordinates are angles, they are treated as being in units `radians`.
+The returned longitude and latitude are in units 'degrees'.
+
+@overload inverse(x1, y1, z1 = nil)
+  @param x1 [Numeric] 
+  @param y1 [Numeric]
+  @param z1 [Numeric, nil]
+
+@return lon2, lat2, [, z2]
+
+@example
+  lon2, lat2 = pj.inverse(x1, y1)
+  lon2, lat2, z2 = pj.inverse(x1, y1, z1)
+
+*/
+static VALUE
+rb_proj_inverse_bang (int argc, VALUE *argv, VALUE self)
+{
+  volatile VALUE vx, vy, vz;
+  Proj *proj;
+  PJ_COORD data_in, data_out;
+  int errno;
+
+  rb_scan_args(argc, argv, "21", (VALUE *)&vx, (VALUE *)&vy, (VALUE *)&vz);
+  Data_Get_Struct(self, Proj, proj);
+
+  if ( ! proj->is_src_latlong ) {
+    rb_raise(rb_eRuntimeError, "requires latlong src crs. use #transform_inverse instead of #inverse.");
+  }
+
   data_in.xyz.x = NUM2DBL(vx);
   data_in.xyz.y = NUM2DBL(vy);
   data_in.xyz.z = NIL_P(vz) ? 0.0 : NUM2DBL(vz);
@@ -681,50 +839,79 @@ rb_proj_get_id_code (int argc, VALUE *argv, VALUE self)
   return (string) ? rb_str_new2(string) : Qnil;
 }
 
-/*
-Gets a PROJJSON string representation of the object.
 
-This method may return nil if the object is not compatible 
-with an export to the requested type.
+/*
+Gets a PROJ string representation of the object.
+This method may return nil if the object is not compatible with 
+an export to the requested type.
 
 @return [String,nil]
 */
 static VALUE
-rb_proj_as_projjson (VALUE self)
+rb_proj_as_proj_string (VALUE self)
 {
   Proj *proj;
-  const char *json;
+  const char *string;
 
   Data_Get_Struct(self, Proj, proj);
-  json = proj_as_projjson(PJ_DEFAULT_CTX, proj->ref, NULL);
-  if ( ! json ) {
+  string = proj_as_proj_string(PJ_DEFAULT_CTX, proj->ref, PJ_PROJ_5, NULL);
+  if ( ! string ) {
     return Qnil;
   }
-  return rb_str_new2(json);
+  return rb_str_new2(string);
 }
 
+#if PROJ_AT_LEAST_VERSION(6,2,0)
 
 /*
-Gets a PROJ string representation of the object.
-This method may return nil if the object is not compatible with 
-an export to the requested type.
+Gets a PROJJSON string representation of the object.
+
+This method may return nil if the object is not compatible 
+with an export to the requested type.
 
 @return [String,nil]
 */
+
 static VALUE
-rb_proj_as_proj_string (VALUE self)
+rb_proj_as_projjson (int argc, VALUE *argv, VALUE self)
 {
   Proj *proj;
-  const char *string;
+	volatile VALUE vopts;
+  const char *options[4] = {NULL, NULL, NULL, NULL};
+  const char *json = NULL;
+	int i;
 
   Data_Get_Struct(self, Proj, proj);
-  string = proj_as_proj_string(PJ_DEFAULT_CTX, proj->ref, PJ_PROJ_5, NULL);
-  if ( ! string ) {
+
+	if ( argc == 0 ) {
+    json = proj_as_projjson(PJ_DEFAULT_CTX, proj->ref, NULL);		
+	}
+	if ( argc > 3 ) {
+		rb_raise(rb_eRuntimeError, "too much options");
+	}
+	else {
+		for (i=0; i<argc; i++) {
+	    Check_Type(argv[i], T_STRING);			
+			options[i] = StringValuePtr(argv[i]);
+		}
+    json = proj_as_projjson(PJ_DEFAULT_CTX, proj->ref, options);				
+	}
+
+  if ( ! json ) {
     return Qnil;
   }
-  return rb_str_new2(string);
+  return rb_str_new2(json);
 }
 
+#endif
+
+
+/*
+Gets a ellipsoid parameters of CRS definition of the object.
+
+@return [Array] Returns Array containing semi_major_axis(m), semi_minor(m), boolean whether the semi-minor value was computed, inverse flattening.
+*/
+
 static VALUE
 rb_proj_ellipsoid_get_parameters (VALUE self)
 {
@@ -746,7 +933,7 @@ rb_proj_ellipsoid_get_parameters (VALUE self)
 /*
 Gets a WKT expression of CRS definition of the object.
 
-@return [String]
+@return [String] Returns String of WKT expression.
 */
 static VALUE
 rb_proj_as_wkt (int argc, VALUE *argv, VALUE self)
@@ -776,7 +963,7 @@ rb_proj_as_wkt (int argc, VALUE *argv, VALUE self)
 
 
 void
-Init_simple_proj ()
+Init_simple_proj_ext ()
 {
   id_forward = rb_intern("forward");
   id_inverse = rb_intern("inverse");
@@ -798,7 +985,9 @@ Init_simple_proj ()
   rb_define_method(rb_cProj, "angular_output?", rb_proj_angular_output, 1);
   rb_define_method(rb_cProj, "normalize_for_visualization", rb_proj_normalize_for_visualization, 0);
   rb_define_method(rb_cProj, "forward", rb_proj_forward, -1);
+  rb_define_method(rb_cProj, "forward!", rb_proj_forward_bang, -1);
   rb_define_method(rb_cProj, "inverse", rb_proj_inverse, -1);
+  rb_define_method(rb_cProj, "inverse!", rb_proj_inverse_bang, -1);
   rb_define_method(rb_cProj, "transform", rb_proj_transform_forward, -1);
   rb_define_method(rb_cProj, "transform_inverse", rb_proj_transform_inverse, -1);
   rb_define_private_method(rb_cProj, "_pj_info", rb_proj_pj_info, 0);
@@ -813,7 +1002,9 @@ Init_simple_proj ()
   rb_define_method(rb_mCommon, "id_auth_name", rb_proj_get_id_auth_name, -1);
   rb_define_method(rb_mCommon, "id_code", rb_proj_get_id_code, -1);
   rb_define_method(rb_mCommon, "to_proj_string", rb_proj_as_proj_string, 0);
-  rb_define_method(rb_mCommon, "to_projjson", rb_proj_as_projjson, 0);
+#if PROJ_AT_LEAST_VERSION(6,2,0)
+  rb_define_method(rb_mCommon, "to_projjson", rb_proj_as_projjson, -1);
+#endif
   rb_define_method(rb_mCommon, "ellipsoid_parameters", rb_proj_ellipsoid_get_parameters, 0);
   rb_define_method(rb_mCommon, "to_wkt", rb_proj_as_wkt, -1);
 

data/lib/simple-proj.rb

@@ -1,10 +1,12 @@
-require 'simple_proj.so'
+require 'simple_proj_ext'
 require 'json'
 require 'bindata'
 require 'ostruct'
 
 class PROJ
 
+  VERSION = _info["version"]
+
   # Returns PROJ info
   #
   # @return [OpenStruct]
@@ -159,6 +161,32 @@ class PROJ
 
 end
 
+### Marshalling
+
+class PROJ
+  
+  def _dump_data 
+    return to_wkt
+  end
+  
+  def _load_data (wkt)
+    initialize_copy self.class.new(wkt)
+  end
+  
+end
+
+class PROJ::CRS
+  
+  def _dump_data 
+    return to_wkt
+  end
+  
+  def _load_data (wkt)
+    initialize_copy self.class.new(wkt)
+  end
+  
+end
+
 begin
   require "simple-proj-carray"
 rescue LoadError

data/simple-proj.gemspec

@@ -1,6 +1,6 @@
 
 Gem::Specification::new do |s|
-  version = "1.0.0"
+  version = "1.0.1"
 
   files = Dir.glob("**/*") - [ 
                                Dir.glob("simple-proj-*.gem"), 
@@ -22,4 +22,5 @@ Gem::Specification::new do |s|
   s.files       = files
   s.extensions  = [ "ext/extconf.rb" ]
   s.required_ruby_version = ">= 2.4.0"
+  s.add_runtime_dependency 'bindata', '~> 2.4', '>= 2.4.8'
 end

data/spec/proj_spec.rb

@@ -0,0 +1,18 @@
+require 'simple-proj'
+require 'rspec-power_assert'
+
+describe 'PROJ' do 
+  
+  example 'creation with proj string' do
+    
+    expect { PROJ.new("") }.to raise_error(RuntimeError)
+    
+    webmerc  = PROJ.new("+proj=webmerc")
+    epsg3857 = PROJ.new("EPSG:3857")
+    
+    pp [webmerc.to_wkt, epsg3857.to_wkt]
+    
+    
+  end
+  
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simple-proj
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
-dependencies: []
+date: 2022-07-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bindata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.8
 description: "    Ruby extension library for PROJ 7\n"
 email: ''
 executables: []
@@ -21,10 +41,12 @@ files:
 - README.md
 - Rakefile
 - ext/extconf.rb
+- ext/mkmf.log
 - ext/rb_proj.c
 - ext/rb_proj.h
 - lib/simple-proj.rb
 - simple-proj.gemspec
+- spec/proj_spec.rb
 homepage: https://github.com/himotoyoshi/simple-proj
 licenses:
 - MIT
@@ -44,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby extension library for PROJ 7