WMS GetFeatureInfo: option to override geometry output

[bartvde]

This is a sequel of ticket:2989

Since our MAP files need to be compliant with both MS 5.2 and trunk, I tried to do the following to not have geometries being output in WMS GetFeatureInfo:

  METADATA
    ..
    "GML_GEOMETRY_TYPE"     "multipolygon"
    "GML_GEOMETRIES"        "geometry"
    "WMS_GEOMETRIES" "none"
    ..
  END

However this does not work, since WMS_GEOMETRIES does not override GML_GEOMETRIES for WMS GetFeatureInfo, however I would expect this to be the case.

The change I did was in mapwms.c in function msWMSFeatureInfo, the last line:

Change

    msGMLWriteQuery(map, NULL, "GMO"); /* default is stdout */

into

    msGMLWriteQuery(map, NULL, "OMG"); /* default is stdout */

[assefa]

committed change (r10804)

[dmorissette]

I think it would be better to use

    msGMLWriteQuery(map, NULL, "MGO"); /* default is stdout */

... to keep "ows_geometries" as the fallback *after* the wms_... and gml_... versions like we do elsewhere, what do you think?

[bartvde]

@dmorissette I am okay with that change

[dmorissette]

I came across this again this morning and just realized that the ordering mistake above was not fixed before the 6.0 release (i.e. ows_* should come last, not first).

I have fixed this in trunk (r11767, v6.2-dev) and branch-6-0 (r11768, v6.0.1)... now the correct ordering for WMS GML GetFeatureInfo metadata will be in this order: wms_*, gml_*, ows_*