27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/src/mjolnir/valhalla_build_admins.cc b/src/mjolnir/valhalla_build_admins.cc
|
|
index 3f675a231..cc211ce42 100644
|
|
--- a/src/mjolnir/valhalla_build_admins.cc
|
|
+++ b/src/mjolnir/valhalla_build_admins.cc
|
|
@@ -141,7 +141,9 @@ int polygondata_comparearea(const void*
|
|
std::vector<std::string> GetWkts(std::unique_ptr<Geometry>& mline) {
|
|
std::vector<std::string> wkts;
|
|
|
|
-#if 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR
|
|
+#if 3 == GEOS_VERSION_MAJOR && 7 <= GEOS_VERSION_MINOR
|
|
+ GeometryFactory::Ptr gf = GeometryFactory::create();
|
|
+#elif 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR
|
|
auto gf = GeometryFactory::create();
|
|
#else
|
|
std::unique_ptr<GeometryFactory> gf(new GeometryFactory());
|
|
@@ -420,7 +422,9 @@ void BuildAdminFromPBF(const boost::prop
|
|
uint32_t count = 0;
|
|
uint64_t nodeid;
|
|
bool has_data;
|
|
-#if 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR
|
|
+#if 3 == GEOS_VERSION_MAJOR && 7 <= GEOS_VERSION_MINOR
|
|
+ GeometryFactory::Ptr gf = GeometryFactory::create();
|
|
+#elif 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR
|
|
auto gf = GeometryFactory::create();
|
|
#else
|
|
std::unique_ptr<GeometryFactory> gf(new GeometryFactory());
|