Add geometry fields to items and situations