get geo-data only by city, no country
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo