Draw new-city neighbors as the original does, with ocean neighbors for ocean and island maps, and always use the built-in city template