Order POI by way_area

[matthijsmelissen]

POI are now ordered by way area. Note that icons are never rendered on top
of each other, so this has only influence on priority decision of icon
rendering.

Large POI (such as universities, malls, etc.) are now rendered with higher
priority.

The old order was:

• Render points with higher priority than areas
• Icon priority from high to low: tourism, amenity, highway, waterway, man_made, historic, shop, leisure
• Text priority from high to low: place, amenity, natural, historic, leisure, landuse, tourism, waterway, man_made, shop, aeroway

It is clear that the old order was quite a mess.

• Resolves partially amenity=university label should be more prominently displayed #287
• Resolves partially Mall names aren't shown when they have shops #797
• Resolves Split POIs into prioritised groups #802
• Resolves Priority of captions #852
• Resolves Regression: shop=department_store has lost its icon #757

[matthijsmelissen]

Rebased.

[matthijsmelissen]

I think we can speed up the merging of pull requests if more people assist in reviewing them. Is anyone interesting in reviewing this pull request?

[gravitystorm]

I've picked up a few errors with this PR:

• natural is an SQL keyword and so needs escaping (in json it becomes 'natural_' || \"natural\"
• there's a double comma in the amenity-points query (way,,coalesce)
• the coalesce is missing an as feature in amenity-points
• a few columns are missing from amenity-points (definitely religion, most likely religion,waterway,lock,historic,leisure since that matches the other layer)
• there's still a combinatorial explosion from having the [shop != ''][zoom >= 17] selector in there.

[matthijsmelissen]

Thanks for the review!

[matthijsmelissen]

Strange, I thought it parsed when I submitted the PR. Obviously submitted too fast.

[matthijsmelissen]

I fixed the issues above, and I believe it now works as intended.

I also fixed #757 (about department store icons) in the process.

[matkoniecz]

Is it fixing also #353 ?

[matthijsmelissen]

Thanks, yes it does.