adwords_location 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07d9ade4c72aef5c7e48a4ea85fd460fe1be206
-  data.tar.gz: d6983e9933b3537669d4c5c96b0e5d50e23512c3
+  metadata.gz: 0eb8b04ad347d9410c700dcf2699547bf973650b
+  data.tar.gz: ac36930ca07f87019ac485b2d036aa0d3a93dd52
 SHA512:
-  metadata.gz: f94f0bc590548e8640e8b87fa59864046acea6e8da7e8460965a16223467e0298c3662fa8a883ccc841052866f849916d9712689ee49e5c24bcf0ea68515727e
-  data.tar.gz: 43dda2ec4700a84903e5302f94e5fb613c400bd8c14eecd32728da88cf5a1234ee10b83e526aa84f677d8daffb0d8be2acdf555aefaa976535b4023b0d03cc8a
+  metadata.gz: f7be6a9dfec9b0c085ee085aae2176c59478c58cfe8f7533fc496a7168c1b875311f5fad0a05433e633823bb69847db483a8af7c64733ab440f52ca4dab48bd1
+  data.tar.gz: 608b3c558541cbc8f26e0d0cdba2dd205501ffd77321caa07049ee3652883eac87f685103d033703f84b0926250a3d50e5b73ee5cf04320bb8ee41cac748e1ac

data/lib/adwords_location.rb

@@ -1 +1,4 @@
-require_relative 'adwords_location/location'
+require 'adwords_location/location'
+require 'adwords_location/postal_code'
+require 'adwords_location/city_2_dma'
+require 'adwords_location/db'

data/lib/adwords_location/city_2_dma.rb

@@ -0,0 +1,53 @@
+require 'csv'
+
+module AdWords
+
+  City2DMA = Struct.new(:city, :criteria_id, :state, :dma_region, :dma_region_code) do
+
+    def ==(other)
+      self.criteria_id == other.criteria_id && self.dma_region_code == other.dma_region_code
+    end
+
+    def description
+      "#{dma_region},#{state}"
+    end
+
+    def self.all 
+      data.drop(1).map do |row|
+        AdWords::City2DMA.new(row[0], row[1].to_i, row[2], row[3], row[4].to_i)
+      end
+    end
+
+    private 
+
+    def self.data
+      adwords_dma_file = 'adwords_api_cities_dma_regions_2014-07-23.csv'
+      @data ||= CSV.read(File.join(File.dirname(__FILE__), '..', 'data', adwords_dma_file)) 
+    end
+
+  end
+
+  class City2DMADb 
+
+    def initialize
+      @city_to_dma_records = {}
+      cities = City2DMA.all
+      cities.each do |r|
+        @city_to_dma_records[r.criteria_id] ||= []
+        @city_to_dma_records[r.criteria_id] << r unless @city_to_dma_records[r.criteria_id].include? r
+      end
+      @city_to_dma_records.freeze
+    end
+
+    def size
+      @city_to_dma_records.size
+    end
+
+    def find_dmas_city_id(criteria_id)
+      @city_to_dma_records[criteria_id.to_i] || []
+    end
+
+  end
+
+end
+

data/lib/adwords_location/db.rb

@@ -0,0 +1,48 @@
+ require_relative 'location'
+ require_relative 'city_2_dma'
+ require_relative 'postal_code'
+
+ module AdWords
+
+  class Db 
+
+    def initialize
+      @location_db = LocationDb.new
+      @postal_code_db = PostalCodeDb.new
+    end
+
+    def zipcode_state_country
+      data = {}
+      @location_db.all_postal_code_records.each do |id, record|
+        path = @location_db.path id
+        data[record.postal_code] = path
+      end
+      data
+    end
+
+    def zipcode_city_dma
+      city_data = {}
+      dma_data = {}
+      other = {}
+      @location_db.all_postal_code_records.each do |id, record|
+        @postal_code_db.cities_by_postal_code(record.postal_code).each do |city_cname|
+          city_record = @location_db.find_by_canonical_name city_cname
+          if city_record.nil?
+            other[record.postal_code] = []
+          else
+            dma_records = @location_db.dmas_by_city(city_record.criteria_id);
+            if dma_records.size > 0
+              dma_records.each do |d|
+                dma_data[record.postal_code] = [city_record.criteria_id, d.criteria_id]
+              end
+            else
+              city_data[record.postal_code] = [city_record.criteria_id]
+            end
+          end
+        end
+      end
+      [city_data, dma_data, other]
+    end
+
+  end
+end

data/lib/adwords_location/location.rb

@@ -1,75 +1,58 @@
 require 'csv'
+require_relative 'city_2_dma'
 
 module AdWords
 
   Location = Struct.new(:criteria_id, :name, :canonical_name, :parent_id, :country_code, :target_type, :status) do 
 
