also restore style for file based layers (followup dfff717) and

jef-n · jef-n · commit d94194988f5b · 2014-10-30T21:27:47.000+01:00
use file name for GeoJSON layers (fixes #10711)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2771,7 +2771,7 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt
 
     // create the layer
 
-    QgsVectorLayer *layer = new QgsVectorLayer( src, base, "ogr" );
+    QgsVectorLayer *layer = new QgsVectorLayer( src, base, "ogr", false );
     Q_CHECK_PTR( layer );
 
     if ( ! layer )
@@ -2807,9 +2807,9 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt
       {
         //set friendly name for datasources with only one layer
         QStringList sublayers = layer->dataProvider()->subLayers();
-        QString ligne = sublayers.at( 0 );
-        QStringList elements = ligne.split( ":" );
-        layer->setLayerName( elements.at( 1 ) );
+        QStringList elements = sublayers.at( 0 ).split( ":" );
+        if ( layer->storageType() != "GeoJSON" )
+          layer->setLayerName( elements.at( 1 ) );
         myList << layer;
       }
       else
@@ -2838,6 +2838,11 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt
 
   // Register this layer with the layers registry
   QgsMapLayerRegistry::instance()->addMapLayers( myList );
+  foreach ( QgsMapLayer *l, myList )
+  {
+    bool ok;
+    l->loadDefaultStyle( ok );
+  }
 
   // Only update the map if we frozen in this method
   // Let the caller do it otherwise
@@ -3163,10 +3168,10 @@ void QgisApp::loadOGRSublayers( QString layertype, QString uri, QStringList list
   {
     // Register layer(s) with the layers registry
     QgsMapLayerRegistry::instance()->addMapLayers( myList );
-    foreach( QgsMapLayer *l, myList )
+    foreach ( QgsMapLayer *l, myList )
     {
       bool ok;
-      l->loadDefaultStyle(ok);
+      l->loadDefaultStyle( ok );
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2771,7 +2771,7 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt`
`2771`	`2771`
`2772`	`2772`	`// create the layer`
`2773`	`2773`
`2774`		`- QgsVectorLayer *layer = new QgsVectorLayer( src, base, "ogr" );`
	`2774`	`+ QgsVectorLayer *layer = new QgsVectorLayer( src, base, "ogr", false );`
`2775`	`2775`	`Q_CHECK_PTR( layer );`
`2776`	`2776`
`2777`	`2777`	`if ( ! layer )`
`@@ -2807,9 +2807,9 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt`
`2807`	`2807`	`{`
`2808`	`2808`	`//set friendly name for datasources with only one layer`
`2809`	`2809`	`QStringList sublayers = layer->dataProvider()->subLayers();`
`2810`		`- QString ligne = sublayers.at( 0 );`
`2811`		`- QStringList elements = ligne.split( ":" );`
`2812`		`- layer->setLayerName( elements.at( 1 ) );`
	`2810`	`+ QStringList elements = sublayers.at( 0 ).split( ":" );`
	`2811`	`+ if ( layer->storageType() != "GeoJSON" )`
	`2812`	`+ layer->setLayerName( elements.at( 1 ) );`
`2813`	`2813`	`myList << layer;`
`2814`	`2814`	`}`
`2815`	`2815`	`else`
`@@ -2838,6 +2838,11 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt`
`2838`	`2838`
`2839`	`2839`	`// Register this layer with the layers registry`
`2840`	`2840`	`QgsMapLayerRegistry::instance()->addMapLayers( myList );`
	`2841`	`+ foreach ( QgsMapLayer *l, myList )`
	`2842`	`+ {`
	`2843`	`+ bool ok;`
	`2844`	`+ l->loadDefaultStyle( ok );`
	`2845`	`+ }`
`2841`	`2846`
`2842`	`2847`	`// Only update the map if we frozen in this method`
`2843`	`2848`	`// Let the caller do it otherwise`
`@@ -3163,10 +3168,10 @@ void QgisApp::loadOGRSublayers( QString layertype, QString uri, QStringList list`
`3163`	`3168`	`{`
`3164`	`3169`	`// Register layer(s) with the layers registry`
`3165`	`3170`	`QgsMapLayerRegistry::instance()->addMapLayers( myList );`
`3166`		`- foreach( QgsMapLayer *l, myList )`
	`3171`	`+ foreach ( QgsMapLayer *l, myList )`
`3167`	`3172`	`{`
`3168`	`3173`	`bool ok;`
`3169`		`- l->loadDefaultStyle(ok);`
	`3174`	`+ l->loadDefaultStyle( ok );`
`3170`	`3175`	`}`
`3171`	`3176`	`}`
`3172`	`3177`	`}`