From 4f30833bed2f6cb91e852b957fca4dda575e2a71 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Wed, 4 Dec 2019 11:21:18 -0500
Subject: [PATCH] Use farm_map_geofield widget in all geofields.

---
 .../farm_area.features.field_instance.inc        | 13 ++-----------
 .../farm_equipment.features.field_instance.inc   | 13 ++-----------
 .../farm_livestock.features.field_instance.inc   | 13 ++-----------
 ...farm_log_activity.features.field_instance.inc | 13 ++-----------
 .../farm_log_harvest.features.field_instance.inc | 13 ++-----------
 .../farm_log_input.features.field_instance.inc   | 13 ++-----------
 ...m_log_observation.features.field_instance.inc | 13 ++-----------
 .../farm_movement.features.field_instance.inc    | 16 ++++------------
 .../farm_soil_test.features.field_instance.inc   | 13 ++-----------
 .../farm_water_test.features.field_instance.inc  | 13 ++-----------
 10 files changed, 22 insertions(+), 111 deletions(-)

diff --git a/modules/farm/farm_area/farm_area.features.field_instance.inc b/modules/farm/farm_area/farm_area.features.field_instance.inc
index ce69e549..0e08f34f 100644
--- a/modules/farm/farm_area/farm_area.features.field_instance.inc
+++ b/modules/farm/farm_area/farm_area.features.field_instance.inc
@@ -133,16 +133,9 @@ function farm_area_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -162,11 +155,9 @@ function farm_area_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 3,
     ),
   );
diff --git a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
index a2d9198f..e0ee4130 100644
--- a/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
+++ b/modules/farm/farm_equipment/farm_equipment.features.field_instance.inc
@@ -432,16 +432,9 @@ function farm_equipment_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -461,11 +454,9 @@ function farm_equipment_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 14,
     ),
   );
diff --git a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
index a7c0cfa8..b60ca3db 100644
--- a/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
+++ b/modules/farm/farm_livestock/farm_livestock.features.field_instance.inc
@@ -689,16 +689,9 @@ function farm_livestock_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -718,11 +711,9 @@ function farm_livestock_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 22,
     ),
   );
diff --git a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
index 5bbbc476..e6bc73ac 100644
--- a/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_activity/farm_log_activity.features.field_instance.inc
@@ -175,16 +175,9 @@ function farm_log_activity_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -204,11 +197,9 @@ function farm_log_activity_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 3,
     ),
   );
diff --git a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
index 45f87246..ed609caf 100644
--- a/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_harvest/farm_log_harvest.features.field_instance.inc
@@ -192,16 +192,9 @@ function farm_log_harvest_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -216,11 +209,9 @@ function farm_log_harvest_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 5,
     ),
   );
diff --git a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
index 2f9bdc86..d6bacf7f 100644
--- a/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_input/farm_log_input.features.field_instance.inc
@@ -247,16 +247,9 @@ function farm_log_input_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -271,11 +264,9 @@ function farm_log_input_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 3,
     ),
   );
diff --git a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
index e107f7b8..04b1c751 100644
--- a/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
+++ b/modules/farm/farm_log/farm_log_observation/farm_log_observation.features.field_instance.inc
@@ -175,16 +175,9 @@ function farm_log_observation_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -199,11 +192,9 @@ function farm_log_observation_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 10,
     ),
   );
diff --git a/modules/farm/farm_movement/farm_movement.features.field_instance.inc b/modules/farm/farm_movement/farm_movement.features.field_instance.inc
index 6bf0a99b..e5c11095 100644
--- a/modules/farm/farm_movement/farm_movement.features.field_instance.inc
+++ b/modules/farm/farm_movement/farm_movement.features.field_instance.inc
@@ -35,17 +35,10 @@ function farm_movement_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 'path',
-          'point' => 'point',
-          'polygon' => 'polygon',
-        ),
-        'geocoder_field' => 'field_farm_animal_tag_location',
+        'geocoder_field' => 'field_farm_move_to',
         'geocoder_handler' => 'bing',
         'handler_settings' => array(
           'google' => array(
@@ -64,11 +57,10 @@ function farm_movement_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
+        'latlng_override' => 0,
         'use_geocoder' => 0,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 3,
     ),
   );
diff --git a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
index 86a87d35..ffd3e817 100644
--- a/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
+++ b/modules/farm/farm_soil/farm_soil_test/farm_soil_test.features.field_instance.inc
@@ -133,16 +133,9 @@ function farm_soil_test_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 0,
-          'point' => 'point',
-          'polygon' => 0,
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -162,11 +155,9 @@ function farm_soil_test_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 8,
     ),
   );
diff --git a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
index d1c64c55..91188705 100644
--- a/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
+++ b/modules/farm/farm_water/farm_water_test/farm_water_test.features.field_instance.inc
@@ -132,16 +132,9 @@ function farm_water_test_field_default_field_instances() {
     ),
     'widget' => array(
       'active' => 1,
-      'module' => 'openlayers_geofield',
+      'module' => 'farm_map_geofield',
       'settings' => array(
-        'allow_edit' => 1,
-        'data_storage' => 'collection',
         'delta_handling' => 'default',
-        'feature_types' => array(
-          'path' => 0,
-          'point' => 'point',
-          'polygon' => 0,
-        ),
         'geocoder_field' => 'field_farm_files',
         'geocoder_handler' => 'kml',
         'handler_settings' => array(
@@ -161,11 +154,9 @@ function farm_water_test_field_default_field_instances() {
             ),
           ),
         ),
-        'openlayers_map' => 'farm_map_geofield',
-        'showInputField' => 1,
         'use_geocoder' => 1,
       ),
-      'type' => 'openlayers_geofield',
+      'type' => 'farm_map_geofield',
       'weight' => 9,
     ),
   );