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

Fix raster handling

Browse Source
This commit is contained in:
Desone Burns II 2020-09-25 15:03:00 -07:00
parent f957c8fb7b
commit 6c0a14c5dc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
profiles/lib/way_handlers.lua
View File

@ -598,6 +598,9 @@ function WayHandlers.weights(profile,way,result,data)
if (result.backward_mode ~= mode.inaccessible and result.backward_speed > 0) then if (result.backward_mode ~= mode.inaccessible and result.backward_speed > 0) then
result.backward_rate = 1 result.backward_rate = 1
end end
elseif profile.standard_rate then
result.forward_rate = 1
result.backward_rate = 1
end end
end end

8
src/extractor/raster_source.cpp
View File

@ -42,8 +42,8 @@ RasterDatum RasterSource::GetRasterData(const int lon, const int lat) const
return {}; return {};
} }
const std::size_t xth = static_cast<std::size_t>(round((lon - xmin) / xstep)); const std::size_t xth = static_cast<std::size_t>(round((lat - xmin) / xstep));
const std::size_t yth = static_cast<std::size_t>(round((ymax - lat) / ystep)); const std::size_t yth = static_cast<std::size_t>(round((lon - ymin) / ystep));
return {raster_data(xth, yth)}; return {raster_data(xth, yth)};
} }
@ -57,9 +57,7 @@ RasterDatum RasterSource::GetRasterInterpolate(const int lon, const int lat) con
} }
const auto xthP = (lon - xmin) / xstep; const auto xthP = (lon - xmin) / xstep;
const auto ythP = const auto ythP = (lat - ymin) / ystep;
(ymax - lat) /
ystep; // the raster texture uses a different coordinate system with y pointing downwards
const std::size_t top = static_cast<std::size_t>(fmax(floor(ythP), 0)); const std::size_t top = static_cast<std::size_t>(fmax(floor(ythP), 0));
const std::size_t bottom = static_cast<std::size_t>(fmin(ceil(ythP), height - 1)); const std::size_t bottom = static_cast<std::size_t>(fmin(ceil(ythP), height - 1));