[mapserver-commits] [MapServer/MapServer] 50aaec: Fix style scale factor inheritance

[Māris Nartišs]

  Branch: refs/heads/backport-7115-to-branch-8-2
  Home:   https://github.com/MapServer/MapServer
  Commit: 50aaec6ad4493855f4371d1aa750e9ca8b5311ee
      https://github.com/MapServer/MapServer/commit/50aaec6ad4493855f4371d1aa750e9ca8b5311ee
  Author: Māris Nartišs <maris.gis at gmail.com>
  Date:   2024-07-28 (Sun, 28 Jul 2024)

  Changed paths:
    M src/mapdraw.c
    M src/maplayer.c
    M src/mapserver.h

  Log Message:
  -----------
  Fix style scale factor inheritance

Commit ede4953 introduced SIZEUNITS inheritance layer->class->style/label.
When LAYER STYLEITEM is in use, for each feature msUpdateStyleFromString
is called but no attempts are made to ensure correct scale factor values
for newly created style item thus all features get scale factor 1.0,
that might be different from value it should have. This wasn't a problem
before ede4953 as layer scale factor was always used to render features
with STYLEITEM.

This commit introduces a workaround by lifting out code from the only
place where scale factor is adjusted in a way that it can be reused also
in the STYLEITEM case.


  Commit: 246eb8f1f8e64a67ad2faec59e22a19a100e0609
      https://github.com/MapServer/MapServer/commit/246eb8f1f8e64a67ad2faec59e22a19a100e0609
  Author: Māris Nartišs <maris.gis at gmail.com>
  Date:   2024-07-28 (Sun, 28 Jul 2024)

  Changed paths:
    A msautotest/misc/data/styleitem_style.csv
    A msautotest/misc/expected/scale_factor_inheritance.png
    A msautotest/misc/scale_factor_inheritance.map

  Log Message:
  -----------
  A test case for style scalefactor correct inheritance when STYLEITEM is in use


  Commit: fba4470674ce7726678c24d37e7fc8fbc4214037
      https://github.com/MapServer/MapServer/commit/fba4470674ce7726678c24d37e7fc8fbc4214037
  Author: Māris Nartišs <maris.gis at gmail.com>
  Date:   2024-07-28 (Sun, 28 Jul 2024)

  Changed paths:
    M src/mapdraw.c

  Log Message:
  -----------
  Fix code formatting


  Commit: 71016a39473ac973f2a95d5216f7b549701d5b12
      https://github.com/MapServer/MapServer/commit/71016a39473ac973f2a95d5216f7b549701d5b12
  Author: Māris Nartišs <maris.gis at gmail.com>
  Date:   2024-07-28 (Sun, 28 Jul 2024)

  Changed paths:
    M src/maplayer.c
    M src/mapserver.h

  Log Message:
  -----------
  Code formatting fix for two more files


Compare: https://github.com/MapServer/MapServer/compare/50aaec6ad449%5E...71016a39473a

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