[mapserver-commits] [MapServer/MapServer] 4c35fb: SLD: fix having a TextSymbolizer rule after a Poly...

Even Rouault noreply at github.com
Fri Oct 18 10:57:47 PDT 2024


  Branch: refs/heads/branch-8-2
  Home:   https://github.com/MapServer/MapServer
  Commit: 4c35fb2016e304cdb5f3a01661a07960f8c424e5
      https://github.com/MapServer/MapServer/commit/4c35fb2016e304cdb5f3a01661a07960f8c424e5
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2024-10-18 (Fri, 18 Oct 2024)

  Changed paths:
    M msautotest/sld/label.map
    M src/mapogcsld.cpp

  Log Message:
  -----------
  SLD: fix having a TextSymbolizer rule after a PolygonSymbolizer one

Currently if we have a SLD like:
```xml
<NamedLayer>
        <Name>...</Name>
        <UserStyle>
            <Title>default</Title>
            <FeatureTypeStyle>
                <Rule>
                    <PolygonSymbolizer>...</PolygonSymbolizer>
                </Rule>
                <Rule>
                    <TextSymbolizer>...</TextSymbolizer>
                </Rule>
            </FeatureTypeStyle>
        </UserStyle>
    </NamedLayer>
</StyledLayerDescriptor>
```

the PolygonSymbolizer rule is no applied, only the TextSymolizer one.

This is due to the logic in msSLDParseRule() that inappropriately
overrides the layerObj::type member.


  Commit: d006b58f3a7f5eefa14e3af99e24ae80b86ef885
      https://github.com/MapServer/MapServer/commit/d006b58f3a7f5eefa14e3af99e24ae80b86ef885
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2024-10-18 (Fri, 18 Oct 2024)

  Changed paths:
    M msautotest/sld/label.map
    M src/mapogcsld.cpp

  Log Message:
  -----------
  Merge pull request #7176 from MapServer/backport-7175-to-branch-8-2

[Backport branch-8-2] SLD: fix having a TextSymbolizer rule after a PolygonSymbolizer one


Compare: https://github.com/MapServer/MapServer/compare/3a25f31c2580...d006b58f3a7f

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


More information about the MapServer-commits mailing list