[mapserver-commits] [mapserver/mapserver] 5be9bc: Sibling of 2ceadc980241b38a4316731646bdf7c6a8b85a5...

backporting[bot] noreply at github.com
Sun Nov 3 04:02:20 PST 2019


  Branch: refs/heads/cherry-pick-backport-5911-to-branch-7-4-e4fe41fe-1aeb-402f-88da-442ae6a249d7
  Home:   https://github.com/mapserver/mapserver
  Commit: 5be9bc12211d38c494aef695d61d7fb87d0479d7
      https://github.com/mapserver/mapserver/commit/5be9bc12211d38c494aef695d61d7fb87d0479d7
  Author: Rutjes, Dennis <dennis.rutjes at kadaster.nl>
  Date:   2019-10-30 (Wed, 30 Oct 2019)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M HISTORY.TXT
    M Makefile
    M Vagrantfile
    M appveyor.yml
    M ci/travis/before_install.sh
    M ci/travis/script.sh
    M cmake/FindProj.cmake
    M create_mapaxisorder_csv.py
    M fontcache.c
    M kerneldensity.c
    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 maplayer.c
    M maplexer.c
    M maplexer.l
    M mapmetadata.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 mapoutput.c
    M mapows.c
    M mapows.h
    M mappostgis.c
    M mapproject.c
    M mapproject.h
    A mapprojhack.c
    M mapquery.c
    M mapraster.c
    M maprasterquery.c
    M mapresample.c
    M mapscale.c
    M mapscript/mapscript.i
    M mapscript/php/mapscript_i.c
    M mapscript/php/php_mapscript.c
    M mapscript/php/php_mapscript.h
    M mapscript/python/pyextend.i
    M mapscript/python/pymodule.i
    M mapscript/python/tests/cases/map_test.py
    M mapscript/swiginc/layer.i
    M mapscript/swiginc/map.i
    M mapserver.h
    M mapservutil.c
    M mapshape.c
    M mapshape.h
    M mapstring.c
    M maptemplate.c
    M mapthread.c
    M mapunion.c
    M maputil.c
    M mapuvraster.c
    M mapwcs.c
    M mapwcs11.c
    M mapwcs20.c
    M mapwfs.c
    M mapwms.c
    M msautotest/.gitignore
    R msautotest/gdal/connectionoptions.map
    R msautotest/gdal/data/red_square.tif.ovr
    R 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
    M msautotest/pymod/testlib.py
    R msautotest/query/expected/expressions_test001.txt
    R msautotest/query/expected/expressions_test002.txt
    R msautotest/query/expected/expressions_test003.txt
    R msautotest/query/expected/expressions_test004.txt
    R msautotest/query/expected/expressions_test005.txt
    R msautotest/query/expected/expressions_test006.txt
    R msautotest/query/expected/expressions_test007.txt
    R msautotest/query/expected/expressions_test008.txt
    R msautotest/query/expected/expressions_test009.txt
    R msautotest/query/expected/query_test013.txt
    R msautotest/query/expressions.map
    M msautotest/query/query.map
    R msautotest/query/template/query_formatted.tmpl
    M msautotest/renderers/expected/labelrot.png
    R msautotest/sld/arithmetic_line.map
    R msautotest/sld/arithmetic_point.map
    R msautotest/sld/arithmetic_polygon.map
    R msautotest/sld/arithmetic_text.map
    R msautotest/sld/base.map
    R msautotest/sld/data/fonts.lst
    R msautotest/sld/data/hexagon.dbf
    R msautotest/sld/data/hexagon.json
    R msautotest/sld/data/hexagon.prj
    R msautotest/sld/data/hexagon.shp
    R msautotest/sld/data/hexagon.shx
    R msautotest/sld/data/inner.dbf
    R msautotest/sld/data/inner.json
    R msautotest/sld/data/inner.prj
    R msautotest/sld/data/inner.shp
    R msautotest/sld/data/inner.shx
    R msautotest/sld/data/plot.dbf
    R msautotest/sld/data/plot.json
    R msautotest/sld/data/plot.prj
    R msautotest/sld/data/plot.shp
    R msautotest/sld/data/plot.shx
    R msautotest/sld/data/set.json
    R msautotest/sld/expected/base_mapfile.png
    R msautotest/sld/expected/base_sldbody.png
    R msautotest/sld/expected/map_reference.png
    R msautotest/sld/expected/size_mapfile.png
    R msautotest/sld/expected/size_sldbody.png
    R msautotest/sld/expected/sld_line_expression_strokeopacity.png
    R msautotest/sld/expected/sld_line_expression_strokewidth.png
    R msautotest/sld/expected/sld_line_literal_stroke.png
    R msautotest/sld/expected/sld_line_literal_strokeopacity.png
    R msautotest/sld/expected/sld_line_literal_strokewidth.png
    R msautotest/sld/expected/sld_line_propertyname_stroke.png
    R msautotest/sld/expected/sld_line_propertyname_strokeopacity.png
    R msautotest/sld/expected/sld_line_propertyname_strokewidth.png
    R msautotest/sld/expected/sld_named_userstyle_1.png
    R msautotest/sld/expected/sld_named_userstyle_2.png
    R msautotest/sld/expected/sld_named_userstyle_3.png
    R msautotest/sld/expected/sld_named_userstyle_get_styles.xml
    R msautotest/sld/expected/sld_point_expression_displacementx.png
    R msautotest/sld/expected/sld_point_expression_displacementy.png
    R msautotest/sld/expected/sld_point_expression_opacity.png
    R msautotest/sld/expected/sld_point_expression_rotation.png
    R msautotest/sld/expected/sld_point_expression_size.png
    R msautotest/sld/expected/sld_point_expression_strokewidth.png
    R msautotest/sld/expected/sld_point_literal_displacementx.png
    R msautotest/sld/expected/sld_point_literal_displacementy.png
    R msautotest/sld/expected/sld_point_literal_fill.png
    R msautotest/sld/expected/sld_point_literal_opacity.png
    R msautotest/sld/expected/sld_point_literal_rotation.png
    R msautotest/sld/expected/sld_point_literal_size.png
    R msautotest/sld/expected/sld_point_literal_stroke.png
    R msautotest/sld/expected/sld_point_literal_strokewidth.png
    R msautotest/sld/expected/sld_point_propertyname_displacementx.png
    R msautotest/sld/expected/sld_point_propertyname_displacementy.png
    R msautotest/sld/expected/sld_point_propertyname_fill.png
    R msautotest/sld/expected/sld_point_propertyname_opacity.png
    R msautotest/sld/expected/sld_point_propertyname_rotation.png
    R msautotest/sld/expected/sld_point_propertyname_size.png
    R msautotest/sld/expected/sld_point_propertyname_stroke.png
    R msautotest/sld/expected/sld_point_propertyname_strokewidth.png
    R msautotest/sld/expected/sld_polygon_expression_fillopacity.png
    R msautotest/sld/expected/sld_polygon_expression_strokeopacity.png
    R msautotest/sld/expected/sld_polygon_expression_strokewidth.png
    R msautotest/sld/expected/sld_polygon_literal_fill.png
    R msautotest/sld/expected/sld_polygon_literal_fillopacity.png
    R msautotest/sld/expected/sld_polygon_literal_stroke.png
    R msautotest/sld/expected/sld_polygon_literal_strokeopacity.png
    R msautotest/sld/expected/sld_polygon_literal_strokewidth.png
    R msautotest/sld/expected/sld_polygon_propertyname_fill.png
    R msautotest/sld/expected/sld_polygon_propertyname_fillopacity.png
    R msautotest/sld/expected/sld_polygon_propertyname_stroke.png
    R msautotest/sld/expected/sld_polygon_propertyname_strokeopacity.png
    R msautotest/sld/expected/sld_polygon_propertyname_strokewidth.png
    R msautotest/sld/expected/sld_reference.png
    R msautotest/sld/expected/sld_text_expression_fontsize.png
    R msautotest/sld/expected/sld_text_expression_rotation.png
    R msautotest/sld/expected/sld_text_literal_fill.png
    R msautotest/sld/expected/sld_text_literal_fontsize.png
    R msautotest/sld/expected/sld_text_literal_halofill.png
    R msautotest/sld/expected/sld_text_literal_rotation.png
    R msautotest/sld/expected/sld_text_propertyname_fill.png
    R msautotest/sld/expected/sld_text_propertyname_fontsize.png
    R msautotest/sld/expected/sld_text_propertyname_halofill.png
    R msautotest/sld/expected/sld_text_propertyname_rotation.png
    R msautotest/sld/reference.map
    R msautotest/sld/run_test.py
    R msautotest/sld/size.map
    R msautotest/sld/sld_named_userstyle.map
    R msautotest/sld/sld_named_userstyle_get_styles.map
    M msautotest/valgrind-suppressions.txt
    R msautotest/wxs/data/nested_attrs.geojson
    M msautotest/wxs/data/polar_stereo.tif
    R 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
    R msautotest/wxs/expected/wcs_20_getcov_bands_name_new_reproject.dat.alternative
    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_filter_projmeter_disjoint.xml
    M msautotest/wxs/expected/wfsogr11_caps.xml
    R msautotest/wxs/expected/wfsogr20_geojson.json
    R msautotest/wxs/expected/wfsogr20_geojson_with_predefine_native_data.json
    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
    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
    R msautotest/wxs/ogr_connectionoptions.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_geojson.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
    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 renderers/agg/include/agg_conv_curve.h
    M renderers/agg/include/agg_path_storage.h
    M scripts/vagrant/mapserver.sh
    M scripts/vagrant/packages.sh
    R scripts/vagrant/proj6.sh

  Log Message:
  -----------
  Sibling of 2ceadc980241b38a4316731646bdf7c6a8b85a56 [skip ci]


skip-checks: true




More information about the mapserver-commits mailing list