? geo_notices.patch Index: geo.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geo/geo.module,v retrieving revision 1.27 diff -u -p -r1.27 geo.module --- geo.module 7 Aug 2009 16:55:12 -0000 1.27 +++ geo.module 4 Sep 2009 07:59:48 -0000 @@ -4,20 +4,20 @@ * Geo: Geospatial storage and retrieval. */ -define(GEO_SRID_DEFAULT, 4326); -define(GEO_DEGREE_M, 111206); +define('GEO_SRID_DEFAULT', 4326); +define('GEO_DEGREE_M', 111206); -define(GEO_TYPE_POINT, 0); -define(GEO_TYPE_CURVE, 2); -define(GEO_TYPE_LINESTRING, 3); -define(GEO_TYPE_SURFACE, 4); -define(GEO_TYPE_POLYGON, 5); -define(GEO_TYPE_COLLECTION, 6); -define(GEO_TYPE_MULTIPOINT, 7); -define(GEO_TYPE_MULTICURVE, 8); -define(GEO_TYPE_MULTILINESTRING, 9); -define(GEO_TYPE_MULTISURFACE, 10); -define(GEO_TYPE_MULTIPOLYGON, 11); +define('GEO_TYPE_POINT', 0); +define('GEO_TYPE_CURVE', 2); +define('GEO_TYPE_LINESTRING', 3); +define('GEO_TYPE_SURFACE', 4); +define('GEO_TYPE_POLYGON', 5); +define('GEO_TYPE_COLLECTION', 6); +define('GEO_TYPE_MULTIPOINT', 7); +define('GEO_TYPE_MULTICURVE', 8); +define('GEO_TYPE_MULTILINESTRING', 9); +define('GEO_TYPE_MULTISURFACE', 10); +define('GEO_TYPE_MULTIPOLYGON', 11); /** * Call an API function from the geo backend databases. @@ -188,7 +188,7 @@ function geo_wkb_get_data($wkb = NULL, $ */ function geo_units($unit = NULL) { $units = array( - 'mi' => t('Miles'), + 'mi' => t('Miles'), 'km' => t('Kilometers'), 'm' => t('Meters'), ); @@ -355,7 +355,7 @@ function geo_gis_input_info($gis_type = } function geo_set_pre_render(&$element) { - if (!isset($element['#pre_render']) + if (!isset($element['#pre_render']) || !in_array('geo_field_convert_value', $element['#pre_render'])) { $element['#pre_render'][] = 'geo_field_convert_value'; } @@ -379,7 +379,7 @@ function geo_field_convert_value($elemen function geo_set_value($item, $theme) { init_theme(); $registry = theme_get_registry(); - + if ($format = $registry[$theme]['gis input']) { $value = geo_wkb_get_data($item['wkb'], $format); $item[$format] = $value['value'];