+    POSTAL_CODE = 'Postal Code'
+    US = 'US'
+
     def description
       "#{canonical_name} (#{target_type})"
     end
 
-    def self.all
-      data.drop(1).map do |row|
-        AdWords::Location.new(row[0].to_i, row[1], row[2], row[3].to_i, row[4], row[5], row[6])
-      end
+    def postal_code
+      raise "Call postal_code the the record targeting type is: #{target_type}" unless target_type == POSTAL_CODE
+      name.rjust(5,'0')
     end
 
-    private 
-
-    def self.data
-      adwords_location_file = 'adwords_api_location_criteria_2014-05-21.csv'
-      @data ||= CSV.read(File.join(File.dirname(__FILE__), '..', 'data', adwords_location_file)) 
+    def us_postal_code?
+      target_type == POSTAL_CODE and country_code == US
     end
-    
-  end
-
-  City2DMA = Struct.new(:city, :criteria_id, :state, :dma_region, :dma_region_code) do
 
-    def ==(other)
-      self.criteria_id == other.criteria_id && self.dma_region_code == other.dma_region_code
-    end
-
-    def description
-      "#{dma_region}, #{state}"
-    end
-
-    def self.all 
+    def self.all
       data.drop(1).map do |row|
-        AdWords::City2DMA.new(row[0], row[1].to_i, row[2], row[3], row[4].to_i)
+        AdWords::Location.new(row[0].to_i, row[1], row[2], row[3].to_i, row[4], row[5], row[6])
       end
     end
 
     private 
 
     def self.data
-      adwords_dma_file = 'adwords_api_cities_dma_regions_2014-05-21.csv'
-      @data ||= CSV.read(File.join(File.dirname(__FILE__), '..', 'data', adwords_dma_file)) 
+      adwords_location_file = 'adwords_api_location_criteria_2014-07-23.csv'
+      @data ||= CSV.read(File.join(File.dirname(__FILE__), '..', 'data', adwords_location_file)) 
     end
-
   end
 
   class LocationDb 
 
-    attr_reader :location_records, :location_records_by_name, :city_to_dma_records
-
     def initialize
       @location_records = {}
       @location_records_by_name = {}
+      @location_records_by_canonical_name = {}
+
       records = Location.all 
       records.each do |r|  
         @location_records[r.criteria_id] = r
         @location_records_by_name[r.name] = r
+        @location_records_by_canonical_name[r.canonical_name] = r
       end
       @location_records.freeze
       @location_records_by_name.freeze
+      @location_records_by_canonical_name.freeze
 
-      @city_to_dma_records = {}
-      cities = City2DMA.all
-      cities.each do |r|
-        @city_to_dma_records[r.criteria_id] ||= []
-        @city_to_dma_records[r.criteria_id] << r unless @city_to_dma_records[r.criteria_id].include? r
-      end
-      @city_to_dma_records.freeze
+      @city_2_dma = City2DMADb.new
     end
 
     def criteria_ids
@@ -84,6 +67,20 @@ module AdWords
       @location_records_by_name[name]
     end
 
+    def find_by_canonical_name(cname)
+      @location_records_by_canonical_name[cname]
+    end
+
+    def all_postal_code_records
+      @location_records.select do |id, record|
+        record.us_postal_code?
+      end
+    end
+
+    def all_postal_codes
+      @postal_code ||= get_call_postal_codes
+    end
+
     def path(criteria_id)
       path = []
       location = find criteria_id
@@ -93,28 +90,24 @@ module AdWords
       end 
       path
     end
-    
-    def city_dmas(criteria_id)
-      @city_to_dma_records[criteria_id.to_i]
-    end
 
-    def lookup_table
-      ltable = {}
-      criteria_ids.map do |id|
-        path = path(id)
-        city_dmas = (city_dmas(id) || [])
-        dma_criteria_ids = city_dmas.map { |dma| find_by_name(dma.dma_region)[:criteria_id]}        
-        ltable[id] = path + dma_criteria_ids
+    def dmas_by_city(criteria_id)
+      dmas = @city_2_dma.find_dmas_city_id criteria_id
+      dmas.map do |dma|
+        find_by_name dma.dma_region
       end
-      ltable
     end
 
-    def output_lookup_table
-      lookup_table.each do |id, values|
-        puts values.join(',')
+    private 
+
+    def get_call_postal_codes
+      codes = []
+      @location_records.each do |id, r|
+        codes << r.postal_code if r.us_postal_code?
       end
+      codes
     end
-
+    
   end
 
 end

data/lib/adwords_location/postal_code.rb

