Revert previous commits for cleaner approach

Author: whytro

CHANGELOG.md

@@ -1,7 +1,5 @@
 # Unreleased
   - Changes from 5.27.1
-    - API:
-      - CHANGED: Require a `radius` parameter when using `bearings`. [#6572](https://github.com/Project-OSRM/osrm-backend/pull/6572)
     - Build:
       - ADDED: Add CI job which builds OSRM with gcc 12. [#6455](https://github.com/Project-OSRM/osrm-backend/pull/6455)
       - CHANGED: Upgrade to clang-tidy 15. [#6439](https://github.com/Project-OSRM/osrm-backend/pull/6439)

docs/http.md

@@ -31,7 +31,7 @@ To pass parameters to each location some options support an array-like encoding:
 
 | Option         | Values                                                 | Description                                                                                                                                                                                               |
 |----------------|--------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|bearings        |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in a clockwise direction. Requires a corresponding radius.                                                                    |
+|bearings        |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in a clockwise direction.                                                                                                     |
 |radiuses        |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.                                                                                                                                                               |
 |generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.                                                                                                               |
 |hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                                                                                                                           |

docs/nodejs/api.md

@@ -111,8 +111,7 @@ var osrm = new OSRM('network.osrm');
 var options = {
   coordinates: [[13.388860,52.517037]],
   number: 3,
-  bearings: [[0,20]],
-  radiuses: [null]
+  bearings: [[0,20]]
 };
 osrm.nearest(options, function(err, response) {
   console.log(response.waypoints); // array of Waypoint objects

features/car/startpoint.feature

@@ -70,7 +70,6 @@ Feature: Car - Allowed start/end modes
         Given the query options
             | snapping  | any          |
             | bearings  | 90,180;      |
-            | radiuses  | unlimited;   |
 
         And the ways
             | nodes | highway | access  |
@@ -113,7 +112,6 @@ Feature: Car - Allowed start/end modes
         Given the query options
             | snapping  | any            |
             | bearings  | 90,180;0,180;; |
-            | radiuses  | unlimited;;;   |
 
         And the ways
             | nodes | highway | access  |

features/support/route.js

@@ -66,9 +66,6 @@ module.exports = function () {
                 if (bs.length === 2) return b;
                 else return b += ',10';
             }).join(';');
-            params.radiuses = bearings.map(() => {
-                return 'unlimited';
-            }).join(';');
         }
 
         if (approaches.length) {

features/testbot/annotations.feature

@@ -112,8 +112,7 @@ Feature: Annotations
         And the query options
           | annotations | speed,distance,duration,nodes |
           | bearings    | 90,5;180,5                    |
-          | radiuses    | unlimited;unlimited           |
 
         When I route I should get
-            | from | to | route    | a:speed | a:distance             | a:duration | a:nodes |
+            | from | to | route    | a:speed | a:distance            | a:duration | a:nodes |
             | a    | c  | abc,abc  | 10:10   | 249.9876189:299.962882 | 25:30      | 1:2:3   |

include/engine/api/base_parameters.hpp

@@ -106,7 +106,7 @@ struct BaseParameters
     bool IsValid() const
     {
         return (hints.empty() || hints.size() == coordinates.size()) &&
-               (bearings.empty() || bearings.size() == radiuses.size()) &&
+               (bearings.empty() || bearings.size() == coordinates.size()) &&
                (radiuses.empty() || radiuses.size() == coordinates.size()) &&
                (approaches.empty() || approaches.size() == coordinates.size()) &&
                std::all_of(bearings.begin(),

include/nodejs/node_osrm_support.hpp

@@ -522,12 +522,6 @@ inline bool argumentsToParameter(const Napi::CallbackInfo &args,
         if (bearings.IsEmpty())
             return false;
 
-        if (!obj.Has("radiuses"))
-        {
-            ThrowError(args.Env(), "Bearings must be accompanied with radiuses");
-            return false;
-        }
-
         if (!bearings.IsArray())
         {
             ThrowError(args.Env(), "Bearings must be an array of arrays of numbers");

include/server/service/utils.hpp

@@ -4,20 +4,18 @@ namespace osrm::server::service
 {
 
 const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] =
-    "Number of elements in %1% size %2% does not match %3% size %4%";
+    "Number of elements in %1% size %2% does not match coordinate size %3%";
 
 template <typename ParamT>
 bool constrainParamSize(const char *msg_template,
-                        const char *param_name,
+                        const char *name,
                         const ParamT &param,
-                        const char *target_name,
                         const std::size_t target_size,
                         std::string &help)
 {
     if (param.size() > 0 && param.size() != target_size)
     {
-        help = (boost::format(msg_template) % param_name % param.size() % target_name % target_size)
-                   .str();
+        help = (boost::format(msg_template) % name % param.size() % target_size).str();
         return true;
     }
     return false;

src/engine/plugins/table.cpp

@@ -43,12 +43,6 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
             "InvalidOptions", "Number of bearings does not match number of coordinates", result);
     }
 
-    if (!params.bearings.empty() && params.radiuses.size() != params.bearings.size())
-    {
-        return Error(
-            "InvalidOptions", "Number of radiuses does not match number of bearings", result);
-    }
-
     // Empty sources or destinations means the user wants all of them included, respectively
     // The ManyToMany routing algorithm we dispatch to below already handles this perfectly.
     const auto num_sources =