[Server][Feature][needs-docs] Update WMTS service: Check layer param

Verifying the LAYER WMTS parameter
qgis · Aug 20, 2018 · 50766ef · 50766ef
1 parent cff8469
commit 50766ef
Show file tree

Hide file tree

Showing 4 changed files with 321 additions and 143 deletions.
diff --git a/src/server/services/wmts/qgswmtsgetcapabilities.cpp b/src/server/services/wmts/qgswmtsgetcapabilities.cpp
@@ -332,16 +332,16 @@ namespace QgsWmts
       // WMTS Project configuration
       bool wmtsProject = project->readBoolEntry( QStringLiteral( "WMTSLayers" ), QStringLiteral( "Project" ) );
 
-      if ( wmtsProject )
+      // Root Layer name
+      QString rootLayerName = QgsServerProjectUtils::wmsRootName( *project );
+      if ( rootLayerName.isEmpty() && !project->title().isEmpty() )
       {
-        layerDef pLayer;
+        rootLayerName = project->title();
+      }
 
-        // Root Layer name
-        QString rootLayerName = QgsServerProjectUtils::wmsRootName( *project );
-        if ( rootLayerName.isEmpty() && !project->title().isEmpty() )
-        {
-          rootLayerName = project->title();
-        }
+      if ( wmtsProject && !rootLayerName.isEmpty() )
+      {
+        layerDef pLayer;
         pLayer.id = rootLayerName;
 
         if ( !project->title().isEmpty() )
@@ -533,6 +533,7 @@ namespace QgsWmts
           layerElem.appendChild( layerAbstElem );
         }
 
+        // WGS84 bounding box
         QDomElement wgs84BBoxElement = doc.createElement( QStringLiteral( "ows:WGS84BoundingBox" ) );
         QDomElement wgs84LowerCornerElement = doc.createElement( QStringLiteral( "LowerCorner" ) );
         QDomText wgs84LowerCornerText = doc.createTextNode( qgsDoubleToString( wmtsLayer.wgs84BoundingRect.xMinimum(), 6 ) + ' ' + qgsDoubleToString( wmtsLayer.wgs84BoundingRect.yMinimum(), 6 ) );
@@ -544,6 +545,41 @@ namespace QgsWmts
         wgs84BBoxElement.appendChild( wgs84UpperCornerElement );
         layerElem.appendChild( wgs84BBoxElement );
 
+        // Other bounding boxes
+        tmsIt = tmsList.begin();
+        for ( ; tmsIt != tmsList.end(); ++tmsIt )
+        {
+          tileMatrixSet &tms = *tmsIt;
+          if ( tms.ref == "EPSG:4326" )
+            continue;
+
+          QgsRectangle rect;
+          QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem::fromOgcWmsCrs( tms.ref );
+          Q_NOWARN_DEPRECATED_PUSH
+          QgsCoordinateTransform exGeoTransform( wgs84, crs );
+          Q_NOWARN_DEPRECATED_POP
+          try
+          {
+            rect = exGeoTransform.transformBoundingBox( wmtsLayer.wgs84BoundingRect );
+          }
+          catch ( const QgsCsException & )
+          {
+            continue;
+          }
+
+          QDomElement bboxElement = doc.createElement( QStringLiteral( "ows:BoundingBox" ) );
+          bboxElement.setAttribute( QStringLiteral( "crs" ), tms.ref );
+          QDomElement lowerCornerElement = doc.createElement( QStringLiteral( "LowerCorner" ) );
+          QDomText lowerCornerText = doc.createTextNode( qgsDoubleToString( rect.xMinimum(), 6 ) + ' ' + qgsDoubleToString( rect.yMinimum(), 6 ) );
+          lowerCornerElement.appendChild( lowerCornerText );
+          bboxElement.appendChild( lowerCornerElement );
+          QDomElement upperCornerElement = doc.createElement( QStringLiteral( "UpperCorner" ) );
+          QDomText upperCornerText = doc.createTextNode( qgsDoubleToString( rect.xMaximum(), 6 ) + ' ' + qgsDoubleToString( rect.yMaximum(), 6 ) );
+          upperCornerElement.appendChild( upperCornerText );
+          bboxElement.appendChild( upperCornerElement );
+          layerElem.appendChild( bboxElement );
+        }
+
         // Layer Style
         QDomElement layerStyleElem = doc.createElement( QStringLiteral( "Style" ) );
         layerStyleElem.setAttribute( QStringLiteral( "isDefault" ), QStringLiteral( "true" ) );
