Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Sep 21, 2012 · 003f833 · 003f833
2 parents 6ac8792 + dd36727
commit 003f833
Show file tree

Hide file tree

Showing 11 changed files with 269 additions and 161 deletions.
diff --git a/doc/index.dox b/doc/index.dox
@@ -19,19 +19,21 @@ fixes, bug reports, contributed documentation, advocacy and supporting other
 users on our mailing lists and forums. Financial contributions are also
 welcome.
 
-\section index_APIStability API Stability
+\section index_APIStability Earlier versions of the API
 
-Versions of QGIS prior to 1.0 did not guarantee API stability since the
-application was undergoing rapid development of new features and we did not
-want to commit ourselves to a fixed API. With the release of QGIS 1.0 we 
-guarantee a backwards compatible API  for the 1.x and 1.0.x release series. 1.x
-releases will be our 'unstable' development builds and 1.0.x releases our
-'stable' (bugfixes and very minor tweaks only).
+Earlier version of the documentation are also available on the Quantum GIS
+website:
+
+<ul>
+<li><a href="http://qgis.org/api/1.8">1.8</a>
+<li><a href="http://qgis.org/api/1.7">1.7</a>
+<li><a href="http://qgis.org/api/1.6">1.6</a>
+</ul>
 
 \section index_maillist Mailing Lists
 <ul>
 <li>For support we encourage you to join our <a
-href="http://qgis.osgeo.org/community/mailing-lists.html">mailing lists</a> for
+href="http://qgis.org/en/community/mailing-lists.html">mailing lists</a> for
 developers.</li> </ul>
 
 \section index_bugs Bug Reporting

diff --git a/src/mapserver/qgsconfigparser.h b/src/mapserver/qgsconfigparser.h
@@ -44,6 +44,8 @@ class QgsConfigParser
 
     virtual void featureTypeList( QDomElement& parentElement, QDomDocument& doc ) const = 0;
 
+    virtual void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const = 0;
+
     /**Returns one or possibly several maplayers for a given layer name and style. If there are several layers, the layers should be drawn in inverse list order.
        If no layers/style are found, an empty list is returned
       @param allowCache true if layer can be read from / written to cache*/

diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -25,6 +25,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsrenderer.h"
 #include "qgsvectorlayer.h"
+#include "qgsvectordataprovider.h"
 
 #include "qgscomposition.h"
 #include "qgscomposerarrow.h"
@@ -206,6 +207,151 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
   return;
 }
 
