Index: geo.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geo/geo.inc,v
retrieving revision 1.18
diff -u -p -r1.18 geo.inc
--- geo.inc	9 Dec 2009 17:34:02 -0000	1.18
+++ geo.inc	23 Dec 2009 21:05:01 -0000
@@ -37,6 +37,7 @@ function geo_supported_types() {
     'point' => t('Point'),
     'linestring' => t('Linestring'),
     'polygon' => t('Polygon'),
+    'geometry' => t('Geometry (all types)'),
   );
 }
 
@@ -151,7 +152,7 @@ function geo_wkt_validate($wkt, $geo_typ
     return t('Unable to parse WKT.');
   }
 
-  if ($geo_type && strtolower($geo_type) != strtolower($type)) {
+  if ($geo_type && ($geo_type != 'geometry' && strtolower($geo_type) != strtolower($type))) {
     return t('Wrong geometry type. Got %result, was expecting %type.', array('%result' => $type, '%type' => $geo_type));
   }
 
Index: includes/geo.api.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geo/includes/geo.api.inc,v
retrieving revision 1.5
diff -u -p -r1.5 geo.api.inc
--- includes/geo.api.inc	21 Dec 2009 17:29:55 -0000	1.5
+++ includes/geo.api.inc	23 Dec 2009 21:05:01 -0000
@@ -4,12 +4,16 @@
 define('GEO_SRID_DEFAULT', 4326);
 define('GEO_DEGREE_M', 111206);
 
-define('GEO_TYPE_POINT', 0);
+define('GEO_TYPE_GEOMETRY', 0);
+define('GEO_TYPE_POINT', 1);
 define('GEO_TYPE_CURVE', 2);
 define('GEO_TYPE_LINESTRING', 3);
+define('GEO_TYPE_LINE', 3);
+define('GEO_TYPE_LINEARRING', 3);
 define('GEO_TYPE_SURFACE', 4);
 define('GEO_TYPE_POLYGON', 5);
 define('GEO_TYPE_COLLECTION', 6);
+define('GEO_TYPE_GEOMETRYCOLLECTION', 6);
 define('GEO_TYPE_MULTIPOINT', 7);
 define('GEO_TYPE_MULTICURVE', 8);
 define('GEO_TYPE_MULTILINESTRING', 9);