parse parameters.annotations into AnnotationsType::All

Project-OSRM · Feb 13, 2017 · a31f401 · a31f401
1 parent 6446257
commit a31f401
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
@@ -228,8 +228,16 @@ class RouteAPI : public BaseAPI
 
         std::vector<util::json::Object> annotations;
 
-        if (parameters.annotations_type != RouteParameters::AnnotationsType::None)
+        if (parameters.annotations_type != RouteParameters::AnnotationsType::None ||
+            parameters.annotations == true)
         {
+            auto requested_annotations = parameters.annotations_type;
+            if ((parameters.annotations == true) &&
+                (parameters.annotations_type == RouteParameters::AnnotationsType::None))
+            {
+                requested_annotations = RouteParameters::AnnotationsType::All;
+            }
+
             for (const auto idx : util::irange<std::size_t>(0UL, leg_geometries.size()))
             {
                 auto &leg_geometry = leg_geometries[idx];
@@ -243,35 +251,36 @@ class RouteAPI : public BaseAPI
                         });
                 }
 
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Duration)
+                // AnnotationsType uses bit flags, & operator checks if a property is set
+                if (ReqAnnotations & RouteParameters::AnnotationsType::Duration)
                 {
                     annotation.values["duration"] = GetAnnotations(
                         leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
                             return anno.duration;
                         });
                 }
 
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Distance)
+                if (requested_annotations & RouteParameters::AnnotationsType::Distance)
                 {
                     annotation.values["distance"] = GetAnnotations(
                         leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
                             return anno.distance;
                         });
                 }
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Weight)
+                if (requested_annotations & RouteParameters::AnnotationsType::Weight)
                 {
                     annotation.values["weight"] = GetAnnotations(
                         leg_geometry,
                         [](const guidance::LegGeometry::Annotation &anno) { return anno.weight; });
                 }
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Datasources)
+                if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
                 {
                     annotation.values["datasources"] = GetAnnotations(
                         leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
                             return anno.datasource;
                         });
                 }
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Nodes)
+                if (requested_annotations & RouteParameters::AnnotationsType::Nodes)
                 {
                     util::json::Array nodes;
                     nodes.values.reserve(leg_geometry.osm_node_ids.size());