[mapserver-commits] r12848 - in branches/branch-6-0: mapserver msautotest/wxs

[svn at osgeo.org]

Author: schpidi
Date: 2011-12-05 10:34:34 -0800 (Mon, 05 Dec 2011)
New Revision: 12848

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapwcs20.c
   branches/branch-6-0/msautotest/wxs/wcs_simple.map
Log:
Fixing single pixel coverages in WCS 2.0 (#4110)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-12-05 18:34:05 UTC (rev 12847)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-12-05 18:34:34 UTC (rev 12848)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- Fixed single pixel coverages in WCS 2.0 (#4110)
+
 - Fixed subsetting in WCS 2.0 (#4099)
 
 - Fixed segfault when calling classObj::updateFromString() with SYMBOL (#4062)

Modified: branches/branch-6-0/mapserver/mapwcs20.c
===================================================================
--- branches/branch-6-0/mapserver/mapwcs20.c	2011-12-05 18:34:05 UTC (rev 12847)
+++ branches/branch-6-0/mapserver/mapwcs20.c	2011-12-05 18:34:34 UTC (rev 12848)
@@ -461,14 +461,14 @@
         }
 
         if (subset->timeOrScalar == MS_WCS20_TIME_VALUE && subset->min.time
-                >= subset->max.time)
+                > subset->max.time)
         {
             msSetError(MS_WCSERR,
                     "Minimum value of subset axis %s is larger than maximum value",
                     "msWCSParseSubset20()", subset->axis);
             return MS_FAILURE;
         }
-        if (subset->timeOrScalar == MS_WCS20_SCALAR_VALUE && subset->min.scalar >= subset->max.scalar)
+        if (subset->timeOrScalar == MS_WCS20_SCALAR_VALUE && subset->min.scalar > subset->max.scalar)
         {
             msSetError(MS_WCSERR,
                     "Minimum value (%f) of subset axis '%s' is larger than maximum value (%f).",

Modified: branches/branch-6-0/msautotest/wxs/wcs_simple.map
===================================================================
--- branches/branch-6-0/msautotest/wxs/wcs_simple.map	2011-12-05 18:34:05 UTC (rev 12847)
+++ branches/branch-6-0/msautotest/wxs/wcs_simple.map	2011-12-05 18:34:34 UTC (rev 12848)
@@ -151,7 +151,7 @@
 # GetCoverage 2.0 image/tiff trim x y both
 # RUN_PARMS: wcs_20_getcov_trim_x_y_both.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&SUBSET=x(10,20)&SUBSET=y(10,20)" > [RESULT_DEMIME]
 # GetCoverage 2.0 image/tiff trim x y both to 1x1px image (#3857)
-# RUN_PARMS: wcs_20_getcov_trim_x_y_both_1px.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&SUBSET=x(10,10.1)&SUBSET=y(10,10.1)" > [RESULT_DEMIME]
+# RUN_PARMS: wcs_20_getcov_trim_x_y_both_1px.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&SUBSET=x(10,10)&SUBSET=y(10,10)" > [RESULT_DEMIME]
 #
 # GetCoverage 2.0 gml+image/tiff full
 # RUN_PARMS: wcs_20_getcov_full.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&MEDIATYPE=multipart/mixed" > [RESULT_DEMIME]