Merge pull request #3720 from sbrunner/WFS-provider-metadata

sbrunner · web-flow · commit 59b10d65b721 · 2016-11-07T17:15:03.000+01:00
Add metadata for WFS provider in layer metadata informations
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -386,6 +386,12 @@ class QgsVectorDataProvider : QgsDataProvider
      */
     virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer* self, const QList<QgsVectorLayer*>& layers ) const;
 
+    /**
+     * Get some metadata that will be display in the metadata tab of the layer properties.
+     * @return The provider metadata
+     */
+    virtual QMap<QString, QString> metadata() const;
+
   signals:
     /**
      * Signals an error in this provider
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -390,7 +390,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
      * Returns true if the provider is strict about the type of inserted features
      * (e.g. no multipolygon in a polygon layer)
      */
-    virtual bool doesStrictFeatureTypeCheck() const { return true;}
+    virtual bool doesStrictFeatureTypeCheck() const { return true; }
 
     //! Returns a list of available encodings
     static QStringList availableEncodings();
@@ -446,6 +446,12 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
      */
     virtual QList<QgsRelation> discoverRelations( const QgsVectorLayer* self, const QList<QgsVectorLayer*>& layers ) const;
 
+    /**
+     * Get some metadata that will be display in the metadata tab of the layer properties.
+     * @return The provider metadata
+     */
+    virtual QMap<QString, QString> metadata() const { return QMap<QString, QString>(); };
+
   signals:
     /**
      * Signals an error in this provider
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3889,6 +3889,20 @@ QString QgsVectorLayer::metadata() const
     myMetadata += QLatin1String( "<p>" );
     myMetadata += dataProvider()->description().replace( '\n', QLatin1String( "<br>" ) );
     myMetadata += QLatin1String( "</p>\n" );
+
+    QMap<QString, QString> dataProviderMetadata = mDataProvider->metadata();
+    if ( !dataProviderMetadata.isEmpty() )
+    {
+      myMetadata += "<p class=\"glossy\">" + tr( "Provider Metadata" ) + "</p>\n";
+      myMetadata +=  "<p><table><tr><th>" + tr( "Metadata name" ) + "</th><th>" + tr( "Metadata value" ) + "</th></tr>\n";
+      QMapIterator<QString, QString> i( dataProviderMetadata );
+      while ( i.hasNext() )
+      {
+        i.next();
+        myMetadata += "<tr><td>" + i.key() + ":</td><td>" + i.value() + "</td></tr>\n";
+      }
+      myMetadata += QLatin1String( "</table></p>\n" );
+    }
   }
 
   // data source
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -1100,6 +1100,16 @@ bool QgsWFSProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_
   }
 }
 
+
+QMap<QString, QString> QgsWFSProvider::metadata()
+{
+  QMap<QString, QString> result;
+  result[tr( "Max Features" )] = mShared->mCaps.maxFeatures == 0 ? tr( "not provided" ) : QString( mShared->mCaps.maxFeatures );
+  result[tr( "Supports Paging" )] = mShared->mCaps.supportsPaging ? tr( "supported" ) : tr( "unsupported" );
+  result[tr( "Supports Joins" )] = mShared->mCaps.supportsJoins ? tr( "supported" ) : tr( "unsupported" );
+  return result;
+}
+
 bool QgsWFSProvider::describeFeatureType( QString& geometryAttribute, QgsFields& fields, QgsWkbTypes::Type& geomType )
 {
   fields.clear();
diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
@@ -132,6 +132,12 @@ class QgsWFSProvider : public QgsVectorDataProvider
      */
     virtual bool changeAttributeValues( const QgsChangedAttributesMap &attr_map ) override;
 
+    /**
+     * Get some metadata description of the provider.
+     * @return The provider metadata
+     */
+    virtual QMap<QString, QString> metadata();
+
   public slots:
     /** Reloads the data from the source. Needs to be implemented by providers with data caches to
       synchronize with changes in the data source*/

Original file line number	Diff line number	Diff line change
`@@ -1100,6 +1100,16 @@ bool QgsWFSProvider::changeAttributeValues( const QgsChangedAttributesMap &attr_`
`1100`	`1100`	`}`
`1101`	`1101`	`}`
`1102`	`1102`
	`1103`	`+`
	`1104`	`+QMap<QString, QString> QgsWFSProvider::metadata()`
	`1105`	`+{`
	`1106`	`+ QMap<QString, QString> result;`
	`1107`	`+ result[tr( "Max Features" )] = mShared->mCaps.maxFeatures == 0 ? tr( "not provided" ) : QString( mShared->mCaps.maxFeatures );`
	`1108`	`+ result[tr( "Supports Paging" )] = mShared->mCaps.supportsPaging ? tr( "supported" ) : tr( "unsupported" );`
	`1109`	`+ result[tr( "Supports Joins" )] = mShared->mCaps.supportsJoins ? tr( "supported" ) : tr( "unsupported" );`
	`1110`	`+ return result;`
	`1111`	`+}`
	`1112`	`+`
`1103`	`1113`	`bool QgsWFSProvider::describeFeatureType( QString& geometryAttribute, QgsFields& fields, QgsWkbTypes::Type& geomType )`
`1104`	`1114`	`{`
`1105`	`1115`	`fields.clear();`