@@ -0,0 +1,71 @@
+require 'csv'
+
+module AdWords
+
+  PostalCode = Struct.new(:country_code, :postal_code, :city, :state, :state_code) do
+
+    def canonical_name 
+      "#{postal_code},#{state_canonical_name}"
+    end
+
+    def city_canonical_name
+      "#{city},#{state_canonical_name}"
+    end
+
+    def state_canonical_name
+      "#{state},United States"
+    end
+
+    def self.all
+      data.drop(1).map do |row|
+        AdWords::PostalCode.new(row[0], row[1].rjust(5, '0'), row[2], row[3], row[4])
+      end
+    end
+
+    def self.data
+      postal_code_file = 'postal_code.csv'
+      @data ||= CSV.read(File.join(File.dirname(__FILE__), '..', 'data', 'postal_code', 'US', postal_code_file)) 
+    end
+
+  end
+
+  class PostalCodeDb 
+
+    def initialize
+      @postal_code_records = {}
+      PostalCode.all.each do |r|
+        @postal_code_records[r.postal_code] ||= []
+        @postal_code_records[r.postal_code] << r
+      end
+      @postal_code_records.freeze
+    end
+
+    def size
+      @postal_code_records.size
+    end
+
+    def find_records_by_postal_code(postal_code)
+      @postal_code_records[postal_code]
+    end
+
+    def include?(postal_code)
+      @postal_code_records.include? postal_code
+    end
+
+    def cities_by_postal_code(postal_code)
+      if include? postal_code then
+        @postal_code_records[postal_code].map do |record|
+          record.city_canonical_name
+        end
+      else 
+        []
+      end
+    end
+
+    def all_postal_codes
+      @postal_code_records.keys
+    end
+
+  end
+
+end

data/lib/data/{adwords_api_cities_dma_regions_2014-05-21.csv → adwords_api_cities_dma_regions_2014-07-23.csv}

@@ -12,7 +12,7 @@ Delta Junction,1012882,Alaska,"Fairbanks, AK",745
 Dillingham,1012883,Alaska,"Anchorage, AK",743
 Eagle River,1012884,Alaska,"Anchorage, AK",743
 Eielson AFB,1012885,Alaska,"Fairbanks, AK",745
-Elmendorf AFB,1012886,Alaska,"Anchorage, AK",743
+Elmendorf Air Force Base,1012886,Alaska,"Anchorage, AK",743
 Fairbanks,1012887,Alaska,"Fairbanks, AK",745
 Galena,1012888,Alaska,"Fairbanks, AK",745
 Glennallen,1012890,Alaska,"Anchorage, AK",743
@@ -1196,6 +1196,7 @@ Mount Baldy,1014039,California,"Los Angeles, CA",803
 Mount Hamilton,1014040,California,"San Francisco-Oakland-San Jose, CA",807
 Mount Laguna,1014041,California,"San Diego, CA",825
 Mount Shasta,1014042,California,"Medford-Klamath Falls, OR",813
+Mount Wilson,1014043,California,"Los Angeles, CA",803
 Mountain View,1014044,California,"San Francisco-Oakland-San Jose, CA",807
 Murrieta,1014045,California,"Los Angeles, CA",803
 Napa,1014046,California,"San Francisco-Oakland-San Jose, CA",807
@@ -1330,6 +1331,7 @@ Redwood Valley,1014180,California,"San Francisco-Oakland-San Jose, CA",807
 Reedley,1014181,California,"Fresno-Visalia, CA",866
 Represa,1014182,California,"Sacramento-Stockton-Modesto, CA",862
 Rescue,1014183,California,"Sacramento-Stockton-Modesto, CA",862
+Reseda,1014184,California,"Los Angeles, CA",803
 Rialto,1014185,California,"Los Angeles, CA",803
 Richgrove,1014186,California,"Fresno-Visalia, CA",866
 Richmond,1014187,California,"San Francisco-Oakland-San Jose, CA",807
@@ -1348,9 +1350,11 @@ Rocklin,1014199,California,"Sacramento-Stockton-Modesto, CA",862
 Rodeo,1014200,California,"San Francisco-Oakland-San Jose, CA",807
 Rohnert Park,1014201,California,"San Francisco-Oakland-San Jose, CA",807
 Rosamond,1014202,California,"Los Angeles, CA",803
+Rosemead,1014203,California,"Los Angeles, CA",803
 Roseville,1014204,California,"Sacramento-Stockton-Modesto, CA",862
 Ross,1014205,California,"San Francisco-Oakland-San Jose, CA",807
 Rough and Ready,1014206,California,"Sacramento-Stockton-Modesto, CA",862
+Rowland Heights,1014207,California,"Los Angeles, CA",803
 Sacramento,1014208,California,"Sacramento-Stockton-Modesto, CA",862
 Salida,1014209,California,"Sacramento-Stockton-Modesto, CA",862
 Salinas,1014210,California,"Monterey-Salinas, CA",828
