merge tools conflicts

.gitignore

@@ -16,9 +16,15 @@ install-sh
 missing
 depcomp
 Makefile
+<<<<<<< HEAD
 valhalla/config.h
 valhalla/config.h.in
 valhalla/stamp-h1
+=======
+include/config.h
+include/config.h.in
+include/stamp-h1
+>>>>>>> tools/master
 ltmain.sh
 m4/libtool.m4
 m4/ltoptions.m4
@@ -34,6 +40,7 @@ libtool
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 libvalhalla.pc
 =======
 libvalhalla_sif.pc
@@ -109,10 +116,32 @@ py-compile
 # built objects
 tyr_service
 >>>>>>> tyr/master
+=======
+libvalhalla_tools.pc
+
+# built objects
+valhalla_benchmark_adjacency_list
+valhalla_benchmark_loki
+valhalla_benchmark_skadi
+valhalla_elevation_service
+valhalla_export_edges
+valhalla_loki_worker
+valhalla_odin_worker
+valhalla_route_service
+valhalla_run_matrix
+valhalla_run_isochrone
+valhalla_run_route
+valhalla_skadi_worker
+valhalla_thor_worker
+valhalla_tyr_worker
+valhalla_associate_segments
+*.la
+>>>>>>> tools/master
 *.o
 .deps/
 .dirstamp
 *.lo
+<<<<<<< HEAD
 conf/
 .libs/
 <<<<<<< HEAD
@@ -153,6 +182,12 @@ libvalhalla_thor.la
 =======
 libvalhalla_tyr.la
 >>>>>>> tyr/master
+=======
+.libs/
+conf/
+include/proto/
+src/proto/
+>>>>>>> tools/master
 
 # tests
 test-suite.log
@@ -164,6 +199,7 @@ test-driver
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 test/thread_file_log_test.log
 test/point2
 test/linesegment2
@@ -272,6 +308,10 @@ scripts/duane_routes.txt
 test/test_config
 test/serializers
 >>>>>>> tyr/master
