geodesic_wgs84 1.32.16 → 1.32.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484164f90bf349f74e8cce75167b362e751eca85
-  data.tar.gz: ec55ae2fe7c28b685d61e1ed0407718f2fad92b0
+  metadata.gz: d05f76ec707266ede381b02ed6734f911f2e8af6
+  data.tar.gz: 8a1eaba21553245498a8309dc606491839c55427
 SHA512:
-  metadata.gz: 46b492042cc3dc9ffe58af012cba41953b121adc1ff66a029e0b07132a6b0c8875659e0a0d97b0737e1e0a331a76b3cdf8d6b550d71e6a87bf9e3653ec5e517d
-  data.tar.gz: a31750e62e7f7eb299c3e4e8b32ce0a408b061f751a52020564290169ab7a33585cfc8de199a1acfaee02d0b8e5fb61b7959936c7c8372cd776cb999b82fc667
+  metadata.gz: 365788de78244ea88b7294536cd72f56de439d6bef89075bd80f67e4ebfcbbb1899466c334ae80b031ecb84cbb1113e87eb27b12bb7548dfa2f37ccc88c0751a
+  data.tar.gz: 19904afe323151bd542c10ac0a8ebb1b1ebf5c88270ba9a8bde8a86a8757b0019dfae851f088b0d36295d4c7c26017e8334d5ba2e0d058dc7fe5a9780ab596d9

data/ext/geodesic_wgs84/geodesic_wgs84.c

@@ -228,6 +228,85 @@ wgs84_distance(int argc, VALUE *argv, VALUE klass)
 }
 
 
+static VALUE
+wgs84_course(double bearing)
+{
+  char *ptr;
+
+  if (bearing < -157.5)
+    ptr = (char *) "S";
+  else if (bearing < -112.5)
+    ptr = (char *) "SW";
+  else if (bearing < -67.5)
+    ptr = (char *) "W";
+  else if (bearing < -22.5)
+    ptr = (char *) "NW";
+  else if (bearing < 22.5)
+    ptr = (char *) "N";
+  else if (bearing < 67.5)
+    ptr = (char *) "NO";
+  else if (bearing < 112.5)
+    ptr = (char *) "O";
+  else if (bearing < 157.5)
+    ptr = (char *) "SO";
+  else
+    ptr = (char *) "S";
+  return rb_str_new2(ptr);
+}
+
+
+static VALUE
+wgs84_dist_course(int argc, VALUE *argv, VALUE klass)
+{
+  int i;
+  double dbl[4], azi1, azi2, s12;
+  VALUE tmp1, tmp2;
+
+  if (argc == 4) {
+    for (i = 0; i < 4; i++)
+      dbl[i] = wgs84_get_value(argv[i]);
+    geod_inverse(&g, dbl[0], dbl[1], dbl[2], dbl[3], &s12, &azi1, &azi2);
+    return rb_ary_new3(3L, INT2NUM((int) round(s12)), INT2NUM((int) azi1), wgs84_course(azi1));
+  }
+
+  if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 4) {
+    for (i = 0; i < 4; i++)
+      dbl[i] = wgs84_get_value(rb_ary_entry(*argv, i));
+    geod_inverse(&g, dbl[0], dbl[1], dbl[2], dbl[3], &s12, &azi1, &azi2);
+    return rb_ary_new3(3L, INT2NUM((int) round(s12)), INT2NUM((int) azi1), wgs84_course(azi1));
+  }
+
+  if (argc == 2) {
+    tmp1 = rb_check_array_type(argv[0]);
+    tmp2 = rb_check_array_type(argv[1]);
+    if (!NIL_P(tmp1) && !NIL_P(tmp2)) {
+      dbl[0] = wgs84_get_value(rb_ary_entry(tmp1, 0));
+      dbl[1] = wgs84_get_value(rb_ary_entry(tmp1, 1));
+      dbl[2] = wgs84_get_value(rb_ary_entry(tmp2, 0));
+      dbl[3] = wgs84_get_value(rb_ary_entry(tmp2, 1));
+      geod_inverse(&g, dbl[0], dbl[1], dbl[2], dbl[3], &s12, &azi1, &azi2);
+      return rb_ary_new3(3L, INT2NUM((int) round(s12)), INT2NUM((int) azi1), wgs84_course(azi1));
+    }
+  }
+
+  if (argc == 1 && TYPE(*argv) == T_ARRAY && RARRAY_LEN(*argv) == 2) {
+    tmp1 = rb_check_array_type(rb_ary_entry(*argv, 0));
+    tmp2 = rb_check_array_type(rb_ary_entry(*argv, 1));
+    if (!NIL_P(tmp1) && !NIL_P(tmp2)) {
+      dbl[0] = wgs84_get_value(rb_ary_entry(tmp1, 0));
+      dbl[1] = wgs84_get_value(rb_ary_entry(tmp1, 1));
+      dbl[2] = wgs84_get_value(rb_ary_entry(tmp2, 0));
+      dbl[3] = wgs84_get_value(rb_ary_entry(tmp2, 1));
+      geod_inverse(&g, dbl[0], dbl[1], dbl[2], dbl[3], &s12, &azi1, &azi2);
+      return rb_ary_new3(3L, INT2NUM((int) round(s12)), INT2NUM((int) azi1), wgs84_course(azi1));
+    }
+  }
+
+  rb_raise(rb_eArgError, "wrong number of arguments");
+  return Qnil;
+}
+
+
 static VALUE
 wgs84_average(VALUE klass, VALUE array, VALUE target)
 {
@@ -312,6 +391,7 @@ Init_geodesic_wgs84(void)
   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, "dist_course", wgs84_dist_course,  -1);
   rb_define_method(cWGS84, "average",     wgs84_average,       2);
   rb_define_method(cWGS84, "center",      wgs84_center,        2);
 }

data/lib/geodesic_wgs84/version.rb

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

data/spec/geodesic_wgs84_spec.rb

@@ -124,5 +124,13 @@ class TestGeodesicWgs84 < MiniTest::Test
   def test_lat_lon_wetzlar
     assert_equal [50.553778, 8.492278], @wgs84.lat_lon("50 33 13.6", "8 29 32.2")
   end
+
+  def test_dist_limburg_marburg
+    assert_equal [68058, -134], @wgs84.distance(50.833833, 8.769333, 50.405778, 8.082222)
+  end
+
+  def test_dist_course_limburg_marburg
+    assert_equal [68058, -134, "SW"], @wgs84.dist_course(50.833833, 8.769333, 50.405778, 8.082222)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geodesic_wgs84
 version: !ruby/object:Gem::Version
-  version: 1.32.16
+  version: 1.32.17
 platform: ruby
 authors:
 - Volker Wiegand
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Calculate distances on Earth using WGS84