+void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const
+{
+  if ( mProjectLayerElements.size() < 1 )
+  {
+    return;
+  }
+
+  QStringList wfsLayersId = wfsLayers();
+  QMap< QString, QMap< int, QString > > aliasInfo = layerAliasInfo();
+  QMap< QString, QSet<QString> > hiddenAttrs = hiddenAttributes();
+
+  foreach( const QDomElement &elem, mProjectLayerElements )
+  {
+    QString type = elem.attribute( "type" );
+    if ( type == "vector" )
+    {
+      QgsMapLayer *mLayer = createLayerFromElement( elem );
+      QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( mLayer );
+      if ( layer && wfsLayersId.contains( layer->id() ) && ( aTypeName == "" || layer->name() == aTypeName ) )
+      {
+        //do a select with searchRect and go through all the features
+        QgsVectorDataProvider* provider = layer->dataProvider();
+        if ( !provider )
+        {
+          continue;
+        }
+
+        //is there alias info for this vector layer?
+        QMap< int, QString > layerAliasInfo;
+        QMap< QString, QMap< int, QString > >::const_iterator aliasIt = aliasInfo.find( mLayer->id() );
+        if ( aliasIt != aliasInfo.constEnd() )
+        {
+          layerAliasInfo = aliasIt.value();
+        }
+
+        //hidden attributes for this layer
+        QSet<QString> layerHiddenAttributes;
+        QMap< QString, QSet<QString> >::const_iterator hiddenIt = hiddenAttrs.find( mLayer->id() );
+        if ( hiddenIt != hiddenAttrs.constEnd() )
+        {
+          layerHiddenAttributes = hiddenIt.value();
+        }
+
+        QString typeName = layer->name();
+        typeName = typeName.replace( QString( " " ), QString( "_" ) );
+
+        //xsd:element
+        QDomElement elementElem = doc.createElement( "element"/*xsd:element*/ );
+        elementElem.setAttribute( "name", typeName );
+        elementElem.setAttribute( "type", "qgs:" + typeName + "Type" );
+        elementElem.setAttribute( "substitutionGroup", "gml:_Feature" );
+        parentElement.appendChild( elementElem );
+
+        //xsd:complexType
+        QDomElement complexTypeElem = doc.createElement( "complexType"/*xsd:complexType*/ );
+        complexTypeElem.setAttribute( "name", typeName + "Type" );
+        parentElement.appendChild( complexTypeElem );
+
+        //xsd:complexType
+        QDomElement complexContentElem = doc.createElement( "complexContent"/*xsd:complexContent*/ );
+        complexTypeElem.appendChild( complexContentElem );
+
+        //xsd:extension
+        QDomElement extensionElem = doc.createElement( "extension"/*xsd:extension*/ );
+        extensionElem.setAttribute( "base", "gml:AbstractFeatureType" );
+        complexContentElem.appendChild( extensionElem );
+
+        //xsd:sequence
+        QDomElement sequenceElem = doc.createElement( "sequence"/*xsd:sequence*/ );
+        extensionElem.appendChild( sequenceElem );
+
+        //xsd:element
+        QDomElement geomElem = doc.createElement( "element"/*xsd:element*/ );
+        geomElem.setAttribute( "name", "geometry" );
+        QGis::WkbType wkbType = layer->wkbType();
+        switch ( wkbType )
+        {
+          case QGis::WKBPoint25D:
+          case QGis::WKBPoint:
+            geomElem.setAttribute( "type", "gml:PointPropertyType" );
+            break;
+          case QGis::WKBLineString25D:
+          case QGis::WKBLineString:
+            geomElem.setAttribute( "type", "gml:LineStringPropertyType" );
+            break;
+          case QGis::WKBPolygon25D:
+          case QGis::WKBPolygon:
+            geomElem.setAttribute( "type", "gml:PolygonPropertyType" );
+            break;
+          case QGis::WKBMultiPoint25D:
+          case QGis::WKBMultiPoint:
+            geomElem.setAttribute( "type", "gml:MultiPointPropertyType" );
+            break;
+          case QGis::WKBMultiLineString25D:
+          case QGis::WKBMultiLineString:
+            geomElem.setAttribute( "type", "gml:MultiLineStringPropertyType" );
+            break;
+          case QGis::WKBMultiPolygon25D:
+          case QGis::WKBMultiPolygon:
+            geomElem.setAttribute( "type", "gml:MultiPolygonPropertyType" );
+            break;
+          default:
+            geomElem.setAttribute( "type", "gml:GeometryPropertyType" );
+            break;
+        }
+        geomElem.setAttribute( "minOccurs", "0" );
+        geomElem.setAttribute( "maxOccurs", "1" );
+        sequenceElem.appendChild( geomElem );
+
+        const QgsFieldMap& fields = provider->fields();
+        for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it )
+        {
+
+          QString attributeName = it.value().name();
+          //skip attribute if it has edit type 'hidden'
+          if ( layerHiddenAttributes.contains( attributeName ) )
+          {
+            continue;
+          }
+
+          //xsd:element
+          QDomElement geomElem = doc.createElement( "element"/*xsd:element*/ );
+          geomElem.setAttribute( "name", attributeName );
+          if ( it.value().type() == 2 )
+            geomElem.setAttribute( "type", "integer" );
+          else if ( it.value().type() == 6 )
+            geomElem.setAttribute( "type", "double" );
+          else
+            geomElem.setAttribute( "type", "string" );
+
+          sequenceElem.appendChild( geomElem );
+
+          //check if the attribute name should be replaced with an alias
+          QMap<int, QString>::const_iterator aliasIt = layerAliasInfo.find( it.key() );
+          if ( aliasIt != layerAliasInfo.constEnd() )
+          {
+            geomElem.setAttribute( "alias", aliasIt.value() );
+          }
+        }
+      }
+    }
+  }
+  return;
+}
+
 void QgsProjectParser::addLayers( QDomDocument &doc,
                                   QDomElement &parentElem,
                                   const QDomElement &legendElem,

diff --git a/src/mapserver/qgsprojectparser.h b/src/mapserver/qgsprojectparser.h
@@ -40,6 +40,8 @@ class QgsProjectParser: public QgsConfigParser
 
     virtual void featureTypeList( QDomElement& parentElement, QDomDocument& doc ) const;
 
+    virtual void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const;
+
     int numberOfLayers() const;
 
     /**Returns one or possibly several maplayers for a given layer name and style. If no layers/style are found, an empty list is returned*/

diff --git a/src/mapserver/qgssldparser.h b/src/mapserver/qgssldparser.h
@@ -57,6 +57,8 @@ class QgsSLDParser: public QgsConfigParser
     void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
 
     void featureTypeList( QDomElement &, QDomDocument & ) const {};
+
+    void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const {};
 
     /**Returns number of layers in configuration*/
     int numberOfLayers() const;

diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -262,143 +262,9 @@ QDomDocument QgsWFSServer::describeFeatureType()
   }
   else
   {
-    return doc;
+    typeName = "";
   }
