Permalink
Browse files

Fix ScaleDenominator print order for 4529

  • Loading branch information...
1 parent 03cfd10 commit 1c17b3f3a94255ed33044179c5c141cf95579a00 @jlarouche jlarouche committed Dec 18, 2012
Showing with 7 additions and 6 deletions.
  1. +7 −6 mapwms.c
View
@@ -3203,12 +3203,6 @@ int msWMSGetCapabilities(mapObj *map, int nVersion, cgiRequestObj *req, owsReque
MS_FALSE, MS_FALSE, MS_FALSE, MS_TRUE, MS_TRUE,
NULL, NULL, NULL, NULL, NULL, " ");
- if (nVersion < OWS_1_3_0)
- msWMSPrintScaleHint(" ", map->web.minscaledenom, map->web.maxscaledenom,
- map->resolution);
- else
- msWMSPrintScaleDenominator(" ", map->web.minscaledenom, map->web.maxscaledenom);
-
if (map->name && strlen(map->name) > 0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") ) {
char *pszEncodedName = NULL;
const char *styleName = NULL;
@@ -3308,6 +3302,13 @@ int msWMSGetCapabilities(mapObj *map, int nVersion, cgiRequestObj *req, owsReque
msIO_fprintf(stdout, " </Style>\n");
msFree(pszEncodedName);
msFree(pszEncodedStyleName);
+
+ /* Prints ScaleDenominator */
+ if (nVersion < OWS_1_3_0)
+ msWMSPrintScaleHint(" ", map->web.minscaledenom, map->web.maxscaledenom,
+ map->resolution);
+ else
+ msWMSPrintScaleDenominator(" ", map->web.minscaledenom, map->web.maxscaledenom);
}
/* */

0 comments on commit 1c17b3f

Please sign in to comment.