313b79ce9cc8538a78edfc82ccc7b02c23766287,osmnx/utils_graph.py,,graph_from_gdfs,#Any#Any#Any#,104

Before Change

    G = nx.MultiDiGraph(**graph_attrs)

    // add the nodes then each node"s non-null attributes
    G.add_nodes_from(gdf_nodes.index)
    for col in gdf_nodes.columns:
        nx.set_node_attributes(G, name=col, values=gdf_nodes[col].dropna())

    // add each edge and its non-null attributes

After Change

    G = nx.MultiDiGraph(**graph_attrs)

    attr_col_headings = [c for c in gdf_edges.columns if c not in ["u", "v"]]
    attribute_data = zip(*[gdf_edges[col] for col in attr_col_headings])

    multigraph_edge_keys = gdf_edges["key"]
    attribute_data = zip(attribute_data, multigraph_edge_keys)

    // Generate graph edges
    for s, t, attrs in zip(gdf_edges["u"], gdf_edges["v"], attribute_data):

        attrs, multigraph_edge_key = attrs
        key = G.add_edge(s, t, key=multigraph_edge_key)

        G[s][t][key].update(zip(attr_col_headings, attrs))

    // Add nodes attributes
    for col in gdf_nodes.columns:
        nx.set_node_attributes(G, name=col, values=gdf_nodes[col].dropna())

    utils.log("Created graph from node/edge GeoDataFrames")

Instances