prioritize natural tags over sport tags [patch]

[Klumbumbus]

The problem: If a node is tagged with e.g. natural=peak and sport=climbing, then the icon does not get hidden on low zoom (because of natural=peak) but shows the climbing icon instead of the peak icon since the sport icons are below the natural tags in the mapcss file. The combination of natural=peak and sport=climbing is very common in the "Sächsische Schweiz" e.g. ​here. There are a lot of high and slim rocks, which are used also for climbing. So the tagging is correct in my eyes.
Also in general I think the natural icons should have higher priority than sport icons.

I added a patch file to fix this. The patch file looks complicated. What I did was just moving the whole sport block above the natural block.

[bastiK]

In 7581/josm:

applied #10546 - mapstyle: prioritize natural tags over sport tags (patch by Klumbumbus)

[Klumbumbus]

In 7925/josm:

Validator: do not warn about natural=peak + sport=climbing, see #10546 for examples.