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

by default restrictions are off if timezone is not found

Browse Source
This commit is contained in:
karenzshea 2017-06-01 15:55:40 +02:00
parent f9a650792a
commit 63ea75612b
5 changed files with 211 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
features/car/conditional_restrictions.feature
View File

@ -318,11 +318,11 @@ Feature: Car - Turn restrictions
| m | p | mj,jp,jp | | m | p | mj,jp,jp |
@only_turning @conditionals @only_turning @conditionals
Scenario: Car - Somewhere in Liverpool, the UK, GMT timezone Scenario: Car - Somewhere in London, the UK, GMT timezone
Given the extract extra arguments "--parse-conditional-restrictions=1" Given the extract extra arguments "--parse-conditional-restrictions=1"
# 9am UTC, 10am BST # 9am UTC, 10am BST
Given the contract extra arguments "--time-zone-file=test/data/tz/liverpool.geojson --parse-conditionals-from-now=1493802000" Given the contract extra arguments "--time-zone-file=test/data/tz/london.geojson --parse-conditionals-from-now=1493802000"
Given the customize extra arguments "--time-zone-file=test/data/tz/liverpool.geojson --parse-conditionals-from-now=1493802000" Given the customize extra arguments "--time-zone-file=test/data/tz/london.geojson --parse-conditionals-from-now=1493802000"
# """ # """
# a # a
@ -664,11 +664,11 @@ Feature: Car - Turn restrictions
| e | c | florida ne,cap south,cap south | depart,turn left,arrive | | e | c | florida ne,cap south,cap south | depart,turn left,arrive |
@only_turning @conditionals @only_turning @conditionals
Scenario: Car - Somewhere in Liverpool, the UK, GMT timezone Scenario: Car - Somewhere in london, the UK, GMT timezone
Given the extract extra arguments "--parse-conditional-restrictions=1" Given the extract extra arguments "--parse-conditional-restrictions=1"
# 9am UTC, 10am BST # 9am UTC, 10am BST
Given the contract extra arguments "--time-zone-file=test/data/tz/liverpool.geojson --parse-conditionals-from-now=1493802000" Given the contract extra arguments "--time-zone-file=test/data/tz/london.geojson --parse-conditionals-from-now=1493802000"
Given the customize extra arguments "--time-zone-file=test/data/tz/liverpool.geojson --parse-conditionals-from-now=1493802000" Given the customize extra arguments "--time-zone-file=test/data/tz/london.geojson --parse-conditionals-from-now=1493802000"
# """ # """
# a # a

3
include/util/timezones.hpp
View File

@ -35,11 +35,10 @@ class Timezoner
Timezoner(const char geojson[], std::time_t utc_time_now); Timezoner(const char geojson[], std::time_t utc_time_now);
Timezoner(const boost::filesystem::path &tz_shapes_filename, std::time_t utc_time_now); Timezoner(const boost::filesystem::path &tz_shapes_filename, std::time_t utc_time_now);
struct tm operator()(const point_t &point) const; boost::optional<struct tm> operator()(const point_t &point) const;
private: private:
void LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t utc_time); void LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t utc_time);
struct tm default_time;
rtree_t rtree; rtree_t rtree;
std::vector<local_time_t> local_times; std::vector<local_time_t> local_times;
}; };

4
src/updater/updater.cpp
View File

