From 1178d1fbb2d2a2eca6e479baf41cae3db62ae640 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Wed, 11 Sep 2019 15:10:18 -0400
Subject: [PATCH] Change all area type styles to match those provided by
 farmOS-map.

---
 modules/farm/farm_area/farm_area.farm_area.inc            | 2 +-
 .../farm_area_types/farm_area_types.farm_area.inc         | 8 ++++----
 .../farm_crop_area_types.farm_area.inc                    | 4 ++--
 .../farm_livestock_area_types.farm_area.inc               | 2 +-
 modules/farm/farm_water/farm_water.farm_area.inc          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/farm/farm_area/farm_area.farm_area.inc b/modules/farm/farm_area/farm_area.farm_area.inc
index c452bede5..5029b6e68 100644
--- a/modules/farm/farm_area/farm_area.farm_area.inc
+++ b/modules/farm/farm_area/farm_area.farm_area.inc
@@ -11,7 +11,7 @@ function farm_area_farm_area_type_info() {
   return array(
     'other' => array(
       'label' => t('Other'),
-      'style' => 'farm_map_style_blue',
+      'style' => 'blue',
       'weight' => 150,
     ),
   );
diff --git a/modules/farm/farm_area/farm_area_types/farm_area_types.farm_area.inc b/modules/farm/farm_area/farm_area_types/farm_area_types.farm_area.inc
index 1815f6145..697c74fc0 100644
--- a/modules/farm/farm_area/farm_area_types/farm_area_types.farm_area.inc
+++ b/modules/farm/farm_area/farm_area_types/farm_area_types.farm_area.inc
@@ -12,23 +12,23 @@ function farm_area_types_farm_area_type_info() {
   return array(
     'building' => array(
       'label' => t('Building'),
-      'style' => 'farm_map_style_red',
+      'style' => 'red',
       'weight' => 0,
     ),
     'field' => array(
       'label' => t('Field'),
-      'style' => 'farm_map_style_yellow',
+      'style' => 'yellow',
       'weight' => 10,
       'dashboard_metric' => TRUE,
     ),
     'landmark' => array(
       'label' => t('Landmark'),
-      'style' => 'farm_map_style_orange',
+      'style' => 'orange',
       'weight' => 50,
     ),
     'property' => array(
       'label' => t('Property'),
-      'style' => 'farm_map_style_purple',
+      'style' => 'purple',
       'weight' => 100,
     ),
   );
diff --git a/modules/farm/farm_crop/farm_crop_area_types/farm_crop_area_types.farm_area.inc b/modules/farm/farm_crop/farm_crop_area_types/farm_crop_area_types.farm_area.inc
index ee9f9b1b6..c76754aba 100644
--- a/modules/farm/farm_crop/farm_crop_area_types/farm_crop_area_types.farm_area.inc
+++ b/modules/farm/farm_crop/farm_crop_area_types/farm_crop_area_types.farm_area.inc
@@ -12,14 +12,14 @@ function farm_crop_area_types_farm_area_type_info() {
   return array(
     'bed' => array(
       'label' => t('Bed'),
-      'style' => 'farm_map_style_green',
+      'style' => 'green',
       'zoom_levels' => array(18, 19, 20, 21, 22, 23, 24),
       'weight' => -5,
       'dashboard_metric' => TRUE,
     ),
     'greenhouse' => array(
       'label' => t('Greenhouse'),
-      'style' => 'farm_map_style_green',
+      'style' => 'green',
       'weight' => 0,
     ),
   );
diff --git a/modules/farm/farm_livestock/farm_livestock_area_types/farm_livestock_area_types.farm_area.inc b/modules/farm/farm_livestock/farm_livestock_area_types/farm_livestock_area_types.farm_area.inc
index 87a4dbfcb..ff76e7fdc 100644
--- a/modules/farm/farm_livestock/farm_livestock_area_types/farm_livestock_area_types.farm_area.inc
+++ b/modules/farm/farm_livestock/farm_livestock_area_types/farm_livestock_area_types.farm_area.inc
@@ -12,7 +12,7 @@ function farm_livestock_area_types_farm_area_type_info() {
   return array(
     'paddock' => array(
       'label' => t('Paddock'),
-      'style' => 'farm_map_style_dark_green',
+      'style' => 'darkgreen',
       'weight' => 5,
       'dashboard_metric' => TRUE,
     ),
diff --git a/modules/farm/farm_water/farm_water.farm_area.inc b/modules/farm/farm_water/farm_water.farm_area.inc
index 5b8f2ffab..fd5c5a280 100644
--- a/modules/farm/farm_water/farm_water.farm_area.inc
+++ b/modules/farm/farm_water/farm_water.farm_area.inc
@@ -12,7 +12,7 @@ function farm_water_farm_area_type_info() {
   return array(
     'water' => array(
       'label' => t('Water'),
-      'style' => 'farm_map_style_blue',
+      'style' => 'blue',
       'weight' => 50,
     ),
   );