geodesic_wgs84 1.32.15 → 1.32.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b53a142bccbeebb0af8a5b86ec4c4b90acf3918d
-  data.tar.gz: a1932e7f89b83cb48f374e07ab78c35ccb9cafbb
+  metadata.gz: 484164f90bf349f74e8cce75167b362e751eca85
+  data.tar.gz: ec55ae2fe7c28b685d61e1ed0407718f2fad92b0
 SHA512:
-  metadata.gz: b1af9f98d2919fd67c2b7965e82342d3726ae81e11878d305b257b4998e9f360040d9d87467be3a953d4e64b7e8e5b4bab77d97f57eb1a10ab179cab57c4dae4
-  data.tar.gz: 4e538adcf7bbd0f053ac767aca0c127779dffede6b55a572a427a5b5eb65fd9ab82bfcfe68b9f49f393485067d4ffaa348d53b2cbecb6dc4497c43aa77b6f205
+  metadata.gz: 46b492042cc3dc9ffe58af012cba41953b121adc1ff66a029e0b07132a6b0c8875659e0a0d97b0737e1e0a331a76b3cdf8d6b550d71e6a87bf9e3653ec5e517d
+  data.tar.gz: a31750e62e7f7eb299c3e4e8b32ce0a408b061f751a52020564290169ab7a33585cfc8de199a1acfaee02d0b8e5fb61b7959936c7c8372cd776cb999b82fc667

data/README.md

@@ -47,6 +47,10 @@ of roughly 10cm. See ( http://en.wikipedia.org/wiki/Decimal_degrees#Accuracy )
 
     wgs84.lat_lon_dms ...
 
+    wgs84.lat_lon_dms_a (aligned) ...
+
+    wgs84.lat_lon_dms_z (zero-filled) ...
+
     wgs84.distance ...
 
     wgs84.average ...

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -93,6 +93,42 @@ wgs84_as_dms(VALUE klass, VALUE arg)
 }
 
 
+static VALUE
+wgs84_as_dms_a(VALUE klass, VALUE arg)
+{
+  double val;
+  char buf[64], *ptr;
+
+  val = wgs84_get_value(arg);
+  memset(buf, 0, sizeof(buf));
+  sprintf(buf, "%2d ", (int) trunc(val));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%2d ", (int) fmod(trunc(fabs(val) * 60.0), 60.0));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%4.1lf", fmod(fabs(val) * 3600.0, 60.0));
+
+  return rb_str_new2(buf);
+}
+
+
+static VALUE
+wgs84_as_dms_z(VALUE klass, VALUE arg)
+{
+  double val;
+  char buf[64], *ptr;
+
+  val = wgs84_get_value(arg);
+  memset(buf, 0, sizeof(buf));
+  sprintf(buf, "%02d ", (int) trunc(val));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%02d ", (int) fmod(trunc(fabs(val) * 60.0), 60.0));
+  ptr = buf + strlen(buf);
+  sprintf(ptr, "%04.1lf", fmod(fabs(val) * 3600.0, 60.0));
+
+  return rb_str_new2(buf);
+}
+
+
 static VALUE
 wgs84_as_bigdec(VALUE klass, VALUE arg)
 {
@@ -271,6 +307,8 @@ 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_dms_a",    wgs84_as_dms_a,      1);
+  rb_define_method(cWGS84, "as_dms_z",    wgs84_as_dms_z,      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);

data/lib/geodesic_wgs84/version.rb

@@ -1,3 +1,3 @@
 module GeodesicWgs84
-  VERSION = "1.32.15"
+  VERSION = "1.32.16"
 end

data/spec/geodesic_wgs84_spec.rb

@@ -41,18 +41,26 @@ class TestGeodesicWgs84 < MiniTest::Test
     assert_equal 50.833833, @wgs84.as_deg(50.833833)
   end
 
-  def test_as_deg
+  def test_dms_as_deg
     assert_equal 50.833833, @wgs84.as_deg("50 50 01.8")
   end
 
-  def test_deg_as
+  def test_deg_as_dms
     assert_equal "50 50 1.8", @wgs84.as_dms(50.833833)
   end
 
-  def test_as
+  def test_dms_as_dms
     assert_equal "50 50 1.8", @wgs84.as_dms("50 50 01.8")
   end
 
+  def test_deg_as_dms_a
+    assert_equal " 9  1  9.2", @wgs84.as_dms_a(9.019222)
+  end
+
+  def test_deg_as_dms_z
+    assert_equal "09 01 09.2", @wgs84.as_dms_z(9.019222)
+  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.15
+  version: 1.32.16
 platform: ruby
 authors:
 - Volker Wiegand