[mapserver-commits] r11944 - sandbox/inspire_soc2011/msautotest/wxs
svn at osgeo.org
svn at osgeo.org
Fri Jul 15 12:23:49 EDT 2011
Author: stefanl
Date: 2011-07-15 09:23:49 -0700 (Fri, 15 Jul 2011)
New Revision: 11944
Modified:
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
inspire view service metadata support (scenario1+2)
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-07-15 16:22:24 UTC (rev 11943)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-07-15 16:23:49 UTC (rev 11944)
@@ -34,24 +34,24 @@
IMAGEURL "/ms_tmp/"
METADATA
- "wms_inspire_capabilities" "url" #enables inspire using scenario 1
- "wms_inspire_languages" "eng,ger" #first default, values according ISO 639-2/B
+ "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" "http://inspire.service/metadata"
"wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
- "wms_inspire_languagesubstitution" "true" #add language parameter to onlineresource
- "wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
- "wms_title_eng" "Transport networks: Road Area"
- "wms_title_ger" "Verkehrsnetze: Straßenfläche"
- "wms_abstract" "myabstract" #to test fallback
- "wms_abstract_ger" "myabstractger"
- #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
- "wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
+ "wms_inspire_languagesubstitution" "true" #add language parameter to onlineresource
+ "wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
+ "wms_title_eng" "myservicetitle"
+ "wms_title_ger" "myservicetitleger"
+ "wms_abstract" "myserviceabstract" #to test fallback
+ "wms_abstract_ger" "myserviceabstractger"
+ #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
+ "wms_onlineresource" "http://path/to/onlineresource..."
"wms_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:4326 EPSG:4269"
"wms_schemas_location" "http://schemas.opengis.net"
"wms_service_onlineresource" "http://www.mapserver.org/"
- "wms_fees" "conditions unknown" #value either "no conditions apply"|default "conditions unknown"|<specific conditions>
- "wms_accessconstraints" "None" #value according ISO 19115 (MD_RestrictionCode codelist) or default "None"
+ "wms_fees" "conditions unknown" #value either "no conditions apply"|default "conditions unknown"|<specific conditions>
+ "wms_accessconstraints" "None" #value according ISO 19115 (MD_RestrictionCode codelist) or default "None"
"wms_addresstype" "myaddresstype"
"wms_address" "myaddress"
"wms_city" "mycity"
@@ -62,13 +62,19 @@
"wms_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
"wms_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
"wms_contactperson" "mycontactperson"
- "wms_contactorganization" "MapServer" #responsible organisation
- "wms_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
- "wms_rootlayer_abstract" "myrootlayerabstract" #to test fallback
- "wms_rootlayer_abstract_ger" "myrootlayerabstractger"
- "wms_rootlayer_keywordlist" "myrootlayerkeyword1,myrootlayerkeyword2"
- "wms_inspire_style_name" "inspire_common:DEFAULT" #style name
- "wms_inspire_style_title" "mystyletitle" #style title
+ "wms_contactorganization" "MapServer" #responsible organisation
+ "wms_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
+ "wms_rootlayer_title_eng" "Transport networks: Road Area"
+ "wms_rootlayer_title_ger" "Verkehrsnetze: Straßenfläche"
+ "wms_rootlayer_abstract" "myroadarealayerabstract" #to test fallback
+ "wms_rootlayer_abstract_ger" "myroadareaabstractger"
+ "wms_rootlayer_keywordlist" "myroadareakeyword1,myroadareakeyword2"
+ "wms_style_name" "inspire_common:DEFAULT" #style name
+ "wms_style_title" "myroadarealayerstyletitle" #style title
+ "wms_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_style_legendurl_height" "40"
+ "wms_style_legendurl_format" "image/png"
+ "wms_style_legendurl_href" "http://path/to/onlineresource...roadarea"
"wms_enable_request" "*"
"wms_sld_enabled" "false"
END
@@ -88,15 +94,15 @@
METADATA
"wms_title_eng" "Transport networks: Road Link"
"wms_title_ger" "Verkehrsnetze: Straßensegment"
- "wms_abstract" "mylayerabstract" #to test fallback
- "wms_abstract_ger" "mylayerabstractger"
- "wms_keywordlist" "mylayerkeyword1,mylayerkeyword2"
+ "wms_abstract" "myroadlinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myroadlinklayerabstractger"
+ "wms_keywordlist" "myroadlinklayerkeyword1,myroadlinklayerkeyword2"
"wms_srs" "EPSG:4326 EPSG:4269"
- "wms_style_inspire_common:DEFAULT_title" "mylayerstyletitle" #override style title
- #"wms_style_inspire_common:DEFAULT_legendurl_width" "mylayerstylelegendurlwidth" #override style legendurl (mandatory: width, height, format, href)
- #"wms_style_inspire_common:DEFAULT_legendurl_height" "mylayerstylelegendurlheight"
- #"wms_style_inspire_common:DEFAULT_legendurl_format" "mylayerstylelegendurlformat"
- #"wms_style_inspire_common:DEFAULT_legendurl_href" "mylayerstylelegendurlhref"
+ "wms_style_inspire_common:DEFAULT_title" "myroadlinklayerstyletitle" #style title
+ "wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ "wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ "wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...roadlink"
END
TYPE LINE
STATUS ON
@@ -105,21 +111,102 @@
END
CLASSGROUP "inspire_common:DEFAULT"
- CLASSITEM "NAME_E"
+ CLASSITEM "F_CODE"
CLASS
NAME "myclass1"
GROUP "inspire_common:DEFAULT"
- EXPRESSION "Trans-Canada Highway"
+ EXPRESSION "67"
COLOR 255 0 0
END
CLASS
NAME "myclass2"
GROUP "inspire_common:DEFAULT"
+ EXPRESSION "68"
COLOR 0 255 0
END
END # Layer
+LAYER
+ NAME TN.RailTransportNetwork.RailwayLink
+ GROUP TN.CommonTransportElements.TransportLink
+ DATA road
+ METADATA
+ "wms_group_title_eng" "Transport networks: Generic Transport Link"
+ "wms_group_title_ger" "Verkehrsnetze: Generisches Verkehrssegment"
+ "wms_group_abstract" "mygenerictransportlinklayerabstract" #to test fallback
+ "wms_group_abstract_ger" "mygenerictransportlinklayerabstract"
+ "wms_group_style_name" "inspire_common:DEFAULT" #style name
+ "wms_group_style_title" "mygenerictransportlinklayerstyletitle" #style title
+ "wms_group_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_group_style_legendurl_height" "40"
+ "wms_group_style_legendurl_format" "image/png"
+ "wms_group_style_legendurl_href" "http://path/to/onlineresource...generictransportlink"
+ "wms_title_eng" "Transport networks: Railway Link"
+ "wms_title_ger" "Verkehrsnetze: Eisenbahnverbindung"
+ "wms_abstract" "myrailwaylinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myrailwaylinklayerabstractger"
+ "wms_keywordlist" "myrailwaylinklayerkeyword1,myrailwaylinklayerkeyword2"
+ "wms_srs" "EPSG:4326 EPSG:4269"
+ #"wms_style_inspire_common:DEFAULT_title" "myrailwaylayerstyletitle" #style title
+ #"wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ #"wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ #"wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ #"wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...railway"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+ "+proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
+ END
+
+ CLASSGROUP "inspire_common:DEFAULT"
+ CLASSITEM "F_CODE"
+
+ CLASS
+ NAME "myclass3"
+ GROUP "inspire_common:DEFAULT"
+ EXPRESSION "74"
+ COLOR 0 0 255
+ END
+
+END # Layer
+
+LAYER
+ NAME TN.AirTransportNetwork.AirLink
+ GROUP TN.CommonTransportElements.TransportLink
+ DATA road
+ METADATA
+ "wms_title_eng" "Transport networks: Air Link"
+ "wms_title_ger" "Verkehrsnetze: Luftverbindung"
+ "wms_abstract" "myairlinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myairlinklayerabstractger"
+ "wms_keywordlist" "myairlinklayerkeyword1,myairlinklayerkeyword2"
+ "wms_srs" "EPSG:4326 EPSG:4269"
+ #"wms_style_inspire_common:DEFAULT_title" "myairlayerstyletitle" #style title
+ #"wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ #"wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ #"wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ #"wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...airlink"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+ "+proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
+ END
+
+ CLASSGROUP "inspire_common:DEFAULT"
+ CLASSITEM "F_CODE"
+
+ CLASS
+ NAME "myclass4"
+ GROUP "inspire_common:DEFAULT"
+ EXPRESSION "66"
+ COLOR 0 255 255
+ END
+
+END # Layer
+
END # Map File
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-07-15 16:22:24 UTC (rev 11943)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-07-15 16:23:49 UTC (rev 11944)
@@ -34,27 +34,27 @@
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_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_inspire_languagesubstitution" "true" #add language parameter to onlineresource
- "wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
- "wms_title_eng" "Transport networks: Road Area"
- "wms_title_ger" "Verkehrsnetze: Straßenfläche"
- "wms_abstract" "myabstract" #to test fallback
- "wms_abstract_ger" "myabstractger"
- #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
- "wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario2"
+ "wms_inspire_capabilities" "embed" #enables inspire using scenario 2
+ "wms_inspire_languages" "eng,ger" #first default, values according ISO 639-2/B
+ "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"
+ "wms_inspire_languagesubstitution" "true" #add language parameter to onlineresource
+ "wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
+ "wms_title_eng" "myservicetitle"
+ "wms_title_ger" "myservicetitleger"
+ "wms_abstract" "myserviceabstract" #to test fallback
+ "wms_abstract_ger" "myserviceabstractger"
+ #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
+ "wms_onlineresource" "http://path/to/onlineresource..."
"wms_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:4326 EPSG:4269"
"wms_schemas_location" "http://schemas.opengis.net"
"wms_service_onlineresource" "http://www.mapserver.org/"
- "wms_fees" "conditions unknown" #value either "no conditions apply"|default "conditions unknown"|<specific conditions>
- "wms_accessconstraints" "None" #value according ISO 19115 (MD_RestrictionCode codelist) or default "None"
+ "wms_fees" "conditions unknown" #value either "no conditions apply"|default "conditions unknown"|<specific conditions>
+ "wms_accessconstraints" "None" #value according ISO 19115 (MD_RestrictionCode codelist) or default "None"
"wms_addresstype" "myaddresstype"
"wms_address" "myaddress"
"wms_city" "mycity"
@@ -65,13 +65,19 @@
"wms_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
"wms_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
"wms_contactperson" "mycontactperson"
- "wms_contactorganization" "MapServer" #responsible organisation
- "wms_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
- "wms_rootlayer_abstract" "myrootlayerabstract" #to test fallback
- "wms_rootlayer_abstract_ger" "myrootlayerabstractger"
- "wms_rootlayer_keywordlist" "myrootlayerkeyword1,myrootlayerkeyword2"
- "wms_inspire_style_name" "inspire_common:DEFAULT" #style name
- "wms_inspire_style_title" "mystyletitle" #style title
+ "wms_contactorganization" "MapServer" #responsible organisation
+ "wms_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
+ "wms_rootlayer_title_eng" "Transport networks: Road Area"
+ "wms_rootlayer_title_ger" "Verkehrsnetze: Straßenfläche"
+ "wms_rootlayer_abstract" "myroadarealayerabstract" #to test fallback
+ "wms_rootlayer_abstract_ger" "myroadareaabstractger"
+ "wms_rootlayer_keywordlist" "myroadareakeyword1,myroadareakeyword2"
+ "wms_style_name" "inspire_common:DEFAULT" #style name
+ "wms_style_title" "myroadarealayerstyletitle" #style title
+ "wms_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_style_legendurl_height" "40"
+ "wms_style_legendurl_format" "image/png"
+ "wms_style_legendurl_href" "http://path/to/onlineresource...roadarea"
"wms_enable_request" "*"
"wms_sld_enabled" "false"
END
@@ -91,15 +97,15 @@
METADATA
"wms_title_eng" "Transport networks: Road Link"
"wms_title_ger" "Verkehrsnetze: Straßensegment"
- "wms_abstract" "mylayerabstract" #to test fallback
- "wms_abstract_ger" "mylayerabstractger"
- "wms_keywordlist" "mylayerkeyword1,mylayerkeyword2"
+ "wms_abstract" "myroadlinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myroadlinklayerabstractger"
+ "wms_keywordlist" "myroadlinklayerkeyword1,myroadlinklayerkeyword2"
"wms_srs" "EPSG:4326 EPSG:4269"
- "wms_style_inspire_common:DEFAULT_title" "mylayerstyletitle" #override style title
- #"wms_style_inspire_common:DEFAULT_legendurl_width" "mylayerstylelegendurlwidth" #override style legendurl (mandatory: width, height, format, href)
- #"wms_style_inspire_common:DEFAULT_legendurl_height" "mylayerstylelegendurlheight"
- #"wms_style_inspire_common:DEFAULT_legendurl_format" "mylayerstylelegendurlformat"
- #"wms_style_inspire_common:DEFAULT_legendurl_href" "mylayerstylelegendurlhref"
+ "wms_style_inspire_common:DEFAULT_title" "myroadlinklayerstyletitle" #style title
+ "wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ "wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ "wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...roadlink"
END
TYPE LINE
STATUS ON
@@ -108,21 +114,102 @@
END
CLASSGROUP "inspire_common:DEFAULT"
- CLASSITEM "NAME_E"
+ CLASSITEM "F_CODE"
CLASS
NAME "myclass1"
GROUP "inspire_common:DEFAULT"
- EXPRESSION "Trans-Canada Highway"
+ EXPRESSION "67"
COLOR 255 0 0
END
CLASS
NAME "myclass2"
GROUP "inspire_common:DEFAULT"
+ EXPRESSION "68"
COLOR 0 255 0
END
END # Layer
+LAYER
+ NAME TN.RailTransportNetwork.RailwayLink
+ GROUP TN.CommonTransportElements.TransportLink
+ DATA road
+ METADATA
+ "wms_group_title_eng" "Transport networks: Generic Transport Link"
+ "wms_group_title_ger" "Verkehrsnetze: Generisches Verkehrssegment"
+ "wms_group_abstract" "mygenerictransportlinklayerabstract" #to test fallback
+ "wms_group_abstract_ger" "mygenerictransportlinklayerabstract"
+ "wms_group_style_name" "inspire_common:DEFAULT" #style name
+ "wms_group_style_title" "mygenerictransportlinklayerstyletitle" #style title
+ "wms_group_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ "wms_group_style_legendurl_height" "40"
+ "wms_group_style_legendurl_format" "image/png"
+ "wms_group_style_legendurl_href" "http://path/to/onlineresource...generictransportlink"
+ "wms_title_eng" "Transport networks: Railway Link"
+ "wms_title_ger" "Verkehrsnetze: Eisenbahnverbindung"
+ "wms_abstract" "myrailwaylinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myrailwaylinklayerabstractger"
+ "wms_keywordlist" "myrailwaylinklayerkeyword1,myrailwaylinklayerkeyword2"
+ "wms_srs" "EPSG:4326 EPSG:4269"
+ #"wms_style_inspire_common:DEFAULT_title" "myrailwaylayerstyletitle" #style title
+ #"wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ #"wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ #"wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ #"wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...railway"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+ "+proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
+ END
+
+ CLASSGROUP "inspire_common:DEFAULT"
+ CLASSITEM "F_CODE"
+
+ CLASS
+ NAME "myclass3"
+ GROUP "inspire_common:DEFAULT"
+ EXPRESSION "74"
+ COLOR 0 0 255
+ END
+
+END # Layer
+
+LAYER
+ NAME TN.AirTransportNetwork.AirLink
+ GROUP TN.CommonTransportElements.TransportLink
+ DATA road
+ METADATA
+ "wms_title_eng" "Transport networks: Air Link"
+ "wms_title_ger" "Verkehrsnetze: Luftverbindung"
+ "wms_abstract" "myairlinklayerabstract" #to test fallback
+ "wms_abstract_ger" "myairlinklayerabstractger"
+ "wms_keywordlist" "myairlinklayerkeyword1,myairlinklayerkeyword2"
+ "wms_srs" "EPSG:4326 EPSG:4269"
+ #"wms_style_inspire_common:DEFAULT_title" "myairlayerstyletitle" #style title
+ #"wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
+ #"wms_style_inspire_common:DEFAULT_legendurl_height" "40"
+ #"wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
+ #"wms_style_inspire_common:DEFAULT_legendurl_href" "http://path/to/onlineresource...airlink"
+ END
+ TYPE LINE
+ STATUS ON
+ PROJECTION
+ "+proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
+ END
+
+ CLASSGROUP "inspire_common:DEFAULT"
+ CLASSITEM "F_CODE"
+
+ CLASS
+ NAME "myclass4"
+ GROUP "inspire_common:DEFAULT"
+ EXPRESSION "66"
+ COLOR 0 255 255
+ END
+
+END # Layer
+
END # Map File
More information about the mapserver-commits
mailing list