address bug for tdmatrix when shape_format -ne 'none'

valhalla · Dec 9, 2023 · 89ec5a8 · 89ec5a8
1 parent 1a01879
commit 89ec5a8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/tyr/matrix_serializer.cc b/src/tyr/matrix_serializer.cc
@@ -50,7 +50,7 @@ json::ArrayPtr serialize_shape(const valhalla::Matrix& matrix,
                                const ShapeFormat shape_format) {
   // TODO(nils): shapes aren't implemented yet in TDMatrix
   auto shapes = json::array({});
-  if (shape_format == no_shape)
+  if (shape_format == no_shape || matrix.algorithm() != Matrix::CostMatrix)
     return shapes;
 
   for (size_t i = start_td; i < start_td + td_count; ++i) {
@@ -145,8 +145,7 @@ json::ArrayPtr serialize_row(const valhalla::Matrix& matrix,
       if (!date_time.empty()) {
         map->emplace("date_time", date_time);
       }
-      // TODO(nils): shapes aren't implemented yet in TDMatrix
-      if (matrix.shapes().size() && !matrix.shapes()[i].empty()) {
+      if (matrix.shapes().size()) {
         switch (shape_format) {
           case geojson:
             map->emplace("shape",
@@ -200,7 +199,7 @@ std::string serialize(const Api& request, double distance_scale) {
     }
     matrix->emplace("distances", distance);
     matrix->emplace("durations", time);
-    if (!(options.shape_format() == no_shape))
+    if (!(options.shape_format() == no_shape) && request.matrix().algorithm() == Matrix::CostMatrix)
       matrix->emplace("shapes", shapes);
 
     json->emplace("sources_to_targets", matrix);