Removed defaults from constructor which were only used in tests.

Author: joto

include/osmium/area/detail/node_ref_segment.hpp

@@ -106,7 +106,7 @@ namespace osmium {
                     m_role(role_type::unknown) {
                 }
 
-                NodeRefSegment(const osmium::NodeRef& nr1, const osmium::NodeRef& nr2, role_type role = role_type::unknown, const osmium::Way* way = nullptr) noexcept :
+                NodeRefSegment(const osmium::NodeRef& nr1, const osmium::NodeRef& nr2, role_type role, const osmium::Way* way) noexcept :
                     m_first(nr1),
                     m_second(nr2),
                     m_way(way),

test/t/area/test_node_ref_segment.cpp

@@ -3,6 +3,7 @@
 #include <osmium/area/detail/node_ref_segment.hpp>
 
 using osmium::area::detail::NodeRefSegment;
+using osmium::area::detail::role_type;
 
 TEST_CASE("Default construction of NodeRefSegment") {
     NodeRefSegment s;
@@ -18,27 +19,27 @@ TEST_CASE("Construction of NodeRefSegment with NodeRefs") {
     osmium::NodeRef nr3{3, {1.2, 3.6}};
     osmium::NodeRef nr4{4, {1.2, 3.7}};
 
-    NodeRefSegment s1{nr1, nr2};
+    NodeRefSegment s1{nr1, nr2, role_type::unknown, nullptr};
     REQUIRE(s1.first().ref() == 1);
     REQUIRE(s1.second().ref() == 2);
 
-    NodeRefSegment s2{nr2, nr3};
+    NodeRefSegment s2{nr2, nr3, role_type::unknown, nullptr};
     REQUIRE(s2.first().ref() == 3);
     REQUIRE(s2.second().ref() == 2);
 
-    NodeRefSegment s3{nr3, nr4};
+    NodeRefSegment s3{nr3, nr4, role_type::unknown, nullptr};
     REQUIRE(s3.first().ref() == 3);
     REQUIRE(s3.second().ref() == 4);
 }
 
 TEST_CASE("Intersection of NodeRefSegments") {
-    NodeRefSegment s1{{ 1, {0.0, 0.0}}, { 2, {2.0, 2.0}}};
-    NodeRefSegment s2{{ 3, {0.0, 2.0}}, { 4, {2.0, 0.0}}};
-    NodeRefSegment s3{{ 5, {2.0, 0.0}}, { 6, {4.0, 2.0}}};
-    NodeRefSegment s4{{ 7, {1.0, 0.0}}, { 8, {3.0, 2.0}}};
-    NodeRefSegment s5{{ 9, {0.0, 4.0}}, {10, {4.0, 0.0}}};
-    NodeRefSegment s6{{11, {0.0, 0.0}}, {12, {1.0, 1.0}}};
-    NodeRefSegment s7{{13, {1.0, 1.0}}, {14, {3.0, 3.0}}};
+    NodeRefSegment s1{{ 1, {0.0, 0.0}}, { 2, {2.0, 2.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s2{{ 3, {0.0, 2.0}}, { 4, {2.0, 0.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s3{{ 5, {2.0, 0.0}}, { 6, {4.0, 2.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s4{{ 7, {1.0, 0.0}}, { 8, {3.0, 2.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s5{{ 9, {0.0, 4.0}}, {10, {4.0, 0.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s6{{11, {0.0, 0.0}}, {12, {1.0, 1.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s7{{13, {1.0, 1.0}}, {14, {3.0, 3.0}}, role_type::unknown, nullptr};
 
     REQUIRE(calculate_intersection(s1, s2) == osmium::Location(1.0, 1.0));
     REQUIRE(calculate_intersection(s2, s1) == osmium::Location(1.0, 1.0));
@@ -66,15 +67,15 @@ TEST_CASE("Intersection of NodeRefSegments") {
 }
 
 TEST_CASE("Intersection of collinear NodeRefSegments") {
-    NodeRefSegment s1{{ 1, {0.0, 0.0}}, { 2, {2.0, 0.0}}}; // *---*
-    NodeRefSegment s2{{ 3, {2.0, 0.0}}, { 4, {4.0, 0.0}}}; //     *---*
-    NodeRefSegment s3{{ 5, {0.0, 0.0}}, { 6, {1.0, 0.0}}}; // *-*
-    NodeRefSegment s4{{ 7, {1.0, 0.0}}, { 8, {2.0, 0.0}}}; //   *-*
-    NodeRefSegment s5{{ 9, {1.0, 0.0}}, {10, {3.0, 0.0}}}; //   *---*
-    NodeRefSegment s6{{11, {0.0, 0.0}}, {12, {4.0, 0.0}}}; // *-------*
-    NodeRefSegment s7{{13, {0.0, 0.0}}, {14, {5.0, 0.0}}}; // *---------*
-    NodeRefSegment s8{{13, {1.0, 0.0}}, {14, {5.0, 0.0}}}; //   *-------*
-    NodeRefSegment s9{{13, {3.0, 0.0}}, {14, {4.0, 0.0}}}; //       *-*
+    NodeRefSegment s1{{ 1, {0.0, 0.0}}, { 2, {2.0, 0.0}}, role_type::unknown, nullptr}; // *---*
+    NodeRefSegment s2{{ 3, {2.0, 0.0}}, { 4, {4.0, 0.0}}, role_type::unknown, nullptr}; //     *---*
+    NodeRefSegment s3{{ 5, {0.0, 0.0}}, { 6, {1.0, 0.0}}, role_type::unknown, nullptr}; // *-*
+    NodeRefSegment s4{{ 7, {1.0, 0.0}}, { 8, {2.0, 0.0}}, role_type::unknown, nullptr}; //   *-*
+    NodeRefSegment s5{{ 9, {1.0, 0.0}}, {10, {3.0, 0.0}}, role_type::unknown, nullptr}; //   *---*
+    NodeRefSegment s6{{11, {0.0, 0.0}}, {12, {4.0, 0.0}}, role_type::unknown, nullptr}; // *-------*
+    NodeRefSegment s7{{13, {0.0, 0.0}}, {14, {5.0, 0.0}}, role_type::unknown, nullptr}; // *---------*
+    NodeRefSegment s8{{13, {1.0, 0.0}}, {14, {5.0, 0.0}}, role_type::unknown, nullptr}; //   *-------*
+    NodeRefSegment s9{{13, {3.0, 0.0}}, {14, {4.0, 0.0}}, role_type::unknown, nullptr}; //       *-*
 
     REQUIRE(calculate_intersection(s1, s1) == osmium::Location());
 
@@ -110,16 +111,16 @@ TEST_CASE("Intersection of collinear NodeRefSegments") {
 }
 
 TEST_CASE("Intersection of very long NodeRefSegments") {
-    NodeRefSegment s1{{1, {90.0, 90.0}}, {2, {-90.0, -90.0}}};
-    NodeRefSegment s2{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}};
+    NodeRefSegment s1{{1, {90.0, 90.0}}, {2, {-90.0, -90.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s2{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}, role_type::unknown, nullptr};
     REQUIRE(calculate_intersection(s1, s2) == osmium::Location(0.0, 0.0));
 
-    NodeRefSegment s3{{1, {-90.0, -90.0}}, {2, {90.0, 90.0}}};
-    NodeRefSegment s4{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}};
+    NodeRefSegment s3{{1, {-90.0, -90.0}}, {2, {90.0, 90.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s4{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}, role_type::unknown, nullptr};
     REQUIRE(calculate_intersection(s3, s4) == osmium::Location(0.0, 0.0));
 
-    NodeRefSegment s5{{1, {-90.00000001, -90.0}}, {2, {90.0, 90.0}}};
-    NodeRefSegment s6{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}};
+    NodeRefSegment s5{{1, {-90.00000001, -90.0}}, {2, {90.0, 90.0}}, role_type::unknown, nullptr};
+    NodeRefSegment s6{{1, {-90.0, 90.0}}, {2, {90.0, -90.0}}, role_type::unknown, nullptr};
     REQUIRE(calculate_intersection(s5, s6) == osmium::Location(0.0, 0.0));
 }
 
@@ -151,13 +152,13 @@ TEST_CASE("More ordering of NodeRefSegments") {
     osmium::NodeRef nr6{6, {2.0, 2.0}};
     osmium::NodeRef nr7{6, {1.0, 2.0}};
 
-    NodeRefSegment s1{nr0, nr1};
-    NodeRefSegment s2{nr0, nr2};
-    NodeRefSegment s3{nr0, nr3};
-    NodeRefSegment s4{nr0, nr4};
-    NodeRefSegment s5{nr0, nr5};
-    NodeRefSegment s6{nr0, nr6};
-    NodeRefSegment s7{nr0, nr7};
+    NodeRefSegment s1{nr0, nr1, role_type::unknown, nullptr};
+    NodeRefSegment s2{nr0, nr2, role_type::unknown, nullptr};
+    NodeRefSegment s3{nr0, nr3, role_type::unknown, nullptr};
+    NodeRefSegment s4{nr0, nr4, role_type::unknown, nullptr};
+    NodeRefSegment s5{nr0, nr5, role_type::unknown, nullptr};
+    NodeRefSegment s6{nr0, nr6, role_type::unknown, nullptr};
+    NodeRefSegment s7{nr0, nr7, role_type::unknown, nullptr};
 
     // s1
     REQUIRE_FALSE(s1 < s1);