Conversion to C++

.gitignore

@@ -1,4 +1,5 @@
 *.o
+*~
 Makefile.in
 aclocal.m4
 autom4te.cache/
@@ -36,3 +37,26 @@ libtool
 .deps/
 stamp-h1
 INSTALL
+
+log
+test-driver
+test-suite.log
+tests/.dirstamp
+tests/test-parse-xml2
+tests/test-middle-ram
+tests/test-middle-pgsql
+tests/test-pgsql-escape
+tests/test-parse-options
+tests/test-output-multi-line
+tests/test-output-multi-point
+tests/test-output-multi-point-multi-table
+tests/test-output-multi-polygon
+tests/test-output-pgsql
+tests/test-expire-tiles
+tests/*.log
+tests/*.trs
+tests/test_output_pgsql_area_way.flat.nodes.bin
+
+.libs/
+*.lo
+libosm2pgsql.la

.travis.yml

@@ -0,0 +1,31 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+env:
+  - USE_LUA=true
+  - USE_LUA=false
+before_install:
+  - sudo add-apt-repository -y ppa:boost-latest/ppa
+  - sudo apt-get update -qq
+install: 
+  - sudo apt-get install -y -qq autoconf automake libtool make g++ libpq-dev libxml2-dev libbz2-dev libproj0 proj-bin libproj-dev # core deps
+  - sudo apt-get install -y -qq boost1.55 
+  - sudo apt-get install -y -qq protobuf-c-compiler libprotobuf-c0-dev
+  - sudo apt-get install -y -qq libgeos-3.3.3 libgeos-dev libgeos++-dev
+  - |-
+    if [ "${USE_LUA}" = "true" ]; then
+      sudo apt-get install -y -qq lua5.2 liblua5.2-dev
+    fi
+before_script:
+  - xml2-config --version
+  - geos-config --version
+  - proj | head -n1
+  - |-
+    if [ "${USE_LUA}" = "true" ]; then
+      lua -v
+    fi
+script:
+  ./autogen.sh && ./configure && make -j2
+after_failure:
+  - cat config.log

Makefile.am

@@ -1,14 +1,131 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = osm2pgsql nodecachefilereader
-
-osm2pgsql_SOURCES = build_geometry.cpp input.c middle.h middle-ram.h output-gazetteer.h output-pgsql.c rb.c sanitizer.h text-tree.h build_geometry.h input.h middle-pgsql.c osm2pgsql.c output.h output-pgsql.h rb.h sprompt.c UTF8sanitizer.c expire-tiles.c keyvals.c middle-pgsql.h osmtypes.h output-null.c parse-o5m.c parse-o5m.h parse-primitive.c parse-primitive.h parse-xml2.c parse-xml2.h pgsql.c reprojection.c sprompt.h expire-tiles.h keyvals.h middle-ram.c output-gazetteer.c output-null.h pgsql.h reprojection.h text-tree.c node-ram-cache.c wildcmp.c node-ram-cache.h node-persistent-cache.c node-persistent-cache.h binarysearcharray.c binarysearcharray.h tagtransform.c 
-
-nodecachefilereader_SOURCES = node-persistent-cache-reader.c node-persistent-cache.c node-ram-cache.c binarysearcharray.c
-
+noinst_LTLIBRARIES = libosm2pgsql.la
+
+osm2pgsql_SOURCES = osm2pgsql.cpp \
+	binarysearcharray.hpp \
+	geometry-builder.hpp \
+	expire-tiles.hpp \
+	input.hpp \
+	keyvals.hpp \
+	middle-pgsql.hpp \
+	middle-ram.hpp \
+	middle.hpp \
+	node-persistent-cache.hpp \
+	node-ram-cache.hpp \
+	options.hpp \
+	osmdata.hpp \
+	osmtypes.hpp \
+	output-gazetteer.hpp \
+	output-null.hpp \
+	output-pgsql.hpp \
+	output.hpp \
+	parse.hpp \
+	parse-o5m.hpp \
+	parse-pbf.hpp \
+	parse-primitive.hpp \
+	parse-xml2.hpp \
+	pgsql.hpp \
+	rb.hpp \
+	reprojection.hpp \
+	sanitizer.hpp \
+	sprompt.hpp \
+	table.hpp \
+	text-tree.hpp \
+	util.hpp
+
+osm2pgsql_LDADD = libosm2pgsql.la
+
+libosm2pgsql_la_SOURCES = \
+	UTF8sanitizer.cpp \
+	binarysearcharray.cpp \
+	buffer.cpp \
+	expire-tiles.cpp \
+	geometry-builder.cpp \
+	geometry-processor.cpp \
+	id-tracker.cpp \
+	input.cpp \
+	keyvals.cpp \
+	middle.cpp \
+	middle-pgsql.cpp \
+	middle-ram.cpp \
+	node-persistent-cache.cpp \
+	node-ram-cache.cpp \
+	options.cpp \
+	osmdata.cpp \
+	output.cpp \
+	output-gazetteer.cpp \
+	output-multi.cpp \
+	output-null.cpp \
+	output-pgsql.cpp \
+	parse.cpp \
+	parse-o5m.cpp \
+	parse-pbf.cpp \
+	parse-primitive.cpp \
+	parse-xml2.cpp \
+	pgsql.cpp \
+	pgsql-id-tracker.cpp \
+	processor-line.cpp \
+	processor-point.cpp \
+	processor-polygon.cpp \
+	rb.cpp \
+	reprojection.cpp \
+	sprompt.cpp \
+	table.cpp \
+	taginfo.cpp \
+	tagtransform.cpp \
+	text-tree.cpp \
+	util.cpp \
+	wildcmp.cpp
+
+nodecachefilereader_SOURCES = node-persistent-cache-reader.cpp
+nodecachefilereader_LDADD = libosm2pgsql.la
+
+check_PROGRAMS = \
+	tests/test-parse-xml2 \
+	tests/test-middle-ram \
+	tests/test-middle-pgsql \
+	tests/test-output-multi-line \
+	tests/test-output-multi-point \
+	tests/test-output-multi-point-multi-table \
+	tests/test-output-multi-polygon \
+	tests/test-output-pgsql \
+	tests/test-pgsql-escape \
+	tests/test-parse-options \
+	tests/test-expire-tiles
+
+tests_test_parse_xml2_SOURCES = tests/test-parse-xml2.cpp 
+tests_test_parse_xml2_LDADD = libosm2pgsql.la
+tests_test_middle_ram_SOURCES = tests/test-middle-ram.cpp tests/middle-tests.cpp
+tests_test_middle_ram_LDADD = libosm2pgsql.la
+tests_test_middle_pgsql_SOURCES = tests/test-middle-pgsql.cpp tests/middle-tests.cpp tests/common-pg.cpp
+tests_test_middle_pgsql_LDADD = libosm2pgsql.la
+tests_test_output_multi_line_SOURCES = tests/test-output-multi-line.cpp tests/common-pg.cpp
+tests_test_output_multi_line_LDADD = libosm2pgsql.la
+tests_test_output_multi_point_SOURCES = tests/test-output-multi-point.cpp tests/common-pg.cpp
+tests_test_output_multi_point_LDADD = libosm2pgsql.la
+tests_test_output_multi_point_multi_table_SOURCES = tests/test-output-multi-point-multi-table.cpp tests/common-pg.cpp
+tests_test_output_multi_point_multi_table_LDADD = libosm2pgsql.la
+tests_test_output_multi_polygon_SOURCES = tests/test-output-multi-polygon.cpp tests/common-pg.cpp
+tests_test_output_multi_polygon_LDADD = libosm2pgsql.la
+tests_test_output_pgsql_SOURCES = tests/test-output-pgsql.cpp tests/common-pg.cpp
+tests_test_output_pgsql_LDADD = libosm2pgsql.la
+tests_test_pgsql_escape_SOURCES = tests/test-pgsql-escape.cpp
+tests_test_pgsql_escape_LDADD = libosm2pgsql.la
+tests_test_parse_options_SOURCES = tests/test-parse-options.cpp
+tests_test_parse_options_LDADD = libosm2pgsql.la
+tests_test_expire_tiles_SOURCES = tests/test-expire-tiles.cpp
+tests_test_expire_tiles_LDADD = libosm2pgsql.la
+
+TESTS = $(check_PROGRAMS) tests/regression-test.sh
+TEST_EXTENSIONS = .sh
+SH_LOG_COMPILER = sh
 
 if READER_PBF
-osm2pgsql_SOURCES += parse-pbf.c parse-pbf.h fileformat.pb-c.c fileformat.pb-c.h osmformat.pb-c.c osmformat.pb-c.h
+osm2pgsql_SOURCES += parse-pbf.hpp fileformat.pb-c.h osmformat.pb-c.h
+libosm2pgsql_la_SOURCES += parse-pbf.cpp fileformat.pb-c.c osmformat.pb-c.c
 
 fileformat.pb-c.c: protobuf/fileformat.proto
 	 $(AM_V_GEN) $(PROTOC_C) --proto_path=protobuf --c_out=. $<
@@ -41,9 +158,22 @@ endif
 osm2pgsqldir = $(datadir)/osm2pgsql
 
 AM_CFLAGS = @PTHREAD_CFLAGS@ @LFS_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@ @PROTOBUF_C_CFLAGS@ @ZLIB_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"' @LUA_INCLUDE@
-AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback @LUA_INCLUDE@
-
-AM_LDFLAGS = @PTHREAD_CFLAGS@ @ZLIB_LDFLAGS@ @ZLIB_LIBS@ @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ @PROTOBUF_C_LDFLAGS@ @PROTOBUF_C_LIBS@ -L/usr/lib/x86_64-linux-gnu @LUA_LIB@
+AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback @LUA_INCLUDE@ @BOOST_CPPFLAGS@
+
+GLOBAL_LDFLAGS = @PTHREAD_CFLAGS@ @ZLIB_LDFLAGS@ @ZLIB_LIBS@ @POSTGRESQL_LDFLAGS@ @POSTGRESQL_LIBS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ @PROTOBUF_C_LDFLAGS@ @PROTOBUF_C_LIBS@ -L/usr/lib/x86_64-linux-gnu @LUA_LIB@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_THREAD_LIB@ -lstdc++
+osm2pgsql_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_parse_xml2_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_middle_ram_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_middle_pgsql_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_output_multi_line_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_output_multi_point_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_output_multi_point_multi_table_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_output_multi_polygon_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_output_pgsql_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_pgsql_escape_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_parse_options_LDADD += $(GLOBAL_LDFLAGS)
+tests_test_expire_tiles_LDADD += $(GLOBAL_LDFLAGS)
+nodecachefilereader_LDADD += $(GLOBAL_LDFLAGS)
 
 osm2pgsql_DATA = default.style 900913.sql
 
@@ -66,6 +196,4 @@ distclean-local:
 	@rm -f $(PACKAGE).spec
 	@rm -f config.nice
 
-test:
-	tests/regression-test.py -f tests/liechtenstein-2013-08-03.osm.pbf
-	tests/regression-test.py -f tests/liechtenstein-2013-08-03.osm.bz2
+test: check

README.md

@@ -49,16 +49,17 @@ compiler.
 To install on a Debian or Ubuntu system, first install the prerequisites:
 
 ```sh
-sudo apt-get install autoconf automake libtool make g++ libxml2-dev libgeos-dev
-  libgeos++-dev libpq-dev libbz2-dev libproj-dev protobuf-c-compiler
-  libprotobuf-c0-dev libbz2-dev lua5.2 liblua5.2-dev
+sudo apt-get install autoconf automake libtool make g++ libboost-dev \
+  libboost-system-dev libboost-filesystem-dev libboost-thread-dev libxml2-dev \
+  libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev
+  protobuf-c-compiler libprotobuf-c0-dev libbz2-dev lua5.2 liblua5.2-dev
 ```
 
 To install on a Fedora system, use
 
 ```sh
-sudo yum install gcc-c++ libxml2-devel geos-develpostgresql-devel bzip2-devel
-  proj-devel protobuf-compiler
+sudo yum install gcc-c++ boost-devel libxml2-devel geos-devel \
+  postgresql-devel bzip2-devel proj-devel protobuf-compiler 
 ```
 
 Then you should be able to bootstrap the build system:
@@ -100,8 +101,8 @@ When importing a large amount of data such as the complete planet, a typical
 command line would be
 
 ```sh
-    osm2pgsql -c -d gis --slim -C <cache size> \
-      --flat-nodes <flat nodes> planet-latest.osm.pbf
+osm2pgsql -c -d gis --slim -C <cache size> \
+  --flat-nodes <flat nodes> planet-latest.osm.pbf
 ```
 where
 * ``<cache size>`` is 24000 on machines with 32GiB or more RAM
@@ -127,6 +128,29 @@ null backend for testing.
 Any questions should be directed at the osm dev list
 http://wiki.openstreetmap.org/index.php/Mailing_lists
 
+## Testing ##
+
+The code also comes with a suite of tests which can be run by
+executing ``make check``.
+
+Some of these tests depend on being able to set up a database and run
+osm2pgsql against it. You need to ensure that PostgreSQL is running
+and that your user is a superuser of that system. To do that, run:
+
+```sh
+sudo -u postgres createuser -s $USER
+sudo mkdir -p /tmp/psql-tablespace
+sudo chown postgres.postgres /tmp/psql-tablespace
+psql -c "CREATE TABLESPACE tablespacetest LOCATION '/tmp/psql-tablespace'" postgres
+```
+
+Once this is all set up, all the tests should run (no SKIPs), and pass
+(no FAILs). If you encounter a failure, you can find more information
+by looking in the `test-suite.log`. If you find something which seems
+to be a bug, please check to see if it is a known issue at
+https://github.com/openstreetmap/osm2pgsql/issues and, if it's not
+already known, report it there.
+
 ## Contributing ##
 
 We welcome contributions to osm2pgsql. If you would like to report an issue,

UTF8sanitizer.c → UTF8sanitizer.cpp

@@ -6,8 +6,8 @@
 #include <zlib.h>
 #include <bzlib.h>
 
-#include "sanitizer.h"
-#include "input.h"
+#include "sanitizer.hpp"
+#include "input.hpp"
 
 int sanitizerClose(void *context);
 int sanitizerProcess(void *context, char *buffer, int len);
@@ -38,13 +38,13 @@ struct Context {
     int out_char[10];
     int pend;
     int verbose;
-    void *file;
+    Input *file;
 };
 
 
 int sanitizerClose(void *context)
 {
-    struct Context *ctx = context;
+    struct Context *ctx = (struct Context *)context;
     int r = inputClose(ctx->file);
 
     if (ctx->verbose) {
@@ -64,7 +64,7 @@ int sanitizerClose(void *context)
 
 xmlTextReaderPtr sanitizerOpen(const char *name)
 {
-    struct Context *ctx = malloc (sizeof(*ctx));
+    struct Context *ctx = (struct Context *)malloc(sizeof(*ctx));
 
     if (!ctx)
         return NULL;
@@ -87,7 +87,7 @@ xmlTextReaderPtr sanitizerOpen(const char *name)
 
 int sanitizerProcess(void *context, char *buffer, int len) 
 {
-  struct Context *ctx = context;
+  struct Context *ctx = (struct Context *)context;
   int current_char, i, out = 0;
 
   while (out < len) {

binarysearcharray.c → binarysearcharray.cpp

@@ -3,8 +3,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "osmtypes.h"
-#include "binarysearcharray.h"
+#include "osmtypes.hpp"
+#include "binarysearcharray.hpp"
 
 static int binary_search_lookup(struct binary_search_array * array, int key)
 {
@@ -95,12 +95,13 @@ void binary_search_add(struct binary_search_array * array, int key,
 
 struct binary_search_array * init_search_array(int capacity)
 {
-    struct binary_search_array * array = calloc(1,
-            sizeof(struct binary_search_array));
-    array->array = calloc(capacity + 1, sizeof(struct key_val_tuple));
+    struct binary_search_array * array = 
+        (struct binary_search_array *)
+        calloc(1, sizeof(struct binary_search_array));
+    array->array = (struct key_val_tuple *)calloc(capacity + 1, sizeof(struct key_val_tuple));
     if (!array->array) {
         fprintf(stderr, "Out of memory trying to allocate %li bytes for binary search array\n", ((capacity + 1) * sizeof(struct key_val_tuple)));
-        exit_nicely();
+	return NULL;
     }
     array->capacity = capacity;
     array->size = 0;