From e635a8ec40abbdac8661b8c4807b03c65031717b Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 11 Mar 2019 16:56:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=B2=D0=B0=D0=BB=D1=8C=D0=B3=D0=B0=D0=BB=D0=BB=D1=8B=203.0?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- geos-3.7.diff | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ef7533..6314347 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /home/valhalla && \ RUN cd /home/valhalla && \ git clone https://github.com/valhalla/valhalla && \ - cd /home/valhalla/valhalla && \ + cd /home/valhalla/valhalla && git checkout 3.0.2 && \ git submodule update --init --recursive ADD geos-3.7.diff /home diff --git a/geos-3.7.diff b/geos-3.7.diff index 4b9865f..e3b62b6 100644 --- a/geos-3.7.diff +++ b/geos-3.7.diff @@ -2,7 +2,7 @@ diff --git a/src/mjolnir/valhalla_build_admins.cc b/src/mjolnir/valhalla_build_a index 3f675a231..cc211ce42 100644 --- a/src/mjolnir/valhalla_build_admins.cc +++ b/src/mjolnir/valhalla_build_admins.cc -@@ -143,7 +143,9 @@ int polygondata_comparearea(const void* vp1, const void* vp2) { +@@ -141,7 +141,9 @@ int polygondata_comparearea(const void* std::vector GetWkts(std::unique_ptr& mline) { std::vector wkts; @@ -10,10 +10,10 @@ index 3f675a231..cc211ce42 100644 +#if 3 == GEOS_VERSION_MAJOR && 7 <= GEOS_VERSION_MINOR + GeometryFactory::Ptr gf = GeometryFactory::create(); +#elif 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR - GeometryFactory::unique_ptr gf = GeometryFactory::create(); + auto gf = GeometryFactory::create(); #else std::unique_ptr gf(new GeometryFactory()); -@@ -422,7 +424,9 @@ void BuildAdminFromPBF(const boost::property_tree::ptree& pt, +@@ -420,7 +422,9 @@ void BuildAdminFromPBF(const boost::prop uint32_t count = 0; uint64_t nodeid; bool has_data; @@ -21,6 +21,6 @@ index 3f675a231..cc211ce42 100644 +#if 3 == GEOS_VERSION_MAJOR && 7 <= GEOS_VERSION_MINOR + GeometryFactory::Ptr gf = GeometryFactory::create(); +#elif 3 == GEOS_VERSION_MAJOR && 6 <= GEOS_VERSION_MINOR - GeometryFactory::unique_ptr gf = GeometryFactory::create(); + auto gf = GeometryFactory::create(); #else std::unique_ptr gf(new GeometryFactory());