Merge changes for Ranch into Develop #289

e-lo · 2022-04-19T16:24:55Z

List of Changes

1. Add CRS_alt

@i-am-sijia please add what this is doing/why or attach an issue. Updated descriptions in [BUG] Re-projection of WGS lat/long fails as out of bounds #302

2. Adds/updates geometry

If a node x/y is changed or a new node is added, update the geometry field for geopandas
Added as [BUG] Nodes need to update their geometry if their XY changes. #297

3. Change default for `UNIQUE_SHAPE_ID` field

changed from shape_id to id because shapes out of Ranch has unique id from SharedStreets, no need to create a shape_id. ( @i-am-sijia please fill in reason)
Fixed in Add kwargs to roadway #296

4. Updated `base_scenario` instantiation

Translate base_scenario to dictionary if base_scenario attribute is of type Scenario so that it is consistent type as it is read in.
Fixed in Allow base scenario as scenario instance #299

5. Added to managed lane required attributes

Added "assign_group", "county", "mpo" as required fields for managed lanes.
Fixed in Add kwargs to roadway #296

…rk_wrangler into develop_with_ranch

networks built by Ranch have 'id' as unique shape id

e-lo · 2022-04-22T04:47:19Z

Change default for UNIQUE_SHAPE_ID field
changed from shape_id to id because... ( @i-am-sijia please fill in reason)

I think this is moot given #296?

e-lo

See inline comments

e-lo · 2022-04-19T16:25:30Z

network_wrangler/roadwaynetwork.py

@@ -187,6 +188,9 @@ class RoadwayNetwork(object):
        "roadway",
        "length",
        "segment_id",
+        "assign_group",


Can't these be added as parameters?

e-lo · 2022-04-19T16:26:38Z

network_wrangler/roadwaynetwork.py

                self.nodes_df = _add_dict_to_df(self.nodes_df, node)
