Browse Source

change map_lanetoxodr. add lane line.

yuchuli 2 years ago
parent
commit
26412b449a

+ 18 - 0
src/common/common/xodr/OpenDrive/Lane.h

@@ -12,6 +12,7 @@ class LaneSection;
 class LaneSectionSample;
 class Lane;
 class LaneWidth;
+class LaneRoadMarkLine;
 class LaneRoadMark;
 class LaneMaterial;
 class LaneVisibility;
@@ -869,4 +870,21 @@ public:
     void Setd(double value);
 };
 
+//----------------------------------------------------------------------------------
+
+class LaneRoadMarkLine
+{
+private:
+    /*
+    * Parameters that describe the lane roadmark line
+    */
+    double mlength;
+    double mspace;
+    double mtOffset;
+    double msOffset;
+    std::string mrule;
+    double width;
+    std::string mcolor;
+};
+
 #endif

+ 2 - 2
src/driver/driver_ntrip_client/ntrip_client.cpp

@@ -73,14 +73,14 @@ void ntrip_client::readyReadSlot()
 
     case 4:
         str = (char *)message.data();
-        if(strstr(str,"ICY 200 OK") > 0)
+        if(strstr(str,"ICY 200 OK") != NULL)
         {
             mFindCMState = 5;
             qDebug("Login succcess");
         }
         else
         {
-            if(strstr(str,"HTTP 401 Unauthorized") > 0)
+            if(strstr(str,"HTTP 401 Unauthorized") != NULL)
             {
                 mFindCMState = -1;
                 qDebug("Authorize Fail. message is %s",message.data());