Major map-data logic change.