upgraded spatialitetools