node importance

Author: traines-source

include/osr/geojson.h

@@ -179,6 +179,7 @@ struct geojson_writer {
           {"car", p.is_car_accessible()},
           {"bike", p.is_bike_accessible()},
           {"foot", p.is_walk_accessible()},
+          {"importance", p.importance()},
           {"is_restricted", w_.r_->node_is_restricted_[n]},
           {"is_entrance", p.is_entrance()},
           {"is_elevator", p.is_elevator()},

include/osr/routing/profiles/bike_sharing.h

@@ -47,7 +47,8 @@ struct bike_sharing {
                      .is_sidewalk_separate_ = false,
                      .motor_vehicle_no_ = false,
                      .has_toll_ = false,
-                     .is_big_street_ = false};
+                     .is_big_street_ = false,
+                     .importance_ = 0};
 
   static constexpr auto const kAdditionalNodeProperties =
       node_properties{.from_level_ = 0,
@@ -58,7 +59,8 @@ struct bike_sharing {
                       .is_entrance_ = false,
                       .is_multi_level_ = false,
                       .is_parking_ = false,
-                      .to_level_ = 0};
+                      .to_level_ = 0,
+                      .importance_ = 0};
 
   enum class node_type : std::uint8_t {
     kInitialFoot,

include/osr/routing/profiles/car_sharing.h

@@ -47,7 +47,8 @@ struct car_sharing {
                      .is_sidewalk_separate_ = false,
                      .motor_vehicle_no_ = false,
                      .has_toll_ = false,
-                     .is_big_street_ = false};
+                     .is_big_street_ = false,
+                     .importance_ = 0};
 
   static constexpr auto const kAdditionalNodeProperties =
       node_properties{.from_level_ = 0,
@@ -58,7 +59,8 @@ struct car_sharing {
                       .is_entrance_ = false,
                       .is_multi_level_ = false,
                       .is_parking_ = false,
-                      .to_level_ = 0};
+                      .to_level_ = 0,
+                      .importance_ = 0};
 
   enum class node_type : std::uint8_t {
     kInitialFoot,

include/osr/ways.h

@@ -103,6 +103,7 @@ struct way_properties {
   bool motor_vehicle_no_ : 1;
   bool has_toll_ : 1;
   bool is_big_street_ : 1;
+  std::uint8_t importance_ : 3;  // only used during extract
 };
 
 static_assert(sizeof(way_properties) == 4);
@@ -115,6 +116,7 @@ struct node_properties {
   constexpr bool is_multi_level() const { return is_multi_level_; }
   constexpr bool is_entrance() const { return is_entrance_; }
   constexpr bool is_parking() const { return is_parking_; }
+  constexpr std::uint8_t importance() const { return importance_; }
 
   constexpr level_t from_level() const { return level_t{from_level_}; }
   constexpr level_t to_level() const { return level_t{to_level_}; }
@@ -142,6 +144,7 @@ struct node_properties {
   bool is_parking_ : 1;
 
   std::uint8_t to_level_ : 5;
+  std::uint8_t importance_ : 3;
 };
 
 static_assert(sizeof(node_properties) == 3);
@@ -152,7 +155,7 @@ struct ways {
   void add_restriction(std::vector<resolved_restriction>&);
   void compute_big_street_neighbors();
   void connect_ways();
-  void build_components();
+  void build_components_and_importance();
 
   std::optional<way_idx_t> find_way(osm_way_idx_t const i) {
     auto const it = std::lower_bound(begin(way_osm_idx_), end(way_osm_idx_), i);

src/extract.cc

@@ -60,23 +60,38 @@ bool is_number(std::string_view s) {
          utl::all_of(s, [](char const c) { return std::isdigit(c); });
 }
 
-bool is_big_street(tags const& t) {
+std::uint8_t get_importance(tags const& t) {
   switch (cista::hash(t.highway_)) {
-    case cista::hash("motorway"):
-    case cista::hash("motorway_link"):
-    case cista::hash("trunk"):
-    case cista::hash("trunk_link"):
-    case cista::hash("primary"):
-    case cista::hash("primary_link"):
+    case cista::hash("pedestrian"):
+    case cista::hash("busway"):
+    case cista::hash("footway"):
+    case cista::hash("cycleway"):
+    case cista::hash("bridleway"):
+    case cista::hash("steps"):
+    case cista::hash("corridor"):
+    case cista::hash("path"): return 0;
+    case cista::hash("track"): return 1;
+    case cista::hash("living_street"):
+    case cista::hash("service"): return 2;
+    case cista::hash("residential"): return 3;
+    case cista::hash("road"): return 4;
+    case cista::hash("unclassified"):
+    case cista::hash("tertiary"):
+    case cista::hash("tertiary_link"): return 5;
     case cista::hash("secondary"):
     case cista::hash("secondary_link"):
-    case cista::hash("tertiary"):
-    case cista::hash("tertiary_link"):
-    case cista::hash("unclassified"): return true;
-    default: return false;
+    case cista::hash("primary"):
+    case cista::hash("primary_link"): return 6;
+    case cista::hash("trunk"):
+    case cista::hash("trunk_link"):
+    case cista::hash("motorway"):
+    case cista::hash("motorway_link"): return 7;
+    default: return 4;
   }
 }
 
+bool is_big_street(std::uint8_t const importance) { return importance > 4; }
+
 speed_limit get_speed_limit(tags const& t) {
   if (is_number(t.max_speed_) /* TODO: support units (kmh/mph) */) {
     return get_speed_limit(
@@ -140,7 +155,8 @@ way_properties get_way_properties(tags const& t) {
   p.motor_vehicle_no_ =
       (t.motor_vehicle_ == "no"sv) || (t.vehicle_ == override::kBlacklist);
   p.has_toll_ = t.toll_;
-  p.is_big_street_ = is_big_street(t);
+  p.importance_ = get_importance(t);
+  p.is_big_street_ = is_big_street(p.importance_);
   return p;
 }
 
@@ -157,6 +173,7 @@ std::pair<node_properties, level_bits_t> get_node_properties(tags const& t) {
   p.is_multi_level_ = is_multi;
   p.is_parking_ = t.is_parking_;
   p.to_level_ = to_idx(to);
+  p.importance_ = 0;
   return {p, t.level_bits_};
 }
 
@@ -581,7 +598,6 @@ void extract(bool const with_platforms,
   w.sync();
 
   w.connect_ways();
-  w.build_components();
 
   auto r = std::vector<resolved_restriction>{};
   {
@@ -600,6 +616,7 @@ void extract(bool const with_platforms,
     pt->update(pt->in_high_);
   }
 
+  w.build_components_and_importance();
   w.add_restriction(r);
 
   utl::sort(w.r_->multi_level_elevators_);

src/ways.cc

@@ -25,7 +25,7 @@ ways::ways(std::filesystem::path p, cista::mmap::protection const mode)
           mm_vec<std::uint64_t>(mm("way_has_conditional_access_no"))},
       way_conditional_access_no_{mm("way_conditional_access_no")} {}
 
-void ways::build_components() {
+void ways::build_components_and_importance() {
   auto q = hash_set<way_idx_t>{};
   auto flood_fill = [&](way_idx_t const way_idx, component_idx_t const c) {
     assert(q.empty());
@@ -34,6 +34,9 @@ void ways::build_components() {
       auto const next = *q.begin();
       q.erase(q.begin());
       for (auto const n : r_->way_nodes_[next]) {
+        r_->node_properties_[n].importance_ =
+            std::max(r_->node_properties_[n].importance_,
+                     r_->way_properties_[next].importance_);
         for (auto const w : r_->node_ways_[n]) {
           auto& wc = r_->way_component_[w];
           if (wc == component_idx_t::invalid()) {
@@ -46,7 +49,9 @@ void ways::build_components() {
   };
 
   auto pt = utl::get_active_progress_tracker_or_activate("osr");
-  pt->status("Build components").in_high(n_ways()).out_bounds(75, 90);
+  pt->status("Build components and importance")
+      .in_high(n_ways())
+      .out_bounds(75, 90);
 
   auto next_component_idx = component_idx_t{0U};
   r_->way_component_.resize(n_ways(), component_idx_t::invalid());