vitalif
/
valhalla
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Фикс для вальгаллы 3.0.2

master
Vitaliy Filippov 2019-03-11 16:56:58 +03:00
parent 3175a77d6e
commit e635a8ec40
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -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

8
geos-3.7.diff
View File

@ -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<std::string> GetWkts(std::unique_ptr<Geometry>& mline) {
std::vector<std::string> 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<GeometryFactory> 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<GeometryFactory> gf(new GeometryFactory());