[FEAT] Changed id type to Union{Int, String} #101

AzilAverakot · 2024-03-06T22:48:20Z

Added functionality to handle String ids.

Project.toml

src/constants.jl

src/graph_utilities.jl

captchanjack · 2024-03-06T23:21:55Z

src/graph_utilities.jl

+Maps node id to index.
+"""
+node_id_to_index(g::OSMGraph, x::String) = g.node_to_index[x]
+node_id_to_index(g::OSMGraph, x::Vector{<:String}) = [node_id_to_index(g, i) for i in x]


won't need this if x is typed parametrically

captchanjack · 2024-03-06T23:22:06Z

src/graph_utilities.jl

+
+Maps node index to dijkstra state (parents).
+"""
+index_to_dijkstra_state(g::OSMGraph, x::String) = g.dijkstra_states[x]


captchanjack · 2024-03-06T23:22:15Z

src/graph_utilities.jl


 """
    node_id_to_dijkstra_state(g::OSMGraph, x::Integer)

 Maps node id to dijkstra state (parents).
 """
 node_id_to_dijkstra_state(g::OSMGraph, x::Integer) = g.dijkstra_states[node_id_to_index(g, x)]
+"""
+    node_id_to_dijkstra_state(g::OSMGraph, x::String)


codecov · 2024-03-06T23:22:33Z

Codecov Report

Attention: Patch coverage is 76.59574% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 81.05%. Comparing base (c5a0b8f) to head (fd12a51).

Files	Patch %	Lines
src/graph_utilities.jl	41.66%	7 Missing ⚠️
src/parse.jl	66.66%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #101      +/-   ##
==========================================
+ Coverage   80.03%   81.05%   +1.02%     
==========================================
  Files          15       15              
  Lines        1142     1151       +9     
==========================================
+ Hits          914      933      +19     
+ Misses        228      218      -10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/graph_utilities.jl

src/nearest_node.jl

src/nearest_way.jl

src/graph.jl

src/types.jl

captchanjack · 2024-03-13T09:08:15Z

src/parse.jl

@@ -342,7 +343,9 @@ function init_graph_from_object(osm_xml_object::XMLDocument,
                                filter_network_type::Bool=true
                                )::OSMGraph
    dict_to_parse = osm_dict_from_xml(osm_xml_object)
+    id_type = typeof(dict_to_parse["node"][1]["id"])


See comment in parse_osm_network_dict function

captchanjack · 2024-03-13T09:11:12Z

src/parse.jl

@@ -357,7 +360,9 @@ function init_graph_from_object(osm_json_object::AbstractDict,
                                filter_network_type::Bool=true
                                )::OSMGraph
    dict_to_parse = osm_dict_from_json(osm_json_object)
+    id_type = typeof(dict_to_parse["node"][1]["id"])


See comment in parse_osm_network_dict function

captchanjack · 2024-03-13T09:16:24Z

src/parse.jl

                                network_type::Symbol=:drive;
                                filter_network_type::Bool=true
                                )::OSMGraph
    U = DEFAULT_OSM_INDEX_TYPE
-    T = DEFAULT_OSM_ID_TYPE
+    T = id_type


do the check here so you don't need the id_type as a new input arg

Suggested change

T = id_type

T = get_id_type(osm_network_dict)

where

function get_id_type(osm_network_dict::AbstractDict)::Type if isempty(dict_to_parse["node"]) return Int64 end first_id = dict_to_parse["node"][1]["id"] if first_id isa Integer return Int64 elseif first_id isa String return String else throw(ErrorException("OSM ID type not supported: $(typeof(first_id))")) end end

also write a doc string describing what is happening and the assumptions we're making:

if the node set is empty we assume IDs are Int32

if first node id is of an Integer type we also assume Int32

if first node id is a String then we assume String

Hybrid types are not supported

test/nearest_node.jl

captchanjack · 2024-03-14T03:24:42Z

Lgtm

AzilAverakot force-pushed the feature/LRS_added_functionality_to_ingest_MM_file branch from 442dc16 to 5d4bfbf Compare March 6, 2024 22:51