lwgeom 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d954159e5ab11a16233f6514548027f9e23fc76c
-  data.tar.gz: 507360127e3de317160190847458e30017701703
+  metadata.gz: f90f94d270e97fb98b8e98482107832dccfc25ea
+  data.tar.gz: 6c56624d707c2d4b30d61f21c5290493331d613c
 SHA512:
-  metadata.gz: d4084add6566bce97abf2501674a4ddf18eb39da7624c2a63664618844dfe9c426c398783d5d5384da72e8a31d74a6dd06668605823085d8f5c3f82ffb0eaeb0
-  data.tar.gz: 5b451a3265279b9f61caf141b4e4960d714f17e27276d5ce286d3d89eaa12f985087572e52f1a100e2b26b5e362e7b205921d8b2691cc3160fc15cbddca88e8d
+  metadata.gz: 81d8d8d808c76623e3617f42c7a773bfaef3a86fd7f2d2b6f6721eb5eefe0637dd07c3822a53a8d08c2e150d454e12b9c05194f336988b832dc330d61d495c5b
+  data.tar.gz: 7dadac221fafd6b8845bfd1271be3abb9f17127b9073edb5889eb6664e3cfb8924e3f9a88ba60586596fca06b245995af016dfb5c0597a3810e4126e7afc7472

data/ext/lwgeom/lwgeom.c

@@ -7,21 +7,66 @@ double EARTH_MINOR_AXIS_RADIUS = 6356752.314245179498;
 LWGEOM *lwg;
 SPHEROID s;
 
-static VALUE get_area(VALUE self, VALUE geom_wkt)
+double get_area_for_lwg()
 {
-  lwg = lwgeom_from_wkt(RSTRING_PTR(geom_wkt), 0);
   double area = lwgeom_area_spheroid(lwg, &s);
   lwgeom_free(lwg);
+  return area;
+}
+
+static VALUE get_area_from_wkb(VALUE self, VALUE geom_wkb)
+{
+  int wkb_size_a;
+  wkb_size_a = RSTRING_LEN(geom_wkb);
+  lwg = lwgeom_from_wkb(RSTRING_PTR(geom_wkb), wkb_size_a, 0);
+  double area = get_area_for_lwg();
+  return rb_float_new(area);
+}
 
+static VALUE get_area_from_hexwkb(VALUE self, VALUE geom_wkb)
+{
+  lwg = lwgeom_from_hexwkb(RSTRING_PTR(geom_wkb), 0);
+  double area = get_area_for_lwg();
   return rb_float_new(area);
 }
 
-VALUE get_length(VALUE self, VALUE geom_wkt)
+static VALUE get_area_from_wkt(VALUE self, VALUE geom_wkt)
 {
   lwg = lwgeom_from_wkt(RSTRING_PTR(geom_wkt), 0);
+  double area = lwgeom_area_spheroid(lwg, &s);
+  return rb_float_new(area);
+}
+
+// methods for calculating length
+double get_length_for_lwg()
+{
   double length = lwgeom_length_spheroid(lwg, &s);
   lwgeom_free(lwg);
+  return length;
+}
+
+static VALUE get_length_from_wkt(VALUE self, VALUE geom_wkt)
+{
+  lwg = lwgeom_from_wkt(RSTRING_PTR(geom_wkt), 0);
+  double length = get_length_for_lwg();
+  return rb_float_new(length);
+}
 
+
+static VALUE get_length_from_wkb(VALUE self, VALUE geom_wkb)
+{
+  int wkb_size_a;
+  wkb_size_a = RSTRING_LEN(geom_wkb);
+  lwg = lwgeom_from_wkb(RSTRING_PTR(geom_wkb), wkb_size_a, 0);
+  double area = get_length_for_lwg();
+  return rb_float_new(area);
+}
+
+static VALUE get_length_from_hexwkb(VALUE self, VALUE geom_hexwkb)
+{
+  size_t wkb_size_a;
+  lwg = lwgeom_from_hexwkb(RSTRING_PTR(geom_hexwkb), 0);
+  double length = get_length_for_lwg();
   return rb_float_new(length);
 }
 
@@ -33,8 +78,12 @@ void Init_lwgeom()
   /* define class */
   VALUE cSpheroid = rb_define_class_under(mLwGeom, "Spheroid", rb_cObject);
 
-  rb_define_module_function(cSpheroid, "get_area", get_area, 1);
-  rb_define_module_function(cSpheroid, "get_length", get_length, 1);
+  rb_define_module_function(cSpheroid, "get_area_from_hexwkb",  get_area_from_hexwkb, 1);
+  rb_define_module_function(cSpheroid, "get_area_from_wkb",     get_area_from_wkb,    1);
+  rb_define_module_function(cSpheroid, "get_area_from_wkt",     get_area_from_wkt,    1);
+  rb_define_module_function(cSpheroid, "get_length_from_wkt",   get_length_from_wkt,  1);
+  rb_define_module_function(cSpheroid, "get_length_from_wkb",   get_length_from_wkb,  1);
+  rb_define_module_function(cSpheroid, "get_length_from_hexwkb",get_length_from_hexwkb,1);
 
   spheroid_init(&s, EARTH_MAJOR_AXIS_RADIUS, EARTH_MINOR_AXIS_RADIUS);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lwgeom
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Yaroslav Nelin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies: []
 description: With this gem you can call lwgeom methods from ruby
 email: