Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "osm4routing"
edition = "2021"
version = "0.7.2"
version = "0.8.0"
authors = ["Tristram Gräbener <tristramg@gmail.com>"]
description = "Convert OpenStreetMap data into routing friendly CSV"
homepage = "https://github.com/Tristramg/osm4routing2"
Expand All @@ -10,6 +10,7 @@ license = "MIT"

[dependencies]
osmpbfreader = "0.17.0"
ahash = "0.8"
csv = "1.3.0"
clap = { version = "4.5", features = ["derive"] }
serde = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions src/osm4routing/models.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::HashMap;
use ahash::HashMap;
use std::hash::{Hash, Hasher};

use super::categorize::EdgeProperties;
Expand Down Expand Up @@ -56,7 +56,7 @@ pub struct Edge {
pub geometry: Vec<Coord>,
pub properties: EdgeProperties,
pub nodes: Vec<NodeId>,
pub tags: std::collections::HashMap<String, String>,
pub tags: HashMap<String, String>,
}

impl Hash for Edge {
Expand Down
4 changes: 2 additions & 2 deletions src/osm4routing/reader.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use super::categorize::*;
use super::models::*;
use ahash::{HashMap, HashMapExt, HashSet, HashSetExt};
use osmpbfreader::objects::{NodeId, WayId};
use std::collections::{HashMap, HashSet};
use std::path::Path;

// Way as represented in OpenStreetMap
Expand Down Expand Up @@ -160,7 +160,7 @@ impl Reader {
}
}

for edge in edges.into_iter() {
for edge in edges {
if !already_merged.contains(&edge.id) {
result.push(edge);
}
Expand Down
Loading