Reorganize parsing of city's html pages, update spider and test.