[mapserver-commits] r11837 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs
svn at osgeo.org
svn at osgeo.org
Mon Jun 20 01:52:53 EDT 2011
Author: stefanl
Date: 2011-06-19 22:52:53 -0700 (Sun, 19 Jun 2011)
New Revision: 11837
Modified:
sandbox/inspire_soc2011/mapserver/mapwms.c
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/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2011-06-18 19:33:43 UTC (rev 11836)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2011-06-20 05:52:53 UTC (rev 11837)
@@ -1455,10 +1455,6 @@
" </Keywords>\n",
"%s ", NULL);
}
- else if (nVersion >= OWS_1_3_0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") )
- {
- msOWSPrintEncodeMetadata(stdout, &(lp->metadata), "MO", "inspire_keyword", OWS_WARN, " <KeywordList> <Keyword vocabulary='ISO'>%s</Keyword>\n</KeywordList>\n", "");
- }
else
{
/* <KeywordList><Keyword> ... in V1.0.6+ */
@@ -2478,21 +2474,10 @@
else
msOWSPrintEncodeMetadata2(stdout, &(map->web.metadata), "MO", "abstract", OWS_NOERR, " <Abstract>%s</Abstract>\n", map->name, validated_language);
-
- if (nVersion >= OWS_1_3_0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") )
- {
- if (msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_rootlayer_keyword"))
- pszTmp = msStrdup("inspire_rootlayer_keyword");
- else
- pszTmp = msStrdup("inspire_keyword");
- }
+ if (msOWSLookupMetadata(&(map->web.metadata), "MO", "rootlayer_keywordlist"))
+ pszTmp = msStrdup("rootlayer_keywordlist");
else
- {
- if (msOWSLookupMetadata(&(map->web.metadata), "MO", "rootlayer_keywordlist"))
- pszTmp = msStrdup("rootlayer_keywordlist");
- else
- pszTmp = msStrdup("keywordlist");
- }
+ pszTmp = msStrdup("keywordlist");
if (nVersion == OWS_1_0_0)
{
@@ -2504,10 +2489,6 @@
" </Keywords>\n",
"%s ", NULL);
}
- else if (nVersion >= OWS_1_3_0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") )
- {
- msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO", pszTmp, OWS_WARN, " <KeywordList> <Keyword vocabulary='ISO'>%s</Keyword>\n</KeywordList>\n", "");
- }
else
{
/* <KeywordList><Keyword> ... in V1.0.6+ */
@@ -2578,7 +2559,7 @@
msIO_fprintf(stdout, " <Style>\n");
msIO_fprintf(stdout, " <Name>inspire_common:DEFAULT</Name>\n");
msIO_fprintf(stdout, " <Title>inspire_common:DEFAULT</Title>\n");
- msIO_fprintf(stream, " </Style>\n");
+ msIO_fprintf(stdout, " </Style>\n");
}
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-06-18 19:33:43 UTC (rev 11836)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-06-20 05:52:53 UTC (rev 11837)
@@ -48,28 +48,29 @@
"wms_abstract" "myabstract" #to test fallback
"wms_abstract_ger" "myabstractger"
#"wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
- "ows_updatesequence" "myupdatesequence"
+ "wms_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
- "ows_schemas_location" "http://schemas.opengis.net"
- "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" "myaddresstype"
- "ows_address" "myaddress"
- "ows_city" "mycity"
- "ows_stateorprovince" "mystateorprovince"
- "ows_postcode" "xxx-xxx"
- "ows_country" "mycountry"
- "ows_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
- "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactperson" "mycontactperson"
- "ows_contactorganization" "MapServer" #responsible organisation
- "ows_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
- "ows_rootlayer_abstract" "myrootlayerabstract" #to test fallback
- "ows_rootlayer_abstract_ger" "myrootlayerabstractger"
- "ows_inspire_rootlayer_keyword" "infoFeatureAccessService" #value according "classification of spatial data services"
- "ows_enable_request" "*"
+ "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_addresstype" "myaddresstype"
+ "wms_address" "myaddress"
+ "wms_city" "mycity"
+ "wms_stateorprovince" "mystateorprovince"
+ "wms_postcode" "xxx-xxx"
+ "wms_country" "mycountry"
+ "wms_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
+ "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_enable_request" "*"
+ "wms_sld_enabled" "false"
"wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
END
END
@@ -91,7 +92,7 @@
"wms_title_ger" "Verkehrsnetze: Straßensegment"
"wms_abstract" "mylayerabstract" #to test fallback
"wms_abstract_ger" "mylayerabstractger"
- "wms_inspire_keyword" "infoManagementService" #value according "classification of spatial data services"
+ "wms_keywordlist" "mylayerkeyword1,mylayerkeyword2"
END
TYPE LINE
STATUS ON
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-06-18 19:33:43 UTC (rev 11836)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-06-20 05:52:53 UTC (rev 11837)
@@ -51,28 +51,29 @@
"wms_abstract" "myabstract" #to test fallback
"wms_abstract_ger" "myabstractger"
#"wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario2"
- "ows_updatesequence" "myupdatesequence"
+ "wms_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
- "ows_schemas_location" "http://schemas.opengis.net"
- "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" "myaddresstype"
- "ows_address" "myaddress"
- "ows_city" "mycity"
- "ows_stateorprovince" "mystateorprovince"
- "ows_postcode" "xxx-xxx"
- "ows_country" "mycountry"
- "ows_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
- "ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactperson" "mycontactperson"
- "ows_contactorganization" "MapServer" #responsible organisation
- "ows_contactposition" "owner" #responsible organisation, value according "INSPIRE Metadata Regulation" (part D6)
- "ows_rootlayer_abstract" "myrootlayerabstract" #to test fallback
- "ows_rootlayer_abstract_ger" "myrootlayerabstractger"
- "ows_inspire_rootlayer_keyword" "infoFeatureAccessService" #value according "classification of spatial data services"
- "ows_enable_request" "*"
+ "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_addresstype" "myaddresstype"
+ "wms_address" "myaddress"
+ "wms_city" "mycity"
+ "wms_stateorprovince" "mystateorprovince"
+ "wms_postcode" "xxx-xxx"
+ "wms_country" "mycountry"
+ "wms_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
+ "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_inspire_rootlayer_keyword" "infoFeatureAccessService" #value according "classification of spatial data services"
+ "wms_enable_request" "*"
+ "wms_sld_enabled" "false"
"wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
END
END
More information about the mapserver-commits
mailing list