fix: set lanes with id=0 to type none by default and implemented sani…

…ty checks for lane widening and lane drops
ika-rwth-aachen · Dec 19, 2023 · 0cad813 · 0cad813
1 parent 291fec4
commit 0cad813
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/src/connection/linkSegments.h b/src/connection/linkSegments.h
@@ -508,6 +508,7 @@ int linkSegments(const DOMElement* rootNode, roadNetwork &data)
 		std::cout << "\t"<< linkcount  << " links are defined" << std::endl;
 	}
 
+	//iterate over all links
 	for (DOMElement *segmentLink = links->getFirstElementChild();segmentLink != NULL; segmentLink = segmentLink->getNextElementSibling())
 	{
 		int fromSegment = readIntAttrFromNode(segmentLink, "fromSegment");

diff --git a/src/executable/main.cpp b/src/executable/main.cpp
@@ -45,10 +45,6 @@ int main(int argc, char** argv){
     cfg.filename = settings.filename;
     cfg.xmlSchemeLocation = &schemaLocation[0];
     cfg.outputName = settings.outputName;
-    //setFileName(settings.filename);
-    //setXMLSchemaLocation(&schemaLocation[0]);
-    //setOutputName(settings.outputName);
-    //setSilentMode(settings.silentMode);
     executePipelineCfg(cfg);
 
     return 0;

diff --git a/src/generation/addLaneSections.h b/src/generation/addLaneSections.h
@@ -15,6 +15,8 @@
  *
  */
 
+#include <string.h>
+
 /**
  * @brief function adds a laneSection with laneWideing to a given lanesection set
  * 
@@ -23,10 +25,19 @@
  * @param s             position of lane widening
  * @param ds            length of lane widening
  * @param addouterLane  specifies if additional lane is on the outer side or not
+ * @param rroad          road to which lane widening is applied. This is used only for sanity chekcs
  * @return int          error code
  */
-int addLaneWidening(std::vector<laneSection> &secs, int addLaneId, double s, double ds, bool addOuterLane)
+int addLaneWidening(std::vector<laneSection> &secs, int addLaneId, double s, double ds, bool addOuterLane, const road* rroad = nullptr)
 {
+
+    if(rroad  && s + ds >= rroad->length)
+    {
+        std::string err = "Lane Widening length exceeds total road length in seg " + std::to_string(rroad->inputSegmentId) + " road "  + std::to_string(rroad->inputId);
+        throwError(err);
+        return -1;
+    }
+
     std::vector<laneSection>::iterator it;
     int i = 0;
 
@@ -159,10 +170,18 @@ int addLaneWidening(std::vector<laneSection> &secs, int addLaneId, double s, dou
  * @param dropLaneID    determines the lane id of the drop
  * @param s             position of laneDrop
  * @param ds            length of laneDrop
+ * @param rroad         road to which the lanedrop is applied to, is only used for sanity checks
  * @return int          error code
  */
-int addLaneDrop(std::vector<laneSection> &secs, int dropLaneID, double s, double ds)
+int addLaneDrop(std::vector<laneSection> &secs, int dropLaneID, double s, double ds, const road* rroad = nullptr)
 {
+    if(rroad  && s + ds >= rroad->length)
+    {
+        std::string err = "Lane Drop length exceeds total road length in seg " + std::to_string(rroad->inputSegmentId) + " road "  + std::to_string(rroad->inputId);
+        throwError(err);
+        return -1;
+    }
+
     std::vector<laneSection>::iterator it;
     std::vector<lane>::iterator itt;
 

diff --git a/src/generation/buildRoad.h b/src/generation/buildRoad.h
@@ -418,6 +418,7 @@ int addLanes(DOMElement* roadIn, road &r, int mode)
     lane l2;
     l2.id = 0;
     l2.rm.type = "broken";
+    l2.type = "none";
     l2.w.a = 0;
     l2.turnStraight = false;
     laneSec.lanes.push_back(l2);
@@ -554,7 +555,7 @@ int addLaneSectionChanges(DOMElement* roadIn, road &r, DOMElement* automaticWide
                 if (s > r.length)
                     continue;
 
-                if (addLaneWidening(r.laneSections, side, s, ds, false))
+                if (addLaneWidening(r.laneSections, side, s, ds, false, &r))
                 {
                      std::cerr << "ERR: error in addLaneWidening";
                     return 1;

diff --git a/src/libfiles/export.cpp b/src/libfiles/export.cpp
@@ -81,7 +81,6 @@ EXPORTED int executePipeline(char* file)
 		return -1;
 	}
 
-
 	// --- initialization ------------------------------------------------------
 
 	xmlTree inputxml;

diff --git a/variation/variation/runner.py b/variation/variation/runner.py
@@ -181,7 +181,6 @@ def executePipeline(cfg):
     """
 
     libpath = ""
-    c = 0
 
     if os.name == "posix":  # if MacOS
         libpath = os.path.join(os.path.dirname(__file__), "resources/libroad-generation.so")          
@@ -205,7 +204,6 @@ def executePipeline(cfg):
             rcfg.outname = c_char_p(filenamearg[:-4].encode('utf-8'))
             rcfg.xmllocation = argXMLPath
             roadgen.executePipelineCfg(rcfg)
-            c += 1