Use libosmium for geometry building

.travis.yml

@@ -8,8 +8,6 @@ addons:
     packages:
     - g++-4.8
     - libexpat1-dev
-    - libgeos-dev
-    - libgeos++-dev
     - libpq-dev
     - libbz2-dev
     - libproj-dev
@@ -44,7 +42,6 @@ install:
 before_script:
   - $CXX --version
   - xml2-config --version
-  - geos-config --version
   - proj | head -n1
   - lua -v
 script:

CMakeLists.txt

@@ -92,7 +92,7 @@ endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-find_package(Osmium REQUIRED COMPONENTS io geos proj)
+find_package(Osmium REQUIRED COMPONENTS io proj)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
 
 if (WITH_LUA)
@@ -167,7 +167,6 @@ endif()
 
 set(osm2pgsql_lib_SOURCES
   expire-tiles.cpp
-  geometry-builder.cpp
   geometry-processor.cpp
   id-tracker.cpp
   middle-pgsql.cpp
@@ -177,6 +176,7 @@ set(osm2pgsql_lib_SOURCES
   node-ram-cache.cpp
   options.cpp
   osmdata.cpp
+  osmium-builder.cpp
   output-gazetteer.cpp
   output-multi.cpp
   output-null.cpp
@@ -195,7 +195,6 @@ set(osm2pgsql_lib_SOURCES
   util.cpp
   wildcmp.cpp
   expire-tiles.hpp
-  geometry-builder.hpp
   geometry-processor.hpp
   id-tracker.hpp
   middle-pgsql.hpp
@@ -205,6 +204,7 @@ set(osm2pgsql_lib_SOURCES
   node-ram-cache.hpp
   options.hpp
   osmdata.hpp
+  osmium-builder.hpp
   osmtypes.hpp
   output-gazetteer.hpp
   output-multi.hpp
@@ -224,6 +224,7 @@ set(osm2pgsql_lib_SOURCES
   tagtransform.hpp
   util.hpp
   wildcmp.hpp
+  wkb.hpp
 )
 
 add_library(osm2pgsql_lib STATIC ${osm2pgsql_lib_SOURCES})

README.md

@@ -35,7 +35,6 @@ to configure and build itself and requires
 Required libraries are
 
 * [expat](http://www.libexpat.org/)
-* [geos](http://trac.osgeo.org/geos)
 * [proj](http://proj.osgeo.org/)
 * [bzip2](http://www.bzip.org/)
 * [zlib](http://www.zlib.net/)
@@ -57,15 +56,14 @@ On a Debian or Ubuntu system, this can be done with:
 ```sh
 sudo apt-get install make cmake g++ libboost-dev libboost-system-dev \
   libboost-filesystem-dev libexpat1-dev zlib1g-dev \
-  libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev lua5.2 \
-  liblua5.2-dev
+  libbz2-dev libpq-dev libproj-dev lua5.2 liblua5.2-dev
 ```
 
 On a Fedora system, use
 
 ```sh
 sudo yum install cmake gcc-c++ boost-devel expat-devel zlib-devel bzip2-devel \
-  postgresql-devel geos-devel proj-devel proj-epsg lua-devel
+  postgresql-devel proj-devel proj-epsg lua-devel
 ```
 
 On RedHat / CentOS first run `sudo yum install epel-release` then install
@@ -75,7 +73,7 @@ On a FreeBSD system, use
 
 ```sh
 pkg install devel/cmake devel/boost-libs textproc/expat2 \
-  databases/postgresql94-client graphics/geos graphics/proj lang/lua52
+  databases/postgresql94-client graphics/proj lang/lua52
 ```
 
 Once dependencies are installed, use CMake to build the Makefiles in a separate folder
@@ -110,7 +108,7 @@ cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
 
 ## Usage ##
 
-Osm2pgsql has one program, the executable itself, which has **44** command line
+Osm2pgsql has one program, the executable itself, which has **43** command line
 options.
 
 Before loading into a database, the database must be created and the PostGIS

appveyor.yml

@@ -47,7 +47,6 @@ build_script:
   - copy /y ..\*.style osm2pgsql-bin
   - copy /y ..\*.lua osm2pgsql-bin
   - copy /y %PREFIX%\bin\lua.dll osm2pgsql-bin
-  - copy /y %PREFIX%\bin\geos.dll osm2pgsql-bin
   - copy /y "%PSQL_ROOT%\bin\libpq.dll" osm2pgsql-bin
   - copy /y "%PSQL_ROOT%\bin\libintl-8.dll" osm2pgsql-bin
   - copy /y "%PSQL_ROOT%\bin\libeay32.dll" osm2pgsql-bin

contrib/libosmium/README.contrib

@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.11.0
+Revision: ab8236405330607932c8f6395956ec6d9bcdee5c