assign WGS84 to output layer, save length and time information (fix #8696)

alexbruy · alexbruy · commit c37e61d199f1 · 2014-06-16T17:19:30.000+03:00
diff --git a/src/plugins/roadgraph/exportdlg.cpp b/src/plugins/roadgraph/exportdlg.cpp
@@ -76,19 +76,20 @@ QgsVectorLayer* RgExportDlg::mapLayer() const
   if ( layerId == QString( "-1" ) )
   {
     // create a temporary layer
-    myLayer = new QgsVectorLayer( "LineString", "shortest path", "memory" );
+    myLayer = new QgsVectorLayer( "LineString?crs=epsg:4326", "shortest path", "memory" );
 
     QgsVectorDataProvider *prov = myLayer->dataProvider();
     if ( prov == NULL )
       return NULL;
 
     QList<QgsField> attrList;
-    attrList.append( QgsField( "id", QVariant::Int ) );
+    attrList.append( QgsField( "lenght", QVariant::Double, "", 20, 8 ) );
+    attrList.append( QgsField( "time", QVariant::Double, "", 20, 8 ) );
     prov->addAttributes( attrList );
+    myLayer->updateFields();
     QList<QgsMapLayer *> myList;
     myList << myLayer;
     QgsMapLayerRegistry::instance()->addMapLayers( myList );
-
   }
   else
   {
diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp
@@ -389,21 +389,34 @@ void RgShortestPathWidget::exportPath()
   int startVertexIdx = path->findVertex( p1 );
   int stopVertexIdx  = path->findVertex( p2 );
 
+  double time = 0.0;
+  double cost = 0.0;
+
+  Unit timeUnit = Unit::byName( mPlugin->timeUnitName() );
+  Unit distanceUnit = Unit::byName( mPlugin->distanceUnitName() );
+
   QgsPolyline p;
   while ( startVertexIdx != stopVertexIdx )
   {
     QgsGraphArcIdList l = path->vertex( stopVertexIdx ).inArc();
     if ( l.empty() )
       break;
     const QgsGraphArc& e = path->arc( l.front() );
+
+    cost += e.property( 0 ).toDouble();
+    time += e.property( 1 ).toDouble();
+
     p.push_front( ct.transform( path->vertex( e.inVertex() ).point() ) );
     stopVertexIdx = e.outVertex();
   }
   p.push_front( ct.transform( p1 ) );
 
   QgsFeature f;
-  QgsFeatureList features;
+  f.initAttributes( vl->pendingFields().count() );
   f.setGeometry( QgsGeometry::fromPolyline( p ) );
+  f.setAttribute( 0, cost / distanceUnit.multipler() );
+  f.setAttribute( 1, time / timeUnit.multipler() );
+  QgsFeatureList features;
   features << f;
   vl->dataProvider()->addFeatures( features );
   vl->updateExtents();
