[mapserver-commits] [mapserver/mapserver] b1c4bd: Bring msDrawQueryLayer() in line with msDrawVector...

Steve Lime noreply at github.com
Tue Nov 19 10:00:56 PST 2019


  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: b1c4bd5671cbf3f64c8ca6014e63d11566390990
      https://github.com/mapserver/mapserver/commit/b1c4bd5671cbf3f64c8ca6014e63d11566390990
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-12 (Tue, 12 Nov 2019)

  Changed paths:
    M mapdraw.c

  Log Message:
  -----------
  Bring msDrawQueryLayer() in line with msDrawVectorLayer() - addresses #5744.


  Commit: 11c332d6425dd8680d49e32283d39be762666838
      https://github.com/mapserver/mapserver/commit/11c332d6425dd8680d49e32283d39be762666838
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M mapdraw.c

  Log Message:
  -----------
  Handle line styles with outline colors differently when setting a hilite color.


  Commit: 0ff529007789c63e49ec8144ee2ea516d2e2091a
      https://github.com/mapserver/mapserver/commit/0ff529007789c63e49ec8144ee2ea516d2e2091a
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M .gitignore
    M .travis.yml
    M CMakeLists.txt
    M HISTORY.TXT
    M INSTALL.CMAKE
    M Makefile
    M Vagrantfile
    M appveyor.yml
    A ci/travis/after_success.sh
    A ci/travis/before_install.sh
    A ci/travis/script.sh
    M cmake/FindOracle.cmake
    A cmake/FindPHP.cmake
    R cmake/FindPHP5.cmake
    M cmake/FindProj.cmake
    A cmake/FindPythonModule.cmake
    M create_mapaxisorder_csv.py
    M fontcache.c
    M kerneldensity.c
    M mapagg.cpp
    M mapaxisorder.csv
    M mapaxisorder.h
    M mapcairo.c
    M mapchart.c
    M mapcluster.c
    M mapcontext.c
    M mapcopy.c
    M mapdraw.c
    M mapfile.c
    M mapfile.h
    M mapgdal.c
    M mapgeos.c
    M mapgml.c
    M mapgraticule.c
    M mapimageio.c
    M mapkmlrenderer.cpp
    M maplabel.c
    M maplayer.c
    M maplexer.c
    M maplexer.l
    M mapmetadata.c
    M mapmssql2008.c
    M mapmvt.c
    M mapobject.c
    M mapogcfilter.c
    M mapogcfilter.h
    M mapogcfiltercommon.c
    M mapogcsld.c
    M mapogcsld.h
    M mapogcsos.c
    M mapogr.cpp
    M mapogroutput.c
    M maporaclespatial.c
    M mapoutput.c
    M mapows.c
    M mapows.h
    M mapparser.c
    M mapparser.h
    M mapparser.y
    M mappostgis.c
    M mapproject.c
    M mapproject.h
    R mapprojhack.c
    M mapquery.c
    M mapraster.c
    M maprasterquery.c
    M maprendering.c
    M mapresample.c
    M mapscale.c
    A mapscript/README.rst
    R mapscript/README.txt
    M mapscript/csharp/CMakeLists.txt
    M mapscript/csharp/csmodule.i
    A mapscript/csharp/run_test.sh
    M mapscript/csharp/swig_csharp_extensions.i
    R mapscript/doc/default.css
    R mapscript/doc/mapscript.css
    M mapscript/mapscript.i
    M mapscript/perl/CMakeLists.txt
    M mapscript/perl/examples/RFC24.pl
    M mapscript/perl/examples/shp_in_shp.pl
    M mapscript/perl/examples/thin.pl
    A mapscript/perl/tests/0-load.t
    A mapscript/perl/tests/maps.t
    M mapscript/php/CMakeLists.txt
    M mapscript/php/class.c
    M mapscript/php/cluster.c
    M mapscript/php/color.c
    M mapscript/php/error.c
    M mapscript/php/grid.c
    M mapscript/php/hashtable.c
    M mapscript/php/image.c
    M mapscript/php/label.c
    M mapscript/php/labelcache.c
    M mapscript/php/labelcachemember.c
    M mapscript/php/labelleader.c
    M mapscript/php/layer.c
    M mapscript/php/legend.c
    M mapscript/php/line.c
    M mapscript/php/map.c
    M mapscript/php/mapscript_error.c
    M mapscript/php/mapscript_i.c
    M mapscript/php/outputformat.c
    M mapscript/php/owsrequest.c
    M mapscript/php/php_mapscript.c
    M mapscript/php/php_mapscript.h
    M mapscript/php/php_mapscript_util.c
    M mapscript/php/php_mapscript_util.h
    R mapscript/php/php_proj.c
    M mapscript/php/point.c
    M mapscript/php/projection.c
    M mapscript/php/querymap.c
    M mapscript/php/rect.c
    M mapscript/php/referencemap.c
    M mapscript/php/result.c
    M mapscript/php/scalebar.c
    M mapscript/php/shape.c
    M mapscript/php/shapefile.c
    M mapscript/php/style.c
    M mapscript/php/symbol.c
    M mapscript/php/web.c
    A mapscript/phpng/CMakeLists.txt
    A mapscript/phpng/README.WIN32
    A mapscript/phpng/php7module.i
    M mapscript/python/CMakeLists.txt
    R mapscript/python/README
    A mapscript/python/README.rst
    A mapscript/python/examples/__init__.py
    R mapscript/python/examples/geocode_addresses.py
    M mapscript/python/examples/project_csv.py
    M mapscript/python/examples/shpdump.py
    M mapscript/python/examples/shpinfo.py
    A mapscript/python/examples/wxs.py
    A mapscript/python/mapscript/__init__.py
    M mapscript/python/pyextend.i
    M mapscript/python/pymodule.i
    M mapscript/python/requirements-dev.txt
    R mapscript/python/setup.cfg
    R mapscript/python/setup.py
    A mapscript/python/setup.py.in
    A mapscript/python/tests/cases/class_test.py
    R mapscript/python/tests/cases/classtest.py
    A mapscript/python/tests/cases/clone_test.py
    R mapscript/python/tests/cases/clonetest.py
    A mapscript/python/tests/cases/color_test.py
    R mapscript/python/tests/cases/colortest.py
    A mapscript/python/tests/cases/font_test.py
    R mapscript/python/tests/cases/fonttest.py
    A mapscript/python/tests/cases/hash_test.py
    R mapscript/python/tests/cases/hashtest.py
    A mapscript/python/tests/cases/image_test.py
    R mapscript/python/tests/cases/imagetest.py
    A mapscript/python/tests/cases/label_test.py
    R mapscript/python/tests/cases/labeltest.py
    A mapscript/python/tests/cases/layer_test.py
    R mapscript/python/tests/cases/layertest.py
    A mapscript/python/tests/cases/line_test.py
    R mapscript/python/tests/cases/linetest.py
    A mapscript/python/tests/cases/map_test.py
    R mapscript/python/tests/cases/maptest.py
    A mapscript/python/tests/cases/outputformat_test.py
    R mapscript/python/tests/cases/outputformattest.py
    A mapscript/python/tests/cases/ows_test.py
    R mapscript/python/tests/cases/owstest.py
    R mapscript/python/tests/cases/parentreference.py
    A mapscript/python/tests/cases/parentreference_test.py
    M mapscript/python/tests/cases/pgtest.py
    A mapscript/python/tests/cases/point_test.py
    R mapscript/python/tests/cases/pointtest.py
    R mapscript/python/tests/cases/pytest.ini
    A mapscript/python/tests/cases/rect_test.py
    R mapscript/python/tests/cases/recttest.py
    R mapscript/python/tests/cases/refcount.py
    A mapscript/python/tests/cases/refcount_test.py
    A mapscript/python/tests/cases/resultcache_test.py
    R mapscript/python/tests/cases/resultcachetest.py
    R mapscript/python/tests/cases/runalltests.py
    A mapscript/python/tests/cases/shape_test.py
    A mapscript/python/tests/cases/shapefile_test.py
    R mapscript/python/tests/cases/shapefiletest.py
    R mapscript/python/tests/cases/shapetest.py
    A mapscript/python/tests/cases/style_test.py
    R mapscript/python/tests/cases/styletest.py
    A mapscript/python/tests/cases/symbol_test.py
    A mapscript/python/tests/cases/symbolset_test.py
    R mapscript/python/tests/cases/symbolsettest.py
    R mapscript/python/tests/cases/symboltest.py
    M mapscript/python/tests/cases/testing.py
    A mapscript/python/tests/cases/thread_test.py
    R mapscript/python/tests/cases/threadtest.py
    A mapscript/python/tests/cases/zoom_test.py
    R mapscript/python/tests/cases/zoomtest.py
    R mapscript/python/wxs.py
    M mapscript/swiginc/class.i
    M mapscript/swiginc/image.i
    M mapscript/swiginc/layer.i
    M mapscript/swiginc/map.i
    M mapscript/swiginc/msio.i
    M mapscript/swiginc/shape.i
    M mapscript/swiginc/style.i
    M mapscript/swiginc/symbol.i
    M mapserver.h
    M mapservutil.c
    M mapshape.c
    M mapshape.h
    M mapstring.c
    M mapsymbol.c
    M maptemplate.c
    M mapthread.c
    M maptime.c
    M maptree.c
    M maptree.h
    M mapunion.c
    M maputfgrid.cpp
    M maputil.c
    M mapuvraster.c
    M mapwcs.c
    M mapwcs11.c
    M mapwcs20.c
    M mapwfs.c
    M mapwms.c
    M mapwmslayer.c
    M msautotest/.gitignore
    A msautotest/gdal/connectionoptions.map
    A msautotest/gdal/data/red_square.tif.ovr
    A msautotest/gdal/expected/connectionoptions.png
    M msautotest/gdal/expected/nonsquare_multiraw.png
    M msautotest/gdal/expected/tileindexmixedsrs.png
    M msautotest/gdal/expected/tileindexmixedsrs2.png
    M msautotest/gdal/expected/tileindexmixedsrs3.png
    M msautotest/gdal/expected/tileindexmixedsrs4.png
    M msautotest/gdal/tileindexmixedsrs.map
    M msautotest/gdal/tileindexmixedsrs2.map
    M msautotest/gdal/tileindexmixedsrs3.map
    M msautotest/gdal/tileindexmixedsrs4.map
    M msautotest/misc/expected/grid_without_label.png
    A msautotest/misc/expected/issue5581-1.png
    A msautotest/misc/expected/issue5581-2.png
    A msautotest/misc/issue5558.map
    M msautotest/pymod/mstestlib.py
    M msautotest/pymod/testlib.py
    A msautotest/query/expected/expressions_test001.txt
    A msautotest/query/expected/expressions_test002.txt
    A msautotest/query/expected/expressions_test003.txt
    A msautotest/query/expected/expressions_test004.txt
    A msautotest/query/expected/expressions_test005.txt
    A msautotest/query/expected/expressions_test006.txt
    A msautotest/query/expected/expressions_test007.txt
    A msautotest/query/expected/expressions_test008.txt
    A msautotest/query/expected/expressions_test009.txt
    A msautotest/query/expected/query_test013.txt
    A msautotest/query/expressions.map
    M msautotest/query/query.map
    A msautotest/query/template/query_formatted.tmpl
    M msautotest/renderers/expected/labelrot.png
    A msautotest/renderers/expected/line_label_auto.json
    A msautotest/renderers/expected/utfgrid_truetype_symbol_labelcache.json
    A msautotest/renderers/expected/utfgrid_truetype_symbol_nolabelcache.json
    M msautotest/renderers/line_label_auto.map
    A msautotest/renderers/utfgrid_truetype_symbol.map
    A msautotest/sld/arithmetic_line.map
    A msautotest/sld/arithmetic_point.map
    A msautotest/sld/arithmetic_polygon.map
    A msautotest/sld/arithmetic_text.map
    A msautotest/sld/base.map
    A msautotest/sld/data/fonts.lst
    A msautotest/sld/data/hexagon.dbf
    A msautotest/sld/data/hexagon.json
    A msautotest/sld/data/hexagon.prj
    A msautotest/sld/data/hexagon.shp
    A msautotest/sld/data/hexagon.shx
    A msautotest/sld/data/inner.dbf
    A msautotest/sld/data/inner.json
    A msautotest/sld/data/inner.prj
    A msautotest/sld/data/inner.shp
    A msautotest/sld/data/inner.shx
    A msautotest/sld/data/plot.dbf
    A msautotest/sld/data/plot.json
    A msautotest/sld/data/plot.prj
    A msautotest/sld/data/plot.shp
    A msautotest/sld/data/plot.shx
    A msautotest/sld/data/set.json
    A msautotest/sld/expected/base_mapfile.png
    A msautotest/sld/expected/base_sldbody.png
    A msautotest/sld/expected/map_reference.png
    A msautotest/sld/expected/size_mapfile.png
    A msautotest/sld/expected/size_sldbody.png
    A msautotest/sld/expected/sld_line_expression_strokeopacity.png
    A msautotest/sld/expected/sld_line_expression_strokewidth.png
    A msautotest/sld/expected/sld_line_literal_stroke.png
    A msautotest/sld/expected/sld_line_literal_strokeopacity.png
    A msautotest/sld/expected/sld_line_literal_strokewidth.png
    A msautotest/sld/expected/sld_line_propertyname_stroke.png
    A msautotest/sld/expected/sld_line_propertyname_strokeopacity.png
    A msautotest/sld/expected/sld_line_propertyname_strokewidth.png
    A msautotest/sld/expected/sld_named_userstyle_1.png
    A msautotest/sld/expected/sld_named_userstyle_2.png
    A msautotest/sld/expected/sld_named_userstyle_3.png
    A msautotest/sld/expected/sld_named_userstyle_get_styles.xml
    A msautotest/sld/expected/sld_point_expression_displacementx.png
    A msautotest/sld/expected/sld_point_expression_displacementy.png
    A msautotest/sld/expected/sld_point_expression_opacity.png
    A msautotest/sld/expected/sld_point_expression_rotation.png
    A msautotest/sld/expected/sld_point_expression_size.png
    A msautotest/sld/expected/sld_point_expression_strokewidth.png
    A msautotest/sld/expected/sld_point_literal_displacementx.png
    A msautotest/sld/expected/sld_point_literal_displacementy.png
    A msautotest/sld/expected/sld_point_literal_fill.png
    A msautotest/sld/expected/sld_point_literal_opacity.png
    A msautotest/sld/expected/sld_point_literal_rotation.png
    A msautotest/sld/expected/sld_point_literal_size.png
    A msautotest/sld/expected/sld_point_literal_stroke.png
    A msautotest/sld/expected/sld_point_literal_strokewidth.png
    A msautotest/sld/expected/sld_point_propertyname_displacementx.png
    A msautotest/sld/expected/sld_point_propertyname_displacementy.png
    A msautotest/sld/expected/sld_point_propertyname_fill.png
    A msautotest/sld/expected/sld_point_propertyname_opacity.png
    A msautotest/sld/expected/sld_point_propertyname_rotation.png
    A msautotest/sld/expected/sld_point_propertyname_size.png
    A msautotest/sld/expected/sld_point_propertyname_stroke.png
    A msautotest/sld/expected/sld_point_propertyname_strokewidth.png
    A msautotest/sld/expected/sld_polygon_expression_fillopacity.png
    A msautotest/sld/expected/sld_polygon_expression_strokeopacity.png
    A msautotest/sld/expected/sld_polygon_expression_strokewidth.png
    A msautotest/sld/expected/sld_polygon_literal_fill.png
    A msautotest/sld/expected/sld_polygon_literal_fillopacity.png
    A msautotest/sld/expected/sld_polygon_literal_stroke.png
    A msautotest/sld/expected/sld_polygon_literal_strokeopacity.png
    A msautotest/sld/expected/sld_polygon_literal_strokewidth.png
    A msautotest/sld/expected/sld_polygon_propertyname_fill.png
    A msautotest/sld/expected/sld_polygon_propertyname_fillopacity.png
    A msautotest/sld/expected/sld_polygon_propertyname_stroke.png
    A msautotest/sld/expected/sld_polygon_propertyname_strokeopacity.png
    A msautotest/sld/expected/sld_polygon_propertyname_strokewidth.png
    A msautotest/sld/expected/sld_reference.png
    A msautotest/sld/expected/sld_text_expression_fontsize.png
    A msautotest/sld/expected/sld_text_expression_rotation.png
    A msautotest/sld/expected/sld_text_literal_fill.png
    A msautotest/sld/expected/sld_text_literal_fontsize.png
    A msautotest/sld/expected/sld_text_literal_halofill.png
    A msautotest/sld/expected/sld_text_literal_rotation.png
    A msautotest/sld/expected/sld_text_propertyname_fill.png
    A msautotest/sld/expected/sld_text_propertyname_fontsize.png
    A msautotest/sld/expected/sld_text_propertyname_halofill.png
    A msautotest/sld/expected/sld_text_propertyname_rotation.png
    A msautotest/sld/reference.map
    A msautotest/sld/run_test.py
    A msautotest/sld/size.map
    A msautotest/sld/sld_named_userstyle.map
    A msautotest/sld/sld_named_userstyle_get_styles.map
    M msautotest/valgrind-suppressions.txt
    M msautotest/wxs/data/alltypes.csv
    M msautotest/wxs/data/alltypes.csvt
    A msautotest/wxs/data/nested_attrs.geojson
    M msautotest/wxs/data/polar_stereo.tif
    A msautotest/wxs/data/popplace.gpkg
    A msautotest/wxs/data/test.gpkg
    A msautotest/wxs/expected/ogr_connectionoptions.xml
    M msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml
    M msautotest/wxs/expected/ows_metadata_wcs_capabilities110.xml
    M msautotest/wxs/expected/ows_wcs_capabilities.xml
    M msautotest/wxs/expected/ows_wcs_describecoverage.xml
    M msautotest/wxs/expected/wcs11_cap.txt
    M msautotest/wxs/expected/wcs11_cap.xml
    M msautotest/wxs/expected/wcs11_caps_section1.xml
    M msautotest/wxs/expected/wcs11_caps_section3.xml
    M msautotest/wxs/expected/wcs11_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs11_describe.xml
    M msautotest/wxs/expected/wcs11_post_cap.xml
    M msautotest/wxs/expected/wcs11_post_caps_section1.xml
    M msautotest/wxs/expected/wcs11_post_caps_section3.xml
    M msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs11_post_describe.xml
    A msautotest/wxs/expected/wcs_20_getcov_bands_name_new_reproject.dat.alternative
    M msautotest/wxs/expected/wcs_20_getcov_gtiff_compress_deflate_predictor.tif
    M msautotest/wxs/expected/wcs_20_getcov_outputcrs.tif
    M msautotest/wxs/expected/wcs_20_getcov_reproj.dat
    M msautotest/wxs/expected/wcs_20_post_getcov_subsettingcrs_outputcrs.tif
    M msautotest/wxs/expected/wcs_cap.txt
    M msautotest/wxs/expected/wcs_cap.xml
    M msautotest/wxs/expected/wcs_caps_updatesequence.xml
    M msautotest/wxs/expected/wcs_describe.xml
    M msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml
    M msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml
    M msautotest/wxs/expected/wcs_get_caps.xml
    M msautotest/wxs/expected/wcs_getcov_exception_bbox.xml
    M msautotest/wxs/expected/wcs_mask_20_getcov_reproj.dat
    M msautotest/wxs/expected/wfs_alltypes_describefeaturetype.xml
    A msautotest/wxs/expected/wfs_filter_islike_no_ending_wildcard_empty_resultset.xml
    A msautotest/wxs/expected/wfs_filter_islike_no_ending_wildcard_non_empty_resultset.xml
    A msautotest/wxs/expected/wfs_filter_postgis_islike_no_ending_wildcard_empty_resultset.xml
    A msautotest/wxs/expected/wfs_filter_postgis_islike_no_ending_wildcard_non_empty_resultset.xml
    M msautotest/wxs/expected/wfs_filter_projmeter_disjoint.xml
    A msautotest/wxs/expected/wfs_ogr_gpkg_filter_startindex.xml
    A msautotest/wxs/expected/wfs_ogr_gpkg_filter_startindex2.xml
    A msautotest/wxs/expected/wfs_ogr_gpkg_issue_5858.xml
    R msautotest/wxs/expected/wfs_post_time_postgis_during_filter_match_features.xml
    R msautotest/wxs/expected/wfs_time_postgis_between.xml
    A msautotest/wxs/expected/wfs_time_postgis_date_getfeature.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_between.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_describe.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_and_other_clause.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_match_features.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_match_no_feature.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_getfeature.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_lessthan.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_or_two_during_filter.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_post_during_filter_match_features.xml
    A msautotest/wxs/expected/wfs_time_postgis_datetime_sortby.xml
    R msautotest/wxs/expected/wfs_time_postgis_describe.xml
    R msautotest/wxs/expected/wfs_time_postgis_during_filter_and_other_clause.xml
    R msautotest/wxs/expected/wfs_time_postgis_during_filter_match_features.xml
    R msautotest/wxs/expected/wfs_time_postgis_during_filter_match_no_feature.xml
    M msautotest/wxs/expected/wfs_time_postgis_getcaps.xml
    R msautotest/wxs/expected/wfs_time_postgis_getfeature.xml
    R msautotest/wxs/expected/wfs_time_postgis_lessthan.xml
    R msautotest/wxs/expected/wfs_time_postgis_or_two_during_filter.xml
    R msautotest/wxs/expected/wfs_time_postgis_sortby.xml
    A msautotest/wxs/expected/wfs_time_postgis_time_getfeature.xml
    M msautotest/wxs/expected/wfsogr10_gpx.xml
    M msautotest/wxs/expected/wfsogr11_caps.xml
    A msautotest/wxs/expected/wfsogr20_geojson.json
    A msautotest/wxs/expected/wfsogr20_geojson_with_predefine_native_data.json
    M msautotest/wxs/expected/wms_get_map_ext_sld_404.xml
    M msautotest/wxs/expected/wms_get_map_ext_sld_fileproto.xml
    M msautotest/wxs/expected/wms_get_map_ext_sld_proto.xml
    M msautotest/wxs/expected/wms_get_map_ext_sld_too_large.xml
    M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_all_layers.png
    M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_all_layers_postgis.png
    M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_one_layer.png
    M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_one_layer_postgis.png
    A msautotest/wxs/expected/wms_getfeatureinfo_encoding.xml
    M msautotest/wxs/expected/wms_inspire_cap.xml
    M msautotest/wxs/expected/wms_inspire_cap_111.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
    M msautotest/wxs/expected/wms_inspire_cap_eng.xml
    M msautotest/wxs/expected/wms_inspire_cap_ger.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml
    M msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml
    M msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml
    M msautotest/wxs/expected/wms_inspire_styles_all.xml
    M msautotest/wxs/expected/wms_inspire_styles_commontransportelements.xml
    M msautotest/wxs/expected/wms_inspire_styles_railtransportnetwork.xml
    M msautotest/wxs/expected/wms_inspire_styles_roadtransportnetwork.xml
    M msautotest/wxs/expected/wms_inspire_styles_transportnode.xml
    A msautotest/wxs/ogr_connectionoptions.map
    M msautotest/wxs/wcs_simple.map
    M msautotest/wxs/wfs_200.map
    M msautotest/wxs/wfs_200_allgeoms.map
    M msautotest/wxs/wfs_200_cite.map
    M msautotest/wxs/wfs_200_cite_postgis.map
    M msautotest/wxs/wfs_200_low_wfsmaxfeatures_no_compute_number_matched.map
    M msautotest/wxs/wfs_filter.map
    M msautotest/wxs/wfs_filter_ogr.map
    M msautotest/wxs/wfs_filter_postgis.map
    M msautotest/wxs/wfs_filter_projmeter.map
    M msautotest/wxs/wfs_ogr.map
    M msautotest/wxs/wfs_ogr_geojson.map
    A msautotest/wxs/wfs_ogr_gpkg.map
    M msautotest/wxs/wfs_ogr_native_sql.map
    M msautotest/wxs/wfs_ogr_no_native_sql.map
    M msautotest/wxs/wfs_time.map
    M msautotest/wxs/wfs_time_ogr.map
    M msautotest/wxs/wfs_time_postgis.map
    A msautotest/wxs/wms_getfeatureinfo_encoding.map
    M msautotest/wxs/wms_inspire.map
    M msautotest/wxs/wms_north_polar_stereo_extent.map
    M msautotest/wxs/wms_raster.map
    M msautotest/wxs/wms_uvraster_map_reprojection.map
    M print-test-results.sh
    M renderers/agg/include/agg_conv_curve.h
    M renderers/agg/include/agg_path_storage.h
    M renderers/mvt/vector_tile.proto
    M scripts/vagrant/mapserver.sh
    M scripts/vagrant/packages.sh
    A scripts/vagrant/proj6.sh
    M shptreetst.c
    A tests/cities.csv
    M tests/test.map

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into issue-5744


  Commit: de494d0361f48a07a88ae30e70ba01b078e5cb15
      https://github.com/mapserver/mapserver/commit/de494d0361f48a07a88ae30e70ba01b078e5cb15
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-15 (Fri, 15 Nov 2019)

  Changed paths:
    M Vagrantfile
    M maputfgrid.cpp
    A msautotest/renderers/expected/utfgrid_truetype_symbol_rotation.json
    M msautotest/renderers/utfgrid_truetype_symbol.map

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into issue-5744


  Commit: 0b0d4de12e8095a77a2addc4307cf2c6337de7ec
      https://github.com/mapserver/mapserver/commit/0b0d4de12e8095a77a2addc4307cf2c6337de7ec
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-18 (Mon, 18 Nov 2019)

  Changed paths:
    M mapwms.c

  Log Message:
  -----------
  Move WMS filter execution (GetMap) to the end of the parameter processing function - after styles are processed.


  Commit: c6dd336b24cf8d92251849b845f0bd166f987e3c
      https://github.com/mapserver/mapserver/commit/c6dd336b24cf8d92251849b845f0bd166f987e3c
  Author: Steve Lime <steve.lime at state.mn.us>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M mapdraw.c
    M mapwms.c

  Log Message:
  -----------
  Merge pull request #5920 from sdlime/issue-5744

Bring msDrawQueryLayer() in line with msDrawVectorLayer() - addresses…


Compare: https://github.com/mapserver/mapserver/compare/ee52c482531b...c6dd336b24cf


More information about the mapserver-commits mailing list