[mapserver-commits] r11796 - sandbox/inspire_soc2011/msautotest/wxs

svn at osgeo.org svn at osgeo.org
Tue Jun 7 16:57:20 EDT 2011


Author: stefanl
Date: 2011-06-07 13:57:20 -0700 (Tue, 07 Jun 2011)
New Revision: 11796

Modified:
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
fixing line breaks

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-06-07 18:23:28 UTC (rev 11795)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-06-07 20:57:20 UTC (rev 11796)
@@ -14,7 +14,7 @@
 NAME WMS_INSPIRE_SCENARIO1_TEST
 STATUS ON
 SIZE 400 300
-#EXTENT   2018000 -73300 3410396 647400
+#EXTENT 2018000 -73300 3410396 647400
 #UNITS METERS
 EXTENT -67.5725 42 -58.9275 48.5
 UNITS DD
@@ -23,16 +23,14 @@
 SYMBOLSET etc/symbols.sym
 FONTSET etc/fonts.txt
 
-
 OUTPUTFORMAT
-  NAME GDPNG
-  DRIVER "GD/PNG"
-  MIMETYPE "image/png"
-#  IMAGEMODE RGB
-  EXTENSION "png"
+ NAME GDPNG
+ DRIVER "GD/PNG"
+ MIMETYPE "image/png"
+#IMAGEMODE RGB
+ EXTENSION "png"
 END
 
-
 #
 # Start of web interface definition
 #
@@ -41,78 +39,78 @@
  IMAGEPATH "/tmp/ms_tmp/"
  IMAGEURL "/ms_tmp/"
 
-  METADATA
-    "wms_inspire_capabilities" "url"						#enables inspire using scenario 1
-    "wms_inspire_languages" "eng,ger"
-    "wms_metadataurl_href" "mymetadataurlhref"
-    "wms_metadataurl_format" "mymetadataurlformat"
-    "wms_title_eng" "mytitleeng"							#localized (as example)
-    "wms_title_ger" "mytitleger"							#localized (as example)
-    "wms_abstract" "myabstract"								#not localized (as example)
-	"ows_updatesequence" "123"
-    "wms_onlineresource"   "http://localhost/path/to/wms_simple?"
-    "wms_srs"		   "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
-    "ows_schemas_location" "http://schemas.opengis.net"
-    "ows_keywordlist" "ogc,wms,mapserver"
-    "ows_service_onlineresource" "http://www.mapserver.org/"
-    "ows_fees" "conditions unknown"							#value either "no conditions apply"|default "conditions unknown"|<specific conditions>
-    "ows_accessconstraints" "none"							#value according ISO 19115 (MD_RestrictionCode codelist) or default "none"
-    "ows_addresstype" "postal"
-    "ows_address"     "123 SomeRoad Road"
-    "ows_city" "Toronto"
-    "ows_stateorprovince" "Ontario"
-    "ows_postcode" "xxx-xxx"
-    "ows_country" "Canada"
-    "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
-    "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
-    "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
-    "ows_contactperson" "Tom Kralidis"
-    "ows_contactorganization" "MapServer"					#responsible organisation
-    "ows_contactposition" "resourceProvider"				#responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
-
-    "ows_rootlayer_title" "My Layers"
-    "ows_rootlayer_abstract" "These are my layers"
-    "ows_rootlayer_keywordlist" "layers,list"
-    "ows_layerlimit" "1"
-    "ows_enable_request" "*" 
-    "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
-  END
+ METADATA
+  "wms_inspire_capabilities" "url"							#enables inspire using scenario 1
+  "wms_inspire_languages" "eng,ger"							#first default, values according ISO 639-2/B
+  "wms_metadataurl_href" "mymetadataurlhref"
+  "wms_metadataurl_format" "mymetadataurlformat"
+  "wms_title_eng" "mytitleeng"								#localized (as example)
+  "wms_title_ger" "mytitleger"								#localized (as example)
+  "wms_abstract" "myabstract"								#should be fallback in english (as example)
+  "wms_abstract_ger" "myabstractger"						#localized (as example)
+  "ows_updatesequence" "123"
+  "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
+  "ows_schemas_location" "http://schemas.opengis.net"
+  "ows_keywordlist" "ogc,wms,mapserver"
+  "ows_service_onlineresource" "http://www.mapserver.org/"
+  "ows_fees" "conditions unknown"							#value either "no conditions apply"|default "conditions unknown"|<specific conditions>
+  "ows_accessconstraints" "none"							#value according ISO 19115 (MD_RestrictionCode codelist) or default "none"
+  "ows_addresstype" "postal"
+  "ows_address" "123 SomeRoad Road"
+  "ows_city" "Toronto"
+  "ows_stateorprovince" "Ontario"
+  "ows_postcode" "xxx-xxx"
+  "ows_country" "Canada"
+  "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
+  "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
+  "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
+  "ows_contactperson" "Tom Kralidis"
+  "ows_contactorganization" "MapServer"						#responsible organisation
+  "ows_contactposition" "resourceProvider"					#responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
+  "ows_rootlayer_title" "My Layers"
+  "ows_rootlayer_abstract" "These are my layers"
+  "ows_rootlayer_keywordlist" "layers,list"
+  "ows_layerlimit" "1"
+  "ows_enable_request" "*" 
+  "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
+ END
 END
 
 PROJECTION