@@ -1360,34 +1364,45 @@ San Ardo,1014213,California,"Monterey-Salinas, CA",828
 San Bernardino,1014214,California,"Los Angeles, CA",803
 San Bruno,1014215,California,"San Francisco-Oakland-San Jose, CA",807
 San Carlos,1014216,California,"San Francisco-Oakland-San Jose, CA",807
+San Clemente,1014217,California,"Los Angeles, CA",803
 San Diego,1014218,California,"San Diego, CA",825
+San Dimas,1014219,California,"Los Angeles, CA",803
+San Fernando,1014220,California,"Los Angeles, CA",803
 San Francisco,1014221,California,"San Francisco-Oakland-San Jose, CA",807
+San Gabriel,1014222,California,"Los Angeles, CA",803
 San Gregorio,1014223,California,"San Francisco-Oakland-San Jose, CA",807
 San Jacinto,1014224,California,"Los Angeles, CA",803
 San Joaquin,1014225,California,"Fresno-Visalia, CA",866
 San Jose,1014226,California,"San Francisco-Oakland-San Jose, CA",807
 San Juan Bautista,1014227,California,"Monterey-Salinas, CA",828
+San Juan Capistrano,1014228,California,"Los Angeles, CA",803
 San Leandro,1014229,California,"San Francisco-Oakland-San Jose, CA",807
 San Lorenzo,1014230,California,"San Francisco-Oakland-San Jose, CA",807
 San Lucas,1014231,California,"Monterey-Salinas, CA",828
 San Luis Obispo,1014232,California,"Santa Barbara-San Luis Obispo, CA",855
 San Luis Rey,1014233,California,"San Diego, CA",825
 San Marcos,1014234,California,"San Diego, CA",825
+San Marino,1014235,California,"Los Angeles, CA",803
 San Martin,1014236,California,"San Francisco-Oakland-San Jose, CA",807
 San Mateo,1014237,California,"San Francisco-Oakland-San Jose, CA",807
 San Miguel,1014238,California,"Santa Barbara-San Luis Obispo, CA",855
 San Pablo,1014239,California,"San Francisco-Oakland-San Jose, CA",807
+San Pedro,1014240,California,"Los Angeles, CA",803
 San Quentin,1014241,California,"San Francisco-Oakland-San Jose, CA",807
 San Rafael,1014242,California,"San Francisco-Oakland-San Jose, CA",807
 San Ramon,1014243,California,"San Francisco-Oakland-San Jose, CA",807
 San Simeon,1014244,California,"Santa Barbara-San Luis Obispo, CA",855
 San Ysidro,1014245,California,"San Diego, CA",825
 Sanger,1014246,California,"Fresno-Visalia, CA",866
+Santa Ana,1014247,California,"Los Angeles, CA",803
 Santa Barbara,1014248,California,"Santa Barbara-San Luis Obispo, CA",855
 Santa Clara,1014249,California,"San Francisco-Oakland-San Jose, CA",807
+Santa Clarita,1014250,California,"Los Angeles, CA",803
 Santa Cruz,1014251,California,"Monterey-Salinas, CA",828
+Santa Fe Springs,1014252,California,"Los Angeles, CA",803
 Santa Margarita,1014253,California,"Santa Barbara-San Luis Obispo, CA",855
 Santa Maria,1014254,California,"Santa Barbara-San Luis Obispo, CA",855
+Santa Monica,1014255,California,"Los Angeles, CA",803
 Santa Paula,1014256,California,"Los Angeles, CA",803
 Santa Rosa,1014257,California,"San Francisco-Oakland-San Jose, CA",807
 Santa Ynez,1014258,California,"Santa Barbara-San Luis Obispo, CA",855
@@ -1395,6 +1410,7 @@ Santee,1014259,California,"San Diego, CA",825
 Saratoga,1014260,California,"San Francisco-Oakland-San Jose, CA",807
 Sausalito,1014261,California,"San Francisco-Oakland-San Jose, CA",807
 Scotts Valley,1014262,California,"Monterey-Salinas, CA",828
+Seal Beach,1014263,California,"Los Angeles, CA",803
 Seaside,1014264,California,"Monterey-Salinas, CA",828
 Sebastopol,1014265,California,"San Francisco-Oakland-San Jose, CA",807
 Selma,1014266,California,"Fresno-Visalia, CA",866
@@ -1404,9 +1420,12 @@ Shandon,1014269,California,"Santa Barbara-San Luis Obispo, CA",855
 Shasta,1014270,California,"Chico-Redding, CA",868
 Shasta Lake,1014271,California,"Chico-Redding, CA",868
 Sheep Ranch,1014272,California,"Sacramento-Stockton-Modesto, CA",862
