Merge branch 'master' of github.com:motis-project/osr

# Conflicts:
#	include/osr/lookup.h

Author: felixguendling

include/osr/lookup.h

@@ -200,8 +200,7 @@ struct lookup {
 
   template <typename Fn>
   void find(geo::latlng const& x, Fn&& fn) const {
-    find(geo::box{{x.lat() - 0.01, x.lng() - 0.01},
-                  {x.lat() + 0.01, x.lng() + 0.01}},
+    find({{x.lat() - 0.01, x.lng() - 0.01}, {x.lat() + 0.01, x.lng() + 0.01}},
          std::forward<Fn>(fn));
   }
 

src/route.cc

@@ -153,6 +153,8 @@ path reconstruct(ways const& w,
   auto segments = std::vector<path::segment>{{.polyline_ = dest.path_,
                                               .from_level_ = dest.lvl_,
                                               .to_level_ = dest.lvl_,
+                                              .from_ = node_idx_t::invalid(),
+                                              .to_ = node_idx_t::invalid(),
                                               .way_ = way_idx_t::invalid()}};
   auto dist = 0.0;
   while (true) {
@@ -248,6 +250,25 @@ best_candidate(ways const& w,
   return std::nullopt;
 }
 
+std::optional<path> try_direct(osr::location const& from,
+                               osr::location const& to) {
+  auto const dist = geo::distance(from.pos_, to.pos_);
+  return dist < 5.0
+             ? std::optional{path{.cost_ = 60U,
+                                  .dist_ = dist,
+                                  .segments_ = {path::segment{
+                                      .polyline_ = {from.pos_, to.pos_},
+                                      .from_level_ = from.lvl_,
+                                      .to_level_ = to.lvl_,
+                                      .from_ = node_idx_t::invalid(),
+                                      .to_ = node_idx_t::invalid(),
+                                      .way_ = way_idx_t::invalid(),
+                                      .cost_ = 60U,
+                                      .dist_ = static_cast<distance_t>(dist)}},
+                                  .uses_elevator_ = false}}
+             : std::nullopt;
+}
+
 template <typename Profile>
 std::optional<path> route(ways const& w,
                           lookup const& l,
@@ -267,6 +288,10 @@ std::optional<path> route(ways const& w,
     return std::nullopt;
   }
 
+  if (auto const direct = try_direct(from, to); direct.has_value()) {
+    return *direct;
+  }
+
   d.reset(max);
 
   for (auto const& start : from_match) {
@@ -339,6 +364,8 @@ std::vector<std::optional<path>> route(
     for (auto const [m, t, r] : utl::zip(to_match, to, result)) {
       if (r.has_value()) {
         ++found;
+      } else if (auto const direct = try_direct(from, t); direct.has_value()) {
+        r = direct;
       } else {
         auto const c = best_candidate(w, d, t.lvl_, m, max, dir);
         if (c.has_value()) {

web/index.html

@@ -504,7 +504,7 @@
     }
 
     const getRoute = async () => {
-        const response = await fetch(`${window.origin}/api/route`, {
+        const response = await fetch('api/route', {
             method: 'POST',
             mode: 'cors',
             headers: {
@@ -544,7 +544,7 @@
     };
 
     const getGraph = async (bounds) => {
-        const response = await fetch(`${window.origin}/api/graph`, {
+        const response = await fetch('api/graph', {
             method: 'POST',
             mode: 'cors',
             headers: {
@@ -560,7 +560,7 @@
     };
 
     const getLevels = async (bounds) => {
-        const response = await fetch(`${window.origin}/api/levels`, {
+        const response = await fetch('api/levels', {
             method: 'POST',
             mode: 'cors',
             headers: {