-  "init=epsg:4326"
-  #"init=./data/epsg2:42304"
+ "init=epsg:4326"
+ #"init=./data/epsg2:42304"
 END
 
-
 #
 # Start of layer definitions
 #
 
 LAYER
-  NAME road
-  DATA road
-  TEMPLATE "ttt"
-  METADATA
-    "wms_title"       "road"
-    "wms_description" "Roads of I.P.E."
-    "wms_srs" "EPSG:43204"
-    "gml_include_items" "all"
-  END
-  TYPE LINE
-  STATUS ON
-  PROJECTION
-    "init=./data/epsg2:42304"
-  END
+ NAME road
+ DATA road
+ TEMPLATE "ttt"
+ METADATA
+  "wms_title_eng" "road"
+  "wms_title_ger" "road"
+  "wms_description" "Roads of I.P.E."
+  "wms_srs" "EPSG:43204"
+  "gml_include_items" "all"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+  "init=epsg:4326"
+  #"init=./data/epsg2:42304"
+ END
 
-  DUMP TRUE
+ DUMP TRUE
 
-  CLASSITEM "Name_e"
-  CLASS
-    NAME "Roads"
-    SYMBOL 0 
-    COLOR 220 0 0
-  END
+ CLASSITEM "Name_e"
+ CLASS
+  NAME "Roads"
+  SYMBOL 0 
+  COLOR 220 0 0
+ END
 END # Layer
 
