diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index 89bc66c70e..decccacc27 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -76,7 +76,7 @@ jobs: EOF sudo mv ./pgdg.pref /etc/apt/preferences.d/ sudo apt update - + - name: Add PostgreSQL APT repository run: | sudo apt-get purge postgresql-* diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 46d6a91d5d..75866aafea 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -51,7 +51,7 @@ jobs: EOF sudo mv ./pgdg.pref /etc/apt/preferences.d/ sudo apt update - + - name: Add PostgreSQL APT repository run: | sudo apt-get purge postgresql-* diff --git a/doc/src/support.rst b/doc/src/support.rst index ac3458def6..6fa184174e 100644 --- a/doc/src/support.rst +++ b/doc/src/support.rst @@ -61,7 +61,7 @@ There are two mailing lists for pgRouting hosted on OSGeo discourse server: For general questions and topics about how to use pgRouting, please write to the user mailing list. -If you want to chat with fellow pgRouting users and contributors, you +If you want to chat with fellow pgRouting users and contributors, you can join our matrix channel: `pgRouting matrix channel `_. You can also ask at `GIS StackExchange `_ and diff --git a/docqueries/metrics/bandwidth.result b/docqueries/metrics/bandwidth.result index 810797844f..3ffedca78e 100644 --- a/docqueries/metrics/bandwidth.result +++ b/docqueries/metrics/bandwidth.result @@ -14,11 +14,11 @@ FROM edges' /* -- q2 */ CREATE TABLE my_edges1 ( - id SERIAL PRIMARY KEY, - source INTEGER, - target INTEGER, - cost DOUBLE PRECISION, - reverse_cost DOUBLE PRECISION + id SERIAL PRIMARY KEY, + source INTEGER, + target INTEGER, + cost DOUBLE PRECISION, + reverse_cost DOUBLE PRECISION ); CREATE TABLE /* -- q3 */ @@ -46,7 +46,7 @@ INSERT INTO my_edges1 (source, target, cost, reverse_cost) VALUES (6, 3, 1, 1), (3, 6, 1, 1), (1, 3, 1, 1), -(3, 1, 1, 1); +(3, 1, 1, 1); INSERT 0 24 /* -- q4 */ SELECT * FROM pgr_bandwidth( @@ -59,11 +59,11 @@ SELECT * FROM pgr_bandwidth( /* -- q5 */ CREATE TABLE my_edges2 ( - id SERIAL PRIMARY KEY, - source INTEGER, - target INTEGER, - cost DOUBLE PRECISION, - reverse_cost DOUBLE PRECISION + id SERIAL PRIMARY KEY, + source INTEGER, + target INTEGER, + cost DOUBLE PRECISION, + reverse_cost DOUBLE PRECISION ); CREATE TABLE /* -- q6 */ diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index e2e7fa8960..d1c46e58aa 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-27 16:54+0000\n" +"POT-Creation-Date: 2025-09-08 17:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3962,8 +3962,8 @@ msgid "The HTML documentation is build by default" msgstr "" msgid "" -"The translated languages (en, es, zh_Hans) HTML documentation is build by" -" default" +"The translated languages (en, es, sv, zh_Hans) HTML documentation is " +"build by default" msgstr "" msgid "`WITH-DOC` is not used anymore" @@ -8185,7 +8185,13 @@ msgstr "" msgid "ES" msgstr "" -msgid "if OFF the Spaish documentation will no be built" +msgid "if OFF the Spanish documentation will no be built" +msgstr "" + +msgid "SV" +msgstr "" + +msgid "if OFF the Swedish documentation will no be built" msgstr "" msgid "ZH_HANS" @@ -8302,9 +8308,24 @@ msgstr "" msgid "Translators (in alphabetical order)" msgstr "" +msgid "Chinese:" +msgstr "" + msgid "Dapeng Wang" msgstr "" +msgid "Spanish:" +msgstr "" + +msgid "Vicky Vergara" +msgstr "" + +msgid "Swedish:" +msgstr "" + +msgid "Daniel Nylander" +msgstr "" + msgid "Corporate Sponsors in this release (in alphabetical order)" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 78a17504f6..33048e7b8b 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-27 16:54+0000\n" +"POT-Creation-Date: 2025-09-08 17:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3556,7 +3556,7 @@ msgstr "" msgid "The HTML documentation is build by default" msgstr "" -msgid "The translated languages (en, es, zh_Hans) HTML documentation is build by default" +msgid "The translated languages (en, es, sv, zh_Hans) HTML documentation is build by default" msgstr "" msgid "`WITH-DOC` is not used anymore" @@ -7009,7 +7009,13 @@ msgstr "" msgid "ES" msgstr "" -msgid "if OFF the Spaish documentation will no be built" +msgid "if OFF the Spanish documentation will no be built" +msgstr "" + +msgid "SV" +msgstr "" + +msgid "if OFF the Swedish documentation will no be built" msgstr "" msgid "ZH_HANS" @@ -7099,9 +7105,24 @@ msgstr "" msgid "Translators (in alphabetical order)" msgstr "" +msgid "Chinese:" +msgstr "" + msgid "Dapeng Wang" msgstr "" +msgid "Spanish:" +msgstr "" + +msgid "Vicky Vergara" +msgstr "" + +msgid "Swedish:" +msgstr "" + +msgid "Daniel Nylander" +msgstr "" + msgid "Corporate Sponsors in this release (in alphabetical order)" msgstr "" diff --git a/src/metrics/metrics_driver.cpp b/src/metrics/metrics_driver.cpp index c05fa4119b..b3b2a7c6ee 100644 --- a/src/metrics/metrics_driver.cpp +++ b/src/metrics/metrics_driver.cpp @@ -1,11 +1,11 @@ /*PGR-GNU***************************************************************** -File: allpairs_driver.cpp +File: metrics_driver.cpp Generated with Template by: Copyright (c) 2025 pgRouting developers Mail: project@pgrouting.org -Developer: +Developer: Copyright (c) 2025 Saloni Kumari Mail: chaudharysaloni2510 at gmail.com diff --git a/src/metrics/metrics_process.cpp b/src/metrics/metrics_process.cpp index 36eabfc1d6..6ff804a2b6 100644 --- a/src/metrics/metrics_process.cpp +++ b/src/metrics/metrics_process.cpp @@ -32,23 +32,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "process/metrics_process.h" -#include - extern "C" { #include "c_common/postgres_connection.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" } +#include + #include "c_types/iid_t_rt.h" #include "cpp_common/assert.hpp" #include "drivers/metrics_driver.hpp" -#if 0 -which = 0 -> bandwidth +/** + which = 0 -> bandwidth -This is c++ code, linked as C code, because pgr_process_metrics is called from C code -#endif + This is c++ code, linked as C code, because pgr_process_metrics is called from C code + */ void pgr_process_metrics(const char* edges_sql, int which, IID_t_rt **result_tuples, size_t *result_count) { pgassert(edges_sql); pgassert(!(*result_tuples)); diff --git a/src/ordering/ordering_process.cpp b/src/ordering/ordering_process.cpp index 336d4b475f..4f58d7b5c7 100644 --- a/src/ordering/ordering_process.cpp +++ b/src/ordering/ordering_process.cpp @@ -29,14 +29,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "process/ordering_process.h" -#include - extern "C" { #include "c_common/postgres_connection.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" } +#include + #include "cpp_common/assert.hpp" #include "drivers/ordering_driver.hpp" diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index d376aab2e3..4497a713b5 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -47,6 +47,8 @@ INCLUDE_ORDER=" -build/include_order:src/cpp_common/pgdata_getters.cpp, -build/include_order:include/cpp_common/get_data.hpp, -build/include_order:src/dijkstra/shortestPath_process.cpp, +-build/include_order:src/metrics/metrics_process.cpp, +-build/include_order:src/ordering/ordering_process.cpp, -build/include_order:src/allpairs/allpairs_process.cpp" if test -z "$DIRECTORY"; then