use GeometryBasics implementation because GeoInterface no longer provides implementations for geo types

Author: rush42

Project.toml

@@ -7,6 +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"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"

example.jl

@@ -1,36 +1,23 @@
-using LightOSM, GeoInterface, Plots, DataFrames
-using ArchGDAL: createmultilinestring
+using LightOSM, Plots
 
 g = graph_from_download(
-    :place_name, place_name="moabit, berlin germany",
+    :place_name, 
+    place_name="tiergarten, berlin germany",
     network_type=:bike
 )
-# reverse coordinates for plotting
-reverse!.(g.node_coordinates)
-
-g_simple, weights, node_gdf, edge_gdf = simplify_graph(g)
-
-# join edges in mulitlinestring for faster plotting
-all_edges = createmultilinestring(coordinates.(edge_gdf.geom))
-
-# node validation
-
-# nodes from original graph
-plot(all_edges, color=:black, size=(1200,800))
-scatter!(first.(g.node_coordinates), last.(g.node_coordinates), color=:red)
-
-# nodes from simplified graph
-plot(all_edges, color=:black, size=(1200,800))
-scatter!(node_gdf.geom, color=:green)
-
-
-# edge validation
-
-function highway_gdf(osmg::OSMGraph)
-    function _geometrize_way(way)
-        createlinestring(map(id -> coordinates(osmg.nodes[id]), way.nodes))
-    end
-    geom = map(way -> _geometrize_way(way), values(osmg.highways))
-    return DataFrame(; id = collect(keys(osmg.highways)), geom)
-end
-
+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)
+savefig("edge_validation")
+
+# show original nodes
+plot(sg)
+plot!(node_gdf(g).geom, color=:red, markersize=2.2)
+savefig("original_nodes")
+
+# show relevant nodes
+plot(sg)
+plot!(node_gdf(sg).geom, color=:green, markersize=2.2)
+savefig("relevant_nodes")

src/LightOSM.jl

@@ -17,6 +17,7 @@ using StaticArrays
 using SpatialIndexing
 using DataFrames
 using GeoInterface
+using GeometryBasics
 using RecipesBase
 
 export GeoLocation,

src/geodataframes.jl

@@ -1,37 +1,21 @@
-coordinates(node::Node) = [node.location.lon, node.location.lat]
+GeometryBasics.Point(node::Node) = Point(node.location.lon, node.location.lat)
+GeometryBasics.LineString(way::Way) = LineString(Point.(way.nodes))
 
-function node_gdf(g::OSMGraph)
+function node_gdf(g::AbstractOSMGraph)
     ids = collect(keys(g.nodes))
-    geom = map(ids) do id
-       coordinates(g.nodes[id])
-    end
-    return DataFrame(;id=ids, geom=Point.(geom))
-end
-
-function way_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=LineString.(geom))
+    return DataFrame(;id=ids, geom=Point.(values(g.nodes)))
 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=Point.(geom))
+function way_gdf(g::AbstractOSMGraph)
+    ids = collect(keys(g.ways))
+    return DataFrame(;id=ids, geom=LineString.(values(g.ways)))
 end
 
-way_gdf(sg::SimplifiedOSMGraph) = way_gdf(sg.parent)
-
-function edge_gdf(sg::SimplifiedOSMGraph)
-    edge_ids = collect(keys(sg.edges))
+function edge_gdf(g::SimplifiedOSMGraph)
+    edge_ids = collect(keys(g.edges))
     geom = map(edge_ids) do edge
-        path = sg.edges[edge]
-        reverse.(sg.parent.node_coordinates[path])
+        path = g.edges[edge]
+        reverse.(g.parent.node_coordinates[path])
     end
     u, v, key = map(i -> getindex.(edge_ids, i), 1:3)
     return DataFrame(;u, v, key, geom=LineString.(geom))

src/plotrecipes.jl

@@ -7,5 +7,5 @@ end
 RecipesBase.@recipe function f(g::AbstractOSMGraph)
     color --> :black
     aspect_ratio --> aspect_ratio(g)
-    MultiLineString(GeoInterface.coordinates.(way_gdf(g).geom))
+    MultiLineString(way_gdf(g).geom)
 end