From 0be87c73cfb47b6ecab41f996ec6323d7f52f744 Mon Sep 17 00:00:00 2001 From: Denis Chaplygin Date: Mon, 26 Aug 2019 14:31:51 +0300 Subject: [PATCH] Fixed typo in flatbuffers: longitute -> longitude. --- features/step_definitions/nearest.js | 2 +- features/support/fbresult_generated.js | 8 ++++---- include/engine/api/flatbuffers/fbresult_generated.h | 10 +++++----- include/engine/api/flatbuffers/position.fbs | 2 +- unit_tests/library/route.cpp | 4 ++-- unit_tests/library/waypoint_check.hpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/features/step_definitions/nearest.js b/features/step_definitions/nearest.js index 56bbd5843..ae4079b8d 100644 --- a/features/step_definitions/nearest.js +++ b/features/step_definitions/nearest.js @@ -72,7 +72,7 @@ module.exports = function () { var fb = FBResult.getRootAsFBResult(buf); var location = fb.waypoints(0).location(); - coord = [location.longitute(), location.latitude()]; + coord = [location.longitude(), location.latitude()]; var got = { in: row.in, out: row.out }; diff --git a/features/support/fbresult_generated.js b/features/support/fbresult_generated.js index 9e10e1606..d418e1bc4 100644 --- a/features/support/fbresult_generated.js +++ b/features/support/fbresult_generated.js @@ -127,7 +127,7 @@ osrm.engine.api.fbresult.Position.prototype.__init = function(i, bb) { /** * @returns {number} */ -osrm.engine.api.fbresult.Position.prototype.longitute = function() { +osrm.engine.api.fbresult.Position.prototype.longitude = function() { return this.bb.readFloat32(this.bb_pos); }; @@ -140,14 +140,14 @@ osrm.engine.api.fbresult.Position.prototype.latitude = function() { /** * @param {flatbuffers.Builder} builder - * @param {number} longitute + * @param {number} longitude * @param {number} latitude * @returns {flatbuffers.Offset} */ -osrm.engine.api.fbresult.Position.createPosition = function(builder, longitute, latitude) { +osrm.engine.api.fbresult.Position.createPosition = function(builder, longitude, latitude) { builder.prep(4, 8); builder.writeFloat32(latitude); - builder.writeFloat32(longitute); + builder.writeFloat32(longitude); return builder.offset(); }; diff --git a/include/engine/api/flatbuffers/fbresult_generated.h b/include/engine/api/flatbuffers/fbresult_generated.h index 47eb51806..f3f05de4a 100644 --- a/include/engine/api/flatbuffers/fbresult_generated.h +++ b/include/engine/api/flatbuffers/fbresult_generated.h @@ -176,19 +176,19 @@ inline const char *EnumNameTurn(Turn e) { FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Position FLATBUFFERS_FINAL_CLASS { private: - float longitute_; + float longitude_; float latitude_; public: Position() { memset(static_cast(this), 0, sizeof(Position)); } - Position(float _longitute, float _latitude) - : longitute_(flatbuffers::EndianScalar(_longitute)), + Position(float _longitude, float _latitude) + : longitude_(flatbuffers::EndianScalar(_longitude)), latitude_(flatbuffers::EndianScalar(_latitude)) { } - float longitute() const { - return flatbuffers::EndianScalar(longitute_); + float longitude() const { + return flatbuffers::EndianScalar(longitude_); } float latitude() const { return flatbuffers::EndianScalar(latitude_); diff --git a/include/engine/api/flatbuffers/position.fbs b/include/engine/api/flatbuffers/position.fbs index ec41d9839..e78f02c67 100644 --- a/include/engine/api/flatbuffers/position.fbs +++ b/include/engine/api/flatbuffers/position.fbs @@ -1,6 +1,6 @@ namespace osrm.engine.api.fbresult; struct Position { - longitute: float; + longitude: float; latitude: float; } \ No newline at end of file diff --git a/unit_tests/library/route.cpp b/unit_tests/library/route.cpp index 2372fb9cb..b00c782be 100644 --- a/unit_tests/library/route.cpp +++ b/unit_tests/library/route.cpp @@ -503,7 +503,7 @@ BOOST_AUTO_TEST_CASE(test_route_serialize_fb) for (const auto &waypoint : *waypoints) { - const auto longitude = waypoint->location()->longitute(); + const auto longitude = waypoint->location()->longitude(); const auto latitude = waypoint->location()->latitude(); BOOST_CHECK(longitude >= -180. && longitude <= 180.); BOOST_CHECK(latitude >= -90. && latitude <= 90.); @@ -548,7 +548,7 @@ BOOST_AUTO_TEST_CASE(test_route_serialize_fb) for (auto intersection : *intersections) { - const auto longitude = intersection->location()->longitute(); + const auto longitude = intersection->location()->longitude(); const auto latitude = intersection->location()->latitude(); BOOST_CHECK(longitude >= -180. && longitude <= 180.); BOOST_CHECK(latitude >= -90. && latitude <= 90.); diff --git a/unit_tests/library/waypoint_check.hpp b/unit_tests/library/waypoint_check.hpp index fe80a5435..5bd3161fc 100644 --- a/unit_tests/library/waypoint_check.hpp +++ b/unit_tests/library/waypoint_check.hpp @@ -24,7 +24,7 @@ inline bool waypoint_check(json::Value waypoint) inline bool waypoint_check(const osrm::engine::api::fbresult::Waypoint *const waypoint) { - util::FloatLongitude lon{waypoint->location()->longitute()}; + util::FloatLongitude lon{waypoint->location()->longitude()}; util::FloatLatitude lat{waypoint->location()->latitude()}; util::Coordinate location_coordinate(lon, lat); return location_coordinate.IsValid();