+Sherman Oaks,1014273,California,"Los Angeles, CA",803
 Shingle Springs,1014274,California,"Sacramento-Stockton-Modesto, CA",862
 Shoshone,1014275,California,"Los Angeles, CA",803
+Sierra Madre,1014276,California,"Los Angeles, CA",803
 Sierraville,1014277,California,"Sacramento-Stockton-Modesto, CA",862
+Silverado,1014278,California,"Los Angeles, CA",803
 Simi Valley,1014279,California,"Los Angeles, CA",803
 Sloughhouse,1014280,California,"Sacramento-Stockton-Modesto, CA",862
 Smartsville,1014281,California,"Sacramento-Stockton-Modesto, CA",862
@@ -1419,7 +1438,10 @@ Somis,1014287,California,"Los Angeles, CA",803
 Sonoma,1014288,California,"San Francisco-Oakland-San Jose, CA",807
 Sonora,1014289,California,"Sacramento-Stockton-Modesto, CA",862
 Soquel,1014290,California,"Monterey-Salinas, CA",828
+South El Monte,1014291,California,"Los Angeles, CA",803
+South Gate,1014292,California,"Los Angeles, CA",803
 South Lake Tahoe,1014293,California,"Reno, NV",811
+South Pasadena,1014294,California,"Los Angeles, CA",803
 South San Francisco,1014295,California,"San Francisco-Oakland-San Jose, CA",807
 Spreckels,1014296,California,"Monterey-Salinas, CA",828
 Spring Valley,1014297,California,"San Diego, CA",825
@@ -1427,6 +1449,8 @@ Springville,1014298,California,"Fresno-Visalia, CA",866
 Squaw Valley,1014299,California,"Fresno-Visalia, CA",866
 Saint Helena,1014300,California,"San Francisco-Oakland-San Jose, CA",807
 Stanford,1014301,California,"San Francisco-Oakland-San Jose, CA",807
+Stanton,1014302,California,"Los Angeles, CA",803
+Stevenson Ranch,1014303,California,"Los Angeles, CA",803
 Stevinson,1014304,California,"Fresno-Visalia, CA",866
 Stinson Beach,1014305,California,"San Francisco-Oakland-San Jose, CA",807
 Stockton,1014306,California,"Sacramento-Stockton-Modesto, CA",862
@@ -1435,8 +1459,10 @@ Strathmore,1014308,California,"Fresno-Visalia, CA",866
 Suisun City,1014310,California,"Sacramento-Stockton-Modesto, CA",862
 Sultana,1014311,California,"Fresno-Visalia, CA",866
 Sun City,1014312,California,"Los Angeles, CA",803
+Sun Valley,1014313,California,"Los Angeles, CA",803
 Sunnyvale,1014315,California,"San Francisco-Oakland-San Jose, CA",807
 Sunol,1014316,California,"San Francisco-Oakland-San Jose, CA",807
+Sunset Beach,1014317,California,"Los Angeles, CA",803
 Susanville,1014318,California,"Reno, NV",811
 Sutter,1014319,California,"Sacramento-Stockton-Modesto, CA",862
 Sutter Creek,1014320,California,"Sacramento-Stockton-Modesto, CA",862
@@ -1445,6 +1471,7 @@ Tahoe City,1014323,California,"Sacramento-Stockton-Modesto, CA",862
 Tahoe Vista,1014324,California,"Sacramento-Stockton-Modesto, CA",862
 Tehachapi,1014326,California,"Bakersfield, CA",800
 Temecula,1014327,California,"Los Angeles, CA",803
+Temple City,1014328,California,"Los Angeles, CA",803
 Templeton,1014329,California,"Santa Barbara-San Luis Obispo, CA",855
 Thermal,1014330,California,"Palm Springs, CA",804
 Thornton,1014331,California,"Sacramento-Stockton-Modesto, CA",862
@@ -1454,33 +1481,44 @@ Three Rivers,1014334,California,"Fresno-Visalia, CA",866
 Tipton,1014335,California,"Fresno-Visalia, CA",866
 Tollhouse,1014336,California,"Fresno-Visalia, CA",866
 Tomales,1014337,California,"San Francisco-Oakland-San Jose, CA",807
+Topanga,1014338,California,"Los Angeles, CA",803
+Torrance,1014339,California,"Los Angeles, CA",803
+Trabuco Canyon,1014340,California,"Los Angeles, CA",803
 Tracy,1014341,California,"Sacramento-Stockton-Modesto, CA",862
 Tranquillity,1014342,California,"Fresno-Visalia, CA",866
 Traver,1014343,California,"Fresno-Visalia, CA",866
 Travis Air Force Base,1014344,California,"Sacramento-Stockton-Modesto, CA",862
 Trona,1014345,California,"Los Angeles, CA",803
 Truckee,1014346,California,"Sacramento-Stockton-Modesto, CA",862
