Fixed front page on mobile and improved city lookup

app/models/city.rb

@@ -18,19 +18,30 @@ class City < ActiveRecord::Base
   def get_translation(locale)
     location = Geocoder.search(address, language: locale.to_s).first
 
+    # if the service lets us down, return nil
+    return nil unless location.present?
+
+    searched_component = false
     location.data['address_components'].each do | component |
-      # city is usually labelled a 'locality' but sometimes this is missing and only 'colloquial_area' is present
-      if component['types'].first == 'locality' || component['types'].first == 'colloquial_area'
+      # city is usually labeled a 'locality' but sometimes this is missing and only 'colloquial_area' is present
+      if component['types'].first == 'locality'
         return component['short_name']
       end
+
+      if component['types'] == location.data['types']
+        searched_component = component['short_name']
+      end
     end
 
-    return nil
+    # return the type we searched for but it's still possible that it will be false
+    searched_component
   end
 
+  # this method will get called automatically if a translation is asked for but not found
   def translate_city(locale)
     translation = get_translation(locale)
     
+    # if we found it, set it
     if translation.present?
       set_column_for_locale(:city, locale, translation)
       save!
@@ -48,16 +59,20 @@ class City < ActiveRecord::Base
     # look up the city in the geocoder
     location = Geocoder.search(str, language: 'en').first
 
+    # return nil to indicate that the service is down
+    return nil unless location.present?
     # see if the city is already present in our database
     city = City.find_by_place_id(location.data['place_id'])
 
     # return the city if we found it in the db already
-    return city if city.present?
+    if city.present?
+      CityCache.create(city_id: city.id, search: str)
+      return city
+    end
 
     # otherwise build a new city
     component_alises = {
       'locality' => :city,
-      'colloquial_area' => :city,
       'administrative_area_level_1' => :territory,
       'country' => :country
     }
@@ -67,15 +82,61 @@ class City < ActiveRecord::Base
       longitude: location.data['geometry']['location']['lng'],
       place_id: location.data['place_id']
     }
+
+    # these things are definitely not cities, make sure we don't think they're one
+    not_a_city = [
+        'administrative_area_level_1',
+        'country',
+        'street_address',
+        'street_number',
+        'postal_code',
+        'postal_code_prefix',
+        'route',
+        'intersection',
+        'premise',
+        'subpremise',
+        'natural_feature',
+        'airport',
+        'park',
+        'point_of_interest',
+        'bus_station',
+        'train_station',
+        'transit_station',
+        'room',
+        'post_box',
+        'parking',
+        'establishment',
+        'floor'
+      ]
+
+    searched_component = nil
     location.data['address_components'].each do | component |
       property = component_alises[component['types'].first]
       city_data[property] = component['short_name'] if property.present?
+
+      # ideally we will find the component that is labeled a locality but
+      # if that fails we will select what was searched for, hopefully they searched for a city
+      # and not an address or country
+      # some places are not labeled 'locality', search for 'Halifax NS' for example and you will
+      # get 'administrative_area_level_2' since Halifax is a municipality
+      if component['types'] == location.data['types'] && not_a_city.include?(component['types'].first)
+        searched_component = component['short_name']
+      end
     end
 
+    # fall back to the searched component 
+    city_data[:city] ||= searched_component
+
+    # we need to have the city and country at least
+    return false unless city_data[:city].present? && city_data[:country].present?
+
     # save the new city
     city = City.new(city_data)
     city.save!
 
+    # save this to our cache
+    CityCache.create(city_id: city.id, search: str)
+
     # and return it
     return city
   end