Restore missing linestring 197 and lanelet 49

Signed-off-by: TaikiYamada4 <taiki.yamada@tier4.jp>
autowarefoundation · Jan 7, 2025 · 8686719 · 8686719
1 parent ad93150
commit 8686719
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 0 deletions.
diff --git a/map/autoware_lanelet2_map_validator/test/data/map/intersection/basic_intersection_area.osm b/map/autoware_lanelet2_map_validator/test/data/map/intersection/basic_intersection_area.osm
@@ -2155,6 +2155,14 @@
     <tag k="type" v="line_thin" />
     <tag k="width" v="0.200" />
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199" visible="true" version="1">
     <nd ref="1890" />
     <nd ref="5966" />
@@ -2798,6 +2806,16 @@
     <tag k="area" v="yes" />
     <tag k="type" v="intersection_area" />
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50" visible="true" version="1">
     <member type="way" ref="199" role="left" />
     <member type="way" ref="218" role="right" />

diff --git a/...t2_map_validator/test/data/map/intersection/intersection_area_with_dangling_reference.osm b/...t2_map_validator/test/data/map/intersection/intersection_area_with_dangling_reference.osm
@@ -2156,6 +2156,14 @@
     <tag k="subtype" v="solid"/>
     <tag k="width" v="0.200"/>
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199">
     <nd ref="1890"/>
     <nd ref="5966"/>
@@ -2799,6 +2807,16 @@
     <tag k="type" v="intersection_area"/>
     <tag k="area" v="yes"/>
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50">
     <member type="way" role="left" ref="199"/>
     <member type="way" role="right" ref="218"/>

diff --git a/...let2_map_validator/test/data/map/intersection/intersection_area_with_irrelative_point.osm b/...let2_map_validator/test/data/map/intersection/intersection_area_with_irrelative_point.osm
@@ -2161,6 +2161,14 @@
     <tag k="subtype" v="solid"/>
     <tag k="width" v="0.200"/>
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199">
     <nd ref="1890"/>
     <nd ref="5966"/>
@@ -2805,6 +2813,16 @@
     <tag k="type" v="intersection_area"/>
     <tag k="area" v="yes"/>
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50">
     <member type="way" role="left" ref="199"/>
     <member type="way" role="right" ref="218"/>

diff --git a/...et2_map_validator/test/data/map/intersection/intersection_area_with_self_intersection.osm b/...et2_map_validator/test/data/map/intersection/intersection_area_with_self_intersection.osm
@@ -2156,6 +2156,14 @@
     <tag k="subtype" v="solid"/>
     <tag k="width" v="0.200"/>
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199">
     <nd ref="1890"/>
     <nd ref="5966"/>
@@ -2799,6 +2807,16 @@
     <tag k="type" v="intersection_area"/>
     <tag k="area" v="yes"/>
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50">
     <member type="way" role="left" ref="199"/>
     <member type="way" role="right" ref="218"/>

diff --git a/...map_validator/test/data/map/intersection/intersection_area_with_wrong_linestring_type.osm b/...map_validator/test/data/map/intersection/intersection_area_with_wrong_linestring_type.osm
@@ -2156,6 +2156,14 @@
     <tag k="subtype" v="solid"/>
     <tag k="width" v="0.200"/>
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199">
     <nd ref="1890"/>
     <nd ref="5966"/>
@@ -2799,6 +2807,16 @@
     <tag k="type" v="intersection_area"/>
     <tag k="area" v="yes"/>
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50">
     <member type="way" role="left" ref="199"/>
     <member type="way" role="right" ref="218"/>

diff --git a/...et2_map_validator/test/data/map/intersection/intersection_area_with_wrong_orientation.osm b/...et2_map_validator/test/data/map/intersection/intersection_area_with_wrong_orientation.osm
@@ -2155,6 +2155,14 @@
     <tag k="type" v="line_thin" />
     <tag k="width" v="0.200" />
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199" visible="true" version="1">
     <nd ref="1890" />
     <nd ref="5966" />
@@ -2798,6 +2806,16 @@
     <tag k="area" v="yes" />
     <tag k="type" v="intersection_area" />
   </way>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50" visible="true" version="1">
     <member type="way" ref="199" role="left" />
     <member type="way" ref="218" role="right" />

diff --git a/map/autoware_lanelet2_map_validator/test/data/map/sample_map.osm b/map/autoware_lanelet2_map_validator/test/data/map/sample_map.osm
@@ -4755,6 +4755,14 @@
     <tag k="subtype" v="solid"/>
     <tag k="width" v="0.200"/>
   </way>
+  <way id="197">
+    <nd ref="1890"/>
+    <nd ref="5966"/>
+    <nd ref="5965"/>
+    <nd ref="1994"/>
+    <nd ref="1995"/>
+    <tag k="type" v="virtual"/>
+  </way>
   <way id="199">
     <nd ref="1890"/>
     <nd ref="5966"/>
@@ -6750,6 +6758,16 @@
     <tag k="one_way" v="yes"/>
     <tag k="turn_direction" v="left"/>
   </relation>
+  <relation id="49" visible="true" version="1">
+    <member type="way" role="left" ref="197"/>
+    <member type="way" role="right" ref="204"/>
+    <tag k="location" v="urban" />
+    <tag k="one_way" v="yes" />
+    <tag k="speed_limit" v="30" />
+    <tag k="subtype" v="road" />
+    <tag k="turn_direction" v="straight" />
+    <tag k="type" v="lanelet" />
+  </relation>
   <relation id="50">
     <member type="way" role="left" ref="199"/>
     <member type="way" role="right" ref="218"/>