rework OSM map parser to use streaming XML reader

breunigs · Aug 17, 2024 · 5c275ec · 5c275ec
1 parent 8e08ad3
commit 5c275ec
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 118 deletions.
diff --git a/lib/map/node.ex b/lib/map/node.ex
@@ -8,6 +8,8 @@ defmodule Map.Node do
 
   @enforce_keys [:lon, :lat]
   defstruct [:id, :lon, :lat, :tags]
+
+  def get_and_update(node, :tags, fun), do: Map.get_and_update(node, :tags, fun)
 end
 
 defimpl Geo.Interpolate, for: Map.Node do

diff --git a/lib/map/parsed.ex b/lib/map/parsed.ex
@@ -3,9 +3,13 @@ defmodule Map.Parsed do
   @enforce_keys @known_params
   defstruct @known_params
 
+  @type indexed_nodes :: %{optional(binary()) => Map.Node.t()}
+  @type indexed_ways :: %{optional(binary()) => [Map.Way.t()]}
+  @type indexed_relations :: %{optional(binary()) => Map.Relation.t()}
+
   @type t :: %__MODULE__{
-          ways: %{optional(binary()) => Map.Way.t()},
-          relations: %{optional(binary()) => Map.Relation.t()},
-          nodes: %{optional(binary()) => Map.Node.t()}
+          ways: indexed_ways(),
+          relations: indexed_relations(),
+          nodes: indexed_nodes()
         }
 end