change map_lanetoxodr. change junction parse.

src/common/common/xodr/OpenDrive/OpenDriveXmlParser.cpp

@@ -1763,15 +1763,17 @@ bool OpenDriveXmlParser::ReadObjectOutlinesOutline(Object_outlines * pObject_out
     }
 
     TiXmlElement *subNode = node->FirstChildElement("cornerRoad");
-    if (subNode)
+    while (subNode)
     {
         ReadObjectOutlinesOutlinecornerRoad(&xoutline, subNode);
+        subNode = subNode->NextSiblingElement("cornerRoad");
     }
 
     subNode = node->FirstChildElement("cornerLocal");
-    if (subNode)
+    while (subNode)
     {
-        ReadObjectOutlinesOutlinecornerRoad(&xoutline, subNode);
+        ReadObjectOutlinesOutlinecornerLocal(&xoutline, subNode);
+        subNode = subNode->NextSiblingElement("cornerLocal");
     }
 
     pObject_outlines->SetObject_outlines_outline(xoutline);
@@ -1840,15 +1842,17 @@ bool OpenDriveXmlParser::ReadObjectOutlinesOutline(Object * pObject,TiXmlElement
     }
 
     TiXmlElement *subNode = node->FirstChildElement("cornerRoad");
-    if (subNode)
+    while (subNode)
     {
         ReadObjectOutlinesOutlinecornerRoad(poutline, subNode);
+        subNode = subNode->NextSiblingElement("cornerRoad");
     }
 
     subNode = node->FirstChildElement("cornerLocal");
-    if (subNode)
+    while (subNode)
     {
-        ReadObjectOutlinesOutlinecornerRoad(poutline, subNode);
+        ReadObjectOutlinesOutlinecornerLocal(poutline, subNode);
+        subNode = subNode->NextSiblingElement("cornerLocal");
     }
 
 
@@ -1900,12 +1904,12 @@ bool OpenDriveXmlParser::ReadObjectOutlinesOutlinecornerLocal(Object_outlines_ou
     int checker=TIXML_SUCCESS;
     checker+=node->QueryDoubleAttribute("u",&u);
     checker+=node->QueryDoubleAttribute("v",&v);
-    checker+=node->QueryDoubleAttribute("zz",&z);
+    checker+=node->QueryDoubleAttribute("z",&z);
     checker+=node->QueryDoubleAttribute("height",&height);
 
     if (checker!=TIXML_SUCCESS)
     {
-        cout<<"Error parsing Object outline cornerRoad attributes"<<endl;
+        cout<<"Error parsing Object outline cornerLocal attributes"<<endl;
         return false;
     }
 
@@ -2958,7 +2962,7 @@ bool OpenDriveXmlParser::ReadJunction (TiXmlElement *node)
 	string id;
 
 	int checker=TIXML_SUCCESS;
-	checker+=node->QueryStringAttribute("name",&name);
+
 	checker+=node->QueryStringAttribute("id",&id);
 	if (checker!=TIXML_SUCCESS)
 	{
@@ -2966,6 +2970,12 @@ bool OpenDriveXmlParser::ReadJunction (TiXmlElement *node)
 		return false;
 	}
 
+    checker+=node->QueryStringAttribute("name",&name);
+    if(checker != TIXML_SUCCESS)
+    {
+        name = "";
+    }
+
 	mOpenDrive->AddJunction(name,id);
 	Junction* junction=mOpenDrive->GetLastJunction();
 

src/tool/map_lanetoxodr/view/myview.cpp

@@ -147,7 +147,7 @@ void MyView::mouseDoubleClickEvent(QMouseEvent *event)
 //           event->pos().y(),
 //           viewport()->rect().center().x(),centerx);
 
-    int viewx,viewy;
+    double viewx,viewy;
     if(beishu == 0)return;
     viewx = centerx +(event->pos().x() - viewport()->rect().center().x())/beishu;
     viewy = centery +(event->pos().y() - viewport()->rect().center().y())/beishu;
@@ -157,7 +157,7 @@ void MyView::mouseDoubleClickEvent(QMouseEvent *event)
     viewpoint.setY(viewy);
 
     emit dbclickxy(viewx,viewy);
-    qDebug("view x is %d view y is %d ",viewx,viewy);
+    qDebug("view x is %f view y is %f ",viewx,viewy);
 }
 
 bool MyView::event(QEvent *event)