Skip to content

Renaming visualization methods #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 13, 2021
Merged

Renaming visualization methods #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b8c55c
renaming visualization methods
joaocarvoli Jul 13, 2021
4174250
a little change
joaocarvoli Jul 13, 2021
cf5528a
Merge branch 'rename-visualization-methods' of github.com:InsightLab/…
mxaviersmp Jul 13, 2021
d8e84d1
renamed matplotlib.plot_traj_id
mxaviersmp Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions pymove/tests/test_visualization_folium.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ def test_filter_generated_feature():
pass


def test_add_begin_end_markers_to_folium_map(tmpdir):
def test_add_begin_end_markers_to_map(tmpdir):

move_df = _default_move_df()

Expand All @@ -471,7 +471,7 @@ def test_add_begin_end_markers_to_folium_map(tmpdir):
tile=TILES[0],
default_zoom_start=12)

folium._add_begin_end_markers_to_folium_map(move_df, base_map)
folium._add_begin_end_markers_to_map(move_df, base_map)

d = tmpdir.mkdir('visualization')

Expand Down Expand Up @@ -518,7 +518,7 @@ def test_add_begin_end_markers_to_folium_map(tmpdir):
'\n{"clusteredMarker":true,"color":"red"}') in map_info)


def test_add_trajectories_to_folium_map(tmpdir):
def test_add_trajectories_to_map(tmpdir):
move_df = _default_move_df()

d = tmpdir.mkdir('visualization')
Expand Down Expand Up @@ -580,18 +580,18 @@ def test_add_trajectories_to_folium_map(tmpdir):
)


def test_plot_trajectories_with_folium(tmpdir):
def test_plot_trajectories(tmpdir):

move_df = _default_move_df()

d = tmpdir.mkdir('visualization')

file_write_default = d.join('plot_trajectories_with_folium.html')
file_write_default = d.join('plot_trajectories.html')
filename = os.path.join(
file_write_default.dirname, file_write_default.basename
)

base_map = folium.plot_trajectories_with_folium(
base_map = folium.plot_trajectories(
move_df,
n_rows=3,
save_as_html=True,
Expand Down Expand Up @@ -645,18 +645,18 @@ def test_plot_trajectories_with_folium(tmpdir):
)


def test_plot_trajectory_by_id_folium(tmpdir):
def test_plot_trajectory_by_id(tmpdir):

move_df = _default_move_df()

d = tmpdir.mkdir('visualization')

file_write_default = d.join('plot_trajectory_by_id_folium.html')
file_write_default = d.join('plot_trajectory_by_id.html')
filename_write_default = os.path.join(
file_write_default.dirname, file_write_default.basename
)

base_map = folium.plot_trajectory_by_id_folium(
base_map = folium.plot_trajectory_by_id(
move_df,
id_=1,
save_as_html=True,
Expand Down Expand Up @@ -866,18 +866,18 @@ def test_plot_bbox(tmpdir):
assert_equal(expected, actual)


def test_plot_point_folium(tmpdir):
def test_plot_point(tmpdir):

move_df = _default_move_df()

d = tmpdir.mkdir('visualization')

file_write_default = d.join('plot_point_folium.html')
file_write_default = d.join('plot_point.html')
filename = os.path.join(
file_write_default.dirname, file_write_default.basename
)

base_map = folium.plot_points_folium(
base_map = folium.plot_points(
move_data=move_df,
user_lat=LATITUDE,
user_lon=LONGITUDE,
Expand Down Expand Up @@ -936,18 +936,18 @@ def test_plot_point_folium(tmpdir):
)


def test_plot_poi_folium(tmpdir):
def test_plot_poi(tmpdir):

move_df = _default_move_df()

d = tmpdir.mkdir('visualization')

file_write_default = d.join('plot_point_folium.html')
file_write_default = d.join('plot_point.html')
filename = os.path.join(
file_write_default.dirname, file_write_default.basename
)

base_map = folium.plot_poi_folium(
base_map = folium.plot_poi(
move_data=move_df,
poi_lat=LATITUDE,
poi_lon=LONGITUDE,
Expand Down Expand Up @@ -1005,18 +1005,18 @@ def test_plot_poi_folium(tmpdir):
)


def test_plot_event_folium(tmpdir):
def test_plot_event(tmpdir):

move_df = _default_move_df()

d = tmpdir.mkdir('visualization')

file_write_default = d.join('plot_event_folium.html')
file_write_default = d.join('plot_event.html')
filename = os.path.join(
file_write_default.dirname, file_write_default.basename
)

base_map = folium.plot_event_folium(
base_map = folium.plot_event(
move_data=move_df,
event_lat=LATITUDE,
event_lon=LONGITUDE,
Expand Down
7 changes: 4 additions & 3 deletions pymove/tests/test_visualization_matplotlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ def test_show_object_id_by_date(tmpdir):

mpl.show_object_id_by_date(
move_data=move_df,
name=filename_write_default
name=filename_write_default,
save_fig=True
)

test_dir = os.path.abspath(os.path.dirname(__file__))
Expand All @@ -64,7 +65,7 @@ def test_show_object_id_by_date(tmpdir):
)


def test_plot_traj_by_id(tmpdir):
def test_plot_trajectory_by_id(tmpdir):
move_df = _default_move_df()
move_df[TID] = ['1', '1', '2', '2', '2']

Expand All @@ -75,7 +76,7 @@ def test_plot_traj_by_id(tmpdir):
file_write_default.dirname, file_write_default.basename
)

mpl.plot_traj_by_id(move_df, '1', save_fig=True, name=filename_write_default)
mpl.plot_trajectory_by_id(move_df, '1', save_fig=True, name=filename_write_default)

test_dir = os.path.abspath(os.path.dirname(__file__))
data_dir = os.path.join(test_dir, 'baseline/traj_id.png')
Expand Down
Loading