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

Enable all unit tests (#5248)

Browse Source 
* Add missing profile name to library extract test.

* Support both tzid and TZID properties on timezone geometry.  Improve validation of timezone polygons.

* Missing tzid property wasn't a geojson validation issue, shouldn't have been tested there.

* Use filesystem glob to loop over all test executables so we don't miss any in the future.

Co-authored-by: Michael Bell <michael@mjjbell.com>
This commit is contained in:
Daniel Patterson
2021-10-22 14:10:25 -07:00
committed by GitHub
parent b120c971a0
commit d5cd702242
7 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/timezones.cpp
+15 -6
View File
@@ -110,14 +110,23 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
// time zone geojson specific checks
const auto &feature = features_array[i].GetObject();
const auto &properties = feature["properties"].GetObject();
if (!properties.HasMember("tzid"))
std::string tzid_key = "tzid";
if (properties.HasMember("tzid"))
{
if (!properties["tzid"].IsString())
throw osrm::util::exception("Feature has non-string 'tzid' value.");
tzid_key = "tzid";
}
else if (properties.HasMember("TZID"))
{
if (!properties["TZID"].IsString())
throw osrm::util::exception("Feature has non-string 'TZID' value.");
tzid_key = "TZID";
}
else
{
throw osrm::util::exception("Feature is missing 'tzid' member in properties.");
}
else if (!properties["tzid"].IsString())
{
throw osrm::util::exception("Feature has non-string 'tzid' value.");
}
// Case-sensitive check of type https://tools.ietf.org/html/rfc7946#section-1.4
const auto &geometry = feature["geometry"].GetObject();
@@ -137,7 +146,7 @@ void Timezoner::LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t ut
local_times.size());
// Get time zone name and emplace polygon and local time for the UTC input
const auto &tzname = properties["tzid"].GetString();
const auto &tzname = properties[tzid_key.c_str()].GetString();
local_times.push_back(local_time_t{polygon, get_local_time_in_tz(tzname)});
}
else