specify allowed geometry types per layer

Configuring the layers in advance prevents the query from having to
perform a check to ensure that the geometry type returned is consistent.