add AbstractOSMGraph and plot recipe

Author: rush42

Project.toml

@@ -7,13 +7,15 @@ version = "0.1.19"
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
 NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
+RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticGraphs = "4c8beaf5-199b-59a0-a7f2-21d17de635b6"

src/LightOSM.jl

@@ -9,14 +9,17 @@ using StaticGraphs: StaticDiGraph
 using SimpleWeightedGraphs: SimpleWeightedDiGraph
 using MetaGraphs: MetaDiGraph
 using NearestNeighbors: KDTree, knn
-using ArchGDAL: IGeometry, createlinestring, createpoint
 using HTTP
 using JSON
 using LightXML
 using DataFrames
+using ArchGDAL: createmultilinestring, createlinestring, createpoint, addgeom!
+using RecipesBase
 
 export GeoLocation,
+       AbstractOSMGraph,
        OSMGraph,
+       SimplifiedOSMGraph,
        Node,
        Way,
        Restriction,
@@ -36,7 +39,10 @@ export GeoLocation,
        buildings_from_object,
        buildings_from_download,
        buildings_from_file,
-       simplify_graph
+       simplify_graph,
+       node_gdf,
+       edge_gdf,
+       highway_gdf
 
 include("types.jl")
 include("constants.jl")
@@ -50,5 +56,7 @@ include("shortest_path.jl")
 include("nearest_node.jl")
 include("buildings.jl")
 include("simplification.jl")
+include("geodataframes.jl")
+include("plotrecipes.jl")
 
 end # module

src/geodataframes.jl

@@ -0,0 +1,38 @@
+coordinates(node::Node) = node.location.lon, node.location.lat
+
+function node_gdf(g::OSMGraph)
+    ids = collect(keys(g.nodes))
+    geom = map(ids) do id
+       coordinates(g.nodes[id])
+    end
+    return DataFrame(;id=ids, geom=createpoint.(geom))
+end
+
+function highway_gdf(g::OSMGraph)
+    ids = collect(keys(g.highways))
+    _way_coordinates(way) = map(way.nodes) do id
+        coordinates(g.nodes[id])
+    end
+    geom = map(id -> _way_coordinates(g.highways[id]), ids)
+    return DataFrame(;id=ids, geom=createlinestring.(geom))
+end
+
+function node_gdf(sg::SimplifiedOSMGraph)
+    ids = collect(keys(sg.node_to_index))
+    geom = map(ids) do id
+        coordinates(sg.parent.nodes[id])
+    end
+    return DataFrame(;id=ids, geom=createpoint.(geom))
+end
+
+highway_gdf(sg::SimplifiedOSMGraph) = highway_gdf(sg.parent)
+
+function edge_gdf(sg::SimplifiedOSMGraph)
+    edge_ids = collect(keys(sg.edges))
+    geom = map(edge_ids) do edge
+        path = sg.edges[edge]
+        reverse.(sg.parent.node_coordinates[path])
+    end
+    u, v, key = map(i -> getindex.(edge_ids, i), 1:3)
+    return DataFrame(;u, v, key, geom=createlinestring.(geom))
+end

src/plotrecipes.jl

@@ -0,0 +1,15 @@
+function aspect_ratio(g::OSMGraph) 
+    max_y, min_y = extrema(first, g.node_coordinates)
+    mid_y = max_y/2 + min_y/2
+    return 1/cos(mid_y * pi/180)
+end
+aspect_ratio(sg::SimplifiedOSMGraph) = aspect_ratio(sg.parent)
+
+
+RecipesBase.@recipe function f(g::AbstractOSMGraph)
+    color --> :black
+    aspect_ratio --> aspect_ratio(g)
+    highways = createmultilinestring()
+    addgeom!.(Ref(highways), highway_gdf(g).geom)
+    return highways
+end

src/types.jl

@@ -99,7 +99,9 @@ Container for storing OpenStreetMap node, way, relation and graph related obejct
 - `kdtree::Union{KDTree,Nothing}`: KDTree used to calculate nearest nodes.
 - `weight_type::Union{Symbol,Nothing}`: Either `:distance`, `:time` or `:lane_efficiency`.
 """
-@with_kw mutable struct OSMGraph{U <: Integer,T <: Integer,W <: Real}
+
+abstract type AbstractOSMGraph end
+@with_kw mutable struct OSMGraph{U <: Integer,T <: Integer,W <: Real} <: AbstractOSMGraph
     nodes::Dict{T,Node{T}} = Dict{T,Node{T}}()
     node_coordinates::Vector{Vector{W}} = Vector{Vector{W}}() # needed for astar heuristic
     highways::Dict{T,Way{T}} = Dict{T,Way{T}}()
@@ -116,7 +118,7 @@ Container for storing OpenStreetMap node, way, relation and graph related obejct
     weight_type::Union{Symbol,Nothing} = nothing
 end
 
-struct SimplifiedOSMGraph{U <: Integer,T <: Integer,W <: Real}
+struct SimplifiedOSMGraph{U <: Integer,T <: Integer,W <: Real} <: AbstractOSMGraph
     parent::OSMGraph{U,T,W}
     node_coordinates::Vector{Vector{W}} # needed for astar heuristic
     node_to_index::OrderedDict{T,U}