fix query.py conflicts

Author: MCavalcante16

pymove/query/query.py

@@ -3,23 +3,22 @@
 
 range_query,
 knn_query,
-query_all_points_by_range, 
+query_all_points_by_range,
 
 """
 
+from datetime import timedelta
 from typing import Optional, Text
 
 import numpy as np
 import pandas as pd
+from IPython.display import clear_output
 from pandas import DataFrame
 
 from pymove.utils import distances
 from pymove.utils.constants import DATETIME, LATITUDE, LONGITUDE, MEDP, MEDT, TRAJ_ID
 from pymove.utils.log import logger, progress_bar
 
-from datetime import timedelta
-from IPython.display import clear_output
-
 
 def range_query(
     traj: DataFrame,
@@ -189,10 +188,12 @@ def _datetime_filter(
     minimum_distance: TimeDelta
 ):
     """
+    Returns all the points of the DataFrame which are in a temporal distance.
+
     Given a row referencing to a point, a DataFrame with
     multiple points and a minimum distance, it returns
     all the points of the DataFrame which are in a temporal
-    distance equal or smaller than the minimum distance 
+    distance equal or smaller than the minimum distance
     parameter.
 
     Parameters
@@ -211,16 +212,19 @@ def _datetime_filter(
         a temporal distance equal or smaller than the minimum
         distance parameter.
     """
-    datetime = row['datetime'];
-    move_df['temporal_distance'] = (move_df['datetime'] - datetime).abs();
-    filtered = move_df[(move_df['temporal_distance'] < minimum_distance) & (move_df['temporal_distance'] > -minimum_distance)];
-    
+    datetime = row['datetime']
+    move_df['temporal_distance'] = (move_df['datetime'] - datetime).abs()
+    filtered = move_df[
+        (move_df['temporal_distance'] < minimum_distance)
+        & (move_df['temporal_distance'] > -minimum_distance)
+    ]
+
     if (filtered.shape[0] > 0):
         filtered['target_id'] = row['id']
         filtered['target_lat'] = row['lat']
         filtered['target_lon'] = row['lon']
         filtered['target_datetime'] = row['datetime']
-        
+
     return filtered
 
 
@@ -229,10 +233,12 @@ def _meters_filter(
     move_df: DataFrame, 
     minimum_distance: float):
     """
+    Returns all the points of the DataFrame which are in a spatial distance.
+
     Given a row referencing to a point, a DataFrame with
     multiple points and a minimum distance, it returns
     all the points of the DataFrame which are in a spatial
-    distance (in meters) equal or smaller than the minimum distance 
+    distance (in meters) equal or smaller than the minimum distance
     parameter.
 
     Parameters
@@ -243,24 +249,27 @@ def _meters_filter(
         The input trajectory data.
     minimum_distance: float
         the minimum spatial distance between the points in meters.
+
     Returns
-    ------- 
+    -------
     DataFrame
         dataframe with all the points of move_df which are in
         a spatial distance equal or smaller than the minimum
         distance parameter.
     """
     lat = row['lat']
     lon = row['lon']
-    move_df['spatial_distance'] = distances.euclidean_distance_in_meters(lat1=lat, lon1=lon, lat2=move_df['lat'], lon2=move_df['lon'])
+    move_df['spatial_distance'] = distances.euclidean_distance_in_meters(
+        lat1=lat, lon1=lon, lat2=move_df['lat'], lon2=move_df['lon']
+    )
     filtered = move_df[move_df['spatial_distance'] < minimum_distance]
-    
+
     if (filtered.shape[0] > 0):
         filtered['target_id'] = row['id']
         filtered['target_lat'] = row['lat']
         filtered['target_lon'] = row['lon']
         filtered['target_datetime'] = row['datetime']
-    
+
     return filtered
 
 
@@ -271,8 +280,10 @@ def query_all_points_by_range(
     minimum_time: Optional[TimeDelta] =timedelta(minutes=2), 
     datetime_label: Optional[Text] = DATETIME):
     """
-    Selects only the points between two Move Dataframes 
-    that have the closest point within a spatial range 
+    Queries closest point within a spatial range based on meters and a temporal range.
+
+    Selects only the points between two Move Dataframes
+    that have the closest point within a spatial range
     based on meters and a temporal range.
 
     Parameters
@@ -295,21 +306,24 @@ def query_all_points_by_range(
         a spatial distance and temporal distance equal or smaller
         than the minimum distance parameters.
     """
-    result = pd.DataFrame([]);
+    if minimum_time is None:
+        minimum_time = timedelta(minutes=2)
+
+    result = pd.DataFrame([])
     total = traj1.shape[0]
     count = 0
-    for index, row in traj1.iterrows():
+    for _, row in traj1.iterrows():
         clear_output(wait=True)
-        print("{} de {}".format(count, total))
-        print("{:.2f}%".format((count*100/total)))
+        print('{} de {}'.format(count, total))
+        print('{:.2f}%'.format((count * 100 / total)))
         coinc_points = _meters_filter(row, move_df, minimum_meters)
         coinc_points = _datetime_filter(row, coinc_points, minimum_time)
         result = coinc_points.append(result)
-        
+
         count += 1
-    
+
     clear_output(wait=True)
-    print("{} de {}".format(count, total))
-    print("{:.2f}%".format((count*100/total)))
+    print('{} de {}'.format(count, total))
+    print('{:.2f}%'.format((count * 100 / total)))
 
     return result

pymove/tests/test_query.py

@@ -1,12 +1,12 @@
-from pandas import DataFrame, Timestamp, Timedelta
+from datetime import timedelta
+
+from pandas import DataFrame, Timedelta, Timestamp
 from pandas.testing import assert_frame_equal
 
 from pymove import MoveDataFrame
 from pymove.query import query
 from pymove.utils.constants import DATETIME, LATITUDE, LONGITUDE, TRAJ_ID
 
-from datetime import timedelta
-
 traj_example = [[16.4, -54.9, Timestamp('2014-10-11 18:00:00'),
                 '            GONZALO'],
                 [16.4, -55.9, Timestamp('2014-10-12 00:00:00'),
@@ -527,7 +527,7 @@ def test_knn_query():
     medt_move_df = query.knn_query(traj_df, move_df, k=2, distance='MEDT')
     assert_frame_equal(medt_move_df, expected_medt)
 
-def test__datetime_filter(): 
+def test__datetime_filter():
     traj_df = _default_traj_df()
     firstpoint = traj_df.iloc[0]
     move_df = _default_move_df()
@@ -543,7 +543,7 @@ def test__datetime_filter():
     assert_frame_equal(result, expected)
 
 
-def test__meters_filter(): 
+def test__meters_filter():
     traj_df = _default_traj_df()
     firstpoint = traj_df.iloc[0]
     move_df = _default_move_df()
@@ -571,6 +571,3 @@ def test_query_all_points_by_range():
 
     result = query.query_all_points_by_range(traj_df, move_df, minimum_meters=1900000, minimum_time=timedelta(hours=19000))
     assert_frame_equal(result, expected)
-
-
-