[Git][debian-gis-team/osm2pgrouting][master] 5 commits: New upstream version 2.3.6

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / osm2pgrouting


Commits:
6fb934f1 by Bas Couwenberg at 2018-11-29T11:45:26Z
New upstream version 2.3.6
- - - - -
a573d093 by Bas Couwenberg at 2018-11-29T11:45:29Z
Merge tag 'upstream/2.3.6'

Upstream version 2.3.6

- - - - -
1a86b523 by Bas Couwenberg at 2018-11-29T11:45:59Z
New upstream release.

- - - - -
d5aa86c8 by Bas Couwenberg at 2018-11-29T11:52:51Z
Remove documentation outside usr/share/doc.

- - - - -
77122e8c by Bas Couwenberg at 2018-11-29T11:52:51Z
Set distribution to unstable.

- - - - -


6 changed files:

- NEWS
- debian/changelog
- debian/rules
- src/osm_elements/Way.cpp
- src/osm_elements/osm2pgrouting.cpp
- src/utilities/prog_options.cpp


Changes:

=====================================
NEWS
=====================================
@@ -1,3 +1,9 @@
+osm2pgRouting 2.3.6
+
+* Fix: Incorrect classification of one-ways.
+* Fix: command line configuration in print outputs (db password removed).
+* Other minor fixes.
+
 osm2pgRouting 2.3.5
 
 * Fix: zero division error when max_speed = 0.


=====================================
debian/changelog
=====================================
@@ -1,15 +1,17 @@
-osm2pgrouting (2.3.5-2) UNRELEASED; urgency=medium
+osm2pgrouting (2.3.6-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]
+  * New upstream release.
   * Bump Standards-Version to 4.2.1, no changes.
   * Use ODbL-1.0 license shortname to match SPDX.
   * Update watch file to limit matches to archive path.
+  * Remove documentation outside usr/share/doc.
 
   [ Christoph Berg ]
   * debian/tests: Do an actual import into PostgreSQL.
     (The old installability test was not enough, see #904942.)
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 05 Jul 2018 10:41:50 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 29 Nov 2018 12:46:53 +0100
 
 osm2pgrouting (2.3.5-1) unstable; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -34,5 +34,8 @@ override_dh_auto_install:
 	# Don't install extra license file
 	$(RM) debian/*/usr/share/osm2pgrouting/COPYING
 
+	# Remove documentation outside usr/share/doc
+	$(RM) debian/*/usr/share/osm2pgrouting/Readme.md
+
 override_dh_install:
 	dh_install --list-missing


=====================================
src/osm_elements/Way.cpp
=====================================
@@ -201,9 +201,7 @@ Way::implied_oneWay(const Tag &tag) {
     if (m_oneWay != "UNKNOWN") return;
 
     if ((key == "junction" && value == "roundabout")
-            || (key == "highway"
-                && (value == "motorway"
-                    || value == "trunk") )) {
+            || (key == "highway" && value == "motorway")) {
         m_oneWay = "YES";
         return;
     }
@@ -215,7 +213,7 @@ void
 Way::pedestrian(const std::string &key, const std::string &value) {
     // TODO(vicky) for 3.0
     // m_pedestrian("UNKNOWN") <-- the default in the constructor
-    if ((key == "sidewak" && value == "no")
+    if ((key == "sidewalk" && value == "no")
             || (key == "foot" && value == "no")) {
         m_pedestrian = "NO";
     }


=====================================
src/osm_elements/osm2pgrouting.cpp
=====================================
@@ -98,7 +98,7 @@ int main(int argc, char* argv[]) {
         }
 
         if (vm.count("version")) {
-            std::cout << "This is osm2pgrouting Version 2.3.5\n";
+            std::cout << "This is osm2pgrouting Version 2.3.6\n";
             return 0;
         }
 
@@ -144,9 +144,9 @@ int main(int argc, char* argv[]) {
         }catch (const std::exception &e){
             cerr << e.what() << std::endl;
             return 1;
-        } 
+        }
 
-        /* 
+        /*
          * preparing the databasse
          */
         std::cout << "Connecting to the database"  << endl;
@@ -168,7 +168,7 @@ int main(int argc, char* argv[]) {
             std::cout << "ERROR: hstore not found\n";
             std::cout << "   HINT: CREATE EXTENSION hstore\n";
             return 1;
-        } 
+        }
 
         if (clean) {
             std::cout << "\nDropping tables..." << endl;
@@ -177,7 +177,7 @@ int main(int argc, char* argv[]) {
         std::cout << "\nCreating tables..." << endl;
         dbConnection.createTables();
 
-        /* 
+        /*
          * End: preparing the databasse
          */
 


=====================================
src/utilities/prog_options.cpp
=====================================
@@ -98,7 +98,6 @@ process_command_line(po::variables_map &vm) {
     std::cout << "port = " << vm["port"].as<std::string>() << "\n";
     std::cout << "dbname = " << vm["dbname"].as<std::string>() << "\n";
     std::cout << "username = " << vm["username"].as<std::string>() << "\n";
-    std::cout << "password = " << vm["password"].as<std::string>() << "\n";
     std::cout << "schema= " << vm["schema"].as<std::string>() << "\n";
     std::cout << "prefix = " << vm["prefix"].as<std::string>() << "\n";
     std::cout << "suffix = " << vm["suffix"].as<std::string>() << "\n";



View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgrouting/compare/33d6e48776d472e5a5fcfae3319a9d674cc1f7ea...77122e8cef1ac0cdf031f3c0caacbff41375b121

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgrouting/compare/33d6e48776d472e5a5fcfae3319a9d674cc1f7ea...77122e8cef1ac0cdf031f3c0caacbff41375b121
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181129/3ae23dd0/attachment-0001.html>