Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

pull in latest osmcode/libosmium changes

Browse Source
This commit is contained in:
Dennis Luxen
2015-04-13 15:44:38 +02:00
parent 27c9230a82 c0402345f7
commit 9cc68b26e2
69 changed files with 1906 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/libosmium/include/osmium/area/assembler.hpp
Vendored
+3 -3
View File
@@ -65,7 +65,7 @@ namespace osmium {
// Enables debug output to stderr
bool debug;
explicit AssemblerConfig(osmium::area::ProblemReporter* pr = nullptr, bool d=false) :
explicit AssemblerConfig(osmium::area::ProblemReporter* pr = nullptr, bool d = false) :
problem_reporter(pr),
debug(d) {
}
@@ -74,7 +74,7 @@ namespace osmium {
* Enable or disable debug output to stderr. This is for Osmium
* developers only.
*/
void enable_debug_output(bool d=true) {
void enable_debug_output(bool d = true) {
debug = d;
}
@@ -445,7 +445,7 @@ namespace osmium {
}
bool add_to_existing_ring(osmium::area::detail::NodeRefSegment segment) {
int n=0;
int n = 0;
for (auto& ring : m_rings) {
if (debug()) {
std::cerr << " check against ring " << n << " " << ring;
third_party/libosmium/include/osmium/area/detail/segment_list.hpp
Vendored
+1 -1
View File
@@ -99,7 +99,7 @@ namespace osmium {
* Enable or disable debug output to stderr. This is for Osmium
* developers only.
*/
void enable_debug_output(bool debug=true) noexcept {
void enable_debug_output(bool debug = true) noexcept {
m_debug = debug;
}
third_party/libosmium/include/osmium/area/multipolygon_collector.hpp
Vendored
+1 -1
View File
@@ -142,7 +142,7 @@ namespace osmium {
* Overwritten from the base class.
*/
void way_not_in_any_relation(const osmium::Way& way) {
if (way.ends_have_same_location() && way.nodes().size() > 3) {
if (way.nodes().size() > 3 && way.ends_have_same_location()) {
// way is closed and has enough nodes, build simple multipolygon
try {
TAssembler assembler(m_assembler_config);