switch back to GeoInterface.jl

Author: rush42

Project.toml

@@ -7,7 +7,7 @@ version = "0.3.1"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
-GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
+GeoInterfaceRecipes = "0329782f-3d07-4b52-b9f6-d3137cf03c7a"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"

example.jl

@@ -1,4 +1,4 @@
-using LightOSM, Plots
+using LightOSM, Plots, GeoInterfaceRecipes
 
 g = graph_from_download(
     :place_name, 
@@ -8,8 +8,8 @@ g = graph_from_download(
 sg = simplify_graph(g)
 
 # check for missing edges
-plot(g, color=:red, linewidth=0.8)
-plot!(edge_gdf(sg).geom, linewidth=1.1, color=:black)
+plot(g, color=:red, linewidth=0.8, size=(800, 800))
+plot!(sg, linewidth=1.1, color=:black)
 savefig("edge_validation")
 
 # show original nodes

src/LightOSM.jl

@@ -16,8 +16,7 @@ using LightXML
 using StaticArrays
 using SpatialIndexing
 using DataFrames
-using GeoInterface
-using GeometryBasics
+using GeoInterface: MultiLineString, LineString, Point 
 using RecipesBase
 
 export GeoLocation,

src/geodataframes.jl

@@ -1,22 +1,24 @@
-GeometryBasics.Point(node::Node) = Point(node.location.lon, node.location.lat)
-GeometryBasics.LineString(way::Way) = LineString(Point.(way.nodes))
+Point(node::Node) = Point(node.location.lon, node.location.lat)
+LineString(g::AbstractOSMGraph, way::Way) = LineString(Point.(g.parent.nodes[i] for i in way.nodes))
 
 function node_gdf(g::AbstractOSMGraph)
     ids = collect(keys(g.nodes))
-    return DataFrame(;id=ids, geom=Point.(values(g.nodes)))
+    nodes = (g.nodes[id] for id in ids)
+    return DataFrame(;id=ids, tags=getproperty.(nodes, :tags), geom=Point.(nodes))
 end
 
 function way_gdf(g::AbstractOSMGraph)
     ids = collect(keys(g.ways))
-    return DataFrame(;id=ids, geom=LineString.(values(g.ways)))
+    ways = (g.ways[id] for id in ids)
+    return DataFrame(;id=ids, tags=getproperty.(ways, :tags), geom=LineString.(Ref(g), ways))
 end
 
 function edge_gdf(g::SimplifiedOSMGraph)
     edge_ids = collect(keys(g.edges))
     geom = map(edge_ids) do edge
         path = g.edges[edge]
-        reverse.(g.parent.node_coordinates[path])
+        LineString(Point.(g.nodes[path]))
     end
     u, v, key = map(i -> getindex.(edge_ids, i), 1:3)
-    return DataFrame(;u, v, key, geom=LineString.(geom))
+    return DataFrame(;u, v, key, geom=geom)
 end

src/plotrecipes.jl

@@ -5,7 +5,22 @@ function aspect_ratio(g::AbstractOSMGraph)
 end
 
 RecipesBase.@recipe function f(g::AbstractOSMGraph)
+    # way color and thickness
     color --> :black
+    linewdith --> 1.5
+    # node color and size
+    markercolor --> :blue
+    markersize --> 2
     aspect_ratio --> aspect_ratio(g)
-    MultiLineString(way_gdf(g).geom)
+    # plot ways
+    @series begin
+        seriestype := :path
+        MultiLineString(way_gdf(g).geom)
+    end
+
+    # plot nodes
+    @series begin
+        seriestype := :scatter
+        node_gdf(g).geom
+    end
 end

src/simplification.jl

@@ -69,6 +69,7 @@ The geometry of the contracted nodes is kept in the edge_gdf DataFrame
 function simplify_graph(g::OSMGraph{U, T, W}) where {U, T, W}
     relevant_nodes = collect(endpoints(g.graph))
     n_relevant = length(relevant_nodes)
+    nodes = Dict{T,Node{T}}()
     graph = DiGraph(n_relevant) 
     weights = similar(g.weights, (n_relevant, n_relevant))
     node_coordinates = Vector{Vector{W}}(undef, n_relevant)
@@ -79,9 +80,10 @@ function simplify_graph(g::OSMGraph{U, T, W}) where {U, T, W}
     for (new_i, old_i) in enumerate(relevant_nodes)
         index_mapping[old_i] = new_i
         node_coordinates[new_i] = g.node_coordinates[old_i]
-        node = g.index_to_node[old_i]
-        index_to_node[new_i] = node
-        node_to_index[node] = new_i
+        osm_id = g.index_to_node[old_i]
+        nodes[osm_id] = g.nodes[osm_id]
+        index_to_node[new_i] = osm_id
+        node_to_index[osm_id] = new_i
     end
 
     edges = Dict{NTuple{3,U}, Vector{U}}()
@@ -106,6 +108,7 @@ function simplify_graph(g::OSMGraph{U, T, W}) where {U, T, W}
 
     return SimplifiedOSMGraph(
                 g,
+                nodes,
                 node_coordinates,
                 node_to_index,
                 index_to_node,

src/types.jl

@@ -161,6 +161,8 @@ function Base.getproperty(g::OSMGraph, field::Symbol)
     elseif field === :node_to_highway
         Base.depwarn("`node_to_highway` field is deprecated, use `node_to_way` field instead", :getproperty)
         return getfield(g, :node_to_way)
+    elseif field === :parent
+        return g
     elseif field === :edge_to_highway
         Base.depwarn("`edge_to_highway` field is deprecated, use `edge_to_way` field instead", :getproperty)
         return getfield(g, :edge_to_way)
@@ -171,6 +173,7 @@ end
 
 struct SimplifiedOSMGraph{U,T,W} <: AbstractOSMGraph{U,T,W}
     parent::OSMGraph{U,T,W}
+    nodes::Dict{T,Node{T}}
     node_coordinates::Vector{Vector{W}} # needed for astar heuristic
     node_to_index::OrderedDict{T,U}
     index_to_node::OrderedDict{U,T}