+Tujunga,1014347,California,"Los Angeles, CA",803
 Tulare,1014348,California,"Fresno-Visalia, CA",866
 Tulelake,1014349,California,"Medford-Klamath Falls, OR",813
 Tupman,1014350,California,"Bakersfield, CA",800
 Turlock,1014351,California,"Sacramento-Stockton-Modesto, CA",862
+Tustin,1014352,California,"Los Angeles, CA",803
 Twain Harte,1014353,California,"Sacramento-Stockton-Modesto, CA",862
 Twentynine Palms,1014354,California,"Los Angeles, CA",803
 Twin Peaks,1014355,California,"Los Angeles, CA",803
 Ukiah,1014356,California,"San Francisco-Oakland-San Jose, CA",807
 Union City,1014357,California,"San Francisco-Oakland-San Jose, CA",807
+Universal City,1014358,California,"Los Angeles, CA",803
 Upland,1014359,California,"Los Angeles, CA",803
 Upper Lake,1014360,California,"San Francisco-Oakland-San Jose, CA",807
 Vacaville,1014361,California,"Sacramento-Stockton-Modesto, CA",862
+Valencia,1014362,California,"Los Angeles, CA",803
 Vallejo,1014363,California,"San Francisco-Oakland-San Jose, CA",807
 Valley Center,1014364,California,"San Diego, CA",825
 Valley Springs,1014365,California,"Sacramento-Stockton-Modesto, CA",862
+Van Nuys,1014367,California,"Los Angeles, CA",803
+Venice,1014368,California,"Los Angeles, CA",803
 Ventura,1014369,California,"Los Angeles, CA",803
 Victorville,1014370,California,"Los Angeles, CA",803
 Vidal,1014371,California,"Los Angeles, CA",803
+Villa Park,1014372,California,"Los Angeles, CA",803
 Visalia,1014373,California,"Fresno-Visalia, CA",866
 Vista,1014374,California,"San Diego, CA",825
 Wallace,1014375,California,"Sacramento-Stockton-Modesto, CA",862
+Walnut,1014376,California,"Los Angeles, CA",803
 Walnut Creek,1014377,California,"San Francisco-Oakland-San Jose, CA",807
 Warner Springs,1014378,California,"San Diego, CA",825
 Wasco,1014379,California,"Bakersfield, CA",800
@@ -1492,18 +1530,23 @@ Weaverville,1014384,California,"Chico-Redding, CA",868
 Weed,1014385,California,"Medford-Klamath Falls, OR",813
 Weldon,1014386,California,"Bakersfield, CA",800
 Weott,1014387,California,"Eureka, CA",802
+West Covina,1014388,California,"Los Angeles, CA",803
+West Hollywood,1014390,California,"Los Angeles, CA",803
 West Sacramento,1014391,California,"Sacramento-Stockton-Modesto, CA",862
 Westlake Village,1014392,California,"Los Angeles, CA",803
 Westley,1014393,California,"Sacramento-Stockton-Modesto, CA",862
+Westminster,1014394,California,"Los Angeles, CA",803
 Westmorland,1014395,California,"Yuma, AZ-El Centro, CA",771
 Westwood,1014396,California,"Reno, NV",811
 Wheatland,1014397,California,"Sacramento-Stockton-Modesto, CA",862
 Whitethorn,1014398,California,"Eureka, CA",802
+Whittier,1014399,California,"Los Angeles, CA",803
 Wildomar,1014400,California,"Los Angeles, CA",803
 Williams,1014401,California,"Sacramento-Stockton-Modesto, CA",862
 Willits,1014402,California,"San Francisco-Oakland-San Jose, CA",807
 Willow Creek,1014403,California,"Eureka, CA",802
 Willows,1014404,California,"Chico-Redding, CA",868
+Wilmington,1014405,California,"Los Angeles, CA",803
 Wilton,1014406,California,"Sacramento-Stockton-Modesto, CA",862
 Winchester,1014407,California,"Los Angeles, CA",803
 Windsor,1014408,California,"San Francisco-Oakland-San Jose, CA",807
@@ -1513,9 +1556,11 @@ Woodacre,1014412,California,"San Francisco-Oakland-San Jose, CA",807
 Woodbridge,1014413,California,"Sacramento-Stockton-Modesto, CA",862
 Woodlake,1014414,California,"Fresno-Visalia, CA",866
 Woodland,1014415,California,"Sacramento-Stockton-Modesto, CA",862
