Merge pull request #667 from lonvia/refactor-nearpoint

Factor out near point into class

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28600018e3f87235844e2afa77b1cd9cffd0d583..79cc7d19755365a5e6a8f684a804418d3042e1bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,12 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE)
 set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE)
+
+if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt")
+    message(FATAL_ERROR "The osm2pgsql directory is empty.\
+    Did you forget to check out Nominatim recursively?\
+    \nTry updating submodules with: git submodules update --init")
+endif()
 add_subdirectory(osm2pgsql)
 
 find_package(Threads REQUIRED)

diff --git a/docs/Import_and_update.md b/docs/Import_and_update.md
index cd9ff697193fd7e9f8c49703d0df837469ed5614..d839a8a54d1b980778005040049b73583bdbdc2e 100644 (file)
--- a/docs/Import_and_update.md
+++ b/docs/Import_and_update.md
@@ -80,10 +80,10 @@ Nominatim is able to use the official TIGER address set to complement the
 OSM housenumber data in the US. You can add TIGER data to your own Nominatim
 instance by following these steps:
 
-  1. Install the GDAL library and python bindings
+  1. Install the GDAL library and python bindings and the unzip tool
 
-       * Ubuntu: `sudo apt-get install python-gdal`
-       * CentOS: `sudo yum install gdal-python`
+       * Ubuntu: `sudo apt-get install python-gdal unzip`
+       * CentOS: `sudo yum install gdal-python unzip`
 
   2. Get the TIGER 2015 data. You will need the EDGES files
      (3,234 zip files, 11GB total). Choose one of the two sources: