Skip to content
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

- initial activity merging updates #2

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

- initial activity merging updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce423a6
- initial activity merging updates
wscott1541 Aug 28, 2023
15ee19a
- reset activity updates
wscott1541 Sep 11, 2023
6a83f60
- merger updates
wscott1541 Jan 31, 2024
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
42 changes: 23 additions & 19 deletions GSS/GSSutils/data_read.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@

cols = ['Activity number','Activity Type','Date','Distance','Time','Shoes','Rise','Fall','1km','1 mile','1.5 mile','3 mile','5km','5 mile','10km','10 mile','20km','Half','Full','C10k','C20k','C50k','C100k','C200k','C250k','Run Rankings','Notes','Admin']

dist_dict = {'1km': 1000,
'1 mile': 1609.34,
'1.5 mile': 2414.02,
'3 mile': 4828.03,
'5km': 5000,
'5 mile': 8046.72,
'10km': 10000,
'10 mile': 16093.40,
'20km': 20000,
'Half': 21097.7,
'Full': 42195}
dist_dict = {
'1km': 1000,
'1 mile': 1609.34,
'1.5 mile': 2414.02,
'3 mile': 4828.03,
'5km': 5000,
'5 mile': 8046.72,
'10km': 10000,
'10 mile': 16093.40,
'20km': 20000,
'Half': 21097.7,
'Full': 42195
}

dist_list = list(dist_dict.keys())

Expand Down Expand Up @@ -546,10 +548,14 @@ def route_data(activity_number):
return(df)
'''

def pull_csv_pd(activity_number,option='column_name'):
def generate_gpx_archive_filename(activity_number: str)->str:
fileDir = os.path.dirname(os.path.realpath('__file__'))

return os.path.join(fileDir, 'GPXarchive.gitignore/activity_{}.csv'.format(activity_number))

filename = os.path.join(fileDir, 'GPXarchive.gitignore/activity_{}.csv'.format(activity_number))
def pull_csv_pd(activity_number, option='column_name'):

filename = generate_gpx_archive_filename(activity_number)

#I think I only need distance and time

Expand All @@ -567,11 +573,9 @@ def pull_csv_pd(activity_number,option='column_name'):

return(df)

def route_data(activity_number,option='column_name'):
#if len(activity_number) == 10:
# df = pull_gpx(activity_number)
#if len(activity_number) == 8 or len(activity_number) == 9:
df = pull_csv_pd(activity_number,option)
def route_data(activity_number, option='column_name'):

df = pull_csv_pd(activity_number, option)

return(df)

Expand Down Expand Up @@ -601,7 +605,7 @@ def __init__(self, activity_id):

#Date-related qualities
self.date_str = self.activity_dict['Date']
self.date_dt = datetime.strptime(self.date_str, '%Y-%m-%d %H:%M:%S')
self.date_dt = datetime.strptime(self.date_str, '%Y-%m-%d %H:%M:%S')# if isinstance(self.date_str, str) else self.date_str
self.date = self.strftime('%Y-%m-%d')
self.time = self.strftime('%H:%M:%S')
self.year, self.month, self.day = (round(float(self.strftime(fmt))) for fmt in ('%Y', '%m', '%d'))
Expand Down
Loading