Merge pull request #186 from pgRouting/develop

version 2.3

Author: cvvergara

.gitignore

@@ -4,6 +4,7 @@ Sample/*
 build
 osm2pgrouting
 tools/vagrant/packaging.sh
+fix_typos
 *.o
 *.out
 *.osm

.travis.yml

@@ -22,42 +22,31 @@ compiler:
 #  email:
 #    on_failure: [email protected]
 
-env: POSTGRESQL_VERSION=9.6   PG_USER=postgres
+env: POSTGRESQL_VERSION=9.6   PG_USER=postgres DIST=precise
 
 matrix:
   include:
 
-    - os: linux
-      sudo: required
-      dist: precise
-      env: POSTGRESQL_VERSION=9.5   PG_USER=postgres
-
-
-    - os: linux
-      sudo: required
-      dist: precise
-      env: POSTGRESQL_VERSION=9.4   PG_USER=postgres
-
 
     - os: linux
       sudo: required
       dist: trusty
       group: edge
-      env: POSTGRESQL_VERSION=9.6   PG_USER=postgres
+      env: POSTGRESQL_VERSION=9.6   PG_USER=postgres DIST=trusty
 
 
     - os: linux
       sudo: required
       dist: trusty
       group: edge
-      env: POSTGRESQL_VERSION=9.5   PG_USER=postgres
+      env: POSTGRESQL_VERSION=9.5   PG_USER=postgres DIST=trusty
 
 
     - os: linux
       sudo: required
       dist: trusty
       group: edge
-      env: POSTGRESQL_VERSION=9.4   PG_USER=postgres
+      env: POSTGRESQL_VERSION=9.4   PG_USER=postgres DIST=trusty
 
 
 
@@ -80,7 +69,8 @@ before_install:
   - sudo sudo apt-get install -y libboost-program-options-dev
 
 install:
-  - sudo ./ci/travis/install-postgres.sh $POSTGRESQL_VERSION $PG_USER
+  #- sudo ./ci/travis/install-postgres.sh $POSTGRESQL_VERSION $PG_USER
+  - sudo ./ci/travis/install-libpqxx.sh $DIST
 
 before_script:
 

AUTHORS.md

@@ -9,6 +9,7 @@
 
 ## Other contributors:
 
+* Aakash Sharma
 * Adrien Pavie
 * Anton Patrushev
 * Daniel Wendt (Initial author) 

CMakeLists.txt

@@ -5,6 +5,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 set (SHARE_DIR "/usr/share/osm2pgrouting")
 
 FIND_PACKAGE(PostgreSQL REQUIRED)
+find_package(LibPQXX REQUIRED)
 FIND_PACKAGE(EXPAT REQUIRED)
 
 FIND_PACKAGE(Boost)
@@ -16,35 +17,53 @@ endif(Boost_INCLUDE_DIRS)
 
 FIND_PACKAGE(Boost COMPONENTS program_options REQUIRED)
 
-FILE(GLOB SRC "${CMAKE_SOURCE_DIR}/src/*.cpp" "${CMAKE_SOURCE_DIR}/src/*.h")
+FILE(GLOB osm2pgrouting_lib_SOURCES "${CMAKE_SOURCE_DIR}/src/*/*.cpp")
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64 -std=c++0x")
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -Wextra  -frounding-math -Wno-deprecated")
-
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -Wextra  -frounding-math -Wno-deprecated -fmax-errors=10")
 
 
+set (OSM2PGROUTING_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/include")
+message(STATUS "LIBPQXX_INCLUDE_DIRS: ${LIBPQXX_INCLUDE_DIRS}")
 message(STATUS "POSTGRESQL_INCLUDE_DIR: ${POSTGRESQL_INCLUDE_DIR}")
 message(STATUS "EXPAT_INCLUDE_DIRS: ${EXPAT_INCLUDE_DIRS}")
 message(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
 message(STATUS "POSTGRESQL_LIBRARIES: ${POSTGRESQL_LIBRARIES}")
 message(STATUS "Boost_LIBRARIES: ${boost_LIBRARIES}")
+message(STATUS "LIBPQXX_LIBRARIES: ${LIBPQXX_LIBRARIES}")
+
+INCLUDE_DIRECTORIES(src
+    ${LIBPQXX_INCLUDE_DIRS}
+    ${POSTGRESQL_INCLUDE_DIR}
+    ${EXPAT_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${OSM2PGROUTING_INCLUDE_DIRS}
+    )
 
-INCLUDE_DIRECTORIES(src ${POSTGRESQL_INCLUDE_DIR} ${EXPAT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
-ADD_EXECUTABLE(osm2pgrouting ${SRC})
+ADD_EXECUTABLE(osm2pgrouting ${osm2pgrouting_lib_SOURCES})
 
-TARGET_LINK_LIBRARIES(osm2pgrouting ${POSTGRESQL_LIBRARIES} ${EXPAT_LIBRARIES} ${Boost_LIBRARIES} )
+TARGET_LINK_LIBRARIES(osm2pgrouting
+    ${LIBPQXX_LIBRARIES}
+    ${POSTGRESQL_LIBRARIES}
+    ${EXPAT_LIBRARIES}
+    ${Boost_LIBRARIES}
+    )
 
 INSTALL(TARGETS osm2pgrouting
     RUNTIME DESTINATION "/usr/bin"
     )
 
+if(WIN32)
+    target_link_libraries(osm2pgrouting wsock32 ws2_32)
+endif()
+
 INSTALL(FILES
     "${CMAKE_SOURCE_DIR}/COPYING"
     "${CMAKE_SOURCE_DIR}/Readme.md"
     "${CMAKE_SOURCE_DIR}/mapconfig.xml"
     "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
     "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
+    "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml"
     DESTINATION "${SHARE_DIR}")
 
 

NEWS

@@ -1,3 +1,14 @@
+osm2pgRouting 2.3.0 develop
+
+* Cost should not return the same value
+* Added a points of Interest table
+* Some default one_way values are taken into consideration
+* Relations are also condsidered
+* Can be forked
+* TODO remove install postGIS, that should be taken care of the user
+* New mapconfig_for_pedestrian.xml
+
+
 osm2pgRouting 2.2.0
 
 * Adding foreign keys to the tables.

Readme.md

@@ -11,6 +11,7 @@ Before you can use this tool for importing Openstreetmap data you need to instal
 3. pgrouting
 4. boost
 5. expat
+5. libpqxx
 6. cmake
 
 and to prepare a database.
@@ -38,6 +39,9 @@ Install some prerqeuisites
 ```
 sudo apt-get install expat
 sudo apt-get install libexpat1-dev
+sudo apt-get install libboost-dev
+sudo apt-get install libboost-program-options-dev
+sudo apt install libpqxx-dev
 ```
 
 CMAKE options:
@@ -82,9 +86,7 @@ osm2pgrouting --f next-OSM-XML-File.osm --conf mapconfig.xml --dbname routing --
 A complete list of arguments are:
 
 ```
-Allowed options:
-
-
+ osm2pgrouting --help
 Allowed options:
 
 Help:
@@ -103,15 +105,22 @@ General:
                                         table names.
   --suffix arg                          Suffix added at the end of the table 
                                         names.
-  --addnodes                            Import the osm_nodes table.
+  --postgis                             Install postgis if not found.
+  --addnodes                            Import the osm_nodes, osm_ways &
+                                        osm_relations tables.
+  --attributes                          Include attributes information.
+  --tags                                Include tag information.
+  --chunk arg (=20000)                  Exporting chunk size.
   --clean                               Drop previously created tables.
+  --no-index                            Do not create indexes (Use when indexes
+                                        are already created)
 
 Database options:
-  -d [ --dbname ] arg               Name of your database (Required).
-  -U [ --username ] arg (=postgres) Name of the user, which have write access 
-                                    to the database.
-  -h [ --host ] arg (=localhost)    Host of your postgresql database.
-  -p [ --port ] arg (=5432)         db_port of your database.
-  -W [ --password ] arg             Password for database access.
+  -d [ --dbname ] arg            Name of your database (Required).
+  -U [ --username ] arg          Name of the user, which have write access to
+                                 the database.
+  -h [ --host ] arg (=localhost) Host of your postgresql database.
+  -p [ --port ] arg (=5432)      db_port of your database.
+  -W [ --password ] arg          Password for database access.
 
 ```

ci/travis/install-libpqxx.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# ------------------------------------------------------------------------------
+# Travis CI scripts 
+# Copyright(c) pgRouting Contributors
+#
+# Install osm2pgrouting prerequesits
+# ------------------------------------------------------------------------------
+
+set -e
+
+
+DISTRIBUTION="$1"
+
+if [[ -z "$DISTRIBUTION=" ]] ; then
+    exit 1
+fi
+
+
+if [[ "$DISTRIBUTION" = "precise" ]] ; then
+    sudo apt-get install -y libpqxx3-dev
+elif [[ "$DISTRIBUTION" = "trusty" ]] ; then
+    sudo sudo sudo apt-get install -y libpqxx-dev
+else 
+    exit 1
+fi
+

ci/travis/osm2pgrouting_build.sh

@@ -9,8 +9,10 @@
 # exit script on error
 set -e 
 
-# build pgRouting
-cmake  -DPOSTGRESQL_VERSION=$POSTGRESQL_VERSION
+# build osm2pgrouting
+mkdir build
+cd build
+cmake .. 
 make
 sudo make install
-
+cd ..

cmake/FindLibPQXX.cmake

@@ -0,0 +1,43 @@
+# - Find libpqxx
+#   Find the libpqxx includes and client library
+# This module defines
+#  PQXX_INCLUDE_DIRS
+#  PQXX_LIBRARIES
+#  PQXX_FOUND
+
+include (FindPackageHandleStandardArgs)
+
+#
+# Look for an installation.
+#
+find_path(LIBPQXX_INCLUDE_DIR NAMES /include/pqxx/connection.hxx PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
+
+    # Look in other places.
+    ${LIBPQXX_DIR_SEARCH}
+
+    # Help the user find it if we cannot.
+    DOC "The ${LIBPQXX_INCLUDE_DIR_MESSAGE}"
+    )
+
+# Now try to get the include and library path.
+if(LIBPQXX_INCLUDE_DIR)
+
+    if(EXISTS "${LIBPQXX_INCLUDE_DIR}")
+        set(LIBPQXX_INCLUDE_DIRS
+            ${LIBPQXX_INCLUDE_DIR}/include
+            )
+    endif()
+endif()
+
+find_library (LIBPQXX_LIBRARIES
+    NAMES
+    pqxx
+    )
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS("PQXX"
+    "libpqxx couldn't be found"
+    LIBPQXX_LIBRARIES
+    LIBPQXX_INCLUDE_DIRS
+    )
+
+mark_as_advanced (PQXX_INCLUDE_DIR PQXX_LIBRARY)