griffordson-georuby-extras 0.6.0 → 0.7.0

data/README

@@ -20,6 +20,7 @@ with GIS extensions for popular databases including Postgres and MySQL.
 * Adds the Vincenty 'direct' algorithm (point_at_bearing_and_distance).
 * Provides native C implementation of a ray casting algorithm to detect if a point is contained in a polygon.
 * No known problems; won't work with JRuby or non-MRI Ruby implementations.
+* Compatible with Ruby 1.8.7 and 1.9.x
 
 == SYNOPSIS:
 

data/ext/pnpoly.c

@@ -59,7 +59,7 @@
 #include "ruby.h"
 #include "pnpoly.h"
 
-static int pnpoly(int nvert, float *vertx, float *verty, float testx, float testy)
+static int pnpoly(int nvert, double *vertx, double *verty, double testx, double testy)
 {
   int i, j, c = 0;
   for (i = 0, j = nvert-1; i < nvert; j = i++) {
@@ -74,17 +74,17 @@ VALUE point_in_poly(VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_points) {
   Check_Type(rb_x, T_FLOAT);
   Check_Type(rb_y, T_FLOAT);
   Check_Type(rb_points, T_ARRAY);
-  
+
   int i = 0;
-  int s = RARRAY(rb_points)->len;
-  float *vertx;
-  float *verty;
+  int s = (int)RARRAY_LEN(rb_points);
+  double *vertx;
+  double *verty;
   
-  vertx = calloc(s, sizeof(float));
-  verty = calloc(s, sizeof(float));
+  vertx = calloc(s, sizeof(double));
+  verty = calloc(s, sizeof(double));
   
-  float test_x = RFLOAT(rb_x)->value;
-  float test_y = RFLOAT(rb_y)->value;
+  double test_x = RFLOAT_VALUE(rb_x);
+  double test_y = RFLOAT_VALUE(rb_y);
   
   ID i_x = rb_intern("x");
   ID i_y = rb_intern("y");
@@ -95,11 +95,11 @@ VALUE point_in_poly(VALUE self, VALUE rb_x, VALUE rb_y, VALUE rb_points) {
     VALUE y = rb_funcall(point, i_y, 0);
     Check_Type(x, T_FLOAT);
     Check_Type(y, T_FLOAT);
-    vertx[i] = RFLOAT(x)->value;
-    verty[i] = RFLOAT(y)->value;
+    vertx[i] = RFLOAT_VALUE(x);
+    verty[i] = RFLOAT_VALUE(y);
   }
   
   return pnpoly(s, vertx, verty, test_x, test_y);
 }
 
-// end
+// end

data/ext/pnpoly.h

@@ -3,4 +3,16 @@
 
 VALUE point_in_poly(VALUE self, VALUE rb_lat, VALUE rb_lon, VALUE rb_points);
 
-#endif // _pnpoly_h_
+#ifndef RUBY_19
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(v) (RARRAY(v)-len)
+#endif
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(v) (RARRAY(v)-ptr)
+#endif
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(v) (RFLOAT(v)->value)
+#endif
+#endif
+
+#endif // _pnpoly_h_

data/ext/vincenty.c

@@ -51,12 +51,12 @@ static VALUE distance(VALUE self, VALUE rb_lon1, VALUE rb_lat1, VALUE rb_lon2, V
 	Check_Type(rb_a, T_FLOAT);
 	Check_Type(rb_b, T_FLOAT);
 
-	double lon1 = RFLOAT(rb_lon1)->value;
-	double lat1 = RFLOAT(rb_lat1)->value;
-	double lon2 = RFLOAT(rb_lon2)->value;
-	double lat2 = RFLOAT(rb_lat2)->value;
-	double a = RFLOAT(rb_a)->value;
-	double b = RFLOAT(rb_b)->value;
+	double lon1 = RFLOAT_VALUE(rb_lon1);
+	double lat1 = RFLOAT_VALUE(rb_lat1);
+	double lon2 = RFLOAT_VALUE(rb_lon2);
+	double lat2 = RFLOAT_VALUE(rb_lat2);
+	double a = RFLOAT_VALUE(rb_a);
+	double b = RFLOAT_VALUE(rb_b);
 
 	double sinLambda, cosLambda, sinSigma, cosSigma, sigma, sinAlpha, cosSqAlpha, cos2SigmaM, C;
 	
@@ -107,12 +107,12 @@ static VALUE point_from_lon_lat(VALUE self, VALUE rb_lon1, VALUE rb_lat1, VALUE
 	
 	VALUE ret;
 
-	double lon1 = RFLOAT(rb_lon1)->value;
-	double lat1 = RFLOAT(rb_lat1)->value;
-	double brng = RFLOAT(rb_bearing)->value;
-	double s = RFLOAT(rb_distance)->value;
-	double a = RFLOAT(rb_a)->value;
-	double b = RFLOAT(rb_b)->value;
+	double lon1 = RFLOAT_VALUE(rb_lon1);
+	double lat1 = RFLOAT_VALUE(rb_lat1);
+	double brng = RFLOAT_VALUE(rb_bearing);
+	double s = RFLOAT_VALUE(rb_distance);
+	double a = RFLOAT_VALUE(rb_a);
+	double b = RFLOAT_VALUE(rb_b);
 	
 	double f = (a-b) / a;
   double alpha1 = brng * DEG_TO_RAD;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: griffordson-georuby-extras
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - David Troy
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -05:00
-default_executable: 
+date: 2012-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: GeoRuby
@@ -56,7 +55,6 @@ files:
 - History.txt
 - test/test_vincenty.rb
 - test/test_pnpoly.rb
-has_rdoc: true
 homepage: http://github.com/griffordson/georuby-extras
 licenses: []
 
@@ -87,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Native extensions and extra functions for the GeoRuby library.