geodesic_wgs84 1.32.8 → 1.32.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a421f900057b282fa125e757054177066471301
-  data.tar.gz: a6561306299110ffb927339ddc7ea3a436f80c35
+  metadata.gz: 38b320a18564a13c896c99ae9197afec51c6aed7
+  data.tar.gz: 12dc71705229f817c9cc7bbf0b160955547a2217
 SHA512:
-  metadata.gz: b13512d9ae017bec057487c5af896c57bacf40b660fd44705cc311f9c55ad662596f6ad027f3bb4a918196e8a87047b0fa216d60703a387e6e47ea937256a9fb
-  data.tar.gz: 30b88b55a54ae2bf0522194968f57a786b6652a00d8789f9f21d81d32ebc6c64a3a89f64084c993626cbb426be727916a1d39be42e0837ab601be1c6b3813a90
+  metadata.gz: d619778b1cf345ed9a373d9ec0b9a846855c29273d0811387aabfb5cec60662689c68ce3368cbad457537971531697c2bbae76da51c795e10eb8ccba1b57f72a
+  data.tar.gz: 0f6df837997db14480304ea1a6ee27fdfa7c5004313a7c2f9fc560eeec423e7280e9c56bb517ec4de45315eb015e36123d4c25f5f61f02ce0a337e67ca9b326f

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -63,6 +63,45 @@ wgs84_get_value(VALUE arg)
 }
 
 
+static void
+wgs84_make_dms(double val, char *buf)
+{
+  char *ptr;
+
+  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));
+  if ((ptr = strchr(ptr, '.')) != NULL)
+    *ptr = ',';
+}
+
+
+static VALUE
+wgs84_as_deg(VALUE klass, VALUE arg)
+{
+  double val;
+
+  val = wgs84_get_value(arg);
+
+  return rb_float_new(val);
+}
+
+
+static VALUE
+wgs84_as_dms(VALUE klass, VALUE arg)
+{
+  double val;
+  char buf[64];
+
+  val = wgs84_get_value(arg);
+  wgs84_make_dms(val, buf);
+
+  return rb_str_new2(buf);
+}
+
+
 static VALUE
 wgs84_lat_lon(int argc, VALUE *argv, VALUE klass)
 {
@@ -87,21 +126,6 @@ wgs84_lat_lon(int argc, VALUE *argv, VALUE klass)
 }
 
 
-static void
-wgs84_make_dms(double val, char *buf)
-{
-  char *ptr;
-
-  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));
-  if ((ptr = strchr(ptr, '.')) != NULL)
-    *ptr = ',';
-}
-
-
 static VALUE
 wgs84_lat_lon_dms(int argc, VALUE *argv, VALUE klass)
 {
@@ -258,6 +282,8 @@ Init_geodesic_wgs84(void)
 {
   cWGS84 = rb_define_class("Wgs84", rb_cObject);
   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, "lat_lon",     wgs84_lat_lon,      -1);
   rb_define_method(cWGS84, "lat_lon_dms", wgs84_lat_lon_dms,  -1);
   rb_define_method(cWGS84, "distance",    wgs84_distance,     -1);

data/lib/geodesic_wgs84/version.rb

@@ -1,3 +1,3 @@
 module GeodesicWgs84
-  VERSION = "1.32.8"
+  VERSION = "1.32.9"
 end

data/spec/geodesic_wgs84_spec.rb

@@ -6,6 +6,22 @@ class TestGeodesicWgs84 < MiniTest::Test
     @wgs84 = Wgs84.new
   end
 
+  def test_deg_as_deg
+    assert_equal 50.833833, @wgs84.as_deg(50.833833)
+  end
+
+  def test_dms_as_deg
+    assert_equal 50.833833, @wgs84.as_deg("50.50.01,8")
+  end
+
+  def test_deg_as_dms
+    assert_equal "50.50.1,8", @wgs84.as_dms(50.833833)
+  end
+
+  def test_dms_as_dms
+    assert_equal "50.50.1,8", @wgs84.as_dms("50.50.01,8")
+  end
+
   def test_lat_lon_two_doubles
     assert_equal [50.833833, 8.769333], @wgs84.lat_lon(50.833833, 8.769333)
   end

metadata

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