Skip to content

Commit

Permalink
Fix to read incorrectly made CSV files with leading spaces after the …
Browse files Browse the repository at this point in the history 
…comma
  • Loading branch information
@wklumpen
wklumpen committed Feb 25, 2021
1 parent be47c83 commit 99fa7fc
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 19 deletions.
53 changes: 36 additions & 17 deletions gtfslite/gtfs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ def load_zip(filepath):
'agency_timezone': str, 'agency_lang': str,
'agency_phone': str, 'agency_fare_url': str,
'agency_email': str
}
},
skipinitialspace=True
)
stops = pd.read_csv(
zip_file.open(filepaths["stops.txt"]),
Expand All @@ -160,7 +161,8 @@ def load_zip(filepath):
'parent_station': str, 'stop_timezone': str,
'wheelchair_boarding': 'Int64', 'level_id': str,
'platform_code': str
}
},
skipinitialspace=True
)
routes = pd.read_csv(
zip_file.open(filepaths["routes.txt"]),
Expand All @@ -169,7 +171,8 @@ def load_zip(filepath):
'route_long_name': str, 'route_desc': str,
'route_type': int, 'route_url': str, 'route_color': str,
'route_text_color': str, 'route_short_order': int
}
},
skipinitialspace=True
)
trips = pd.read_csv(
zip_file.open(filepaths["trips.txt"]),
Expand All @@ -178,7 +181,9 @@ def load_zip(filepath):
'trip_headsign': str, 'trip_short_name': str,
'direction_id': 'Int64', 'block_id': str, 'shape_id': str,
'wheelchair_accessible': 'Int64', 'bikes_allowed': 'Int64'
})
},
skipinitialspace=True
)
stop_times = pd.read_csv(
zip_file.open(filepaths["stop_times.txt"]),
dtype={
Expand All @@ -187,6 +192,7 @@ def load_zip(filepath):
'pickup_type': 'Int64', 'drop_off_type': 'Int64',
'shape_dist_traveled': float, 'timepoint': 'Int64'
},
skipinitialspace=True
)

if filepaths["calendar.txt"] in zip_file.namelist():
Expand All @@ -198,7 +204,8 @@ def load_zip(filepath):
'saturday': bool, 'sunday': bool, 'start_date': str,
'end_date': str
},
parse_dates=['start_date', 'end_date']
parse_dates=['start_date', 'end_date'],
skipinitialspace=True
)

else:
Expand All @@ -210,7 +217,8 @@ def load_zip(filepath):
dtype={
'service_id': str, 'date': str, 'exception_type': int
},
parse_dates=['date']
parse_dates=['date'],
skipinitialspace=True
)
if calendar_dates.shape[0] == 0:
calendar_dates = None
Expand All @@ -224,7 +232,8 @@ def load_zip(filepath):
'fare_id': str, 'price': float, 'currency_type': str,
'payment_method': int, 'transfers': 'Int64',
'agency_id': str, 'transfer_duration': 'Int64'
}
},
skipinitialspace=True
)
else:
fare_attributes = None
Expand All @@ -235,7 +244,8 @@ def load_zip(filepath):
dtype={
'fare_id': str, 'route_id': str, 'origin_id': str,
'destination_id': str, 'contains_id': str
}
},
skipinitialspace=True
)
else:
fare_rules = None
Expand All @@ -247,7 +257,8 @@ def load_zip(filepath):
'shape_id': str, 'shape_pt_lat': float,
'shape_pt_lon': float, 'shape_pt_sequence': int,
'shape_dist_traveled': float
}
},
skipinitialspace=True
)
else:
shapes = None
Expand All @@ -259,7 +270,8 @@ def load_zip(filepath):
'trip_id': str, 'start_time': str, 'end_time': str,
'headway_secs': int, 'exact_times': int
},
parse_dates=['start_time', 'end_time']
parse_dates=['start_time', 'end_time'],
skipinitialspace=True
)
else:
frequencies = None
Expand All @@ -270,7 +282,8 @@ def load_zip(filepath):
dtype={
'from_stop_id': str, 'to_stop_id': str,
'transfer_type': 'Int64', 'min_transfer_time': 'Int64'
}
},
skipinitialspace=True
)
else:
transfers = None
Expand All @@ -285,7 +298,8 @@ def load_zip(filepath):
'traversal_time': 'Int64', 'stair_count': 'Int64',
'max_slope': 'float64', 'min_width': 'float64',
'signposted_as': str, 'reverse_signposted_as': str
}
},
skipinitialspace=True
)
else:
pathways = None
Expand All @@ -296,7 +310,8 @@ def load_zip(filepath):
dtype={
'level_id': str, 'level_index': float,
'level_name': str
}
},
skipinitialspace=True
)
else:
levels = None
Expand All @@ -308,7 +323,8 @@ def load_zip(filepath):
'table_name': str, 'field_name': str, 'language': str,
'translation': str, 'record_id': str,
'record_sub_id': str, 'field_value': str
}
},
skipinitialspace=True
)
feed_info = pd.read_csv(
zip_file.open(filepaths["feed_info.txt"]),
Expand All @@ -318,7 +334,8 @@ def load_zip(filepath):
'feed_start_date': str, 'feed_end_date': str,
'feed_version': str, 'feed_contact_email': str,
'feed_contact_url': str
}
},
skipinitialspace=True
)
elif filepaths["feed_info.txt"] in zip_file.namelist():
feed_info = pd.read_csv(
Expand All @@ -329,7 +346,8 @@ def load_zip(filepath):
'feed_start_date': str, 'feed_end_date': str,
'feed_version': str, 'feed_contact_email': str,
'feed_contact_url': str
}
},
skipinitialspace=True
)
translations=None
else:
Expand All @@ -342,7 +360,8 @@ def load_zip(filepath):
dtype={
'attribution_id': str, 'agency_id': str,
'route_id': str, 'trip_id': str,
}
},
skipinitialspace=True
)
else:
attributions = None
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

@pytest.fixture
def feed_zipfile():
return r"data/PATC-2020-02-23-12.zip"
return r"data/metra_2020-02-23.zip"

@pytest.fixture
def test_date():
return date(2020, 7, 2)
return date(2020, 2, 24)

@pytest.fixture
def test_timerange():
Expand Down

0 comments on commit 99fa7fc

Please sign in to comment.