[mapserver-commits] r8737 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Mon Mar 9 16:50:08 EDT 2009
Author: tomkralidis
Date: 2009-03-09 16:50:08 -0400 (Mon, 09 Mar 2009)
New Revision: 8737
Added:
trunk/msautotest/wxs/expected/wms_nosld_cap.xml
trunk/msautotest/wxs/expected/wms_nosld_get_map_line_sld.png
trunk/msautotest/wxs/expected/wms_nosld_legend.png
trunk/msautotest/wxs/wms_nosld.map
Log:
add support for disabling SLD (#1395)
Added: trunk/msautotest/wxs/expected/wms_nosld_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_nosld_cap.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wms_nosld_cap.xml 2009-03-09 20:50:08 UTC (rev 8737)
@@ -0,0 +1,117 @@
+Content-type: application/vnd.ogc.wms_xml
+
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<!DOCTYPE WMT_MS_Capabilities SYSTEM "http://ogc.dmsolutions.ca/wms/1.1.1/capabilities_1_1_1.dtd"
+ [
+ <!ELEMENT VendorSpecificCapabilities EMPTY>
+ ]> <!-- end of DOCTYPE declaration -->
+
+<WMT_MS_Capabilities version="1.1.1">
+
+<Service>
+ <Name>OGC:WMS</Name>
+ <Title>Test simple wms</Title>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/>
+ <ContactInformation>
+ </ContactInformation>
+</Service>
+
+<Capability>
+ <Request>
+ <GetCapabilities>
+ <Format>application/vnd.ogc.wms_xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetCapabilities>
+ <GetMap>
+ <Format>image/png</Format>
+ <Format>image/gif</Format>
+ <Format>image/png; mode=24bit</Format>
+ <Format>image/jpeg</Format>
+ <Format>image/vnd.wap.wbmp</Format>
+ <Format>image/tiff</Format>
+ <Format>image/svg+xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetMap>
+ <GetFeatureInfo>
+ <Format>text/plain</Format>
+ <Format>application/vnd.ogc.gml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetFeatureInfo>
+ </Request>
+ <Exception>
+ <Format>application/vnd.ogc.se_xml</Format>
+ <Format>application/vnd.ogc.se_inimage</Format>
+ <Format>application/vnd.ogc.se_blank</Format>
+ </Exception>
+ <VendorSpecificCapabilities />
+ <UserDefinedSymbolization SupportSLD="1" UserLayer="0" UserStyle="1" RemoteWFS="0"/>
+ <Layer>
+ <Name>WMS_NOSLD</Name>
+ <Title>Test simple wms</Title>
+ <SRS>EPSG:42304</SRS>
+ <SRS>EPSG:42101</SRS>
+ <SRS>EPSG:4269</SRS>
+ <SRS>EPSG:4326</SRS>
+ <LatLonBoundingBox minx="-67.5725" miny="42" maxx="-58.9275" maxy="48.5" />
+ <BoundingBox SRS="EPSG:4326"
+ minx="-67.5725" miny="42" maxx="-58.9275" maxy="48.5" />
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>province</Name>
+ <Title>province</Title>
+<!-- WARNING: Mandatory mapfile parameter '(at least one of) MAP.PROJECTION, LAYER.PROJECTION or wms_srs metadata' was missing in this context. -->
+ <LatLonBoundingBox minx="-66.7243" miny="41.7705" maxx="-57.7217" maxy="48.4773" />
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="91" height="23">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?version=1.1.1&service=WMS&request=GetLegendGraphic&layer=province&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>popplace</Name>
+ <Title>popplace</Title>
+<!-- WARNING: Mandatory mapfile parameter '(at least one of) MAP.PROJECTION, LAYER.PROJECTION or wms_srs metadata' was missing in this context. -->
+ <LatLonBoundingBox minx="-66.3286" miny="42.5631" maxx="-59.6882" maxy="47.9413" />
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="77" height="23">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?version=1.1.1&service=WMS&request=GetLegendGraphic&layer=popplace&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>road</Name>
+ <Title>road</Title>
+<!-- WARNING: Mandatory mapfile parameter '(at least one of) MAP.PROJECTION, LAYER.PROJECTION or wms_srs metadata' was missing in this context. -->
+ <LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="70" height="23">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?version=1.1.1&service=WMS&request=GetLegendGraphic&layer=road&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+</Capability>
+</WMT_MS_Capabilities>
Added: trunk/msautotest/wxs/expected/wms_nosld_get_map_line_sld.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/wxs/expected/wms_nosld_get_map_line_sld.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/wxs/expected/wms_nosld_legend.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/wxs/expected/wms_nosld_legend.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/msautotest/wxs/wms_nosld.map
===================================================================
--- trunk/msautotest/wxs/wms_nosld.map (rev 0)
+++ trunk/msautotest/wxs/wms_nosld.map 2009-03-09 20:50:08 UTC (rev 8737)
@@ -0,0 +1,157 @@
+#
+# Test WMS non-enabled SLD
+#
+# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
+#
+#
+# GetCapabilities
+# RUN_PARMS: wms_nosld_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
+#
+# Generate map image with a new line symbology for the road layer.
+# RUN_PARMS: wms_nosld_get_map_line_sld.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-68.125,42,-58.375,48.5&FORMAT=image/png&WIDTH=300&HEIGHT=200&STYLES=&LAYERS=road&sld_body=%3CStyledLayerDescriptor+version%3D%221.0.0%22%3E%0D%0A%3CNamedLayer%3E%0D%0A%3CName%3Eroad%3C%2FName%3E%0D%0A%3CUserStyle%3E%0D%0A%3CTitle%3Exxx%3C%2FTitle%3E%0D%0A%3CFeatureTypeStyle%3E%0D%0A%3CRule%3E%0D%0A%3CLineSymbolizer%3E%0D%0A%3CGeometry%3E%0D%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0D%0A%3C%2FGeometry%3E%0D%0A%3CStroke%3E%0D%0A%3CCssParameter+name%3D%22stroke%22%3E%230000ff%3C%2FCssParameter%3E%0D%0A%3C%2FStroke%3E%0D%0A%3C%2FLineSymbolizer%3E%0D%0A%3C%2FRule%3E%0D%0A%3C%2FFeatureTypeStyle%3E%0D%0A%3C%2FUserStyle%3E%0D%0A%3C%2FNamedLayer%3E%0D%0A%3C%2FStyledLayerDescriptor%3E%0D%0A" > [RESULT_DEMIME]
+#
+#
+# GetLegendGraphic
+# RUN_PARMS: wms_nosld_legend.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetLegendGraphic&FORMAT=image/png&LAYER=road&sld_body=%3CStyledLayerDescriptor+version%3D%221.0.0%22%3E%0D%0A%3CNamedLayer%3E%0D%0A%3CName%3Eroad%3C%2FName%3E%0D%0A%3CUserStyle%3E%0D%0A%3CTitle%3Exxx%3C%2FTitle%3E%0D%0A%3CFeatureTypeStyle%3E%0D%0A%3CRule%3E%0D%0A%3CLineSymbolizer%3E%0D%0A%3CGeometry%3E%0D%0A%3CPropertyName%3Ecenter-line%3C%2FPropertyName%3E%0D%0A%3C%2FGeometry%3E%0D%0A%3CStroke%3E%0D%0A%3CCssParameter+name%3D%22stroke%22%3E%230000ff%3C%2FCssParameter%3E%0D%0A%3C%2FStroke%3E%0D%0A%3C%2FLineSymbolizer%3E%0D%0A%3C%2FRule%3E%0D%0A%3C%2FFeatureTypeStyle%3E%0D%0A%3C%2FUserStyle%3E%0D%0A%3C%2FNamedLayer%3E%0D%0A%3C%2FStyledLayerDescriptor%3E%0D%0A" > [RESULT_DEMIME]
+
+NAME WMS_NOSLD
+STATUS ON
+SIZE 400 300
+#EXTENT 2018000 -73300 3410396 647400
+#UNITS METERS
+EXTENT -67.5725 42 -58.9275 48.5
+UNITS DD
+IMAGECOLOR 255 255 255
+SHAPEPATH ./data
+SYMBOLSET etc/symbols.sym
+FONTSET etc/fonts.txt
+
+OUTPUTFORMAT
+ NAME GDPNG
+ DRIVER "GD/PNG"
+ MIMETYPE "image/png"
+ IMAGEMODE RGB
+ EXTENSION "png"
+END
+
+
+#
+# Start of web interface definition
+#
+WEB
+
+ IMAGEPATH "/tmp/ms_tmp/"
+ IMAGEURL "/ms_tmp/"
+
+ METADATA
+ "wms_title" "Test simple wms"
+ "wms_onlineresource" "http://localhost/path/to/wms_simple?"
+ "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
+ "ows_schemas_location" "http://ogc.dmsolutions.ca"
+ "wms_sld_enabled" "false"
+ END
+END
+
+PROJECTION
+# "init=./data/epsg2:42304"
+# "init=epsg:42304"
+ "init=epsg:4326"
+END
+
+
+#
+# Start of layer definitions
+#
+
+
+
+LAYER
+ NAME province
+ DATA province
+ METADATA
+ "wms_title" "province"
+ "wms_description" "province"
+ "wms_result_fields" "NAME_E YEAR_EST AREA_KMSQ"
+ END
+ TYPE POINT
+ STATUS ON
+ PROJECTION
+ "init=./data/epsg2:42304"
+# "init=epsg:42304"
+ END
+
+ DUMP TRUE
+ CLASSITEM "Name_e"
+
+ CLASS
+ NAME "Province"
+ COLOR 200 255 0
+ OUTLINECOLOR 120 120 120
+ END
+END # Layer
+
+
+LAYER
+ NAME popplace
+ DATA popplace
+ METADATA
+ "wms_title" "popplace"
+ "wms_description" "Cities of I.P.E."
+ "wms_result_fields" "NAME"
+ END
+ TYPE POINT
+ STATUS ON
+ PROJECTION
+ "init=./data/epsg2:42304"
+# "init=epsg:42304"
+ END
+
+ DUMP TRUE
+ LabelItem "Name"
+ CLASSITEM "Capital"
+
+ CLASS
+ EXPRESSION /./
+ SYMBOL 2
+ SIZE 8
+ NAME "Cities"
+ LABEL
+ COLOR 0 0 0
+ FONT Vera
+ TYPE truetype
+ SIZE 8
+ POSITION AUTO
+ PARTIALS FALSE
+ OUTLINECOLOR 255 255 255
+ END
+ COLOR 0 0 0
+ END
+END # Layer
+
+
+LAYER
+ NAME road
+ DATA road
+ METADATA
+ "wms_title" "road"
+ "wms_description" "Roads of I.P.E."
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+ "init=./data/epsg2:42304"
+# "init=epsg:42304"
+ END
+
+ DUMP TRUE
+
+ CLASSITEM "Name_e"
+ CLASS
+ NAME "Roads"
+ SYMBOL 0
+ COLOR 220 0 0
+ END
+END # Layer
+
+
+END # Map File
More information about the mapserver-commits
mailing list