Merge branch 'fix/geometry-plan-with-single-location'

Author: jcoupey

src/routing/wrapper.h

@@ -52,28 +52,22 @@ class Wrapper {
           route_locs.reserve(v.steps.size());
 
           bool has_job_steps = false;
+
+          if (v.has_start()) {
+            route_locs.push_back(v.start.value());
+          }
+
           for (const auto& step : v.steps) {
-            switch (step.type) {
-              using enum STEP_TYPE;
-            case START:
-              if (v.has_start()) {
-                route_locs.push_back(v.start.value());
-              }
-              break;
-            case END:
-              if (v.has_end()) {
-                route_locs.push_back(v.end.value());
-              }
-              break;
-            case BREAK:
-              break;
-            case JOB:
+            if (step.type == STEP_TYPE::JOB) {
               has_job_steps = true;
               route_locs.push_back(jobs[step.rank].location);
-              break;
             }
           }
 
+          if (v.has_end()) {
+            route_locs.push_back(v.end.value());
+          }
+
           if (has_job_steps) {
             assert(route_locs.size() >= 2);
 

src/structures/vroom/input/input.cpp

@@ -1081,7 +1081,7 @@ void Input::set_matrices(unsigned nb_thread, bool sparse_filling) {
         assert(!define_durations || define_distances);
 
         if (define_durations || define_distances) {
-          if (_locations.size() == 1) {
+          if (_locations.size() == 1 && !sparse_filling) {
             durations_m->second = Matrix<UserDuration>(1);
             distances_m->second = Matrix<UserDistance>(1);
           } else {
@@ -1355,6 +1355,7 @@ Solution Input::check(unsigned nb_thread) {
       auto search = route_rank_to_v_rank.find(i);
       assert(search != route_rank_to_v_rank.end());
       const auto v_rank = search->second;
+      assert(v_rank < _vehicles_geometry.size());
       route.geometry = std::move(_vehicles_geometry[v_rank]);
     }