-END # Map File
+END # Map File
\ No newline at end of file

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-06-07 18:23:28 UTC (rev 11795)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-06-07 20:57:20 UTC (rev 11796)
@@ -1,122 +1,120 @@
-#
-# Test WMS
-#
-# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
-#
-# Tests for INSPIRE View Service using WMS 1.3.0 (based on wms_simple.map)
-# scenario 2 - embedded inspire service metadata 
-#
-# Capabilities
-# RUN_PARMS: wms_inspire_scenario2_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
-
-MAP
-
-NAME WMS_INSPIRE_SCENARIO1_TEST
-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_inspire_capabilities" "embed"						#enables inspire using scenario 2
-    "wms_inspire_languages" "eng,ger"						#first default, values according ISO 639-2/B
-    "wms_inspire_keyword" "infoMapAccessService"			#value according "classification of spatial data services"
-    "wms_inspire_temporal_reference" "2011-09-19"			#date of last revision, value according YYYY-MM-DD
-    "wms_inspire_conformity" "not evaluated"				#value either "conformant"|"not conformant"|default "not evaluated"
-	"wms_inspire_mpoc_name" "mympocname"					#point of contact
-    "wms_inspire_mpoc_email" "mympocemail"					#point of contact
-    "wms_inspire_metadatadate" "2011-09-19"					#value according YYYY-MM-DD
-    "wms_title_eng" "mytitleeng"							#localized (as example)
-    "wms_title_ger" "mytitleger"							#localized (as example)
-    "wms_abstract" "myabstract"								#not localized (as example)
-	"ows_updatesequence" "123"
-    "wms_onlineresource"   "http://localhost/path/to/wms_simple?"
-    "wms_srs"		   "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
-    "ows_schemas_location" "http://schemas.opengis.net"
-    "ows_keywordlist" "ogc,wms,mapserver"
-    "ows_service_onlineresource" "http://www.mapserver.org/"
-    "ows_fees" "conditions unknown"							#value either "no conditions apply"|default "conditions unknown"|<specific conditions>
-    "ows_accessconstraints" "none"							#value according ISO 19115 (MD_RestrictionCode codelist) or default "none"
-    "ows_addresstype" "postal"
-    "ows_address"     "123 SomeRoad Road"
-    "ows_city" "Toronto"
-    "ows_stateorprovince" "Ontario"
-    "ows_postcode" "xxx-xxx"
-    "ows_country" "Canada"
-    "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
-    "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
-    "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
-    "ows_contactperson" "Tom Kralidis"
-    "ows_contactorganization" "MapServer"					#responsible organisation
-    "ows_contactposition" "resourceProvider"				#responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
-
-    "ows_rootlayer_title" "My Layers"
-    "ows_rootlayer_abstract" "These are my layers"
-    "ows_rootlayer_keywordlist" "layers,list"
-    "ows_layerlimit" "1"
-    "ows_enable_request" "*" 
-    "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
-  END
-END
-
-PROJECTION
-  "init=epsg:4326"
-  #"init=./data/epsg2:42304"
-END
-
-
-#
-# Start of layer definitions
-#
-
-LAYER
-  NAME road
-  DATA road
-  TEMPLATE "ttt"
-  METADATA
-    "wms_title"       "road"
-    "wms_description" "Roads of I.P.E."
-    "wms_srs" "EPSG:43204"
-    "gml_include_items" "all"
-  END
-  TYPE LINE
-  STATUS ON
-  PROJECTION
-    "init=./data/epsg2:42304"
-  END
-
-  DUMP TRUE
-
-  CLASSITEM "Name_e"
-  CLASS
-    NAME "Roads"
-    SYMBOL 0 
-    COLOR 220 0 0
-  END
-END # Layer
-
-END # Map File
+#
+# Test WMS
+#
+# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
+#
+# Tests for INSPIRE View Service using WMS 1.3.0 (based on wms_simple.map)
+# scenario 2 - embedded inspire service metadata
+#
+# Capabilities
+# RUN_PARMS: wms_inspire_scenario1_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
+
+MAP
+
+NAME WMS_INSPIRE_SCENARIO1_TEST
+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_inspire_capabilities" "embed"						#enables inspire using scenario 2
+  "wms_inspire_languages" "eng,ger"							#first default, values according ISO 639-2/B
+  "wms_inspire_keyword" "infoMapAccessService"				#value according "classification of spatial data services"
+  "wms_inspire_temporal_reference" "2011-09-19"				#date of last revision, value according YYYY-MM-DD
+  "wms_inspire_conformity" "not evaluated"					#value either "conformant"|"not conformant"|default "not evaluated"
+  "wms_inspire_mpoc_name" "mympocname"						#point of contact
+  "wms_inspire_mpoc_email" "mympocemail"					#point of contact
+  "wms_inspire_metadatadate" "2011-09-19"					#value according YYYY-MM-DD
+  "wms_title_eng" "mytitleeng"								#localized (as example)
+  "wms_title_ger" "mytitleger"								#localized (as example)
+  "wms_abstract" "myabstract"								#should be fallback in english (as example)
+  "wms_abstract_ger" "myabstractger"						#localized (as example)
+  "ows_updatesequence" "123"
+  "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
+  "ows_schemas_location" "http://schemas.opengis.net"
+  "ows_keywordlist" "ogc,wms,mapserver"
+  "ows_service_onlineresource" "http://www.mapserver.org/"
+  "ows_fees" "conditions unknown"							#value either "no conditions apply"|default "conditions unknown"|<specific conditions>
+  "ows_accessconstraints" "none"							#value according ISO 19115 (MD_RestrictionCode codelist) or default "none"
+  "ows_addresstype" "postal"
+  "ows_address" "123 SomeRoad Road"
+  "ows_city" "Toronto"
+  "ows_stateorprovince" "Ontario"
+  "ows_postcode" "xxx-xxx"
+  "ows_country" "Canada"
+  "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
+  "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
+  "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
+  "ows_contactperson" "Tom Kralidis"
+  "ows_contactorganization" "MapServer"						#responsible organisation
+  "ows_contactposition" "resourceProvider"					#responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
+  "ows_rootlayer_title" "My Layers"
+  "ows_rootlayer_abstract" "These are my layers"
+  "ows_rootlayer_keywordlist" "layers,list"
+  "ows_layerlimit" "1"
+  "ows_enable_request" "*" 
+  "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
+ END
+END
+
+PROJECTION
+ "init=epsg:4326"
+ #"init=./data/epsg2:42304"
+END
+
+#
+# Start of layer definitions
+#
+
+LAYER
+ NAME road
+ DATA road
+ TEMPLATE "ttt"
+ METADATA
+  "wms_title_eng" "road"
+  "wms_title_ger" "road"
+  "wms_description" "Roads of I.P.E."
+  "wms_srs" "EPSG:43204"
+  "gml_include_items" "all"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+  "init=epsg:4326"
+  #"init=./data/epsg2:42304"
+ END
+
+ DUMP TRUE
+
+ CLASSITEM "Name_e"
+ CLASS
+  NAME "Roads"
+  SYMBOL 0 
+  COLOR 220 0 0
+ END
+END # Layer
+
+END # Map File
\ No newline at end of file



More information about the mapserver-commits mailing list