Merge branch 'master' of github.com:Project-OSRM/osrm-backend into HEAD

2020-12-01 19:24:11 -07:00
parent 1a5e5df6bd 18a0f6c1f8
commit 0e10b94d38
370 changed files with 1193 additions and 1154 deletions
@@ -424,8 +424,8 @@ void Sol2ScriptingEnvironment::InitContext(LuaScriptingContext &context)
        "get_relations",
        [&getTypedRefBySol](ExtractionRelationContainer &cont, const sol::object &obj)
            -> const ExtractionRelationContainer::RelationIDList & {
-                return cont.GetRelations(getTypedRefBySol(obj));
-            },
+            return cont.GetRelations(getTypedRefBySol(obj));
+        },
        "relation",
        [](ExtractionRelationContainer &cont, const ExtractionRelation::OsmIDTyped &rel_id)
            -> const ExtractionRelation & { return cont.GetRelationData(rel_id); });