[mapserver-commits] [MapServer/MapServer] 8ede9a: OGC API Features: implement CQL2 text filtering fr...

[Even Rouault]

  Branch: refs/heads/main
  Home:   https://github.com/MapServer/MapServer
  Commit: 8ede9a25bdf4faedb78b88a28ade94a954af8c7a
      https://github.com/MapServer/MapServer/commit/8ede9a25bdf4faedb78b88a28ade94a954af8c7a
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2026-02-25 (Wed, 25 Feb 2026)

  Changed paths:
    M .pre-commit-config.yaml
    M CMakeLists.txt
    M msautotest/api/expected/conformance.json
    M msautotest/api/expected/ogcapi_api.json
    A msautotest/api/expected/ogcapi_cql2_quoted_identifier.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_add.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_false.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_query_param_filter.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_query_param_filter2.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_true.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_between_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_casei_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_div.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_div2.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_double_constant.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_equal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_crs.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_crs_invalid.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_lang_invalid.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_four_and.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_ge.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_gt.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_iequal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_in_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_is_not_null_not_supported.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_is_null_not_supported.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_le.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_no_match.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_single_char.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_wildcard.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_lt.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_mod.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_multiply.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_a_queryable.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_casei_not_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_equal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_between_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_iequal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_in_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_or_false.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_or_true.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_s_intersects_bbox.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_s_intersects_point.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_subtract.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_syntax_error.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_timestamp.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_unary_minus.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_unsupported_function.json.txt
    M msautotest/api/expected/ogcapi_queryables.html
    M msautotest/api/expected/ogcapi_queryables.json.txt
    M msautotest/api/ogcapi.map
    A src/check_md5sum.cmake
    A src/cql2.cpp
    A src/cql2.h
    A src/cql2text.cpp
    A src/cql2text.h
    A src/cql2textparser.cpp
    A src/cql2textparser.hpp
    A src/cql2textparser.y
    A src/generate_cql2text_parser.cmake
    M src/mapogcapi.cpp
    M src/mapogcfilter.h
    M src/mapogcfiltercommon.cpp

  Log Message:
  -----------
  OGC API Features: implement CQL2 text filtering from Part 3

New query parameters: filter, filter-lang and filter-crs

New layer metadata:
- "oga_geometry_name": geometry field name. Defaults to 'geom'
- "oga_geometry_type": among "geometry-point", "geometry-multipoint",
  "geometry-linestring", "geometry-multilinestring", "geometry-polygon",
  "geometry-multipolygon", and "geometry-geometrycollection".
  Or "geometry-any" which is the default


  Commit: 196af68690ded505b03cf629c5706a1df9c3b793
      https://github.com/MapServer/MapServer/commit/196af68690ded505b03cf629c5706a1df9c3b793
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2026-03-09 (Mon, 09 Mar 2026)

  Changed paths:
    M .pre-commit-config.yaml
    M CMakeLists.txt
    M msautotest/api/expected/conformance.json
    M msautotest/api/expected/ogcapi_api.json
    A msautotest/api/expected/ogcapi_cql2_quoted_identifier.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_add.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_false.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_query_param_filter.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_query_param_filter2.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_and_true.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_between_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_casei_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_div.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_div2.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_double_constant.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_equal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_crs.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_crs_invalid.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_filter_lang_invalid.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_four_and.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_ge.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_gt.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_iequal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_in_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_is_not_null_not_supported.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_is_null_not_supported.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_le.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_no_match.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_single_char.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_like_wildcard.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_lt.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_mod.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_multiply.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_a_queryable.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_casei_not_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_equal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_between_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_iequal.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_in_json.txt
    A msautotest/api/expected/ogcapi_cql2_text_not_not_like.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_or_false.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_or_true.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_s_intersects_bbox.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_s_intersects_point.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_subtract.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_syntax_error.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_timestamp.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_unary_minus.json.txt
    A msautotest/api/expected/ogcapi_cql2_text_unsupported_function.json.txt
    M msautotest/api/expected/ogcapi_queryables.html
    M msautotest/api/expected/ogcapi_queryables.json.txt
    M msautotest/api/ogcapi.map
    A src/check_md5sum.cmake
    A src/cql2.cpp
    A src/cql2.h
    A src/cql2text.cpp
    A src/cql2text.h
    A src/cql2textparser.cpp
    A src/cql2textparser.hpp
    A src/cql2textparser.y
    A src/generate_cql2text_parser.cmake
    M src/mapogcapi.cpp
    M src/mapogcfilter.h
    M src/mapogcfiltercommon.cpp

  Log Message:
  -----------
  Merge pull request #7436 from rouault/cql2

OGC API Features: implement CQL2 text filtering from Part 3


Compare: https://github.com/MapServer/MapServer/compare/107ee5bb3747...196af68690de

To unsubscribe from these emails, change your notification settings at https://github.com/MapServer/MapServer/settings/notifications