-
-  QStringList wfsLayersId = mConfigParser->wfsLayers();
-  QMap< QString, QMap< int, QString > > aliasInfo = mConfigParser->layerAliasInfo();
-  QMap< QString, QSet<QString> > hiddenAttributes = mConfigParser->hiddenAttributes();
-
-  QList<QgsMapLayer*> layerList;
-  QgsMapLayer* currentLayer = 0;
-
-  layerList = mConfigParser->mapLayerFromStyle( typeName, "" );
-  currentLayer = layerList.at( 0 );
-
-  QgsVectorLayer* layer = dynamic_cast<QgsVectorLayer*>( currentLayer );
-  if ( layer && wfsLayersId.contains( layer->id() ) )
-  {
-    //is there alias info for this vector layer?
-    QMap< int, QString > layerAliasInfo;
-    QMap< QString, QMap< int, QString > >::const_iterator aliasIt = aliasInfo.find( currentLayer->id() );
-    if ( aliasIt != aliasInfo.constEnd() )
-    {
-      layerAliasInfo = aliasIt.value();
-    }
-
-    //hidden attributes for this layer
-    QSet<QString> layerHiddenAttributes;
-    QMap< QString, QSet<QString> >::const_iterator hiddenIt = hiddenAttributes.find( currentLayer->id() );
-    if ( hiddenIt != hiddenAttributes.constEnd() )
-    {
-      layerHiddenAttributes = hiddenIt.value();
-    }
-
-    //do a select with searchRect and go through all the features
-    QgsVectorDataProvider* provider = layer->dataProvider();
-    if ( !provider )
-    {
-      return doc;
-    }
-
-    typeName = typeName.replace( QString( " " ), QString( "_" ) );
-
-    //xsd:element
-    QDomElement elementElem = doc.createElement( "element"/*xsd:element*/ );
-    elementElem.setAttribute( "name", typeName );
-    elementElem.setAttribute( "type", "qgs:" + typeName + "Type" );
-    elementElem.setAttribute( "substitutionGroup", "gml:_Feature" );
-    schemaElement.appendChild( elementElem );
-
-    //xsd:complexType
-    QDomElement complexTypeElem = doc.createElement( "complexType"/*xsd:complexType*/ );
-    complexTypeElem.setAttribute( "name", typeName + "Type" );
-    schemaElement.appendChild( complexTypeElem );
-
-    //xsd:complexType
-    QDomElement complexContentElem = doc.createElement( "complexContent"/*xsd:complexContent*/ );
-    complexTypeElem.appendChild( complexContentElem );
-
-    //xsd:extension
-    QDomElement extensionElem = doc.createElement( "extension"/*xsd:extension*/ );
-    extensionElem.setAttribute( "base", "gml:AbstractFeatureType" );
-    complexContentElem.appendChild( extensionElem );
-
-    //xsd:sequence
-    QDomElement sequenceElem = doc.createElement( "sequence"/*xsd:sequence*/ );
-    extensionElem.appendChild( sequenceElem );
-
-    //xsd:element
-    QDomElement geomElem = doc.createElement( "element"/*xsd:element*/ );
-    geomElem.setAttribute( "name", "geometry" );
-    QGis::WkbType wkbType = layer->wkbType();
-    switch ( wkbType )
-    {
-      case QGis::WKBPoint25D:
-      case QGis::WKBPoint:
-        geomElem.setAttribute( "type", "gml:PointPropertyType" );
-        break;
-      case QGis::WKBLineString25D:
-      case QGis::WKBLineString:
-        geomElem.setAttribute( "type", "gml:LineStringPropertyType" );
-        break;
-      case QGis::WKBPolygon25D:
-      case QGis::WKBPolygon:
-        geomElem.setAttribute( "type", "gml:PolygonPropertyType" );
-        break;
-      case QGis::WKBMultiPoint25D:
-      case QGis::WKBMultiPoint:
-        geomElem.setAttribute( "type", "gml:MultiPointPropertyType" );
-        break;
-      case QGis::WKBMultiLineString25D:
-      case QGis::WKBMultiLineString:
-        geomElem.setAttribute( "type", "gml:MultiLineStringPropertyType" );
-        break;
-      case QGis::WKBMultiPolygon25D:
-      case QGis::WKBMultiPolygon:
-        geomElem.setAttribute( "type", "gml:MultiPolygonPropertyType" );
-        break;
-      default:
-        geomElem.setAttribute( "type", "gml:GeometryPropertyType" );
-        break;
-    }
-    geomElem.setAttribute( "minOccurs", "0" );
-    geomElem.setAttribute( "maxOccurs", "1" );
-    sequenceElem.appendChild( geomElem );
-
-    const QgsFieldMap& fields = provider->fields();
-    for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it )
-    {
-
-      QString attributeName = it.value().name();
-      //skip attribute if it has edit type 'hidden'
-      if ( layerHiddenAttributes.contains( attributeName ) )
-      {
-        continue;
-      }
-
-      //xsd:element
-      QDomElement geomElem = doc.createElement( "element"/*xsd:element*/ );
-      geomElem.setAttribute( "name", attributeName );
-      if ( it.value().type() == 2 )
-        geomElem.setAttribute( "type", "integer" );
-      else if ( it.value().type() == 6 )
-        geomElem.setAttribute( "type", "double" );
-      else
-        geomElem.setAttribute( "type", "string" );
-
-      sequenceElem.appendChild( geomElem );
-
-      //check if the attribute name should be replaced with an alias
-      QMap<int, QString>::const_iterator aliasIt = layerAliasInfo.find( it.key() );
-      if ( aliasIt != layerAliasInfo.constEnd() )
-      {
-        geomElem.setAttribute( "alias", aliasIt.value() );
-      }
-
-    }
-  }
-
+  mConfigParser->describeFeatureType( typeName, schemaElement, doc);
   return doc;
 }
 

diff --git a/src/providers/grass/qgis.d.rast.c b/src/providers/grass/qgis.d.rast.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <assert.h>
 #ifdef WIN32
 #include <fcntl.h>
 #include <io.h>
@@ -36,6 +37,12 @@
 #include <grass/raster.h>
 #include <grass/display.h>
 
+#ifdef _MSC_VER
+#include <float.h>
+#define INFINITY (DBL_MAX+DBL_MAX)
+#define NAN (INFINITY-INFINITY)
+#endif
+
 int display( char *name, char *mapset, RASTER_MAP_TYPE data_type, char *format );
 
 int main( int argc, char **argv )
@@ -151,6 +158,9 @@ static int cell_draw( char *name,
   // and 0./0. if all fails
 #endif
 
+  assert( dnul != dnul );
+  assert( fnul != fnul );
+
   big_endian = !( *(( char * )( &one ) ) );
 
   ncols = G_window_cols();