Merge branch 'master' of github.com:php-geospatial/geospatial

Conflicts:
	geospatial.c
	php_geospatial.h

Author: derickr

geospatial.c

@@ -16,6 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
+
 /* $Id$ */
 
 #ifdef HAVE_CONFIG_H
@@ -42,13 +43,58 @@ ZEND_BEGIN_ARG_INFO_EX(fraction_along_gc_line_args, 0, 0, 3)
 	ZEND_ARG_INFO(0, radius)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(helmert_args, 0, 0, 3)
+	ZEND_ARG_INFO(0, x)
+	ZEND_ARG_INFO(0, y)
+	ZEND_ARG_INFO(0, z)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(polar_to_cartesian_args, 0, 0, 3)
+	ZEND_ARG_INFO(0, latitude)
+	ZEND_ARG_INFO(0, longitude)
+	ZEND_ARG_INFO(0, reference_ellipsoid)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(cartesian_to_polar_args, 0, 0, 4)
+	ZEND_ARG_INFO(0, x)
+	ZEND_ARG_INFO(0, y)
+	ZEND_ARG_INFO(0, z)
+	ZEND_ARG_INFO(0, reference_ellipsoid)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(transform_datum_args, 0, 0, 4)
+	ZEND_ARG_INFO(0, latitude)
+	ZEND_ARG_INFO(0, longitude)
+	ZEND_ARG_INFO(0, from_reference_ellipsoid)
+	ZEND_ARG_INFO(0, to_reference_ellipsoid)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(dms_to_decimal_args, 0, 0, 4)
+	ZEND_ARG_INFO(0, degrees)
+	ZEND_ARG_INFO(0, minutes)
+	ZEND_ARG_INFO(0, seconds)
+	ZEND_ARG_INFO(0, direction)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(decimal_to_dms_args, 0, 0, 2)
+	ZEND_ARG_INFO(0, decimal)
+	ZEND_ARG_INFO(0, coordinate)
+ZEND_END_ARG_INFO()
+
 /* {{{ geospatial_functions[]
  *
  * Every user visible function must have an entry in geospatial_functions[].
  */
 const zend_function_entry geospatial_functions[] = {
 	PHP_FE(haversine, haversine_args)
 	PHP_FE(fraction_along_gc_line, fraction_along_gc_line_args)
+	PHP_FE(helmert, helmert_args)
+	PHP_FE(polar_to_cartesian, polar_to_cartesian_args)
+	PHP_FE(cartesian_to_polar, cartesian_to_polar_args)
+	PHP_FE(transform_datum, transform_datum_args)
+	PHP_FE(dms_to_decimal, dms_to_decimal_args)
+	PHP_FE(decimal_to_dms, decimal_to_dms_args)
+	/* End of functions */
 	{ NULL, NULL, NULL }
 };
 /* }}} */
