Merge pull request #319 from pgRouting/develop

New version v3.0.0

Author: cvvergara

.github/workflows/libpqxx.yml

@@ -1,45 +1,58 @@
 name: Build for Ubuntu
 
+# manually triggered workflow
+
 on:
+  workflow_dispatch:
   push:
-    branches-ignore:
-      - 'translations_*'
-    tags: []
   pull_request:
-    paths-ignore:
-      - '**.po'
 
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
 jobs:
   build:
-    name: Build
+    name: Ubuntu psql
     runs-on: ${{ matrix.os }}
 
     strategy:
         fail-fast: false
         matrix:
-          psql: [9.6,10,11,12, 13]
-          postgis: [2.5,3]
-          os: [ubuntu-latest]
+          psql: [13, 14, 15, 16, 17, 18]
+          postgis: [3]
+          release: [Debug, Release]
+          os: [ubuntu-latest, ubuntu-22.04]
+          compiler: [ gcc-latest, g++-11, clang ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
-      - name: get postgres version
+      - name: 'Raise Priority for apt.postgresql.org'
         run: |
-          sudo service postgresql start
-          pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
-          echo "PGVER=${pgver}" >> $GITHUB_ENV
-          PGP=5433
-          if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
-          echo "PGPORT=${PGP}" >> $GITHUB_ENV
+          cat << EOF >> ./pgdg.pref
+          Package: *
+          Pin: release o=apt.postgresql.org
+          Pin-Priority: 600
+          EOF
+          sudo mv ./pgdg.pref /etc/apt/preferences.d/
+          sudo apt update
 
       - name: Add PostgreSQL APT repository
         run: |
-          sudo apt-get install curl ca-certificates gnupg
-          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
-            $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          sudo apt-get -y purge postgresql-*
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-testing main ${{ matrix.psql }}" > /etc/apt/sources.list.d/pgdg.list'
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
+
+      - name: Install compiler
+        id: install_cc
+        uses: rlalik/setup-cpp-compiler@master
+        with:
+          compiler: ${{ matrix.compiler }}
 
       - name: Install dependencies
         run: |
@@ -54,23 +67,20 @@ jobs:
             postgresql-${{ matrix.psql }}-pgrouting \
             libpqxx-dev \
             postgresql-server-dev-${{ matrix.psql }}
+            # should be 7 on latest and 6 on 22.04
+            apt-cache policy libpqxx-dev
 
-      - name: Configure
+      - name: Configure compiler
         run: |
+          export CC=/usr/bin/${{ steps.install_cc.outputs.cc }}
+          export CXX=/usr/bin/${{ steps.install_cc.outputs.cxx }}
           export PATH=/usr/lib/postgresql/${{ matrix.psql }}/bin:$PATH
           mkdir build
           cd build
-          cmake -DPOSTGRESQL_VERSION=${{ matrix.psql }} -DCMAKE_BUILD_TYPE=Release -DWITH_DOC=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=${{ matrix.release }} ..
 
       - name: Build
         run: |
           cd build
           make -j 4
           sudo make install
-
-      - name: Test
-        if: false
-        run: |
-          sudo service postgresql start
-          sudo -u postgres createdb -p ${PGPORT}  ___vrp___test___
-          sudo -u postgres bash ./tools/testers/pg_prove_tests.sh postgres ${PGPORT}  Release

.github/workflows/ubuntu.yml

@@ -1,12 +1,15 @@
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
 
 if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
     message(FATAL_ERROR "In-source builds not allowed.
     Please make a new directory (called a build directory) and run CMake from there.
     You may need to remove CMakeCache.txt." )
 endif()
 
-PROJECT(osm2pgrouting)
+PROJECT(osm2pgrouting VERSION 3.0.0
+  LANGUAGES C CXX)
 
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
@@ -46,7 +49,7 @@ else()
 endif()
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
-set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -Wextra  -frounding-math -Wno-deprecated -fmax-errors=10")
+set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wconversion -pedantic -Wextra  -frounding-math -Wno-deprecated")
 
 if(WIN32 AND MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_DEPRECATE")

CMakeLists.txt

@@ -1,6 +1,52 @@
+osm2pgRouting 3.0.0
+
+* cmake >= 3.12
+* geometry column name: `geom`
+
+New "ways" table structure
+      Column       |           Type            | Modifications      | Default
+-------------------+---------------------------+--------------------+-----------
+ id                | bigint                    | previously was gid | generated always as identity
+ osm_id            | bigint                    |
+ tag_id            | integer                   |
+ length            | double precision          |
+ length_m          | double precision          |
+ name              | text                      |
+ source            | bigint                    |
+ target            | bigint                    |
+ source_osm        | bigint                    |
+ target_osm        | bigint                    |
+ cost              | double precision          |
+ reverse_cost      | double precision          |
+ cost_s            | double precision          |
+ reverse_cost_s    | double precision          |
+ rule              | text                      |
+ one_way           | integer                   |
+ oneway            | text                      |
+ x1                | double precision          |
+ y1                | double precision          |
+ x2                | double precision          |
+ y2                | double precision          |
+ maxspeed_forward  | double precision          |
+ maxspeed_backward | double precision          |
+ priority          | double precision          |
+ geom              | geometry(LineString,4326) | previously was the_geom
+
+New "ways_vertices_pgr" table structure
+
+  Column   |         Type         |          Default
+-----------+----------------------+-------------------------------------------
+ id        | bigint               |  Default: generated always as identity
+ in_edges  | bigint[]             |  New column
+ out_edges | bigint[]             |  New column
+ x         | numeric(11,8)        |  Default: generated always as (st_x(geom)) stored
+ y         | numeric(11,8)        |  Default: generated always as (st_y(geom)) stored
+ osm_id    | bigint               |
+ geom      | geometry(Point,4326)
+
 osm2pgRouting 2.3.9
 
-*
+* Homebrew: Add algorithm for std::transform
 
 osm2pgRouting 2.3.8