Merge pull request #1 from derickr/adding-arginfo

Fixed arginfo and tests; added a prototype.

Author: mgdm

geospatial.c

@@ -27,12 +27,12 @@
 #include "ext/standard/info.h"
 #include "php_geospatial.h"
 
-ZEND_BEGIN_ARG_INFO(haversine_args,ZEND_SEND_BY_VAL)
-	ZEND_ARG_INFO(0,fromLatitude)
-	ZEND_ARG_INFO(0,fromLongitude)
-	ZEND_ARG_INFO(0,toLatitude)
-	ZEND_ARG_INFO(0,toLongitude)
-	ZEND_ARG_INFO(0,radius)
+ZEND_BEGIN_ARG_INFO_EX(haversine_args, 0, 0, 4)
+	ZEND_ARG_INFO(0, fromLatitude)
+	ZEND_ARG_INFO(0, fromLongitude)
+	ZEND_ARG_INFO(0, toLatitude)
+	ZEND_ARG_INFO(0, toLongitude)
+	ZEND_ARG_INFO(0, radius)
 ZEND_END_ARG_INFO()
 
 /* {{{ geospatial_functions[]
@@ -97,7 +97,8 @@ PHP_MINFO_FUNCTION(geospatial)
 }
 /* }}} */
 
-
+/* {{{ proto haversine(double fromLat, double fromLong, double toLat, double toLong [, double radius ])
+ * Calculates the greater circle distance between the two lattitude/longitude pairs */
 PHP_FUNCTION(haversine)
 {
 	double fromLat, fromLong, toLat, toLong, deltaLat, deltaLong;
@@ -118,6 +119,7 @@ PHP_FUNCTION(haversine)
 	result = radius * 2.0 * asin(sqrt(latH + result * longH));
 	RETURN_DOUBLE(result);
 }
+/* }}} */
 
 /*
  * Local variables:

tests/geospatial_haversine_london_edinburgh.phpt

@@ -2,6 +2,8 @@
 Check the haversine function returns the correct distance between London and Edinburgh.
 --SKIPIF--
 <?php if (!extension_loaded("geospatial")) print "skip"; ?>
+--INI--
+precision=14
 --FILE--
 <?php 
 echo haversine(51.5171, 0.1062, 55.9500, 3.2200);

tests/geospatial_haversine_polar_distance.phpt

@@ -2,6 +2,8 @@
 Check the haversine function returns the correct distance between the North and South poles, using a custom radius.
 --SKIPIF--
 <?php if (!extension_loaded("geospatial")) print "skip"; ?>
+--INI--
+precision=14
 --FILE--
 <?php 
 echo haversine(90, 0, -90, 0, 6356.7523);

tests/haversine.phpt

@@ -1,5 +1,7 @@
 --TEST--
-haversine() function  - bastic test for haversine forumla
+haversine() function - basic test for haversine forumla
+--INI--
+precision=15
 --FILE--
 <?php
 $lat1 = 39.06546;
@@ -10,4 +12,4 @@ $lon2 = -104.80;
 var_dump(haversine($lat1, $lon1, $lat2, $lon2));
 ?>
 --EXPECT--
-float(7.3785163137969)
+float(7.38469839293155)