+ Use Simple Features terms instead of redefining geometries as
Wavellite entities