Skip to content

Add generate_weights #107

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add generate_weights #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions src/graph.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,17 @@ function add_indexed_restrictions!(g::OSMGraph{U,T,W}) where {U <: DEFAULT_OSM_I
end

"""
add_weights!(g::OSMGraph, weight_type::Symbol=:distance)
generate_weights(g::OSMGraph; weight_type::Symbol=:distance)

Adds edge weights to `OSMGraph`.
Generates a sparse weights matrix for the graph.
"""
function add_weights!(g::OSMGraph, weight_type::Symbol=:distance)
function generate_weights(g::OSMGraph; weight_type::Symbol=:distance)
n_edges = length(g.edge_to_way)
o_indices = Vector{Int}(undef, n_edges) # edge origin node indices
d_indices = Vector{Int}(undef, n_edges) # edge destination node indices
weights = Vector{Float64}(undef, n_edges)

W = DEFAULT_OSM_EDGE_WEIGHT_TYPE
W = LightOSM.DEFAULT_OSM_EDGE_WEIGHT_TYPE

@inbounds for (i, edge) in enumerate(keys(g.edge_to_way))
o_loc = g.nodes[edge[1]].location
Expand All @@ -377,23 +377,35 @@ function add_weights!(g::OSMGraph, weight_type::Symbol=:distance)
dist = distance(o_loc, d_loc, :haversine)
if weight_type == :time || weight_type == :lane_efficiency
highway = g.edge_to_way[edge]
maxspeed = g.ways[highway].tags["maxspeed"]::DEFAULT_OSM_MAXSPEED_TYPE
maxspeed = g.ways[highway].tags["maxspeed"]::LightOSM.DEFAULT_OSM_MAXSPEED_TYPE
if weight_type == :time
weight = dist / maxspeed
else
lanes = g.ways[highway].tags["lanes"]::DEFAULT_OSM_LANES_TYPE
lane_efficiency = get(LANE_EFFICIENCY[], lanes, 1.0)
lanes = g.ways[highway].tags["lanes"]::LightOSM.DEFAULT_OSM_LANES_TYPE
lane_efficiency = get(LightOSM.LANE_EFFICIENCY[], lanes, 1.0)
weight = dist / (maxspeed * lane_efficiency)
end
else
# Distance
elseif weight_type == :distance
weight = dist
else
weight = Float64[]
end
weights[i] = max(weight, eps(W))
end

n = length(g.nodes)
g.weights = sparse(o_indices, d_indices, weights, n, n)
weights_matrix = sparse(o_indices, d_indices, weights, n, n)

weights_matrix
end

"""
add_weights!(g::OSMGraph, weight_type::Symbol=:distance)

Adds edge weights to `OSMGraph`.
"""
function add_weights!(g::OSMGraph, weight_type::Symbol=:distance)
g.weights = generate_weights(g; weight_type)
g.weight_type = weight_type
return g
end
Expand Down