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

Fix raster_source + tests

Browse Source
This commit is contained in:
Lauren Budorick 2016-03-30 15:29:47 -07:00 committed by Patrick Niklaus
parent 4b60fc4747
commit 49e2cb6c36
6 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/raster/weights.feature
View File

@ -61,7 +61,7 @@ Feature: Raster - weights
| d | b | de,eb | 10 km/h | | d | b | de,eb | 10 km/h |
Scenario: Weighting based on raster sources Scenario: Weighting based on raster sources
Given the profile "rasterbot-interp" Given the profile "rasterbotinterp"
When I run "osrm-extract {osm_base}.osm -p {profile}" When I run "osrm-extract {osm_base}.osm -p {profile}"
Then stdout should contain "evaluating segment" Then stdout should contain "evaluating segment"
And I run "osrm-contract {osm_base}.osm" And I run "osrm-contract {osm_base}.osm"

5
include/extractor/raster_source.hpp
View File

@ -2,6 +2,7 @@
#define RASTER_SOURCE_HPP #define RASTER_SOURCE_HPP
#include "util/exception.hpp" #include "util/exception.hpp"
#include "util/coordinate.hpp"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
@ -141,9 +142,9 @@ class SourceContainer
std::size_t nrows, std::size_t nrows,
std::size_t ncols); std::size_t ncols);
RasterDatum getRasterDataFromSource(unsigned int source_id, int lon, int lat); RasterDatum getRasterDataFromSource(unsigned int source_id, double lon, double lat);
RasterDatum getRasterInterpolateFromSource(unsigned int source_id, int lon, int lat); RasterDatum getRasterInterpolateFromSource(unsigned int source_id, double lon, double lat);
private: private:
std::vector<RasterSource> LoadedSources; std::vector<RasterSource> LoadedSources;

4
profiles/rasterbot.lua
View File

@ -13,6 +13,9 @@ function way_function (way, result)
result.name = name result.name = name
end end
result.forward_mode = mode.cycling
result.backward_mode = mode.cycling
result.forward_speed = 15 result.forward_speed = 15
result.backward_speed = 15 result.backward_speed = 15
end end
@ -30,6 +33,7 @@ function source_function ()
end end
function segment_function (source, target, distance, weight) function segment_function (source, target, distance, weight)
io.write("lookup for " .. source.lon .. "," .. source.lat .. " " .. target.lon .. "," .. target.lat .. "\n")
local sourceData = sources:query(raster_source, source.lon, source.lat) local sourceData = sources:query(raster_source, source.lon, source.lat)
local targetData = sources:query(raster_source, target.lon, target.lat) local targetData = sources:query(raster_source, target.lon, target.lat)
io.write("evaluating segment: " .. sourceData.datum .. " " .. targetData.datum .. "\n") io.write("evaluating segment: " .. sourceData.datum .. " " .. targetData.datum .. "\n")

3
profiles/rasterbot-interp.lua → profiles/rasterbotinterp.lua
View File

@ -13,6 +13,9 @@ function way_function (way, result)
result.name = name result.name = name
end end
result.forward_mode = mode.cycling
result.backward_mode = mode.cycling
result.forward_speed = 15 result.forward_speed = 15
result.backward_speed = 15 result.backward_speed = 15
end end

36
src/extractor/raster_source.cpp
View File

