Permalink
Browse files

fix order of wms <Style> element in capabilities (#4529)

  • Loading branch information...
1 parent 5e3bc56 commit b6abf97da8c426fa74cb055405f3b05643c9ebdb @tbonfort tbonfort committed Dec 11, 2012
Showing with 7 additions and 5 deletions.
  1. +7 −5 mapwms.c
View
@@ -2275,6 +2275,13 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
"xlink:type=\"simple\" xlink:href=\"%s\"/>\n ",
MS_FALSE, MS_FALSE, MS_FALSE, MS_TRUE, MS_TRUE,
NULL, NULL, NULL, NULL, NULL, " ");
+
+ /* print Min/Max ScaleDenominator */
+ if (nVersion < OWS_1_3_0)
+ msWMSPrintScaleHint(" ", lp->minscaledenom, lp->maxscaledenom, map->resolution);
+ else
+ msWMSPrintScaleDenominator(" ", lp->minscaledenom, lp->maxscaledenom);
+
/* The LegendURL reside in a style. The Web Map Context spec already */
/* included the support on this in mapserver. However, it is not in the */
@@ -2551,11 +2558,6 @@ int msDumpLayer(mapObj *map, layerObj *lp, int nVersion, const char *script_url_
msFree(pszMetadataName);
- if (nVersion < OWS_1_3_0)
- msWMSPrintScaleHint(" ", lp->minscaledenom, lp->maxscaledenom, map->resolution);
- else
- msWMSPrintScaleDenominator(" ", lp->minscaledenom, lp->maxscaledenom);
-
if ( grouplayer == MS_FALSE )
msIO_printf("%s </Layer>\n", indent);

0 comments on commit b6abf97

Please sign in to comment.