From 25ecd4faf13a5c75d6c977ec1b11c4f8dd1eb359 Mon Sep 17 00:00:00 2001
From: paul121 <paul.weidner@gmail.com>
Date: Tue, 27 Oct 2020 15:58:03 -0700
Subject: [PATCH] Get the assets current location relative to the movement
 time.

---
 .../farm/farm_livestock/farm_livestock.farm_quick.move.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc b/modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc
index dfbd918ca..a56360fcf 100644
--- a/modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc
+++ b/modules/farm/farm_livestock/farm_livestock.farm_quick.move.inc
@@ -222,7 +222,8 @@ function farm_livestock_move_form($form, &$form_state) {
     // Load current location geometry of all assets.
     $geoms = array();
     foreach ($assets as $asset) {
-      $geoms[] = farm_movement_asset_geometry($asset);
+      $timestamp = strtotime($form_state['values']['move']['date'] ?: $defaults['date']);
+      $geoms[] = farm_movement_asset_geometry($asset, $timestamp);
     }
 
     // Combine geometries.
@@ -628,7 +629,7 @@ function farm_livestock_move_form_submit($form, &$form_state) {
       // Load current locations of all assets.
       $previous_areas = array();
       foreach ($assets as $asset) {
-        $previous_areas = array_merge($previous_areas, farm_movement_asset_location($asset));
+        $previous_areas = array_merge($previous_areas, farm_movement_asset_location($asset, $timestamp));
       }
 
       // Remove any duplicate areas.
@@ -646,7 +647,7 @@ function farm_livestock_move_form_submit($form, &$form_state) {
       // Load current location geometry of all assets.
       $geoms = array();
       foreach ($assets as $asset) {
-        $geoms[] = farm_movement_asset_geometry($asset);
+        $geoms[] = farm_movement_asset_geometry($asset, $timestamp);
       }
 
       // Combine geometries.