Skip to content

Commit 6d00bb0

Browse files
committed
update crs refs in utility packages
1 parent 2b18dd1 commit 6d00bb0

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

_shared_utils/shared_utils/rt_utils.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def get_vehicle_positions(ix_df: pd.DataFrame) -> gpd.GeoDataFrame:
402402
vp_all = gpd.read_parquet(f"{VP_FILE_PATH}vp_{date_str}.parquet")
403403
org_vp = vp_all >> filter(_.gtfs_dataset_key.isin(ix_df.vehicle_positions_gtfs_dataset_key))
404404
org_vp = org_vp >> select(-_.location_timestamp, -_.service_date, -_.activity_date)
405-
org_vp = org_vp.to_crs(geography_utils.CA_NAD83Albers)
405+
org_vp = org_vp.to_crs(geography_utils.CA_NAD83Albers_m)
406406
utils.geoparquet_gcs_export(org_vp, GCS_FILE_PATH + V2_SUBFOLDER, filename)
407407

408408
return org_vp
@@ -459,7 +459,9 @@ def get_stops(ix_df: pd.DataFrame) -> gpd.GeoDataFrame:
459459
org_stops = gpd.read_parquet(path)
460460
else:
461461
feed_key_list = list(ix_df.feed_key.unique())
462-
org_stops = gtfs_utils_v2.get_stops(service_date, feed_key_list, stop_cols, crs=geography_utils.CA_NAD83Albers)
462+
org_stops = gtfs_utils_v2.get_stops(
463+
service_date, feed_key_list, stop_cols, crs=geography_utils.CA_NAD83Albers_m
464+
)
463465
utils.geoparquet_gcs_export(org_stops, GCS_FILE_PATH + V2_SUBFOLDER, filename)
464466

465467
return org_stops
@@ -478,7 +480,7 @@ def get_shapes(ix_df: pd.DataFrame) -> gpd.GeoDataFrame:
478480
else:
479481
feed_key_list = list(ix_df.feed_key.unique())
480482
org_shapes = gtfs_utils_v2.get_shapes(
481-
service_date, feed_key_list, crs=geography_utils.CA_NAD83Albers, shape_cols=shape_cols
483+
service_date, feed_key_list, crs=geography_utils.CA_NAD83Albers_m, shape_cols=shape_cols
482484
)
483485
# invalid geos are nones in new df...
484486
org_shapes = org_shapes.dropna(subset=["geometry"])

_shared_utils/shared_utils/shared_data.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def make_county_centroids():
1919
"""
2020
URL = "https://opendata.arcgis.com/datasets/" "8713ced9b78a4abb97dc130a691a8695_0.geojson"
2121

22-
gdf = gpd.read_file(URL).to_crs(geography_utils.CA_StatePlane)
22+
gdf = gpd.read_file(URL).to_crs(geography_utils.CA_NAD83Albers_ft)
2323
gdf.columns = gdf.columns.str.lower()
2424

2525
gdf = (
@@ -167,7 +167,7 @@ def segment_highway_lines_by_postmile(gdf: gpd.GeoDataFrame):
167167

168168
# Assign segment geometry and overwrite the postmile geometry column
169169
gdf2 = (
170-
gdf.assign(geometry=gpd.GeoSeries(segment_geom, crs=geography_utils.CA_NAD83Albers))
170+
gdf.assign(geometry=gpd.GeoSeries(segment_geom, crs=geography_utils.CA_NAD83Albers_m))
171171
.drop(columns=drop_cols)
172172
.set_geometry("geometry")
173173
)
@@ -205,7 +205,7 @@ def create_postmile_segments(
205205
.explode("geometry")
206206
.reset_index(drop=True)
207207
.pipe(round_odometer_values, ["bodometer", "eodometer"], num_decimals=3)
208-
.to_crs(geography_utils.CA_NAD83Albers)
208+
.to_crs(geography_utils.CA_NAD83Albers_m)
209209
)
210210

211211
# Have a list accompany the geometry
@@ -222,7 +222,7 @@ def create_postmile_segments(
222222
f"{GCS_FILE_PATH}state_highway_network_postmiles.parquet", columns=group_cols + ["odometer", "geometry"]
223223
)
224224
.pipe(round_odometer_values, ["odometer"], num_decimals=3)
225-
.to_crs(geography_utils.CA_NAD83Albers)
225+
.to_crs(geography_utils.CA_NAD83Albers_m)
226226
)
227227
# Round to 3 digits for odometer. When there are more decimal places, it makes our cutoffs iffy
228228
# when we use this condition below: odometer >= bodometer & odometer <= eodometer

bus_service_increase/bus_service_utils/create_parallel_corridors.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def process_transit_routes(
3131
## Clean transit routes
3232
df = df.assign(
3333
route_length = df.to_crs(
34-
geography_utils.CA_StatePlane).geometry.length
35-
).to_crs(geography_utils.CA_StatePlane)
34+
geography_utils.CA_NAD83Albers_ft).geometry.length
35+
).to_crs(geography_utils.CA_NAD83Albers_ft)
3636

3737
# Get it down to route_id and pick longest shape
3838
df2 = (df.sort_values(operator_cols + ["route_id", "route_length"],
@@ -63,7 +63,7 @@ def prep_highway_directions_for_dissolve(
6363
'''
6464
df = (gpd.read_parquet("gs://calitp-analytics-data/data-analyses/"
6565
"shared_data/state_highway_network.parquet")
66-
.to_crs(geography_utils.CA_StatePlane))
66+
.to_crs(geography_utils.CA_NAD83Albers_ft))
6767

6868
# Get dummies for direction
6969
# Can make data wide instead of long

rt_segment_speeds/segment_speed_utils/parallel_corridors.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def process_transit_routes(analysis_date: str) -> gpd.GeoDataFrame:
4040

4141
# Get this to same CRS as highways
4242
gdf = gdf.assign(
43-
route_length_feet = gdf.geometry.to_crs(geography_utils.CA_StatePlane).length
44-
).drop(columns = "route_length").to_crs(geography_utils.CA_StatePlane)
43+
route_length_feet = gdf.geometry.to_crs(geography_utils.CA_NAD83Albers_ft).length
44+
).drop(columns = "route_length").to_crs(geography_utils.CA_NAD83Albers_ft)
4545

4646

4747
return gdf
@@ -65,7 +65,7 @@ def process_highways(
6565
direction_cols = ["NB", "SB", "EB", "WB"]
6666

6767
df = (gpd.read_parquet(SHN_FILE)
68-
.to_crs(geography_utils.CA_StatePlane)
68+
.to_crs(geography_utils.CA_NAD83Albers_ft)
6969
)
7070

7171
# Get dummies for direction

0 commit comments

Comments
 (0)