[mapserver-commits] r11807 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs
svn at osgeo.org
svn at osgeo.org
Mon Jun 13 06:13:45 EDT 2011
Author: stefanl
Date: 2011-06-13 03:13:45 -0700 (Mon, 13 Jun 2011)
New Revision: 11807
Modified:
sandbox/inspire_soc2011/mapserver/mapows.c
sandbox/inspire_soc2011/mapserver/mapows.h
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/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c 2011-06-10 17:33:26 UTC (rev 11806)
+++ sandbox/inspire_soc2011/mapserver/mapows.c 2011-06-13 10:13:45 UTC (rev 11807)
@@ -771,8 +771,8 @@
if ( online_resource && validated_language &&
msOWSLookupMetadata(&(map->web.metadata), namespaces, "inspire_languagesubstitution") ) {
/* online_resource is already terminated, so we can simply add language=...& */
- /* but first we need to make sure that online_resource has enough capacity */
- online_resource = (char *)msSmallRealloc(online_resource, strlen(online_resource) + strlen(validated_language) + 11);
+ /* but first we need to make sure that online_resource has enough capacity */
+ online_resource = (char *)msSmallRealloc(online_resource, strlen(online_resource) + strlen(validated_language) + 11);
strcat(online_resource, "language=");
strcat(online_resource, validated_language);
strcat(online_resource, "&");
@@ -845,16 +845,16 @@
const char *inspire_languages = NULL;
if (!msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities")) {
- *numitems = 0;
- return NULL;
+ *numitems = 0;
+ return NULL;
}
inspire_languages = msOWSLookupMetadata(&(map->web.metadata), namespaces, "inspire_languages");
if (inspire_languages && strlen(inspire_languages) > 0) {
- return msStringSplit(inspire_languages, ',', numitems);
+ return msStringSplit(inspire_languages, ',', numitems);
} else {
- *numitems = 0;
- return NULL;
+ *numitems = 0;
+ return NULL;
}
}
@@ -879,11 +879,11 @@
char *language = NULL;
if( inspire_languages && num_items > 0 ) {
- if ( !requested_language || !msStringInArray( requested_language, inspire_languages, num_items) ) {
- language = msStrdup(inspire_languages[0]);
- } else {
- language = msStrdup(requested_language);
- }
+ if ( !requested_language || !msStringInArray( requested_language, inspire_languages, num_items) ) {
+ language = msStrdup(inspire_languages[0]);
+ } else {
+ language = msStrdup(requested_language);
+ }
}
msFreeCharArray(inspire_languages, num_items);
@@ -904,20 +904,20 @@
** Returns a status code; MS_NOERR if all ok, action_if_not_found otherwise
*/
int msOWSPrintInspireCommonExtendedCapabilities(FILE *stream, mapObj *map, const char *namespaces,
- int action_if_not_found, const char *tag_name,
- const char *validated_language, const int service) {
+ int action_if_not_found, const char *tag_name,
+ const char *validated_language, const int service) {
int metadataStatus = 0;
int languageStatus = 0;
- msIO_fprintf(stream, " <%s>\n", tag_name);
+ msIO_fprintf(stream, " <%s>\n", tag_name);
- metadataStatus = msOWSPrintInspireCommonMetadata(stream, map, namespaces, action_if_not_found);
- languageStatus = msOWSPrintInspireCommonLanguages(stream, map, namespaces, action_if_not_found, validated_language);
+ metadataStatus = msOWSPrintInspireCommonMetadata(stream, map, namespaces, action_if_not_found);
+ languageStatus = msOWSPrintInspireCommonLanguages(stream, map, namespaces, action_if_not_found, validated_language);
- msIO_fprintf(stream, " </%s>\n", tag_name);
+ msIO_fprintf(stream, " </%s>\n", tag_name);
- return (metadataStatus != MS_NOERR) ? metadataStatus : languageStatus;
+ return (metadataStatus != MS_NOERR) ? metadataStatus : languageStatus;
}
/* msOWSPrintInspireCommonMetadata
@@ -928,24 +928,53 @@
*/
int msOWSPrintInspireCommonMetadata(FILE *stream, mapObj *map, const char *namespaces,
int action_if_not_found) {
- int status = MS_NOERR;
- /* Referencing a CSW only is the solution known as Scenario 1 */
- if ( msOWSLookupMetadata(&(map->web.metadata), namespaces, "metadataurl_href") ) {
- msIO_fprintf(stream, " <inspire_common:MetadataUrl xsi:type=\"inspire_common:resourceLocatorType\">\n");
- msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_href", OWS_WARN, " <inspire_common:URL>%s</inspire_common:URL>\n", "");
- msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_format", OWS_WARN, " <inspire_common:MediaType>%s</inspire_common:MediaType>\n", "");
- msIO_fprintf(stream, " </inspire_common:MetadataUrl>\n");
- } else if ( "embed" != msOWSLookupMetadata(&(map->web.metadata), namespaces, "inspire_capabilities") ) {
- status = action_if_not_found;
- if (OWS_WARN == action_if_not_found) {
- msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "metadataurl_href");
- }
+ int status = MS_NOERR;
+ const char *inspire_capabilities = NULL;
+
+ inspire_capabilities = msOWSLookupMetadata(&(map->web.metadata), namespaces, "inspire_capabilities");
+
+ if (strcasecmp("url",inspire_capabilities) == 0)
+ {
+ if ( msOWSLookupMetadata(&(map->web.metadata), namespaces, "metadataurl_href") != NULL )
+ {
+ msIO_fprintf(stream, " <inspire_common:MetadataUrl xsi:type=\"inspire_common:resourceLocatorType\">\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_href", OWS_WARN, " <inspire_common:URL>%s</inspire_common:URL>\n", "");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_format", OWS_WARN, " <inspire_common:MediaType>%s</inspire_common:MediaType>\n", "");
+ msIO_fprintf(stream, " </inspire_common:MetadataUrl>\n");
+ }
+ else
+ {
+ status = action_if_not_found;
+ if (OWS_WARN == action_if_not_found)
+ {
+ msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "metadataurl_href");
+ }
+ }
}
+ else if (strcasecmp("embed",inspire_capabilities) == 0)
+ {
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "onlineresource", OWS_NOERR, " <inspire_common:ResourceLocator> <inspire_common:URL>%s</inspire_common:URL>\n</inspire_common:ResourceLocator>\n", NULL);
+ msIO_fprintf(stream," <inspire_common:ResourceType>service</inspire_common:ResourceType>\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_temporal_reference", OWS_WARN, " <inspire_common:TemporalReference> <inspire_common:DateOfLastRevision>%s</inspire_common:DateOfLastRevision>\n</inspire_common:TemporalReference>\n", "");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_conformity", OWS_WARN, " <inspire_common:Conformity> <inspire_common:Degree>%s</inspire_common:Degree>\n</inspire_common:Conformity>\n", "");
+ msIO_fprintf(stream, " <inspire_common:MetadataPointOfContact>\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_name", OWS_WARN, " <inspire_common:OrganisationName>%s</inspire_common:OrganisationName>\n", "");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_email", OWS_WARN, " <inspire_common:EmailAddress>%s</inspire_common:EmailAddress>\n", "");
+ msIO_fprintf(stream, " </inspire_common:MetadataPointOfContact>\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_metadatadate", OWS_WARN, " <inspire_common:MetadataDate>%s</inspire_common:MetadataDate>\n", "");
+ msIO_fprintf(stream," <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_keyword", OWS_WARN, " <inspire_common:Keyword xsi:type='inspire_common:classificationOfSpatialDataService'> <inspire_common:KeywordValue>%s</inspire_common:KeywordValue>\n</inspire_common:Keyword>\n", "");
+ }
+ else
+ {
+ status = action_if_not_found;
+ if (OWS_WARN == action_if_not_found)
+ {
+ msIO_fprintf(stream, "<!-- WARNING: invalid value '%s' for 'inspire_capabilities', only 'embed' and 'url' are supported. -->\n", inspire_capabilities);
+ }
+ }
- /* Including all required extension metadata is known as Scenario 2 */
- /* TODO */
-
return status;
}
@@ -956,13 +985,14 @@
** Returns a status code; MS_NOERR if all OK; action_if_not_found otherwise
*/
int msOWSPrintInspireCommonLanguages(FILE *stream, mapObj *map, const char *namespaces,
- int action_if_not_found, const char *validated_language) {
- char *buffer = NULL; /* temp variable for malloced strings that will need freeing */
- int status = MS_NOERR;
+ int action_if_not_found, const char *validated_language) {
+ char *buffer = NULL; /* temp variable for malloced strings that will need freeing */
+ int status = MS_NOERR;
- char *default_language = msOWSGetInspireLanguage(map, namespaces, NULL);
+ char *default_language = msOWSGetInspireLanguage(map, namespaces, NULL);
- if(validated_language && default_language) {
+ if(validated_language && default_language)
+ {
msIO_fprintf(stream, " <inspire_common:SupportedLanguages>\n");
msIO_fprintf(stream, " <inspire_common:DefaultLanguage><inspire_common:Language>%s"
"</inspire_common:Language></inspire_common:DefaultLanguage>\n",
@@ -970,14 +1000,14 @@
msFree(buffer);
msOWSPrintEncodeMetadataList(stream, &(map->web.metadata), namespaces, "inspire_languages", NULL, NULL,
" <inspire_common:SupportedLanguage><inspire_common:Language>%s"
- "</inspire_common:Language></inspire_common:SupportedLanguage>\n", NULL);
+ "</inspire_common:Language></inspire_common:SupportedLanguage>\n", default_language);
msIO_fprintf(stream, " </inspire_common:SupportedLanguages>\n");
msIO_fprintf(stream, " <inspire_common:ResponseLanguage><inspire_common:Language>%s"
"</inspire_common:Language></inspire_common:ResponseLanguage>\n", validated_language);
} else {
status = action_if_not_found;
if (OWS_WARN == action_if_not_found) {
- msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "inspire_languages");
+ msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "inspire_languages");
}
}
@@ -1503,11 +1533,11 @@
keywords = msStringSplit(value, ',', &numkeywords);
if(keywords && numkeywords > 0) {
int kw;
- if(startTag) msIO_fprintf(stream, "%s", startTag);
- for(kw=0; kw<numkeywords; kw++)
+ if(startTag) msIO_fprintf(stream, "%s", startTag);
+ for(kw=0; kw<numkeywords; kw++)
msIO_fprintf(stream, itemFormat, keywords[kw]);
- if(endTag) msIO_fprintf(stream, "%s", endTag);
- msFreeCharArray(keywords, numkeywords);
+ if(endTag) msIO_fprintf(stream, "%s", endTag);
+ msFreeCharArray(keywords, numkeywords);
}
return MS_TRUE;
}
@@ -1518,6 +1548,9 @@
**
** Prints comma-separated lists metadata. (e.g. keywordList)
** This will print HTML encoded values.
+** default_value serves 2 purposes if specified:
+** - won't be printed if part of MetadataList (exclusion)
+** - will be printed if MetadataList is empty (fallback)
**/
int msOWSPrintEncodeMetadataList(FILE *stream, hashTableObj *metadata,
const char *namespaces, const char *name,
@@ -1527,24 +1560,36 @@
{
const char *value;
char *encoded;
- if((value = msOWSLookupMetadata(metadata, namespaces, name)) ||
- (value = default_value) != NULL )
+
+ value = msOWSLookupMetadata(metadata, namespaces, name);
+
+ if(value == NULL)
{
+ value = default_value;
+ default_value = NULL;
+ }
+
+ if(value != NULL)
+ {
char **keywords;
int numkeywords;
keywords = msStringSplit(value, ',', &numkeywords);
if(keywords && numkeywords > 0) {
int kw;
- if(startTag) msIO_fprintf(stream, "%s", startTag);
- for(kw=0; kw<numkeywords; kw++)
+ if(startTag) msIO_fprintf(stream, "%s", startTag);
+ for(kw=0; kw<numkeywords; kw++)
{
+ if (default_value != NULL
+ && strcasecmp(keywords[kw],default_value) == 0)
+ continue;
+
encoded = msEncodeHTMLEntities(keywords[kw]);
msIO_fprintf(stream, itemFormat, encoded);
msFree(encoded);
}
- if(endTag) msIO_fprintf(stream, "%s", endTag);
- msFreeCharArray(keywords, numkeywords);
+ if(endTag) msIO_fprintf(stream, "%s", endTag);
+ msFreeCharArray(keywords, numkeywords);
}
return MS_TRUE;
}
@@ -1690,7 +1735,7 @@
const char *namespaces,
int wms_version)
{
- const char *value, *resx, *resy, *wms_bbox_extended, *epsg_str;
+ const char *value, *resx, *resy, *wms_bbox_extended, *epsg_str;
char *encoded, *encoded_resx, *encoded_resy;
char **epsgs;
int i, num_epsgs;
Modified: sandbox/inspire_soc2011/mapserver/mapows.h
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.h 2011-06-10 17:33:26 UTC (rev 11806)
+++ sandbox/inspire_soc2011/mapserver/mapows.h 2011-06-13 10:13:45 UTC (rev 11807)
@@ -173,12 +173,12 @@
#define OWS_WFS 2
MS_DLL_EXPORT int msOWSPrintInspireCommonExtendedCapabilities(FILE *stream, mapObj *map, const char *namespaces,
- const int action_if_not_found, const char *tag_name,
- const char *validated_language, const int service);
+ const int action_if_not_found, const char *tag_name,
+ const char *validated_language, const int service);
int msOWSPrintInspireCommonMetadata(FILE *stream, mapObj *map, const char *namespaces,
int action_if_not_found);
int msOWSPrintInspireCommonLanguages(FILE *stream, mapObj *map, const char *namespaces,
- int action_if_not_found, const char *validated_language);
+ int action_if_not_found, const char *validated_language);
MS_DLL_EXPORT int msOWSPrintMetadata(FILE *stream, hashTableObj *metadata,
const char *namespaces, const char *name,
@@ -348,9 +348,9 @@
} gmlGroupListObj;
typedef struct {
- char *prefix;
- char *uri;
- char *schemalocation;
+ char *prefix;
+ char *uri;
+ char *schemalocation;
} gmlNamespaceObj;
typedef struct {
Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2011-06-10 17:33:26 UTC (rev 11806)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2011-06-13 10:13:45 UTC (rev 11807)
@@ -1176,7 +1176,7 @@
*/
if( adjust_extent )
{
- double dx, dy;
+ double dx, dy;
dx = (map->extent.maxx - map->extent.minx) / map->width;
map->extent.minx += dx*0.5;
@@ -1947,7 +1947,7 @@
* -numNestedGroups: This array holds the number of nested groups for each layer *
***********************************************************************************/
void msWMSPrintNestedGroups(mapObj* map, int nVersion, char* pabLayerProcessed,
- int index, int level, char*** nestedGroups, int* numNestedGroups, const char *script_url_encoded, const char *validated_language)
+ int index, int level, char*** nestedGroups, int* numNestedGroups, const char *script_url_encoded, const char *validated_language)
{
int j;
@@ -2083,7 +2083,7 @@
if ((script_url=msOWSGetOnlineResource2(map, "MO", "onlineresource", req, validated_language)) == NULL ||
(script_url_encoded = msEncodeHTMLEntities(script_url)) == NULL)
{
- msFree(validated_language);
+ msFree(validated_language);
return msWMSException(map, nVersion, NULL, wms_exception_format);
}
@@ -2967,7 +2967,7 @@
continue;
/* if(msLayerOpen(lp) != MS_SUCCESS || msLayerGetItems(lp) != MS_SUCCESS)
- return msWMSException(map, nVersion, NULL); */
+ return msWMSException(map, nVersion, NULL); */
/* Use metadata to control which fields to output. We use the same
* metadata names as for GML:
@@ -3081,7 +3081,7 @@
for(j=0; j<map->numlayers; j++) {
/* Force all layers OFF by default */
- GET_LAYER(map, j)->status = MS_OFF;
+ GET_LAYER(map, j)->status = MS_OFF;
for(k=0; k<numlayers; k++) {
if (((GET_LAYER(map, j)->name && strcasecmp(GET_LAYER(map, j)->name, layers[k]) == 0) ||
(map->name && strcasecmp(map->name, layers[k]) == 0) ||
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-06-10 17:33:26 UTC (rev 11806)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-06-13 10:13:45 UTC (rev 11807)
@@ -27,7 +27,7 @@
NAME GDPNG
DRIVER "GD/PNG"
MIMETYPE "image/png"
-#IMAGEMODE RGB
+ #IMAGEMODE RGB
EXTENSION "png"
END
@@ -42,35 +42,37 @@
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_metadataurl_href" "http://inspire.service/metadata"
+ "wms_metadataurl_format" "inspire.service.format"
+ "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_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
- "ows_updatesequence" "123"
+ "ows_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
"ows_schemas_location" "http://schemas.opengis.net"
- "ows_keywordlist" "ogc,wms,mapserver"
+ "ows_keywordlist" "mykeyword1,mykeyword2"
"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_addresstype" "myaddresstype"
+ "ows_address" "myaddress"
+ "ows_city" "mycity"
+ "ows_stateorprovince" "mystateorprovince"
"ows_postcode" "xxx-xxx"
- "ows_country" "Canada"
- "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
+ "ows_country" "mycountry"
+ "ows_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
"ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
"ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactperson" "Tom Kralidis"
+ "ows_contactperson" "mycontactperson"
"ows_contactorganization" "MapServer" #responsible organisation
"ows_contactposition" "owner" #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_rootlayer_title" "myrootlayertitle"
+ "ows_rootlayer_abstract" "myrootlayerabstract" #to test fallback
+ "ows_rootlayer_abstract_ger" "myrootlayerabstract"
+ "ows_rootlayer_keywordlist" "myrootlayerkeyword1,myrootlayerkeyword2"
"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"
@@ -78,7 +80,8 @@
END
PROJECTION
- "init=epsg:4326"
+ #"init=epsg:4326"
+ "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
END
#
@@ -100,7 +103,8 @@
TYPE LINE
STATUS ON
PROJECTION
- "init=epsg:4326"
+ #"init=epsg:4326"
+ "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
END
DUMP TRUE
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-06-10 17:33:26 UTC (rev 11806)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-06-13 10:13:45 UTC (rev 11807)
@@ -27,7 +27,7 @@
NAME GDPNG
DRIVER "GD/PNG"
MIMETYPE "image/png"
-#IMAGEMODE RGB
+ #IMAGEMODE RGB
EXTENSION "png"
END
@@ -42,39 +42,40 @@
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_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_onlineresource" "http://localhost/path/to/wms_inspire_scenario2"
- "ows_updatesequence" "123"
+ "ows_updatesequence" "myupdatesequence"
"wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
"ows_schemas_location" "http://schemas.opengis.net"
- "ows_keywordlist" "ogc,wms,mapserver"
+ "ows_keywordlist" "mykeyword1,mykeyword2"
"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_addresstype" "myaddresstype"
+ "ows_address" "myaddress"
+ "ows_city" "mycity"
+ "ows_stateorprovince" "mystateorprovince"
"ows_postcode" "xxx-xxx"
- "ows_country" "Canada"
- "ows_contactelectronicmailaddress" "tomkralidis at xxxxxxx.xxx"
+ "ows_country" "mycountry"
+ "ows_contactelectronicmailaddress" "mycontactelectronicmailaddress at xxxxxxx.xxx"
"ows_contactvoicetelephone" "+xx-xxx-xxx-xxxx"
"ows_contactfacsimiletelephone" "+xx-xxx-xxx-xxxx"
- "ows_contactperson" "Tom Kralidis"
+ "ows_contactperson" "mycontactperson"
"ows_contactorganization" "MapServer" #responsible organisation
"ows_contactposition" "owner" #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_rootlayer_title" "myrootlayertitle"
+ "ows_rootlayer_abstract" "myrootlayerabstract" #to test fallback
+ "ows_rootlayer_abstract_ger" "myrootlayerabstract"
+ "ows_rootlayer_keywordlist" "myrootlayerkeyword1,myrootlayerkeyword2"
"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"
@@ -82,7 +83,8 @@
END
PROJECTION
- "init=epsg:4326"
+ #"init=epsg:4326"
+ "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
END
#
@@ -104,7 +106,8 @@
TYPE LINE
STATUS ON
PROJECTION
- "init=epsg:4326"
+ #"init=epsg:4326"
+ "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
END
DUMP TRUE
More information about the mapserver-commits
mailing list