Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Make Tile plugin validate its parameters, fixes #2109

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-03-18 15:30:28 +01:00 committed by Patrick Niklaus
parent 843a4b8eae
commit 5beaab97da
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/engine/api/tile_parameters.hpp
View File

@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ENGINE_API_TILE_PARAMETERS_HPP #ifndef ENGINE_API_TILE_PARAMETERS_HPP
#define ENGINE_API_TILE_PARAMETERS_HPP #define ENGINE_API_TILE_PARAMETERS_HPP
#include <cmath>
namespace osrm namespace osrm
{ {
namespace engine namespace engine
@ -41,8 +43,16 @@ struct TileParameters final
unsigned y; unsigned y;
unsigned z; unsigned z;
// FIXME check if x and y work with z bool IsValid() const
bool IsValid() { return z < 20; }; {
// https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Zoom_levels
// https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#X_and_Y
const auto valid_x = x <= static_cast<unsigned>(std::pow(2., z)) - 1;
const auto valid_y = y <= static_cast<unsigned>(std::pow(2., z)) - 1;
const auto valid_z = z < 20;
return valid_x && valid_y && valid_z;
};
}; };
} }
} }

2
src/engine/plugins/tile.cpp
View File

@ -168,6 +168,8 @@ FixedLine coordinatesToTileLine(const util::Coordinate start,
Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::string &pbf_buffer) Status TilePlugin::HandleRequest(const api::TileParameters &parameters, std::string &pbf_buffer)
{ {
BOOST_ASSERT(parameters.IsValid());
using namespace util::coordinate_calculation; using namespace util::coordinate_calculation;
double min_lon, min_lat, max_lon, max_lat; double min_lon, min_lat, max_lon, max_lat;