@@ -83,6 +129,8 @@ PHP_MINIT_FUNCTION(geospatial)
 {
 	REGISTER_DOUBLE_CONSTANT("GEO_DEG_TO_RAD", GEO_DEG_TO_RAD, CONST_CS | CONST_PERSISTENT);
 	REGISTER_DOUBLE_CONSTANT("GEO_EARTH_RADIUS", GEO_EARTH_RADIUS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GEO_AIRY_1830", GEO_AIRY_1830, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("GEO_WGS84", GEO_WGS84, CONST_CS | CONST_PERSISTENT);
 	return SUCCESS;
 }
 /* }}} */
@@ -174,7 +222,252 @@ double php_geo_haversine(double from_lat, double from_long, double to_lat, doubl
 	return result;
 }
 
-/* {{{ proto double haversine(double from_lat, double from_long, double to_lat, double to_long [, double radius ])
+geo_ellipsoid get_ellipsoid(long ellipsoid_const)
+{
+	switch (ellipsoid_const) {
+		case GEO_AIRY_1830:
+			return airy_1830;
+			break;
+		case GEO_WGS84:
+		default:
+			return wgs84;
+			break;
+	}
+}
+
+geo_helmert_constants get_helmert_constants(long from, long to)
+{
+	switch (from - to) {
+		case 1:
+			return osgb36_wgs84;
+			break;
+		default:
+		case -1:
+			return wgs84_osgb36;
+			break;
+	}
+}
+
+geo_cartesian helmert(double x, double y, double z, geo_helmert_constants helmet_consts)
+{
+	double rX, rY, rZ;
+	double xOut, yOut, zOut;
+	double scale_change;
+	geo_cartesian point;
+	scale_change = 1 + (helmet_consts.scale_change);
+	rX = helmet_consts.rotation_x / GEO_SEC_IN_DEG * GEO_DEG_TO_RAD;
+	rY = helmet_consts.rotation_y / GEO_SEC_IN_DEG * GEO_DEG_TO_RAD;
+	rZ = helmet_consts.rotation_z / GEO_SEC_IN_DEG * GEO_DEG_TO_RAD;
+
+	xOut = helmet_consts.translation_x + ((x - (rZ * y) + (rY * z)) * scale_change);
+
+	yOut =  helmet_consts.translation_y + (((rZ * x) + y - (rX * z)) * scale_change);
+
+	zOut = helmet_consts.translation_z + (((-1 * rY * x) + (rX * y) + z) * scale_change);
+
+	point.x = xOut;
+	point.y = yOut;
+	point.z = zOut;
+	return point;
+}
+
+geo_cartesian polar_to_cartesian(double latitude, double longitude, geo_ellipsoid eli)
+{
+	double x, y, z;
+
+	geo_cartesian point;
+	double phi = latitude * GEO_DEG_TO_RAD;
+	double lambda = longitude * GEO_DEG_TO_RAD;
+	double eSq = ((eli.a * eli.a)  - (eli.b * eli.b))  /  (eli.a * eli.a);
+	double nu = eli.a / sqrt(1 - (eSq * sin(phi) * sin(phi)));
+	x = nu + HEIGHT;
+	x *= cos(phi) * cos(lambda);
+	y = nu + HEIGHT;
+	y *= cos(phi) * sin(lambda);
+	z = ((1 - eSq) * nu) + HEIGHT;
+	z*= sin(phi);
+	point.x = x;
+	point.y = y;
+	point.z = z;
+	return point;
+}
+
+
+geo_lat_long cartesian_to_polar(double x, double y, double z, geo_ellipsoid eli)
+{
+
+	double nu, lambda, h;
+	geo_lat_long polar;
+
+	/* aiming for 1m accuracy */
+	double precision = 0.1 / eli.a;
+	double eSq = ((eli.a * eli.a)  - (eli.b * eli.b))  /  (eli.a * eli.a);
+	double p = sqrt(x * x + y * y);
+	double phi = atan2(z, p * (1 - eSq));
+	double phiP = 2 * M_PI;
+
+	while (abs(phi - phiP) > precision) {
+		nu = eli.a / sqrt(1 - eSq * sin(phi) * sin(phi));
+		phiP = phi;
+		phi = atan2(z + eSq * nu * sin(phi), p);
+	}
+
+	lambda = atan2(y ,x);
+	h = p / cos(phi) - nu;
+	polar.latitude = phi / GEO_DEG_TO_RAD;
+	polar.longitude = lambda / GEO_DEG_TO_RAD;
+	polar.height = h;
+
+	return polar;
+}
+
+/* {{{ proto dms_to_decimal(double degrees, double minutes, double seconds [,string direction])
+ * Convert degrees, minutes & seconds values to decimal degrees */
+PHP_FUNCTION(dms_to_decimal)
+{
+	double degrees, minutes, sign;
+	double seconds, decimal;
+	char *direction = "";
+	int direction_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddd|s", &degrees, &minutes, &seconds, &direction, &direction_len) == FAILURE) {
+		return;
+	}
+
+	if (strcmp("", direction) == 0) {
+		sign = degrees > 1 ? 1 : -1;
+	} else {
+		sign = strcmp(direction, "S") == 0 || strcmp(direction, "W") == 0 ? -1 : 1;
+	}
+
+	decimal = abs(degrees) + minutes / 60 + seconds / 3600;
+	decimal *= sign;
+	RETURN_DOUBLE(decimal);
+}
+/* }}} */
+
+/* {{{ proto decimal_to_dms(double decimal, string coordinate)
+ * Convert decimal degrees value to whole degrees and minutes and decimal seconds */
+PHP_FUNCTION(decimal_to_dms)
+{
+	double decimal, seconds;
+	int degrees, minutes;
+	char *direction;
+	char *coordinate;
+	int coordinate_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ds", &decimal, &coordinate, &coordinate_len) == FAILURE) {
+		return;
+	}
+
+	if (strcmp(coordinate, "longitude") == 0) {
+		direction = decimal < 1 ? "W" : "E";
+	} else {
+		direction = decimal < 1 ? "S" : "N";
+	}
+
+	array_init(return_value);
+	decimal = fabs(decimal);
+	degrees = (int) decimal;
+	minutes = decimal * 60 - degrees * 60;
+	seconds = decimal * 3600 - degrees * 3600 - minutes * 60;
+	add_assoc_long(return_value, "degrees", degrees);
+	add_assoc_long(return_value, "minutes", minutes);
+	add_assoc_double(return_value, "seconds", seconds);
+	add_assoc_string(return_value, "direction", direction, 1);
+}
+/* }}} */
+
+/* {{{ proto helmert(double x, double y, double z [, long from_reference_ellipsoid, long to_reference_ellipsoid])
+ * Convert polar ones (latitude, longitude) tp cartesian co-ordiantes (x, y, z)  */
+PHP_FUNCTION(helmert)
+{
+	double x, y, z;
+	geo_cartesian point;
+	long from_reference_ellipsoid, to_reference_ellipsoid;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddd|ll", &x, &y, &z, &from_reference_ellipsoid, &to_reference_ellipsoid) == FAILURE) {
+		return;
+	}
+
+	array_init(return_value);
+	geo_helmert_constants helmert_constants = get_helmert_constants(from_reference_ellipsoid, to_reference_ellipsoid);
+	point = helmert(x, y, z, helmert_constants);
+	add_assoc_double(return_value, "x", point.x);
+	add_assoc_double(return_value, "y", point.y);
+	add_assoc_double(return_value, "z", point.z);
+}
+/* }}} */
+
+/* {{{ proto polar_to_cartesian(double latitude, double longitude[, long reference_ellipsoid])
+ * Convert polar ones (latitude, longitude) tp cartesian co-ordiantes (x, y, z)  */
+PHP_FUNCTION(polar_to_cartesian)
+{
+	double latitude, longitude;
+	long reference_ellipsoid;
+	geo_cartesian point;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dd|l", &latitude, &longitude, &reference_ellipsoid) == FAILURE) {
+		return;
+	}
+
+	geo_ellipsoid eli = get_ellipsoid(reference_ellipsoid);
+	array_init(return_value);
+	point = polar_to_cartesian(latitude, longitude, eli);
+	add_assoc_double(return_value, "x", point.x);
+	add_assoc_double(return_value, "y", point.y);
+	add_assoc_double(return_value, "z", point.z);
+}
+/* }}} */
+
+/* {{{ proto cartesian_to_polar(double x, double y, double z [, long reference_ellipsoid])
+ * Convert cartesian co-ordiantes (x, y, z) to polar ones (latitude, longitude) */
+PHP_FUNCTION(cartesian_to_polar)
+{
+	double x, y, z;
+	long reference_ellipsoid;
+	geo_lat_long polar;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddd|l", &x, &y, &z, &reference_ellipsoid) == FAILURE) {
+		return;
+	}
+
+	geo_ellipsoid eli = get_ellipsoid(reference_ellipsoid);
+	array_init(return_value);
+	polar = cartesian_to_polar(x, y, z, eli);
+	add_assoc_double(return_value, "lat", polar.latitude);
+	add_assoc_double(return_value, "long", polar.longitude);
+	add_assoc_double(return_value, "height", polar.height);
+}
+/* }}} */
+
+
+/* {{{ proto transform_datum(double latitude, double longitude, long from_reference_ellipsoid, long to_reference_ellipsoid)
+ * Unified function to transform projection of geo-cordinates between datums */
+PHP_FUNCTION(transform_datum)
+{
+	double latitude, longitude;
+	long from_reference_ellipsoid, to_reference_ellipsoid;
+	geo_cartesian point, converted_point;
+	geo_lat_long polar;
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddll", &latitude, &longitude, &from_reference_ellipsoid, &to_reference_ellipsoid) == FAILURE) {
+		return;
+	}
+
+	geo_ellipsoid eli_from = get_ellipsoid(from_reference_ellipsoid);
+	geo_ellipsoid eli_to = get_ellipsoid(to_reference_ellipsoid);
+	point = polar_to_cartesian(latitude, longitude, eli_from);
+	geo_helmert_constants helmert_constants = get_helmert_constants(from_reference_ellipsoid, to_reference_ellipsoid);
+	converted_point = helmert(point.x, point.y, point.z, helmert_constants);
+	polar = cartesian_to_polar(converted_point.x, converted_point.y, converted_point.z, eli_to);
+
+	array_init(return_value);
+	add_assoc_double(return_value, "lat", polar.latitude);
+	add_assoc_double(return_value, "long", polar.longitude);
+	add_assoc_double(return_value, "height", polar.height);
+}
+/* }}} */
+
+/* {{{ 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)
 {