Overwrite existing boundingBoxes with the same CRS in WMS capabilities.

Roel · m-kuhn · commit a2a2d28d344b · 2018-05-08T11:00:15.000+02:00
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -872,7 +872,6 @@ void QgsWmsCapabilities::parseLayer( QDomElement const &e, QgsWmsLayerProperty &
       }
       else if ( tagName == QLatin1String( "BoundingBox" ) )
       {
-        // TODO: overwrite inherited
         QgsWmsBoundingBoxProperty bbox;
         bbox.box = QgsRectangle( e1.attribute( QStringLiteral( "minx" ) ).toDouble(),
                                  e1.attribute( QStringLiteral( "miny" ) ).toDouble(),
@@ -893,7 +892,18 @@ void QgsWmsCapabilities::parseLayer( QDomElement const &e, QgsWmsLayerProperty &
             bbox.box = invAxisBbox;
           }
 
-          layerProperty.boundingBoxes << bbox;
+          // Overwrite existing bounding boxes with identical CRS
+          bool inheritedOverwritten = false;
+          for ( int i = 0; i < layerProperty.boundingBoxes.size(); i++ )
+          {
+              if ( layerProperty.boundingBoxes[i].crs == bbox.crs )
+              {
+                  layerProperty.boundingBoxes[i] = bbox;
+                  inheritedOverwritten = true;
+              }
+          }
+          if ( ! inheritedOverwritten )
+              layerProperty.boundingBoxes << bbox;
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,6 @@ void QgsWmsCapabilities::parseLayer( QDomElement const &e, QgsWmsLayerProperty &`
`872`	`872`	`}`
`873`	`873`	`else if ( tagName == QLatin1String( "BoundingBox" ) )`
`874`	`874`	`{`
`875`		`- // TODO: overwrite inherited`
`876`	`875`	`QgsWmsBoundingBoxProperty bbox;`
`877`	`876`	`bbox.box = QgsRectangle( e1.attribute( QStringLiteral( "minx" ) ).toDouble(),`
`878`	`877`	`e1.attribute( QStringLiteral( "miny" ) ).toDouble(),`
`@@ -893,7 +892,18 @@ void QgsWmsCapabilities::parseLayer( QDomElement const &e, QgsWmsLayerProperty &`
`893`	`892`	`bbox.box = invAxisBbox;`
`894`	`893`	`}`
`895`	`894`
`896`		`- layerProperty.boundingBoxes << bbox;`
	`895`	`+ // Overwrite existing bounding boxes with identical CRS`
	`896`	`+ bool inheritedOverwritten = false;`
	`897`	`+ for ( int i = 0; i < layerProperty.boundingBoxes.size(); i++ )`
	`898`	`+ {`
	`899`	`+ if ( layerProperty.boundingBoxes[i].crs == bbox.crs )`
	`900`	`+ {`
	`901`	`+ layerProperty.boundingBoxes[i] = bbox;`
	`902`	`+ inheritedOverwritten = true;`
	`903`	`+ }`
	`904`	`+ }`
	`905`	`+ if ( ! inheritedOverwritten )`
	`906`	`+ layerProperty.boundingBoxes << bbox;`
`897`	`907`	`}`
`898`	`908`	`else`
`899`	`909`	`{`