unit tests for geojson validation

include/util/geojson_validation.hpp

@@ -0,0 +1,84 @@
+#ifndef OSRM_GEOJSON_VALIDATION_HPP
+#define OSRM_GEOJSON_VALIDATION_HPP
+
+#include "util/exception.hpp"
+#include "util/log.hpp"
+
+#include "rapidjson/document.h"
+
+namespace osrm
+{
+namespace util
+{
+
+inline void ValidateCoordinate(const rapidjson::Value &coordinate)
+{
+    if (!coordinate.IsArray())
+        throw osrm::util::exception("Feature geometry has a non-array coordinate.");
+    if (coordinate.Capacity() != 2)
+    {
+        throw osrm::util::exception("Feature geometry has a malformed coordinate with more than 2 values.");
+    } else {
+        for (rapidjson::SizeType i = 0; i < coordinate.Size(); i++)
+        {
+            if (!coordinate[i].IsNumber() && !coordinate[i].IsDouble())
+                throw osrm::util::exception("Feature geometry has a non-number coordinate.");
+        }
+    }
+}
+
+inline void ValidateFeature(const rapidjson::Value &feature)
+{
+    if (!feature.HasMember("type"))
+    {
+        throw osrm::util::exception("Feature is missing type member.");
+    } else if (!feature["type"].IsString())
+    {
+        throw osrm::util::exception("Feature has non-string type member.");
+    }
+    if (!feature.HasMember("properties"))
+    {
+        throw osrm::util::exception("Feature is missing properties member.");
+    }
+    else if (!feature.GetObject()["properties"].IsObject())
+    {
+        throw osrm::util::exception("Feature has non-object properties member.");
+    }
+    if (!feature["properties"].GetObject().HasMember("TZID"))
+    {
+        throw osrm::util::exception("Feature is missing TZID member in properties.");
+    }
+    else if (!feature["properties"].GetObject()["TZID"].IsString())
+    {
+        throw osrm::util::exception("Feature has non-string TZID value.");
+    }
+    if (!feature.HasMember("geometry"))
+    {
+        throw osrm::util::exception("Feature is missing geometry member.");
+    }
+    else if (!feature.GetObject()["geometry"].IsObject())
+    {
+        throw osrm::util::exception("Feature non-object geometry member.");
+    }
+
+    if (!feature["geometry"].GetObject().HasMember("type"))
+    {
+        throw osrm::util::exception("Feature geometry is missing type member.");
+    } else if (!feature["geometry"].GetObject()["type"].IsString()) {
+        throw osrm::util::exception("Feature geometry has non-string type member.");
+    }
+    if (!feature["geometry"].GetObject().HasMember("coordinates"))
+    {
+        throw osrm::util::exception("Feature geometry is missing coordinates member.");
+    } else if (!feature["geometry"].GetObject()["coordinates"].IsArray()) {
+        throw osrm::util::exception("Feature geometry has a non-array coordinates member.");
+    }
+    const auto coord_array = feature["geometry"].GetObject()["coordinates"].GetArray();
+    if (coord_array.Empty())
+        throw osrm::util::exception("Feature geometry coordinates member is empty.");
+    if (!coord_array[0].GetArray()[0].IsArray())
+        throw osrm::util::exception("Feature geometry coordinates array has non-array outer ring.");
+}
+}
+}
+#endif // OSRM_GEOJSON_VALIDATION_HPP

include/util/timezones.hpp

@@ -37,8 +37,6 @@ class Timezoner
 
     struct tm operator()(const point_t &point) const;
   private:
-    void ValidateFeature(const rapidjson::Value &feature);
-    void ValidateCoordinate(const rapidjson::Value &coordinate);
     void LoadLocalTimesRTree(rapidjson::Document &geojson, std::time_t utc_time);
 
     struct tm default_time;