geodesic_wgs84 1.32.13 → 1.32.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed536b8bf5290792069be154595f80c905433157
-  data.tar.gz: 09af4b468561369f8b9c7b41d275d5e22d826083
+  metadata.gz: 5096166b267e94e2c95955b0e28fede57d76f4da
+  data.tar.gz: 4c68dfcaa423c772a6bdbae8eab21fbad0c82cb0
 SHA512:
-  metadata.gz: 3abbbb9ea956b9681f9c30f1125bc8d597a1a0c874ee7b208d14836fc513378e77e5a56fd59c8175bea8e5fd537fbf12bafe52aaaed80ff5bc186dc8d777708c
-  data.tar.gz: 983a583aa804672d815b4a5fd93cde5c3756e0dfb4827e1adc400c6df2fb7cd1676f2f8b03d7d397e47af3c17826261709092fca831cea49574fe944fae9a2bf
+  metadata.gz: 0ecde825e2fb0d054daa731125ebe82f6992f00f7790bfcd53ea1d6228ba5d78bf78e9aaee5e5cafe76a0405050797d0a2b2b746474ef875eefe1a2e864defb9
+  data.tar.gz: 8002c67ae0a928f3be2361e1588b542a4d789dbc6bdc6b45fb26b704a358b38c71eb7bc897bac4adbfa1d65305815a824eff85128e7c93a64bee8ee4689c9b01

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -61,40 +61,49 @@ wgs84_get_value(VALUE arg)
 }
 
 
-static void
-wgs84_make_dms(double val, char *buf)
+static VALUE
+wgs84_as_deg(VALUE klass, VALUE arg)
 {
-  char *ptr;
+  double val;
 
-  sprintf(buf, "%d ", (int) trunc(val));
-  ptr = buf + strlen(buf);
-  sprintf(ptr, "%d ", (int) fmod(trunc(fabs(val) * 60.0), 60.0));
-  ptr = buf + strlen(buf);
-  sprintf(ptr, "%.1lf", fmod(fabs(val) * 3600.0, 60.0));
+  val = wgs84_get_value(arg);
+
+  return rb_float_new(val);
 }
 
 
 static VALUE
-wgs84_as_deg(VALUE klass, VALUE arg)
+wgs84_as_dms(VALUE klass, VALUE arg)
 {
   double val;
+  char buf[64], *ptr;
 
   val = wgs84_get_value(arg);
+  memset(buf, 0, sizeof(buf));
+  sprintf(buf, "%d ", (int) trunc(val));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%d ", (int) fmod(trunc(fabs(val) * 60.0), 60.0));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%.1lf", fmod(fabs(val) * 3600.0, 60.0));
 
-  return rb_float_new(val);
+  return rb_str_new2(buf);
 }
 
 
 static VALUE
-wgs84_as_dms(VALUE klass, VALUE arg)
+wgs84_as_bigdec(VALUE klass, VALUE arg)
 {
   double val;
-  char buf[64];
+  char buf[64], *ptr;
 
   val = wgs84_get_value(arg);
-  wgs84_make_dms(val, buf);
+  memset(buf, 0, sizeof(buf));
+  sprintf(buf, "%07.0lf", round(val * 1000000.0));
+  ptr = buf + (strlen(buf) - 6);
+  memmove(ptr + 1, ptr, 6);
+  *ptr = '.';
 
-  return rb_str_new2(buf);
+  return rb_funcall(rb_path2class("BigDecimal"), rb_intern("new"), 1, rb_str_new2(buf));
 }
 
 
@@ -259,6 +268,7 @@ Init_geodesic_wgs84(void)
   rb_define_method(cWGS84, "initialize",  wgs84_init,          0);
   rb_define_method(cWGS84, "as_deg",      wgs84_as_deg,        1);
   rb_define_method(cWGS84, "as_dms",      wgs84_as_dms,        1);
+  rb_define_method(cWGS84, "as_bigdec",   wgs84_as_bigdec,     1);
   rb_define_method(cWGS84, "lat_lon",     wgs84_lat_lon,      -1);
   rb_define_method(cWGS84, "distance",    wgs84_distance,     -1);
   rb_define_method(cWGS84, "average",     wgs84_average,       2);

data/lib/geodesic_wgs84/version.rb

@@ -1,3 +1,3 @@
 module GeodesicWgs84
-  VERSION = "1.32.13"
+  VERSION = "1.32.14"
 end

data/spec/geodesic_wgs84_spec.rb

@@ -1,11 +1,32 @@
 require 'minitest/autorun'
 require 'geodesic_wgs84'
+require 'bigdecimal'
 
 class TestGeodesicWgs84 < MiniTest::Test
   def setup
     @wgs84 = Wgs84.new
   end
 
+  def test_bigdec_1
+    assert_equal 50.833833, @wgs84.as_bigdec(50.833833).to_f
+  end
+
+  def test_bigdec_2
+    assert_equal 50.833833, @wgs84.as_bigdec(50.8338332).to_f
+  end
+
+  def test_bigdec_3
+    assert_equal 50.833834, @wgs84.as_bigdec(50.8338337).to_f
+  end
+
+  def test_bigdec_4
+    assert_equal 0.0, @wgs84.as_bigdec(0).to_f
+  end
+
+  def test_bigdec_5
+    assert_equal -1.0, @wgs84.as_bigdec(-1).to_f
+  end
+
   def test_deg_as_deg
     assert_equal 50.833833, @wgs84.as_deg(50.833833)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geodesic_wgs84
 version: !ruby/object:Gem::Version
-  version: 1.32.13
+  version: 1.32.14
 platform: ruby
 authors:
 - Volker Wiegand