+Woodland Hills,1014416,California,"Los Angeles, CA",803
 Wrightwood,1014417,California,"Los Angeles, CA",803
 Yermo,1014418,California,"Los Angeles, CA",803
 Yolo,1014419,California,"Sacramento-Stockton-Modesto, CA",862
+Yorba Linda,1014420,California,"Los Angeles, CA",803
 Yosemite Valley,1014421,California,"Fresno-Visalia, CA",866
 Yountville,1014422,California,"San Francisco-Oakland-San Jose, CA",807
 Yreka,1014423,California,"Medford-Klamath Falls, OR",813
@@ -1525,6 +1570,7 @@ Yucca Valley,1014426,California,"Los Angeles, CA",803
 New Pine Creek,1024525,California,"Medford-Klamath Falls, OR",813
 Alta Sierra,9051507,California,"Sacramento-Stockton-Modesto, CA",862
 Arden-Arcade,9051519,California,"Sacramento-Stockton-Modesto, CA",862
+Avocado Heights,9051533,California,"Los Angeles, CA",803
 Bay Point,9051556,California,"San Francisco-Oakland-San Jose, CA",807
 Baywood-Los Osos,9051561,California,"Santa Barbara-San Luis Obispo, CA",855
 Blackhawk,9051601,California,"San Francisco-Oakland-San Jose, CA",807
@@ -1532,12 +1578,18 @@ Bonita,9051618,California,"San Diego, CA",825
 Cameron Park,9051682,California,"Sacramento-Stockton-Modesto, CA",862
 Camp Pendleton South,9051684,California,"San Diego, CA",825
 Canyon Lake,9051689,California,"Los Angeles, CA",803
+Commerce,9051759,California,"Los Angeles, CA",803
 Cotati,9051775,California,"San Francisco-Oakland-San Jose, CA",807
+Coto de Caza,9051776,California,"Los Angeles, CA",803
 Del Monte Forest,9051815,California,"Monterey-Salinas, CA",828
 Discovery Bay,9051835,California,"San Francisco-Oakland-San Jose, CA",807
+East La Mirada,9051870,California,"Los Angeles, CA",803
+East Los Angeles,9051873,California,"Los Angeles, CA",803
 East Palo Alto,9051877,California,"San Francisco-Oakland-San Jose, CA",807
 Eastvale,9051887,California,"Los Angeles, CA",803
 Edwards AFB,9051895,California,"Los Angeles, CA",803
+El Camino Village,9051898,California,"Los Angeles, CA",803
+Florence-Graham,9051954,California,"Los Angeles, CA",803
 Florin,9051956,California,"Sacramento-Stockton-Modesto, CA",862
 Foothill Farms,9051959,California,"Sacramento-Stockton-Modesto, CA",862
 Foster City,9051977,California,"San Francisco-Oakland-San Jose, CA",807
@@ -1546,18 +1598,22 @@ Gold River,9052035,California,"Sacramento-Stockton-Modesto, CA",862
 Granite Bay,9052048,California,"Sacramento-Stockton-Modesto, CA",862
 Graton,9052052,California,"San Francisco-Oakland-San Jose, CA",807
 Happy Valley,9052104,California,"Chico-Redding, CA",868
+Hawaiian Gardens,9052114,California,"Los Angeles, CA",803
 Hidden Meadows,9052127,California,"San Diego, CA",825
 Hillsborough,9052136,California,"San Francisco-Oakland-San Jose, CA",807
 Idyllwild-Pine Cove,9052177,California,"Los Angeles, CA",803
+Irwindale,9052191,California,"Los Angeles, CA",803
 Isla Vista,9052192,California,"Santa Barbara-San Luis Obispo, CA",855
 Janesville,9052196,California,"Reno, NV",811
 La Riviera,9052251,California,"Sacramento-Stockton-Modesto, CA",862
+Laguna Woods,9052259,California,"Los Angeles, CA",803
 Lake of the Pines,9052270,California,"Sacramento-Stockton-Modesto, CA",862
 Linda,9052326,California,"Sacramento-Stockton-Modesto, CA",862
 Live Oak,9052336,California,"Monterey-Salinas, CA",828
 Los Altos Hills,9052350,California,"San Francisco-Oakland-San Jose, CA",807
 Lucas Valley-Marinwood,9052358,California,"San Francisco-Oakland-San Jose, CA",807
 Montecito,9052467,California,"Santa Barbara-San Luis Obispo, CA",855
+North Tustin,9052561,California,"Los Angeles, CA",803
 Oildale,9052592,California,"Bakersfield, CA",800
 Olivehurst,9052597,California,"Sacramento-Stockton-Modesto, CA",862
 Orange Cove,9052601,California,"Fresno-Visalia, CA",866