@ -487,6 +487,8 @@ bool IsRestrictionValid(const Timezoner &tz_handler,
// Get local time of the restriction // Get local time of the restriction
const auto &local_time = tz_handler(point_t{lon, lat}); const auto &local_time = tz_handler(point_t{lon, lat});
if (!local_time)
return false;
// TODO: check restriction type [:<transportation mode>][:<direction>] // TODO: check restriction type [:<transportation mode>][:<direction>]
// http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Tagging // http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Tagging
@ -494,7 +496,7 @@ bool IsRestrictionValid(const Timezoner &tz_handler,
// TODO: parsing will fail for combined conditions, e.g. Sa-Su AND weight>7 // TODO: parsing will fail for combined conditions, e.g. Sa-Su AND weight>7
// http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Combined_conditions:_AND // http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Combined_conditions:_AND
if (osrm::util::CheckOpeningHours(condition, local_time)) if (osrm::util::CheckOpeningHours(condition, *local_time))
return true; return true;
return false; return false;

15
src/util/timezones.cpp
View File

@ -6,12 +6,14 @@
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <boost/scope_exit.hpp> #include <boost/scope_exit.hpp>
#include <boost/optional.hpp>
#include "rapidjson/document.h" #include "rapidjson/document.h"
#include "rapidjson/istreamwrapper.h" #include "rapidjson/istreamwrapper.h"
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <regex>
#include <unordered_map> #include <unordered_map>
// Function loads time zone shape polygons, computes a zone local time for utc_time, // Function loads time zone shape polygons, computes a zone local time for utc_time,
@ -25,8 +27,6 @@ namespace updater
Timezoner::Timezoner(const char geojson[], std::time_t utc_time_now) Timezoner::Timezoner(const char geojson[], std::time_t utc_time_now)
{ {
util::Log() << "Time zone validation based on UTC time : " << utc_time_now; util::Log() << "Time zone validation based on UTC time : " << utc_time_now;
// Thread safety: MT-Unsafe const:env
default_time = *gmtime(&utc_time_now);
rapidjson::Document doc; rapidjson::Document doc;
rapidjson::ParseResult ok = doc.Parse(geojson); rapidjson::ParseResult ok = doc.Parse(geojson);
if (!ok) if (!ok)
@ -41,8 +41,6 @@ Timezoner::Timezoner(const char geojson[], std::time_t utc_time_now)
Timezoner::Timezoner(const boost::filesystem::path &tz_shapes_filename, std::time_t utc_time_now) Timezoner::Timezoner(const boost::filesystem::path &tz_shapes_filename, std::time_t utc_time_now)
{ {
util::Log() << "Time zone validation based on UTC time : " << utc_time_now; util::Log() << "Time zone validation based on UTC time : " << utc_time_now;
// Thread safety: MT-Unsafe const:env
default_time = *gmtime(&utc_time_now);
if (tz_shapes_filename.empty()) if (tz_shapes_filename.empty())
throw osrm::util::exception("Missing time zone geojson file"); throw osrm::util::exception("Missing time zone geojson file");
@ -107,7 +105,9 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
throw osrm::util::exception("Feature has non-string TZID value."); throw osrm::util::exception("Feature has non-string TZID value.");
} }
const std::string &feat_type = features_array[i].GetObject()["geometry"].GetObject()["type"].GetString(); const std::string &feat_type = features_array[i].GetObject()["geometry"].GetObject()["type"].GetString();
if (feat_type == "polygon") std::regex polygon_match("polygon", std::regex::icase);
std::smatch res;
if (std::regex_match(feat_type, res, polygon_match))
{ {
polygon_t polygon; polygon_t polygon;
// per geojson spec, the first array of polygon coords is the exterior ring, we only want to access that // per geojson spec, the first array of polygon coords is the exterior ring, we only want to access that
@ -127,7 +127,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
// Get time zone name and emplace polygon and local time for the UTC input // Get time zone name and emplace polygon and local time for the UTC input
const auto tzname = const auto tzname =
features_array[i].GetObject()["properties"].GetObject()["TZID"].GetString(); features_array[i].GetObject()["properties"].GetObject()["tzid"].GetString();
local_times.push_back(local_time_t{polygon, get_local_time_in_tz(tzname)}); local_times.push_back(local_time_t{polygon, get_local_time_in_tz(tzname)});
} }
else else
@ -140,7 +140,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
rtree = rtree_t(polygons); rtree = rtree_t(polygons);
} }
struct tm Timezoner::operator()(const point_t &point) const boost::optional<struct tm> Timezoner::operator()(const point_t &point) const
{ {
std::vector<rtree_t::value_type> result; std::vector<rtree_t::value_type> result;
rtree.query(boost::geometry::index::intersects(point), std::back_inserter(result)); rtree.query(boost::geometry::index::intersects(point), std::back_inserter(result));
@ -149,6 +149,7 @@ struct tm Timezoner::operator()(const point_t &point) const
const auto index = v.second; const auto index = v.second;
if (boost::geometry::within(point, local_times[index].first)) if (boost::geometry::within(point, local_times[index].first))
return local_times[index].second; return local_times[index].second;
} }
} }
} }

199
test/data/tz/liverpool.geojson
View File

