MVT: Sets correct media type of Mapbox vector tiles output (#6331)

The correct media type is defined as "vnd.mapbox-vector-tile" (see http://www.iana.org/assignments/media-types/media-types.xhtml). Use that by default, but also keep application/x-protobuf as a possibility (e.g. it will still be advertised in GetCapabilities response).
MapServer · May 20, 2021 · 2c3767a · 2c3767a
1 parent c862b04
commit 2c3767a
Show file tree

Hide file tree

Showing 48 changed files with 62 additions and 19 deletions.
diff --git a/maperror.c b/maperror.c
@@ -422,7 +422,7 @@ void msWriteErrorImage(mapObj *map, char *filename, int blank)
 
   /* Default to GIF if no suitable GD output format set */
   if (format == NULL || !MS_RENDERER_PLUGIN(format))
-    format = msCreateDefaultOutputFormat( NULL, "AGG/PNG8", "png" );
+    format = msCreateDefaultOutputFormat( NULL, "AGG/PNG8", "png", NULL );
 
   if(!format->transparent) {
     if(map && MS_VALID_COLOR(map->imagecolor)) {

diff --git a/mapfile.c b/mapfile.c
@@ -4931,7 +4931,7 @@ static int loadOutputFormat(mapObj *map)
           goto load_output_error;
         }
 
-        format = msCreateDefaultOutputFormat( map, driver, name );
+        format = msCreateDefaultOutputFormat( map, driver, name, NULL );
         if( format == NULL ) {
           msSetError(MS_MISCERR,
                      "OUTPUTFORMAT (%s) clause references driver (%s), but this driver isn't configured.",

diff --git a/mapmvt.c b/mapmvt.c
@@ -544,8 +544,8 @@ int msMVTWriteTile( mapObj *map, int sendheaders ) {
   if( sendheaders ) {
     msIO_fprintf( stdout,
 		  "Content-Length: %d\r\n"
-		  "Content-Type: application/x-protobuf\r\n\r\n",
-                  len);
+		  "Content-Type: %s\r\n\r\n",
+                  len, MS_IMAGE_MIME_TYPE(map->outputformat));
   }
   msIO_fwrite(buf,len,1,stdout);
   msFree(buf);

diff --git a/mapoutput.c b/mapoutput.c
@@ -121,6 +121,9 @@ struct defaultOutputFormatEntry defaultoutputformats[] = {
 #endif
 #ifdef USE_PBF
   {"mvt","MVT","application/vnd.mapbox-vector-tile"},
+  // The following format is added to keep backward compatibility
+  // for the application/x-protobuf media type
+  {"mvtxprotobuf","MVT","application/x-protobuf"},
 #endif
   {"json","UTFGrid","application/json"},
   {NULL,NULL,NULL}
@@ -164,13 +167,14 @@ int msPostMapParseOutputFormatSetup( mapObj *map )
 
 outputFormatObj *msCreateDefaultOutputFormat( mapObj *map,
     const char *driver,
-    const char *name )
+    const char *name,
+    const char *mimetype )
 
 {
 
   outputFormatObj *format = NULL;
   if( strncasecmp(driver,"GD/",3) == 0 ) {
-    return msCreateDefaultOutputFormat( map, "AGG/PNG8", name );
+    return msCreateDefaultOutputFormat( map, "AGG/PNG8", name, mimetype );
   }
 
   if( strcasecmp(driver,"UTFGRID") == 0 ) {
@@ -214,7 +218,12 @@ outputFormatObj *msCreateDefaultOutputFormat( mapObj *map,
   else if( strcasecmp(driver,"MVT") == 0 ) {
     if(!name) name="mvt";
     format = msAllocOutputFormat( map, name, driver );
-    format->mimetype = msStrdup("application/x-protobuf");
+    if (mimetype) {
+      format->mimetype = msStrdup(mimetype);
+    } else {
+      format->mimetype = msStrdup("application/vnd.mapbox-vector-tile");
+    }
+
     format->imagemode = MS_IMAGEMODE_FEATURE;
     format->extension = msStrdup("pbf");
     format->renderer = MS_RENDER_WITH_MVT;
@@ -410,7 +419,7 @@ void msApplyDefaultOutputFormats( mapObj *map )
   defEntry = defaultoutputformats;
   while(defEntry->name) {
     if( msSelectOutputFormat( map, defEntry->name ) == NULL )
-      msCreateDefaultOutputFormat( map, defEntry->driver, defEntry->name );
+      msCreateDefaultOutputFormat( map, defEntry->driver, defEntry->name, defEntry->mimetype );
     defEntry++;
   }
   if( map->imagetype != NULL )
@@ -609,7 +618,7 @@ outputFormatObj *msSelectOutputFormat( mapObj *map,
     struct defaultOutputFormatEntry *formatEntry = defaultoutputformats;
     while(formatEntry->name) {
       if(!strcasecmp(imagetype,formatEntry->name) || !strcasecmp(imagetype,formatEntry->mimetype)) {
-        format = msCreateDefaultOutputFormat( map, formatEntry->driver, formatEntry->name );
+        format = msCreateDefaultOutputFormat( map, formatEntry->driver, formatEntry->name, formatEntry->mimetype );
         break;
       }
       formatEntry++;

diff --git a/mapscript/php/mapscript_i.c b/mapscript/php/mapscript_i.c
@@ -1988,7 +1988,7 @@ outputFormatObj* outputFormatObj_new(const char *driver, char *name)
 {
   outputFormatObj *format;
 
-  format = msCreateDefaultOutputFormat(NULL, driver, name);
+  format = msCreateDefaultOutputFormat(NULL, driver, name, NULL);
 
   /* in the case of unsupported formats, msCreateDefaultOutputFormat
      should return NULL */
@@ -2029,7 +2029,7 @@ imageObj *symbolObj_getImage(symbolObj *self, outputFormatObj *input_format)
   if (input_format) {
     format = input_format;
   } else {
-    format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "png");
+    format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "png", NULL);
 
     if (format)
       msInitializeRendererVTable(format);

diff --git a/mapscript/swiginc/image.i b/mapscript/swiginc/image.i
@@ -49,7 +49,7 @@
             format = input_format;
         }
         else {
-            format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "aggpng");
+            format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "aggpng", NULL);
             if (format)
                 msInitializeRendererVTable(format);
         }

diff --git a/mapscript/swiginc/outputformat.i b/mapscript/swiginc/outputformat.i
@@ -34,7 +34,7 @@
     {
         outputFormatObj *format;
 
-        format = msCreateDefaultOutputFormat(NULL, driver, name);
+        format = msCreateDefaultOutputFormat(NULL, driver, name, NULL);
 
         /* in the case of unsupported formats, msCreateDefaultOutputFormat
            should return NULL */

diff --git a/mapscript/swiginc/symbol.i b/mapscript/swiginc/symbol.i
@@ -106,7 +106,7 @@
         }
         else 
         {
-            format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "aggpng");
+            format = msCreateDefaultOutputFormat(NULL, "AGG/PNG", "aggpng", NULL);
             if (format)
                 msInitializeRendererVTable(format);
         }

diff --git a/mapserver.h b/mapserver.h
@@ -2807,7 +2807,7 @@ extern "C" {
   MS_DLL_EXPORT outputFormatObj *msSelectOutputFormat( mapObj *map, const char *imagetype );
   MS_DLL_EXPORT void msApplyOutputFormat( outputFormatObj **target, outputFormatObj *format, int transparent, int interlaced, int imagequality );
   MS_DLL_EXPORT const char *msGetOutputFormatOption( outputFormatObj *format, const char *optionkey, const char *defaultresult );
-  MS_DLL_EXPORT outputFormatObj *msCreateDefaultOutputFormat( mapObj *map, const char *driver, const char *name );
+  MS_DLL_EXPORT outputFormatObj *msCreateDefaultOutputFormat( mapObj *map, const char *driver, const char *name, const char *mimetype );
   MS_DLL_EXPORT int msPostMapParseOutputFormatSetup( mapObj *map );
   MS_DLL_EXPORT void msSetOutputFormatOption( outputFormatObj *format, const char *key, const char *value );
   MS_DLL_EXPORT void msGetOutputFormatMimeList( mapObj *map, char **mime_list, int max_mime );

diff --git a/mapservutil.c b/mapservutil.c
@@ -1530,7 +1530,7 @@ int msCGIDispatchImageRequest(mapservObj *mapserv)
     case TILE:
       msTileSetExtent(mapserv);
 
-      if(!strcmp(MS_IMAGE_MIME_TYPE(mapserv->map->outputformat), "application/x-protobuf")) {
+      if(!strcmp(MS_IMAGE_MIME_TYPE(mapserv->map->outputformat), "application/vnd.mapbox-vector-tile") || !strcmp(MS_IMAGE_MIME_TYPE(mapserv->map->outputformat), "application/x-protobuf")) {
         if(msMVTWriteTile(mapserv->map, mapserv->sendheaders) != MS_SUCCESS) return MS_FAILURE;
         return MS_SUCCESS;
       }

diff --git a/mapwms.cpp b/mapwms.cpp
@@ -3770,7 +3770,7 @@ int msWMSGetMap(mapObj *map, int nVersion, char **names, char **values, int nume
   } else {
 
     /* intercept requests for Mapbox vector tiles */
-    if(!strcmp(MS_IMAGE_MIME_TYPE(map->outputformat), "application/x-protobuf")) {
+    if(!strcmp(MS_IMAGE_MIME_TYPE(map->outputformat), "application/vnd.mapbox-vector-tile") || !strcmp(MS_IMAGE_MIME_TYPE(map->outputformat), "application/x-protobuf")) {
       int status=0;
       if((status = msMVTWriteTile(map, MS_TRUE)) != MS_SUCCESS) return MS_FAILURE;
       return MS_SUCCESS;

diff --git a/msautotest/wxs/expected/ows_all_wms_capabilities.xml b/msautotest/wxs/expected/ows_all_wms_capabilities.xml
@@ -61,6 +61,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml b/msautotest/wxs/expected/ows_all_wms_capabilities_post.xml
@@ -61,6 +61,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml b/msautotest/wxs/expected/ows_metadata_wms_capabilities111.xml
@@ -64,6 +64,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
       <Format>image/svg+xml</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml b/msautotest/wxs/expected/ows_metadata_wms_capabilities130.xml
@@ -61,6 +61,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/svg+xml</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_wms_capabilities.xml b/msautotest/wxs/expected/ows_wms_capabilities.xml
@@ -36,6 +36,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml b/msautotest/wxs/expected/ows_wms_rootlayer_name_capabilities.xml
@@ -36,6 +36,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml b/msautotest/wxs/expected/ows_wms_rootlayer_name_empty_capabilities.xml
@@ -36,6 +36,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms111_test_xml_escaping.xml b/msautotest/wxs/expected/wms111_test_xml_escaping.xml
@@ -58,6 +58,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms130_test_xml_escaping.xml b/msautotest/wxs/expected/wms130_test_xml_escaping.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_dimension_cap.xml b/msautotest/wxs/expected/wms_dimension_cap.xml
@@ -39,6 +39,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_dimension_cap130.xml b/msautotest/wxs/expected/wms_dimension_cap130.xml
@@ -36,6 +36,7 @@ Content-Type: text/xml; charset=UTF-8
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_empty_cap111.xml b/msautotest/wxs/expected/wms_empty_cap111.xml
@@ -36,6 +36,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_empty_cap130.xml b/msautotest/wxs/expected/wms_empty_cap130.xml
@@ -33,6 +33,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_empty_cap_latestversion.xml b/msautotest/wxs/expected/wms_empty_cap_latestversion.xml
@@ -33,6 +33,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml b/msautotest/wxs/expected/wms_get_capabilities_tileindexmixedsrs.xml
@@ -38,6 +38,7 @@ Content-Type: application/vnd.ogc.wms_xml; charset=UTF-8
       <Format>image/svg+xml</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap.xml b/msautotest/wxs/expected/wms_inspire_cap.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap_111.xml b/msautotest/wxs/expected/wms_inspire_cap_111.xml
@@ -58,6 +58,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap_111_eng.xml b/msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
@@ -58,6 +58,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap_111_ger.xml b/msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
@@ -58,6 +58,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap_eng.xml b/msautotest/wxs/expected/wms_inspire_cap_eng.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_cap_ger.xml b/msautotest/wxs/expected/wms_inspire_cap_ger.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_eng.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap111_ger.xml
@@ -57,6 +57,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>

diff --git a/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml b/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
@@ -55,6 +55,7 @@
       <Format>image/tiff</Format>
       <Format>application/vnd.google-earth.kml+xml</Format>
       <Format>application/vnd.google-earth.kmz</Format>
+      <Format>application/vnd.mapbox-vector-tile</Format>
       <Format>application/x-protobuf</Format>
       <Format>application/json</Format>
       <DCPType>