Revert "Issue #1153032 by citlacom: Fixed Markers doesn't work in a view with...

Revert "Issue #1153032 by citlacom: Fixed Markers doesn't work in a view with the configuration: choose latitude and longitude fields."

This reverts commit 0502e4bf.

Conflicts:
	gmap_plugin_style_gmap.inc

gmap_plugin_style_gmap.inc

@@ -96,7 +96,10 @@ class gmap_plugin_style_gmap extends views_plugin_style {
     }
 
     $defaults = gmap_defaults();
+    $lat_field = 'gmap_lat';
+    $lon_field = 'gmap_lon';
 
+<<<<<<< HEAD
     if ($this->options['datasource'] == 'location') {
       $lat_field = 'gmap_lat';
       $lon_field = 'gmap_lon';
@@ -105,12 +108,14 @@ class gmap_plugin_style_gmap extends views_plugin_style {
       $lat_field = 'lat';
       $lon_field = 'lon';
     }
+=======
+>>>>>>> parent of 0502e4b... Issue #1153032 by citlacom: Fixed Markers doesn't work in a view with the configuration: choose latitude and longitude fields.
     // Determine fieldname for latitude and longitude fields.
-    else if ($this->options['datasource'] == 'fields') {
-      $lat_field_obj = $this->view->display_handler->get_handler('field', $this->options['latfield']);
+    if ($this->options['datasource'] == 'fields') {
+      $lat_fied_obj = $this->view->display_handler->get_handler('field', $this->options['latfield']);
       $lon_field_obj = $this->view->display_handler->get_handler('field', $this->options['lonfield']);
-      $lat_field = $this->options['latfield'];
-      $lon_field = $this->options['lonfield'];
+      $lat_field = $lat_fied_obj->field_alias;
+      $lon_field = $lon_field_obj->field_alias;
     }
 
     $tooltip_field = '';
@@ -186,6 +191,7 @@ class gmap_plugin_style_gmap extends views_plugin_style {
 
       foreach ($records as $row_index => $row) {
         $this->view->row_index = $row_index;
+<<<<<<< HEAD
 
         if ($this->options['datasource'] == 'location') {
           $lat = (float)$row->{$lat_field};
@@ -209,6 +215,10 @@ class gmap_plugin_style_gmap extends views_plugin_style {
             $lon = (float)$custom_field_lon['value'];
           }
         }
+=======
+        $lat = (float)$row->{$lat_field};
+        $lon = (float)$row->{$lon_field};
+>>>>>>> parent of 0502e4b... Issue #1153032 by citlacom: Fixed Markers doesn't work in a view with the configuration: choose latitude and longitude fields.
 
         // $row->nid is present in node views, views without node as the base table must include the nid field,
         // which will be in $row->node_nid if present.
@@ -349,7 +359,6 @@ class gmap_plugin_style_gmap extends views_plugin_style {
       '#title' => t('Data Source'),
       '#options' => array(
         'location' => t('Location.module'),
-        'geofield' => t('Geofield.module'),
         'fields' => t('Choose latitude and longitude fields'),
       //'geocode' => t('Just-in-time geocoding on field named "address"'),
       ),
@@ -377,16 +386,6 @@ class gmap_plugin_style_gmap extends views_plugin_style {
       '#dependency' => array('edit-style-options-datasource' => array('fields')),
     );
 
-    $form['geofield'] = array(
-      '#title' => t('Geofield field'),
-      '#description' => t('Select the Geofield source field.'),
-      '#type' => 'select',
-      '#options' => $field_options,
-      '#default_value' => $this->options['geofield'],
-      '#process' => array('ctools_dependent_process'),
-      '#dependency' => array('edit-style-options-datasource' => array('geofield')),
-    );
-
     $form['markers'] = array(
       '#type' => 'select',
       '#title' => t('Marker handling'),