@@ -1569,11 +1625,17 @@ Rancho Calaveras,9052727,California,"Sacramento-Stockton-Modesto, CA",862
 Rancho Murieta,9052728,California,"Sacramento-Stockton-Modesto, CA",862
 Rancho San Diego,9052729,California,"San Diego, CA",825
 Rosemont,9052771,California,"Sacramento-Stockton-Modesto, CA",862
+Rossmoor,9052775,California,"Los Angeles, CA",803
+Signal Hill,9052850,California,"Los Angeles, CA",803
+South Whittier,9052888,California,"Los Angeles, CA",803
 Tamalpais-Homestead Valley,9052956,California,"San Francisco-Oakland-San Jose, CA",807
 Valle Vista,9053039,California,"Los Angeles, CA",803
 Vandenberg Air Force Base,9053046,California,"Santa Barbara-San Luis Obispo, CA",855
 Vineyard,9053056,California,"Sacramento-Stockton-Modesto, CA",862
+West Carson,9053107,California,"Los Angeles, CA",803
 West Point,9053123,California,"Sacramento-Stockton-Modesto, CA",862
+West Rancho Dominguez,9053124,California,"Los Angeles, CA",803
+Willowbrook,9053170,California,"Los Angeles, CA",803
 Woodcrest,9053199,California,"Los Angeles, CA",803
 Woodside,9053208,California,"San Francisco-Oakland-San Jose, CA",807
 Yosemite Lakes,9053226,California,"Fresno-Visalia, CA",866
@@ -1785,7 +1847,7 @@ Strasburg,1014636,Colorado,"Denver, CO",751
 Telluride,1014638,Colorado,"Denver, CO",751
 Towaoc,1014639,Colorado,"Albuquerque-Santa Fe, NM",790
 Trinidad,1014640,Colorado,"Colorado Springs-Pueblo, CO",752
-Air Force Academy,1014641,Colorado,"Colorado Springs-Pueblo, CO",752
+U.S. Air Force Academy,1014641,Colorado,"Colorado Springs-Pueblo, CO",752
 Vail,1014642,Colorado,"Denver, CO",751
 Victor,1014643,Colorado,"Colorado Springs-Pueblo, CO",752
 Vilas,1014644,Colorado,"Colorado Springs-Pueblo, CO",752
@@ -2367,7 +2429,7 @@ Plymouth,1015173,Florida,"Orlando-Daytona Beach, FL",534
 Polk City,1015174,Florida,"Tampa-St Petersburg (Sarasota), FL",539
 Pomona Park,1015175,Florida,"Jacksonville, FL",561
 Pompano Beach,1015176,Florida,"Miami-Ft. Lauderdale, FL",528
-Ponte Vedra,1015177,Florida,"Jacksonville, FL",561
+Ponte Vedra Beach,1015177,Florida,"Jacksonville, FL",561
 Port Charlotte,1015178,Florida,"Ft. Myers-Naples, FL",571
 Port Orange,1015179,Florida,"Orlando-Daytona Beach, FL",534
 Port Richey,1015180,Florida,"Tampa-St Petersburg (Sarasota), FL",539
@@ -2479,7 +2541,7 @@ Feather Sound,9051940,Florida,"Tampa-St Petersburg (Sarasota), FL",539
 Ferry Pass,9051944,Florida,"Mobile, AL-Pensacola, FL",686
 Florida City,9051955,Florida,"Miami-Ft. Lauderdale, FL",528
 Forest City,9051961,Florida,"Orlando-Daytona Beach, FL",534
-Fountainebleau,9051979,Florida,"Miami-Ft. Lauderdale, FL",528
+Fontainebleau,9051979,Florida,"Miami-Ft. Lauderdale, FL",528
 Four Corners,9051981,Florida,"Orlando-Daytona Beach, FL",534
 Fruit Cove,9051999,Florida,"Jacksonville, FL",561
 Fruitville,9052001,Florida,"Tampa-St Petersburg (Sarasota), FL",539
@@ -7380,7 +7442,7 @@ Grosse Pointe Park,9052074,Michigan,"Detroit, MI",505
 Grosse Pointe Woods,9052075,Michigan,"Detroit, MI",505
 Huron Charter Township,9052175,Michigan,"Detroit, MI",505
 Independence Township,9052179,Michigan,"Detroit, MI",505
-Kalamazoo,9052214,Michigan,"Grand Rapids-Kalamazoo, MI",563
+Oshtemo,9052214,Michigan,"Grand Rapids-Kalamazoo, MI",563
 Kentwood,9052226,Michigan,"Grand Rapids-Kalamazoo, MI",563
 Lawton,9052306,Michigan,"Grand Rapids-Kalamazoo, MI",563
 Leoni Township,9052315,Michigan,"Lansing, MI",551