[mapserver-commits] r9855 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-02-21 19:20:06 -0500 (Sun, 21 Feb 2010)
New Revision: 9855

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapwms.c
Log:
Fixed invalid warning when map has a valid EPSG proj, but layer doesn't (#2028)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-02-21 23:48:56 UTC (rev 9854)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-02-22 00:20:06 UTC (rev 9855)
@@ -19,10 +19,15 @@
 
 - Determine PgSQL version in a more backwards compatible way (#3291)
 
-- Implemented RFC 52 LayerResultsGetShape support for OGR connection type. (#3069)
+- Implemented RFC 52 LayerResultsGetShape support for OGR connection 
+  type. (#3069)
 
 - Fixed problem with the oracle driver w/FUNCTION=NONE (#3260)
 
+- Got rid of invalid warning about missing EPSG proj in WMs GetCapabilities
+  when map has a valid EPSG proj, but layer doesn't (#2028)
+
+
 Version 5.6.1 (2010-01-08):
 ---------------------------
 

Modified: branches/branch-5-6/mapserver/mapwms.c
===================================================================
--- branches/branch-5-6/mapserver/mapwms.c	2010-02-21 23:48:56 UTC (rev 9854)
+++ branches/branch-5-6/mapserver/mapwms.c	2010-02-22 00:20:06 UTC (rev 9855)
@@ -1446,9 +1446,10 @@
    if (msOWSGetEPSGProj(&(map->projection),&(map->web.metadata),
                         "MO", MS_FALSE) == NULL)
    {
-       /* starting 1.1.1 SRS are given in individual tags */
+       /* If map has no proj then every layer MUST have one or produce a warning */
        if (nVersion > OWS_1_1_0)
        {
+           /* starting 1.1.1 SRS are given in individual tags */
            if (nVersion >= OWS_1_3_0)
              msOWSPrintEncodeParamList(stdout, "(at least one of) "
                                        "MAP.PROJECTION, LAYER.PROJECTION "
@@ -1469,7 +1470,6 @@
                                      "        <SRS>%s</SRS>\n", NULL);
        }
        else
-         /* If map has no proj then every layer MUST have one or produce a warning */
          msOWSPrintEncodeParam(stdout, "(at least one of) MAP.PROJECTION, "
                                "LAYER.PROJECTION or wms_srs metadata",
                                msOWSGetEPSGProj(&(lp->projection),
@@ -1478,9 +1478,10 @@
    }
    else
    {
-       /* starting 1.1.1 SRS are given in individual tags */
+       /* No warning required in this case since there's at least a map proj. */
        if (nVersion > OWS_1_1_0)
        {
+           /* starting 1.1.1 SRS are given in individual tags */
            if (nVersion >=  OWS_1_3_0)
              msOWSPrintEncodeParamList(stdout, "(at least one of) "
                                      "MAP.PROJECTION, LAYER.PROJECTION "
@@ -1488,7 +1489,7 @@
                                      msOWSGetEPSGProj(&(lp->projection), 
                                                       &(lp->metadata),
                                                       "MO", MS_FALSE),
-                                     OWS_WARN, ' ', NULL, NULL, 
+                                     OWS_NOERR, ' ', NULL, NULL, 
                                      "        <CRS>%s</CRS>\n", NULL);
            else
              msOWSPrintEncodeParamList(stdout, "(at least one of) "
@@ -1497,11 +1498,10 @@
                                      msOWSGetEPSGProj(&(lp->projection), 
                                                       &(lp->metadata),
                                                       "MO", MS_FALSE),
-                                     OWS_WARN, ' ', NULL, NULL, 
+                                     OWS_NOERR, ' ', NULL, NULL, 
                                      "        <SRS>%s</SRS>\n", NULL);
        }
        else
-       /* No warning required in this case since there's at least a map proj. */
          msOWSPrintEncodeParam(stdout,
                                " LAYER.PROJECTION (or wms_srs metadata)",
                                msOWSGetEPSGProj(&(lp->projection),