+=======
+test/*.log
+test/*.trs
+>>>>>>> tools/master
 
 # test coverage stuff
 *.gcno
@@ -283,6 +323,7 @@ coverage/
 .cproject
 .project
 .settings
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -296,3 +337,5 @@ scripts/gdal-2.0.0.tar.gz
 duplicateways.txt
 connectivity*
 >>>>>>> mjolnir/master
+=======
+>>>>>>> tools/master

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "rapidjson"]
 	path = rapidjson
 	url = https://github.com/miloyip/rapidjson
+[submodule "proto"]
+	path = OSMLR
+	url = https://github.com/opentraffic/osmlr-tile-spec.git

AUTHORS

@@ -3,4 +3,3 @@ Greg Knisely <[email protected]>
 Kevin Kreiser <[email protected]>
 Kristen DiLuca <[email protected]>
 Dave Nesbitt <[email protected]>
-Kristen DiLuca <[email protected]>

Makefile.am

@@ -7,6 +7,7 @@ ACLOCAL_AMFLAGS = -I m4
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 AM_LDFLAGS = @COVERAGE_LDFLAGS@ @PTHREAD_LIBS@ @PTHREAD_CFLAGS@
 AM_CPPFLAGS = -I@abs_srcdir@/valhalla @PTHREAD_CFLAGS@ -Igenfiles
 =======
@@ -64,10 +65,16 @@ AM_CXXFLAGS = -I@abs_srcdir@/valhalla @COVERAGE_CXXFLAGS@ -Igenfiles
 =======
 AM_CXXFLAGS = -I@abs_srcdir@/valhalla @COVERAGE_CXXFLAGS@ -Igenfiles
 >>>>>>> tyr/master
+=======
+AM_LDFLAGS = @BOOST_LDFLAGS@ @COVERAGE_LDFLAGS@ @PTHREAD_LIBS@ @PTHREAD_CFLAGS@
+AM_CPPFLAGS = -I@abs_srcdir@/include -I@abs_srcdir@/include/proto @BOOST_CPPFLAGS@ -Igenfiles
+AM_CXXFLAGS = -I@abs_srcdir@/include -I@abs_srcdir@/include/proto @COVERAGE_CXXFLAGS@ -Igenfiles
+>>>>>>> tools/master
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status libtool
 
+<<<<<<< HEAD
 # things for versioning
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -108,6 +115,8 @@ pkgconfig_DATA = libvalhalla_tyr.pc
 >>>>>>> tyr/master
 EXTRA_DIST = version.sh
 
+=======
+>>>>>>> tools/master
 # conditional test coverage
 if ENABLE_COVERAGE
 .PHONY: clean-coverage
@@ -131,6 +140,7 @@ coverage/index.html: coverage.info
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 >>>>>>> sif/master
@@ -142,6 +152,9 @@ coverage/index.html: coverage.info
 >>>>>>> skadi/master
 =======
 >>>>>>> loki/master
+=======
+
+>>>>>>> tools/master
 .PHONY: clean-gcno
 clean-gcno:
 	-find -name '*.gcno' -exec rm -rf {} \;
@@ -158,6 +171,7 @@ clean-genfiles:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -1001,6 +1015,103 @@ test_serializers_SOURCES = test/serializers.cc test/test.cc
 test_serializers_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
 test_serializers_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB) libvalhalla_tyr.la
 >>>>>>> tyr/master
+=======
+
+# protobuf generated code
+PROTO_FILES = proto/segment.proto proto/tile.proto
+src/proto/%.pb.cc: proto/%.proto
+	@echo " PROTOC $<"; mkdir -p src/proto include/proto; @PROTOC_BIN@ -Iproto --cpp_out=include/proto $< && mv include/proto/$(@F) src/proto
+
+BUILT_SOURCES = $(patsubst %.proto,src/%.pb.cc,$(PROTO_FILES))
+CLEANFILES = $(patsubst %.proto,valhalla/%.pb.h,$(PROTO_FILES)) $(patsubst %.proto,src/%.pb.cc,$(PROTO_FILES))
+
+#distributed executables
+bin_PROGRAMS = valhalla_skadi_worker \
+	valhalla_loki_worker \
+	valhalla_odin_worker \
+	valhalla_thor_worker \
+	valhalla_tyr_worker \
+	valhalla_benchmark_loki \
+	valhalla_benchmark_skadi \
+	valhalla_elevation_service \
+	valhalla_route_service \
+	valhalla_run_isochrone \
+	valhalla_run_route \
+	valhalla_benchmark_adjacency_list \
+	valhalla_run_matrix \
+	valhalla_export_edges \
+	valhalla_associate_segments
+valhalla_skadi_worker_SOURCES = src/valhalla_skadi_worker.cc
+valhalla_skadi_worker_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_skadi_worker_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_loki_worker_SOURCES = src/valhalla_loki_worker.cc
+valhalla_loki_worker_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_loki_worker_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_odin_worker_SOURCES = src/valhalla_odin_worker.cc
+valhalla_odin_worker_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_odin_worker_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_thor_worker_SOURCES = src/valhalla_thor_worker.cc
+valhalla_thor_worker_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_thor_worker_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_tyr_worker_SOURCES = src/valhalla_tyr_worker.cc
+valhalla_tyr_worker_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_tyr_worker_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_benchmark_loki_SOURCES = src/valhalla_benchmark_loki.cc
+valhalla_benchmark_loki_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_benchmark_loki_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_benchmark_skadi_SOURCES = src/valhalla_benchmark_skadi.cc
+valhalla_benchmark_skadi_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_benchmark_skadi_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_elevation_service_SOURCES = src/valhalla_elevation_service.cc
+valhalla_elevation_service_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_elevation_service_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_route_service_SOURCES = src/valhalla_route_service.cc
+valhalla_route_service_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_route_service_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+valhalla_run_isochrone_SOURCES = src/valhalla_run_isochrone.cc
+valhalla_run_isochrone_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_run_isochrone_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+valhalla_run_route_SOURCES = src/valhalla_run_route.cc
+valhalla_run_route_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_run_route_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+valhalla_benchmark_adjacency_list_SOURCES = src/valhalla_benchmark_adjacency_list.cc
+valhalla_benchmark_adjacency_list_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_benchmark_adjacency_list_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+valhalla_run_matrix_SOURCES = src/valhalla_run_matrix.cc
+valhalla_run_matrix_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_run_matrix_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+valhalla_export_edges_SOURCES = src/valhalla_export_edges.cc
+valhalla_export_edges_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_export_edges_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+valhalla_associate_segments_SOURCES = src/valhalla_associate_segments.cc src/proto/segment.pb.cc src/proto/tile.pb.cc
+valhalla_associate_segments_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+valhalla_associate_segments_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+
+EXTRA_PROGRAMS = city_test unconnected_ways
+CLEANFILES += $(EXTRA_PROGRAMS)
+city_test_SOURCES = src/city_test.cc
+city_test_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+city_test_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+unconnected_ways_SOURCES = src/unconnected_ways.cc
+unconnected_ways_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+unconnected_ways_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB)
+
+
+# python bindings
+if PYTHON_BINDINGS
+pyexec_LTLIBRARIES = valhalla.la
+valhalla_la_SOURCES = src/bindings/python/python.cc
+valhalla_la_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@ @PYTHON_CPPFLAGS@
+valhalla_la_LIBADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ @PYTHON_LIBS@ -l$(BOOST_PYTHON_LIB) $(VALHALLA_DEPS_LIBS)
+valhalla_la_LDFLAGS = @COVERAGE_LDFLAGS@ -avoid-version -module -shared
+endif
+
+# tests
+#check_PROGRAMS = test/something
+#test_something_SOURCES = test/something.cc test/test.cc
+#test_something_CPPFLAGS = $(DEPS_CFLAGS) $(VALHALLA_DEPS_CFLAGS) @BOOST_CPPFLAGS@
+#test_something_LDADD = $(DEPS_LIBS) $(VALHALLA_DEPS_LIBS) @BOOST_LDFLAGS@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+>>>>>>> tools/master
 
 TESTS = $(check_PROGRAMS)
 TEST_EXTENSIONS = .sh

circle.yml

@@ -8,6 +8,7 @@ checkout:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     - (rc=0; for f in *.json; do python -c "import json; json.load(open('$f'))" || rc=$?; done; exit $rc;)
 >>>>>>> mjolnir/master
@@ -19,6 +20,12 @@ checkout:
 >>>>>>> thor/master
 =======
 >>>>>>> tyr/master
+=======
+
+machine:
+  environment:
+    PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+>>>>>>> tools/master
 
 dependencies:
   override:
@@ -29,6 +36,7 @@ dependencies:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     - (rc=0; for f in lua/*.lua; do lua $f || rc=$?; done; exit $rc;)
 >>>>>>> mjolnir/master
@@ -45,6 +53,12 @@ dependencies:
 test:
   override:
     - scripts/install.sh --enable-coverage
+=======
+
+test:
+  override:
+    - scripts/install.sh --enable-coverage --enable-python-bindings
+>>>>>>> tools/master
 
 general:
   artifacts: