use the geometry property defined in the style if available even for GFI requests
Merge branch 'ticket-475' into pdok