[Git][debian-gis-team/osm2pgrouting][upstream] New upstream version 2.3.7
Bas Couwenberg
gitlab at salsa.debian.org
Tue Feb 2 05:14:07 GMT 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / osm2pgrouting
Commits:
07d56e95 by Bas Couwenberg at 2021-02-02T06:00:19+01:00
New upstream version 2.3.7
- - - - -
14 changed files:
- CMakeLists.txt
- + CODE_OF_CONDUCT.md
- + CONTRIBUTING.md
- LICENSE.txt → LICENSE
- NEWS
- Readme.md → README.md
- cmake/FindPostgreSQL.cmake
- + docs/CNAME
- how_to_release.md → docs/how_to_release.md
- mapconfig.xml
- mapconfig_for_bicycles.xml
- mapconfig_for_pedestrian.xml
- src/osm_elements/Way.cpp
- src/osm_elements/osm2pgrouting.cpp
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -19,7 +19,7 @@ FIND_PACKAGE(Boost)
if(Boost_INCLUDE_DIRS)
message(STATUS "Boost headers were found here: ${Boost_INCLUDE_DIRS}")
else(Boost_INCLUDE_DIRS)
- message(FATAL_ERROR " Please check your Boost installation ")
+ message(FATAL_ERROR " Please check your Boost installation ")
endif(Boost_INCLUDE_DIRS)
FIND_PACKAGE(Boost COMPONENTS program_options REQUIRED)
@@ -115,7 +115,7 @@ endif()
INSTALL(FILES
"${CMAKE_SOURCE_DIR}/COPYING"
- "${CMAKE_SOURCE_DIR}/Readme.md"
+ "${CMAKE_SOURCE_DIR}/README.md"
"${CMAKE_SOURCE_DIR}/mapconfig.xml"
"${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
"${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
=====================================
CODE_OF_CONDUCT.md
=====================================
@@ -0,0 +1,69 @@
+Contributors to pgRouting are expected to act respectfully toward others in accordance with the http://www.osgeo.org/code_of_conduct.
+
+Full transcription:
+
+
+# OSGeo Code of Conduct
+
+Version: 1.0
+
+Date: May 2015
+
+## Introduction
+
+This code of conduct governs how we behave in any OSGeo forum or event and whenever we will be judged by our actions. We expect it to be honored by everyone who participates in the OSGeo community formally or informally, or claims any affiliation with the OSGeo Foundation.
+
+It applies to in-person events (such as conferences and related social events), IRC, public and private mailing lists, the issue tracker, the wiki, blogs, Twitter, and any other forums which the community uses for communication and interactions.
+
+This code is not exhaustive or complete. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.
+
+## Diversity Statement
+
+OSGeo welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about joining, and we will always work to treat everyone well. No matter how you identify yourself or how others perceive you: we welcome you.
+Specific Guidelines
+
+We strive to:
+
+- Be open.
+ We invite anyone to participate in our community. We preferably use public methods of communication for project-related messages, unless discussing something sensitive. This applies to messages for help or project-related support, too; not only is a public support request much more likely to result in an answer to a question, it also makes sure that any inadvertent mistakes made by people answering will be more easily detected and corrected.
+
+- Be empathetic, welcoming, friendly, and patient.
+ We work together to resolve conflict, assume good intentions, and do our best to act in an empathetic fashion. We may all experience some frustration from time to time, but we do not allow frustration to turn into a personal attack. A community where people feel uncomfortable or threatened is not a productive one. Note that we have a multi-cultural, multi-lingual community and some of us are non-native speakers. We should be respectful when dealing with other community members as well as with people outside our community.
+
+- Be collaborative.
+ Our work will be used by other people, and in turn we will depend on the work of others. When we make something for the benefit of OSGeo, we are willing to explain to others how it works, so that they can build on the work to make it even better. Any decision we make will affect users and colleagues, and we take those consequences seriously when making decisions.
+
+- Be inquisitive.
+ Nobody knows everything! Asking questions early avoids many problems later, so questions are encouraged, though they may be directed to the appropriate forum. Those who are asked should be responsive and helpful, within the context of our shared goal of improving OSGeo.
+
+- Be careful in the words that we choose.
+ Whether we are participating as professionals or volunteers, we value professionalism in all interactions, and take responsibility for our own speech. Be kind to others. Do not insult or put down other participants..
+
+- Be concise
+ Keep in mind that what you write once will be read by hundreds of persons. Writing a short email means people can understand the conversation as efficiently as possible. Short emails should always strive to be empathetic, welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
+
+ Try to bring new ideas to a conversation so that each mail adds something unique to the thread, keeping in mind that the rest of the thread still contains the other messages with arguments that have already been made.
+
+ Try to stay on topic, especially in discussions that are already fairly large.
+
+- Step down considerately.
+ Members of every project come and go. When somebody leaves or disengages from the project they should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. In doing so, they should remain respectful of those who continue to participate in the project and should not misrepresent the project's goals or achievements. Likewise, community members should respect any individual's choice to leave the project.
+
+## Anti-Harassment
+
+Harassment and other exclusionary behaviour are not acceptable. This includes, but is not limited to:
+
+- Personal insults or discriminatory jokes and language, especially those using racist or sexist terms.
+- Offensive comments, excessive or unnecessary profanity.
+- Intimidation, violent threats or demands.
+- Sustained disruption of sessions or events.
+- Stalking, harassing photography or recording.
+- Unwelcome physical contact or sexual attention.
+- Repeated harassment of others. In general, if someone asks you to stop, then stop.
+- Posting (or threatening to post) other people's personally identifying information ("doxing").
+- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history.
+- Advocating for, or encouraging, any of the above behaviour.
+
+## Reporting Guidelines
+
+If you believe someone is breaking this code of conduct, you may reply to them, and point to this code of conduct. Such messages may be in public or in private, whatever is most appropriate. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion. Should there be difficulties in dealing with the situation, you may report your concerns to event staff, a forum leader or the OSGeo Board. Serious or persistent offenders may be expelled from the event or forum by event organizers or forum leaders.
=====================================
CONTRIBUTING.md
=====================================
@@ -0,0 +1,39 @@
+# How to contribute
+
+We are really glad you are reading this, because we need volunteer developers to help this project.
+
+If you have not already, come find us in [](https://gitter.im/pgRouting/pgrouting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or contact us via [mailing list](http://lists.osgeo.org/mailman/listinfo/pgrouting-dev). We want you working on things you're excited about. Drop a message and if some one can assist you, will contact you back ASAP.
+
+Here are some important resources:
+
+ * [pgRouting Documentation](http://docs.pgrouting.org/) The plugin is based on pgRouting
+ * [Wish list on the wiki](https://github.com/pgRouting/pgrouting/wiki/GSoC-Ideas) is the foot view of what we think the community needs and can be done by GSoC students.
+ * [Additional wish list](https://github.com/pgRouting/osm2pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3A%22Functionality+Request%22).
+ * Participate on the [discussions](https://github.com/pgRouting/osm2pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3ADiscussion).
+ * Participate fixing [Documentation](https://github.com/pgRouting/osm2pgrouting/issues?q=is%3Aopen+is%3Aissue+label%3ADocumentation).
+ * Find a bug? [Let us know](https://github.com/pgRouting/osm2pgrouting/issues).
+
+## Contribution agreement
+
+Any kind of contribution will automatically fall to the following Licences:
+
+- Code contribution: GNU GENERAL PUBLIC LICENSE Version 2,
+ - Directly by making a pul explicit pull request.
+ - Indirectly by posting code on issues/wiki/gitter/mailng lists
+- Documentation contribution:
+ - Creative Commons Attribution-Share Alike 3.0
+
+## Submitting changes
+
+
+Write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should have more information.
+Fill the commit message template.
+
+## Coding conventions
+
+This is open source software. Consider the people who will read your code, and make it look nice for them.
+
+ * We indent using four spaces (soft tabs)
+
+Thanks,
+pgRouting team
=====================================
LICENSE.txt → LICENSE
=====================================
=====================================
NEWS
=====================================
@@ -1,3 +1,12 @@
+osm2pgRouting 2.3.7
+
+* fix: Way - fixed bug handling oneway false conditions
+* fix: fixed CMakeLists
+* fix: adjustments to FindPostgreSQL.cmake.
+* Improvements on mapconfig XML files.
+* New docs: "Code of Conduct" and "Contributing".
+* Docs improvements.
+
osm2pgRouting 2.3.6
* Fix: Incorrect classification of one-ways.
=====================================
Readme.md → README.md
=====================================
@@ -9,7 +9,7 @@
* [Installation](#installation)
* [How to use](#how-to-use)
* [Tips](#tips)
-
+
## Requirements
@@ -59,12 +59,12 @@ If you have libraries installed in non-standard locations, you might need to pas
CMAKE options:
-DBOOST_ROOT:PATH=/path/to/boost folder that contains include, lib, bin directories for boost
-
+
-DEXPATH_INCLUDE_DIR:PATH=/path/to/expat/include the include folder for where your expat is installed
-
+
-DPOSTGRESQL_INCLUDE_DIR:PATH=/path/to/postgresql/include the include folder for postgresql development headers
-
-
+
+
A cmake with custom options might look something like
```
@@ -110,14 +110,13 @@ General:
-c [ --conf ] arg (=/usr/share/osm2pgrouting/mapconfig.xml)
Name of the configuration xml file.
--schema arg Database schema to put tables.
- blank: defaults to default schema
- dictated by PostgreSQL
+ blank: defaults to default schema
+ dictated by PostgreSQL
search_path.
- --prefix arg Prefix added at the beginning of the
+ --prefix arg Prefix added at the beginning of the
table names.
- --suffix arg Suffix added at the end of the table
+ --suffix arg Suffix added at the end of the table
names.
- --postgis Install postgis if not found.
--addnodes Import the osm_nodes, osm_ways &
osm_relations tables.
--attributes Include attributes information.
@@ -142,7 +141,7 @@ Database options:
Open Street Map (OSM) files contains tags not used at all for routing operations by PgRouting (i.e. author, version, timestamps, etc.). You can reduce a lot the size of your OSM file to import removing this metadata tags from original file (you can get around half size of original file).
The best tool to remove tags is [osmconvert](https://wiki.openstreetmap.org/wiki/Osmconvert).
-There are another tools but osmconvert is the fastest parsing osm files.
+There are another tools but osmconvert is the fastest parsing osm files.
Example:
```
=====================================
cmake/FindPostgreSQL.cmake
=====================================
@@ -31,6 +31,7 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h
${T_POSTGRESQL_INCLUDE_DIR}
+ /usr/pgsql-*/include
/usr/include
/usr/include/pgsql
/usr/local/include/pgsql
@@ -52,6 +53,7 @@ else(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
find_library(POSTGRESQL_LIBRARIES NAMES pq libpq
${T_POSTGRESQL_LIB_DIR}
PATHS
+ /usr/pgsql-*/lib
/usr/lib
/usr/local/lib
/usr/lib/postgresql
=====================================
docs/CNAME
=====================================
@@ -0,0 +1 @@
+osm.pgrouting.org
=====================================
how_to_release.md → docs/how_to_release.md
=====================================
=====================================
mapconfig.xml
=====================================
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- a way is imported if it matches one of the following tag_values -->
+<!-- tag_values are processed in the order of their ID -->
<configuration>
<tag_name name="highway" id="1">
+ <tag_value name="road" id="100" />
<tag_value name="motorway" id="101" />
<tag_value name="motorway_link" id="102" />
<tag_value name="motorway_junction" id="103" />
@@ -25,10 +28,9 @@
<tag_value name="bridleway" id="120" />
<tag_value name="byway" id="121" />
<tag_value name="steps" id="122" />
-
<tag_value name="unclassified" id="123" />
- <tag_value name="road" id="100" />
</tag_name>
+ <!-- the following lines are only evaluated if there is no highway-tag at the way -->
<tag_name name="cycleway" id="2">
<tag_value name="lane" id="201" />
<tag_value name="track" id="202" />
=====================================
mapconfig_for_bicycles.xml
=====================================
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- only ways which match to one of the following key-values pares will be imported -->
+<!-- the lines are evaluated in the order of their priority and id (ascending) -->
+<!-- only the tag-id of the first match is stored in the table -->
<configuration>
<tag_name name="cycleway" id="1">
<tag_value name="track" priority="1.0" id="101" />
@@ -40,7 +43,7 @@
<tag_value name="pedestrian" priority="1.1" id="503" />
<tag_value name="footway" priority="1.1" id="504" />
<tag_value name="bridleway" priority="1.3" id="505" />
- <tag_value name="track" priority="1.0" id="506" />
+ <tag_value name="track" priority="2.0" id="506" />
<tag_value name="living_street" priority="2.0" id="507" />
<tag_value name="service" priority="2.0" id="508" />
<tag_value name="residential" priority="2.2" id="509" />
@@ -54,7 +57,4 @@
<tag_value name="primary" priority="3.5" id="517" />
<tag_value name="road" priority="4.0" id="500" />
</tag_name>
- <tag_name name="junction" id="6">
- <tag_value name="roundabout" priority="2.5" id="601" />
- </tag_name>
</configuration>
=====================================
mapconfig_for_pedestrian.xml
=====================================
@@ -1,23 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
-
<tag_name name="highway" id="1">
- <tag_value name="footway" id="115" priority="2.5" maxspeed="5" />
- <tag_value name="steps" id="116" priority="2.5" maxspeed="5" />
- <tag_value name="pedestrian" id="117" priority="2.5" maxspeed="5" />
-
- <tag_value name="unclassified" id="118" priority="3" maxspeed="9"/>
- <tag_value name="road" id="119" priority="5" maxspeed="5" />
- <tag_value name="path" id="120" priority="2.5" maxspeed="5" />
+ <tag_value name="road" id="100" />
+ <!--<tag_value name="trunk" id="104" /> -->
+ <!--<tag_value name="trunk_link" id="105" /> -->
+ <tag_value name="primary" id="106" />
+ <tag_value name="primary_link" id="107" />
+ <tag_value name="secondary" id="108" />
+ <tag_value name="secondary_link" id="124" />
+ <tag_value name="tertiary" id="109" />
+ <tag_value name="tertiary_link" id="125" />
+ <tag_value name="residential" id="110" />
+ <tag_value name="living_street" id="111" />
+ <tag_value name="service" id="112" />
+ <tag_value name="track" id="113" />
+ <tag_value name="pedestrian" id="114" />
+ <tag_value name="services" id="115" />
+ <tag_value name="path" id="117" />
+ <tag_value name="cycleway" id="118" />
+ <tag_value name="footway" id="119" />
+ <tag_value name="bridleway" id="120" />
+ <tag_value name="byway" id="121" />
+ <tag_value name="steps" id="122" />
+ <tag_value name="unclassified" id="123" />
</tag_name>
-
-
-
- <tag_name name="barrier" id="3">
- <tag_value name="kerb" id="301" priority="1.0" maxspeed="13" />
- <tag_value name="gate" id="302" priority="1.0" maxspeed="13" />
- <tag_value name="bollard" id="303" priority="1.0" maxspeed="13" />
- <tag_value name="cycle_barrier" id="304" priority="1.0" maxspeed="13" />
- </tag_name>
-
</configuration>
+<!-- for considering the access to the ways you have to import the access information too -->
+<!-- use command line options --addnodes --tags to import all osm attributes -->
=====================================
src/osm_elements/Way.cpp
=====================================
@@ -176,7 +176,7 @@ Way::oneWay(const Tag &tag) {
}
// check false conditions: 0, no, false
- if ((value == "no") || value == "false" || value == "1") {
+ if ((value == "no") || value == "false" || value == "0") {
m_oneWay = "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.6\n";
+ std::cout << "This is osm2pgrouting Version 2.3.7\n";
return 0;
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgrouting/-/commit/07d56e954807ca411ef89cdd1f24cf8cb42bf3b2
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgrouting/-/commit/07d56e954807ca411ef89cdd1f24cf8cb42bf3b2
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/20210202/76f9542b/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list