+
+            # add geometry for new nodes
+            self.nodes_df["geometry"] = self.nodes_df.apply(


I see two problematic things here:

If the X/Y are updated, they need to have their geometry updated. It's probably an easy enough operation that I would just update it for all.

If you are doing a selection, do it in the Dataframe before the .apply()

RE 1: This chunk of codes is for adding new links and new nodes. I don't think Lasso/Wrangler currently support node changes.
RE 2: I was following the implementation of new links.

network_wrangler/network_wrangler/roadwaynetwork.py

Lines 1677 to 1696 in 34580a0

# add location reference and geometry for new links

self.links_df["locationReferences"] = self.links_df.apply(

lambda x: create_location_reference_from_nodes(

self.nodes_df[

self.nodes_df[RoadwayNetwork.NODE_FOREIGN_KEY] == x["A"]

].squeeze(),

self.nodes_df[

self.nodes_df[RoadwayNetwork.NODE_FOREIGN_KEY] == x["B"]

].squeeze(),

)

if x["new_link"] == 1

else x["locationReferences"],

axis=1,

)

self.links_df["geometry"] = self.links_df.apply(

lambda x: create_line_string(x["locationReferences"])

if x["new_link"] == 1

else x["geometry"],

axis=1,

)

e-lo · 2022-04-19T16:26:56Z

network_wrangler/roadwaynetwork.py

@@ -148,6 +148,7 @@ class RoadwayNetwork(object):

    # CRS = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"
    CRS = 4326  # "EPSG:4326"
+    CRS_alt=4269


I'm not sure what this is? But the naming is confusing/doesn't mean anything.

Perhaps we can name it alternative_standard_crs. Added details in #302

e-lo · 2022-04-22T04:50:08Z

Added to managed lane required attributes
Added "assign_group", "county", "mpo" as required fields for managed lanes.

I think this is also taken care of by the flexibility in #296?

e-lo · 2022-04-22T15:33:43Z

network_wrangler/scenario.py

@@ -96,6 +96,17 @@ def __init__(self, base_scenario: dict, project_cards: [ProjectCard] = None):
        self.road_net = None
        self.transit_net = None

+        if type(base_scenario) is dict:


technically it is supposed to be a dict per typehint? but we can address it

e-lo · 2022-04-22T16:03:59Z

@i-am-sijia I think this branch is now moot based on individual PRs to develop (as noted) with the exception of the alt_CRS - explanation of what it is?

i-am-sijia · 2022-05-18T18:41:09Z

I added descriptions in #302 regarding the CRS issue.

…r osmnx

e-lo · 2023-03-10T00:06:06Z

@i-am-sijia I believe this is now all moot and we can close this PR? Please check.

…_project apply transit project card

stop deletion in "set"

add comments, updated shape_id naming format, updated the condition for adding new stop node

Apply transit line addition and deletion project cards

assign ml node in the 950,000 range

…_node Revert "assign ml node in the 950,000 range"

Dependency bug fix

In transit routing change, new stops are add to the stops table based on index position. If a stop record gets deleted, the indices of the remaining rows need to be adjusted

fixed shape index and adding new stops issue

…bering

…ring assign ml node in the 950,000 range

e-lo · 2024-08-28T16:50:55Z

This is a dupe of functionality already in v1.

i-am-sijia and others added 6 commits March 22, 2022 22:59

develop metcouncil networks with ranch

c113585

correct UNIQUE_SHAPE_KEY

0223890

add default to ML creation

6cb3a29

Merge branch 'develop_with_ranch' of https://github.com/wsp-sag/netwo…

396a31d

…rk_wrangler into develop_with_ranch

create new scenarios from existing scenarios

57456e5

change UNIQUE_SHAPE_KEY to id; create geometry for new nodes

34580a0

networks built by Ranch have 'id' as unique shape id

e-lo added this to the v1.0 milestone Apr 19, 2022

e-lo assigned i-am-sijia Apr 19, 2022

e-lo commented Apr 22, 2022

View reviewed changes

e-lo mentioned this pull request Apr 22, 2022

[BUG] Nodes need to update their geometry if their XY changes. #297

Closed

1 task

e-lo commented Apr 22, 2022

View reviewed changes

i-am-sijia added 2 commits June 29, 2022 17:12

yaml load deprecated in pyyaml>5.4

b4650ee

setting index before calling ox.graph_from_gdfs() is required in newe…

6079afd

…r osmnx

e-lo marked this pull request as draft March 10, 2023 00:05

i-am-sijia and others added 11 commits January 26, 2024 13:49

change lanes when the base network has ML

36bbb24

changes from Rachel & Dave, adding attributes to ML acc/egr links

238b52b

MTC transit improvements

939e573

apply transit project card

2fd334a

check if trip_id of a stop node is in existing trip_id list

f4e0564

Merge pull request #334 from wsp-sag/develop_with_ranch_apply_transit…

6fbb465

…_project apply transit project card

stop deletion in "set"

bacbb24

Merge pull request #335 from wsp-sag/develop_with_ranch_special_case

bd90d43

stop deletion in "set"

add new transit project

c3b228e

add comments and some minor changes

d266353

add condition when model_node_id is empty

d6dade0

yueshuaing and others added 20 commits April 2, 2024 13:01

addressed the comments in PR#337

348183b

add comments, updated shape_id naming format, updated the condition for adding new stop node

updated the condition for adding a new stop node

f1508a7

cosmetic reformatting

a20fb50

transit line deletion

10b392f

updated line deletion

bde0fa1

Merge pull request #337 from wsp-sag/develop_with_ranch_add_transit_a1

0c9aad7

Apply transit line addition and deletion project cards

assign ml node in the 950,000 range

bd929af

Merge pull request #338 from wsp-sag/develop_with_ranch_ml_node

2301835

assign ml node in the 950,000 range

Revert "assign ml node in the 950,000 range"

c034ce1

Merge pull request #340 from wsp-sag/revert-338-develop_with_ranch_ml…

8fa7698

…_node Revert "assign ml node in the 950,000 range"

append to adjacency_list if already exist

875fab0

Merge pull request #342 from wsp-sag/dependency_bug

9c6adfa

Dependency bug fix

shape index in update, deletion project card

f1ebee7

assign ml node in the 950,000 range

fd5b28e

fix bugs in adding new stops

a51a4d4

reset index after deletion

feb72ef

In transit routing change, new stops are add to the stops table based on index position. If a stop record gets deleted, the indices of the remaining rows need to be adjusted

Merge pull request #350 from wsp-sag/develop_with_ranch_transit_deletion

2c5bbe5

fixed shape index and adding new stops issue

Merge branch 'develop_with_ranch' into develop_with_ranch_ml_node_num…

6cadef6

…bering

add timeofday feature to roadway property change

422e149

Merge pull request #351 from wsp-sag/develop_with_ranch_ml_node_numbe…

c28d4e4

…ring assign ml node in the 950,000 range

e-lo closed this Aug 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge changes for Ranch into Develop #289

Merge changes for Ranch into Develop #289

e-lo commented Apr 19, 2022 •

edited by i-am-sijia

Loading

e-lo commented Apr 22, 2022

e-lo left a comment

e-lo Apr 19, 2022

i-am-sijia May 18, 2022

e-lo Apr 19, 2022

i-am-sijia May 18, 2022

e-lo Apr 19, 2022

i-am-sijia May 18, 2022

e-lo commented Apr 22, 2022

e-lo Apr 22, 2022

e-lo commented Apr 22, 2022

i-am-sijia commented May 18, 2022

e-lo commented Mar 10, 2023

e-lo commented Aug 28, 2024

	# add location reference and geometry for new links
	self.links_df["locationReferences"] = self.links_df.apply(
	lambda x: create_location_reference_from_nodes(
	self.nodes_df[
	self.nodes_df[RoadwayNetwork.NODE_FOREIGN_KEY] == x["A"]
	].squeeze(),
	self.nodes_df[
	self.nodes_df[RoadwayNetwork.NODE_FOREIGN_KEY] == x["B"]
	].squeeze(),
	)
	if x["new_link"] == 1
	else x["locationReferences"],
	axis=1,
	)
	self.links_df["geometry"] = self.links_df.apply(
	lambda x: create_line_string(x["locationReferences"])
	if x["new_link"] == 1
	else x["geometry"],
	axis=1,
	)

Merge changes for Ranch into Develop #289

Merge changes for Ranch into Develop #289

Conversation

e-lo commented Apr 19, 2022 • edited by i-am-sijia Loading

List of Changes

1. Add CRS_alt

2. Adds/updates geometry

3. Change default for UNIQUE_SHAPE_ID field

4. Updated base_scenario instantiation

5. Added to managed lane required attributes

e-lo commented Apr 22, 2022

e-lo left a comment

Choose a reason for hiding this comment

e-lo Apr 19, 2022

Choose a reason for hiding this comment

i-am-sijia May 18, 2022

Choose a reason for hiding this comment

e-lo Apr 19, 2022

Choose a reason for hiding this comment

i-am-sijia May 18, 2022

Choose a reason for hiding this comment

e-lo Apr 19, 2022

Choose a reason for hiding this comment

i-am-sijia May 18, 2022

Choose a reason for hiding this comment

e-lo commented Apr 22, 2022

e-lo Apr 22, 2022

Choose a reason for hiding this comment

e-lo commented Apr 22, 2022

i-am-sijia commented May 18, 2022

e-lo commented Mar 10, 2023

e-lo commented Aug 28, 2024

e-lo commented Apr 19, 2022 •

edited by i-am-sijia

Loading

3. Change default for `UNIQUE_SHAPE_ID` field

4. Updated `base_scenario` instantiation