shp_scanner geometry filtering

Allowed filtering of geometry with an actual dataset as opposed to
geometries.
Merge branch 'master' into i238-icclim
mark - fixed tests with calculation key