Wrap "Sample points" field in a fieldset to fix ZoomToSource not firing.

modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc

@@ -170,7 +170,7 @@ function farm_soil_test_field_default_field_instances() {
         'use_geocoder' => 1,
       ),
       'type' => 'openlayers_geofield',
-      'weight' => 7,
+      'weight' => 8,
     ),
   );
 

modules/farm/farm_soil/farm_soil_test/farm_soil_test.field_group.inc

@@ -114,8 +114,8 @@ function farm_soil_test_field_group_info() {
       2 => 'field_farm_flags',
       3 => 'name',
       4 => 'timestamp',
-      5 => 'group_farm_category',
-      6 => 'group_farm_assignment',
+      5 => 'group_farm_assignment',
+      6 => 'group_farm_category',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
@@ -129,6 +129,35 @@ function farm_soil_test_field_group_info() {
   );
   $field_groups['group_farm_general|log|farm_soil_test|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_geometry|log|farm_soil_test|form';
+  $field_group->group_name = 'group_farm_geometry';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_soil_test';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_farm_location';
+  $field_group->data = array(
+    'label' => 'Sample points',
+    'weight' => '7',
+    'children' => array(
+      0 => 'field_farm_geofield',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Sample points',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-geometry field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_geometry|log|farm_soil_test|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -144,7 +173,7 @@ function farm_soil_test_field_group_info() {
     'children' => array(
       0 => 'field_farm_area',
       1 => 'field_farm_soil_names',
-      2 => 'field_farm_geofield',
+      2 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
@@ -201,6 +230,7 @@ function farm_soil_test_field_group_info() {
   t('Files');
   t('General');
   t('Location');
+  t('Sample points');
   t('Tabs');
 
   return $field_groups;

modules/farm/farm_soil/farm_soil_test/farm_soil_test.info

@@ -37,6 +37,7 @@ features[field_group][] = group_farm_assignment|log|farm_soil_test|form
 features[field_group][] = group_farm_category|log|farm_soil_test|form
 features[field_group][] = group_farm_files|log|farm_soil_test|form
 features[field_group][] = group_farm_general|log|farm_soil_test|form
+features[field_group][] = group_farm_geometry|log|farm_soil_test|form
 features[field_group][] = group_farm_location|log|farm_soil_test|form
 features[field_group][] = group_farm_tabs|log|farm_soil_test|form
 features[field_instance][] = log-farm_soil_test-field_farm_area

modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc

@@ -169,7 +169,7 @@ function farm_water_test_field_default_field_instances() {
         'use_geocoder' => 1,
       ),
       'type' => 'openlayers_geofield',
-      'weight' => 8,
+      'weight' => 9,
     ),
   );
 

modules/farm/farm_water/farm_water_test/farm_water_test.field_group.inc

@@ -109,13 +109,13 @@ function farm_water_test_field_group_info() {
     'label' => 'General',
     'weight' => '1',
     'children' => array(
-      0 => 'field_farm_notes',
-      1 => 'field_farm_water_lab',
-      2 => 'field_farm_flags',
+      0 => 'field_farm_flags',
+      1 => 'field_farm_notes',
+      2 => 'field_farm_water_lab',
       3 => 'name',
       4 => 'timestamp',
-      5 => 'group_farm_category',
-      6 => 'group_farm_assignment',
+      5 => 'group_farm_assignment',
+      6 => 'group_farm_category',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
@@ -129,6 +129,35 @@ function farm_water_test_field_group_info() {
   );
   $field_groups['group_farm_general|log|farm_water_test|form'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_farm_geometry|log|farm_water_test|form';
+  $field_group->group_name = 'group_farm_geometry';
+  $field_group->entity_type = 'log';
+  $field_group->bundle = 'farm_water_test';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_farm_location';
+  $field_group->data = array(
+    'label' => 'Sample points',
+    'weight' => '8',
+    'children' => array(
+      0 => 'field_farm_geofield',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'label' => 'Sample points',
+      'instance_settings' => array(
+        'required_fields' => 1,
+        'id' => '',
+        'classes' => 'group-farm-geometry field-group-fieldset',
+        'description' => '',
+      ),
+      'formatter' => 'collapsed',
+    ),
+  );
+  $field_groups['group_farm_geometry|log|farm_water_test|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -143,7 +172,7 @@ function farm_water_test_field_group_info() {
     'weight' => '2',
     'children' => array(
       0 => 'field_farm_area',
-      1 => 'field_farm_geofield',
+      1 => 'group_farm_geometry',
     ),
     'format_type' => 'field_group_easy_responsive_tabs_nav_item',
     'format_settings' => array(
@@ -200,6 +229,7 @@ function farm_water_test_field_group_info() {
   t('Files');
   t('General');
   t('Location');
+  t('Sample points');
   t('Tabs');
 
   return $field_groups;

modules/farm/farm_water/farm_water_test/farm_water_test.info

@@ -36,6 +36,7 @@ features[field_group][] = group_farm_assignment|log|farm_water_test|form
 features[field_group][] = group_farm_category|log|farm_water_test|form
 features[field_group][] = group_farm_files|log|farm_water_test|form
 features[field_group][] = group_farm_general|log|farm_water_test|form
+features[field_group][] = group_farm_geometry|log|farm_water_test|form
 features[field_group][] = group_farm_location|log|farm_water_test|form
 features[field_group][] = group_farm_tabs|log|farm_water_test|form
 features[field_instance][] = log-farm_water_test-field_farm_area