@@ -578,6 +614,22 @@ namespace QgsWmts
         for ( ; tmsIt != tmsList.end(); ++tmsIt )
         {
           tileMatrixSet &tms = *tmsIt;
+          if ( tms.ref != "EPSG:4326" )
+          {
+            QgsRectangle rect;
+            QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem::fromOgcWmsCrs( tms.ref );
+            Q_NOWARN_DEPRECATED_PUSH
+            QgsCoordinateTransform exGeoTransform( wgs84, crs );
+            Q_NOWARN_DEPRECATED_POP
+            try
+            {
+              rect = exGeoTransform.transformBoundingBox( wmtsLayer.wgs84BoundingRect );
+            }
+            catch ( const QgsCsException & )
+            {
+              continue;
+            }
+          }
 
           //wmts:TileMatrixSetLink
           QDomElement tmslElement = doc.createElement( QStringLiteral( "TileMatrixSetLink" )/*wmts:TileMatrixSetLink*/ );
@@ -587,6 +639,47 @@ namespace QgsWmts
           identifierElem.appendChild( identifierText );
           tmslElement.appendChild( identifierElem );
 
+          //wmts:TileMatrixSetLimits
+          QDomElement tmsLimitsElement = doc.createElement( QStringLiteral( "TileMatrixSetLimits" )/*wmts:TileMatrixSetLimits*/ );
+          int tmIdx = 0;
+          QList<tileMatrix>::iterator tmIt = tms.tileMatrixList.begin();
+          for ( ; tmIt != tms.tileMatrixList.end(); ++tmIt )
+          {
+            tileMatrix &tm = *tmIt;
+
+            QDomElement tmLimitsElement = doc.createElement( QStringLiteral( "TileMatrixLimits" )/*wmts:TileMatrixLimits*/ );
+
+            QDomElement tmIdentifierElem = doc.createElement( QStringLiteral( "TileMatrix" ) );
+            QDomText tmIdentifierText = doc.createTextNode( QString::number( tmIdx ) );
+            tmIdentifierElem.appendChild( tmIdentifierText );
+            tmLimitsElement.appendChild( tmIdentifierElem );
+
+            QDomElement minTileColElem = doc.createElement( QStringLiteral( "MinTileCol" ) );
+            QDomText minTileColText = doc.createTextNode( QString::number( 0 ) );
+            minTileColElem.appendChild( minTileColText );
+            tmLimitsElement.appendChild( minTileColElem );
+
+            QDomElement maxTileColElem = doc.createElement( QStringLiteral( "MaxTileCol" ) );
+            QDomText maxTileColText = doc.createTextNode( QString::number( tm.col ) );
+            maxTileColElem.appendChild( maxTileColText );
+            tmLimitsElement.appendChild( maxTileColElem );
+
+            QDomElement minTileRowElem = doc.createElement( QStringLiteral( "MinTileRow" ) );
+            QDomText minTileRowText = doc.createTextNode( QString::number( 0 ) );
+            minTileRowElem.appendChild( minTileRowText );
+            tmLimitsElement.appendChild( minTileRowElem );
+
+            QDomElement maxTileRowElem = doc.createElement( QStringLiteral( "MaxTileRow" ) );
+            QDomText maxTileRowText = doc.createTextNode( QString::number( tm.row ) );
+            maxTileRowElem.appendChild( maxTileRowText );
+            tmLimitsElement.appendChild( maxTileRowElem );
+
+            tmsLimitsElement.appendChild( tmLimitsElement );
+
+            ++tmIdx;
+          }
+          tmslElement.appendChild( tmsLimitsElement );
+
           layerElem.appendChild( tmslElement );
         }
 

diff --git a/src/server/services/wmts/qgswmtsgettile.cpp b/src/server/services/wmts/qgswmtsgettile.cpp
@@ -31,7 +31,7 @@ namespace QgsWmts
     QgsServerRequest::Parameters params = request.parameters();
 
     // WMS query
-    QUrlQuery query = translateWmtsParamToWmsQueryItem( QStringLiteral( "GetMap" ), params, project );
+    QUrlQuery query = translateWmtsParamToWmsQueryItem( QStringLiteral( "GetMap" ), params, project, serverIface );
 
     QgsServerParameters wmsParams( query );
     QgsServerRequest wmsRequest( "?" + query.query( QUrl::FullyDecoded ) );