@ -3,8 +3,6 @@
#include "util/simple_logger.hpp" #include "util/simple_logger.hpp"
#include "util/timing_util.hpp" #include "util/timing_util.hpp"
#include "osrm/coordinate.hpp"
#include <cmath> #include <cmath>
namespace osrm namespace osrm
@ -84,10 +82,10 @@ int SourceContainer::loadRasterSource(const std::string &path_string,
std::size_t nrows, std::size_t nrows,
std::size_t ncols) std::size_t ncols)
{ {
const auto _xmin = static_cast<int>(xmin * COORDINATE_PRECISION); const auto _xmin = static_cast<int>(util::toFixed(util::FloatLongitude(xmin)));
const auto _xmax = static_cast<int>(xmax * COORDINATE_PRECISION); const auto _xmax = static_cast<int>(util::toFixed(util::FloatLongitude(xmax)));
const auto _ymin = static_cast<int>(ymin * COORDINATE_PRECISION); const auto _ymin = static_cast<int>(util::toFixed(util::FloatLatitude(ymin)));
const auto _ymax = static_cast<int>(ymax * COORDINATE_PRECISION); const auto _ymax = static_cast<int>(util::toFixed(util::FloatLatitude(ymax)));
const auto itr = LoadedSourcePaths.find(path_string); const auto itr = LoadedSourcePaths.find(path_string);
if (itr != LoadedSourcePaths.end()) if (itr != LoadedSourcePaths.end())
@ -122,38 +120,40 @@ int SourceContainer::loadRasterSource(const std::string &path_string,
} }
// External function for looking up nearest data point from a specified source // External function for looking up nearest data point from a specified source
RasterDatum SourceContainer::getRasterDataFromSource(unsigned int source_id, int lon, int lat) RasterDatum SourceContainer::getRasterDataFromSource(unsigned int source_id, double lon, double lat)
{ {
if (LoadedSources.size() < source_id + 1) if (LoadedSources.size() < source_id + 1)
{ {
throw util::exception("error reading: no such loaded source"); throw util::exception("error reading: no such loaded source");
} }
BOOST_ASSERT(lat < (90 * COORDINATE_PRECISION)); BOOST_ASSERT(lat < 90);
BOOST_ASSERT(lat > (-90 * COORDINATE_PRECISION)); BOOST_ASSERT(lat > -90);
BOOST_ASSERT(lon < (180 * COORDINATE_PRECISION)); BOOST_ASSERT(lon < 180);
BOOST_ASSERT(lon > (-180 * COORDINATE_PRECISION)); BOOST_ASSERT(lon > -180);
const auto &found = LoadedSources[source_id]; const auto &found = LoadedSources[source_id];
return found.getRasterData(lon, lat); return found.getRasterData(static_cast<int>(util::toFixed(util::FloatLongitude(lon))),
static_cast<int>(util::toFixed(util::FloatLatitude(lat))));
} }
// External function for looking up interpolated data from a specified source // External function for looking up interpolated data from a specified source
RasterDatum RasterDatum
SourceContainer::getRasterInterpolateFromSource(unsigned int source_id, int lon, int lat) SourceContainer::getRasterInterpolateFromSource(unsigned int source_id, double lon, double lat)
{ {
if (LoadedSources.size() < source_id + 1) if (LoadedSources.size() < source_id + 1)
{ {
throw util::exception("error reading: no such loaded source"); throw util::exception("error reading: no such loaded source");
} }
BOOST_ASSERT(lat < (90 * COORDINATE_PRECISION)); BOOST_ASSERT(lat < 90);
BOOST_ASSERT(lat > (-90 * COORDINATE_PRECISION)); BOOST_ASSERT(lat > -90);
BOOST_ASSERT(lon < (180 * COORDINATE_PRECISION)); BOOST_ASSERT(lon < 180);
BOOST_ASSERT(lon > (-180 * COORDINATE_PRECISION)); BOOST_ASSERT(lon > -180);
const auto &found = LoadedSources[source_id]; const auto &found = LoadedSources[source_id];
return found.getRasterInterpolate(lon, lat); return found.getRasterInterpolate(static_cast<int>(util::toFixed(util::FloatLongitude(lon))),
static_cast<int>(util::toFixed(util::FloatLatitude(lat))));
} }
} }
} }

4
unit_tests/extractor/raster_source.cpp
View File

@ -16,12 +16,12 @@ int normalize(double coord) { return static_cast<int>(coord * COORDINATE_PRECISI
#define CHECK_QUERY(source_id, lon, lat, expected) \ #define CHECK_QUERY(source_id, lon, lat, expected) \
BOOST_CHECK_EQUAL( \ BOOST_CHECK_EQUAL( \
sources.getRasterDataFromSource(source_id, normalize(lon), normalize(lat)).datum, \ sources.getRasterDataFromSource(source_id, lon, lat).datum, \
expected) expected)
#define CHECK_INTERPOLATE(source_id, lon, lat, expected) \ #define CHECK_INTERPOLATE(source_id, lon, lat, expected) \
BOOST_CHECK_EQUAL( \ BOOST_CHECK_EQUAL( \
sources.getRasterInterpolateFromSource(source_id, normalize(lon), normalize(lat)).datum, \ sources.getRasterInterpolateFromSource(source_id, lon, lat).datum, \
expected) expected)
BOOST_AUTO_TEST_CASE(raster_test) BOOST_AUTO_TEST_CASE(raster_test)