add comment to shapemap to clarify generics.
Use Iterators.concat to build iterator for calendardate.