Index: gmap_geo.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gmap_geo/gmap_geo.module,v
retrieving revision 1.8
diff -r1.8 gmap_geo.module
25c25
<  * Implementation of hook_widget_info().
---
>  * Implementation of hook_gis_input_info().
27,28c27,28
< function gmap_geo_widget_info() {
<   return array(
---
> function gmap_geo_gis_input_info($gis_type = NULL) {
>   $inputs = array(
31c31,36
<       'field types' => array('geo'),
---
>       'gis input' => 'array',
>       'safe reverse' => TRUE,
>       'gis types' => array('point', 'linestring', 'polygon'),
>       'element' => array(
>         '#type' => 'gmap_geo_picker',
>       ),
34,63c39
< }
< 
< /**
<  * Implementation of hook_widget().
<  */
< function gmap_geo_widget(&$form, &$form_state, $field, $items, $delta = 0) {
<   return array(
<     '#type' => $field['widget']['type'],
<     '#default_value' => isset($items[$delta]) ? $items[$delta] : '',
<   );
< }
< 
< /**
<  * Implementation of hook_widget_settings().
<  * Adds a field to set a GMap macro for the location picker map.
<  */
< function gmap_geo_widget_settings($op, $widget) {
<   switch ($op) {
<     case 'form':
<       $form = array();
<       $form['gmap_geo_picker_macro'] = array(
<         '#type' => 'textfield',
<         '#title' => 'GMap macro',
<         '#default_value' => $widget['gmap_geo_picker_macro'] ? $widget['gmap_geo_picker_macro'] : '[gmap]',
<         '#description' => t("A GMap macro describing the initial location picker map. <em>[gmap]</em> displays a map with the settings from !gmap-admin.", array('!gmap-admin' => l('admin/settings/gmap', 'admin/settings/gmap'))),
<       );
<       return $form;
<     case 'save':
<       return array('gmap_geo_picker_macro');
<   }
---
>   return $inputs;
94,97d69
<   $element['wkt'] = array(
<     '#type' => 'value',
<     '#value' => isset($element['#value']['wkt']) ? $element['#value']['wkt'] : NULL,
<   );