@ -1,8 +1,195 @@
{ {
"type": "FeatureCollection", "type": "FeatureCollection",
"features": [
"features": [ {
{ "type": "Feature", "properties": { "tzid": "Europe\/Isle_of_Man" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -4.115297325087907, 54.52745749948722 ], [ -4.0344301, 54.479 ], [ -3.9654913, 54.292 ], [ -3.9921158, 54.219 ], [ -4.1294243, 54.062 ], [ -4.3969301, 53.905 ], [ -4.4945949, 53.869 ], [ -4.8076135, 53.845 ], [ -4.9658203125, 53.863090828317766 ], [ -4.9658203125, 54.353344549330089 ], [ -4.8948807, 54.392 ], [ -4.868376, 54.4339904 ], [ -4.542761329182349, 54.52745749948722 ], [ -4.115297325087907, 54.52745749948722 ] ] ] } }, "type": "Feature",
{ "type": "Feature", "properties": { "tzid": "Europe\/London" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -4.868376, 54.4339904 ], [ -4.9658203125, 54.440433357982556 ], [ -4.9658203125, 54.52745749948722 ], [ -4.542761329182349, 54.52745749948722 ], [ -4.868376, 54.4339904 ] ] ], [ [ [ -4.9658203125, 52.991764530370652 ], [ -4.8118632, 53.085 ], [ -4.9658203125, 53.175318218576706 ], [ -4.9658203125, 53.428980227009838 ], [ -4.8911294, 53.532 ], [ -4.7808677, 53.595 ], [ -4.6646014, 53.621 ], [ -4.4026046, 53.634 ], [ -4.147566, 53.599 ], [ -4.0053089, 53.526 ], [ -3.8324713, 53.541 ], [ -3.6271987, 53.508 ], [ -3.4402166, 53.547 ], [ -3.4248294, 53.62 ], [ -3.3683406, 53.697 ], [ -3.3958062, 53.764 ], [ -3.3917274, 53.8697263 ], [ -3.5494708, 53.99 ], [ -3.605841, 54.079 ], [ -3.729297, 54.198 ], [ -3.7790165, 54.288 ], [ -3.9491542, 54.4245157 ], [ -4.115297325087907, 54.52745749948722 ], [ -2.13134765625, 54.52745749948722 ], [ -2.13134765625, 52.656393941988028 ], [ -4.9658203125, 52.656393941988028 ], [ -4.9658203125, 52.991764530370652 ] ] ] ] } } "properties": {
] "tzid": "Europe\\/Isle_of_Man"
},
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-4.115297325087907,
54.52745749948722
],
[
-4.0344301,
54.479
],
[
-3.9654913,
54.292
],
[
-3.9921158,
54.219
],
[
-4.1294243,
54.062
],
[
-4.3969301,
53.905
],
[
-4.4945949,
53.869
],
[
-4.8076135,
53.845
],
[
-4.9658203125,
53.863090828317766
],
[
-4.9658203125,
54.35334454933009
],
[
-4.8948807,
54.392
],
[
-4.868376,
54.4339904
],
[
-4.542761329182349,
54.52745749948722
],
[
-4.115297325087907,
54.52745749948722
]
]
]
}
},
{
"type": "Feature",
"properties": {
"tzid": "Europe\\/London"
},
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-4.9658203125,
52.99176453037065
],
[
-4.8118632,
53.085
],
[
-4.9658203125,
53.175318218576706
],
[
-4.9658203125,
53.42898022700984
],
[
-4.8911294,
53.532
],
[
-4.7808677,
53.595
],
[
-4.6646014,
53.621
],
[
-4.4026046,
53.634
],
[
-4.147566,
53.599
],
[
-4.0053089,
53.526
],
[
-3.8324713,
53.541
],
[
-3.6271987,
53.508
],
[
-3.4402166,
53.547
],
[
-3.4248294,
53.62
],
[
-3.3683406,
53.697
],
[
-3.3958062,
53.764
],
[
-3.3917274,
53.8697263
],
[
-3.5494708,
53.99
],
[
-3.605841,
54.079
],
[
-3.729297,
54.198
],
[
-3.7790165,
54.288
],
[
-3.9491542,
54.4245157
],
[
-4.115297325087907,
54.52745749948722
],
[
-2.13134765625,
54.52745749948722
],
[
-2.13134765625,
52.65639394198803
],
[
-4.9658203125,
52.65639394198803
],
[
-4.9658203125,
52.99176453037065
]
]
]
}
}
]
} }