us_geo 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76c059a8661033a5ac658fc7cb9aa3f3a10f478adb44c1c1c4681374dba1b78
-  data.tar.gz: fe0d4bc194e683493ed4bc7be6cb0f886b2223c7ae20e9b9c71595300cf4e5ee
+  metadata.gz: 82fdb1c898a2418d36e688ac330574627a8bdf91907da3f6b3ff0d07468c8e16
+  data.tar.gz: 03ca9f21708193790500d6d0319906d70e531349b5b269b37fb59c8731552799
 SHA512:
-  metadata.gz: a11dc0cebe135efdec9b1d6a94ebfc87786311ef2266cd987778121de1b18ead07d099914342ba027d0002ff574d4d9f7c39f226c412a3c02c97dc51f9f05fc6
-  data.tar.gz: d23e1c89a23594ee86284f3597a22e0f26f69621b827dc411abad38088aa8faf1b0dace47d619950bc0e5714f75df80034aeb27cec58a41f8960821f14455926
+  metadata.gz: 1e6698c42195ba9e80e28ce9c7c7311a92ef4ab69ece75cfeb57a26fc5e640f56bb7fd7637abf7a938311511d2e3b177ab35ff19d1f4e5e668b3b5fa01558474
+  data.tar.gz: 91bae4b904d7041570db5ee53a473ac453cf8a20927c4246390109a88a97bf6a9636412576de5e07bddbf83a86773cf2af6aa0d1f2b28db44c1a8228b618fee2

data/CHANGELOG.md

@@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.3.0
+
+### Fixed
+
+- Fixed default data URL to point to the `main` branch on GitHub instead of the old `master` branch. The files on the `master` branch have not been updated since version 2.0.0.
+- Fixed `TypeError` raised by `USGeo::ZctaPlace#percent_place_land_area` and `#percent_place_total_area` when the place does not have a land area (i.e. the U6 FIPS classification places added in version 2.2.0). The `percent_*` methods on all join models now return `nil` instead of raising an error or returning `NaN`/`Infinity` when the denominator is missing or zero.
+- Fixed the `us_geo:import:dump_removed` rake task which raised a `NameError` and did not produce valid JSON output.
+- Added `USGeo::ZctaMapping` to the import rake tasks. Previously `us_geo:import:all` did not load the ZCTA mappings data needed by `USGeo::Zcta.for_zipcode`, and the `removed_counts`, `dump_removed`, and `cleanup` tasks did not include it. It can now also be loaded individually with `us_geo:import:zcta_mappings`.
+- Removed the `delegate :region, to: :division` on `USGeo::State` which was shadowing the `belongs_to :region` association reader so that the `region_id` attribute was never used.
+- Removed the unimplemented `gzipped` keyword argument from the abstract `USGeo::BaseRecord.load!` method signature to match the subclass implementations.
+- Renaming duplicate county subdivisions during import now includes the geoid in the new name and respects the 60 character limit on names so that the rename cannot fail validation.
+- Updated `db/schema.rb` to include the `usps_locality` and `usps_state_code` columns on ZCTA's and the indexes on the ZCTA primary place and county subdivision geoid columns.
+
+### Added
+
+- `USGeo::Zcta#usps_locality` and `USGeo::Zcta#usps_state_code` are now populated by `USGeo::Zcta.load!` with the city and state that the U.S. Postal Service delivers mail to for the ZIP code. The columns were added to the schema in version 2.2.0, but were never populated. They are `nil` for ZIP codes that the Postal Service does not deliver mail to. Note that `zctas.csv` gained `USPS Locality` and `USPS State Code` columns, so the data files must be reimported to pick up the new values.
+- `USGeo::CombinedStatisticalArea` now validates presence and uniqueness of `short_name`, and `USGeo::UrbanArea` now validates presence of `name` and `short_name`, matching the database constraints.
+
+### Removed
+
+- Removed `USGeo::ZctaPlace#percent_zcta_population` and `#percent_place_population`. These methods were supposed to have been removed in version 2.0 along with the other population methods on the join models (see UPDATING_TO_VERSION_2.md). They raised `NameError` on databases created with the version 2 migrations since the population column no longer exists.
+
+## 2.2.0
+
+### Added
+
+- Added places with `U6` FIPS classification. This adds more places in rural areas where not all settlements were previously included in the data set because they were not classified as places by the Census Bureau. These are places that are not incorporated and do not have many businesses or services, but are still recognized places where people live. These places do not have any demographic data associated with them since they are not included in the Census population estimates.
+
+### Changed
+
+- Updated data set with 2023 population estimates from the Census Bureau.
+
 ## 2.1.1
 
 ### Fixed

data/README.md

@@ -139,12 +139,14 @@ rails us_geo:import:county_subdivisions
 rails us_geo:import:urban_areas
 rails us_geo:import:places
 rails us_geo:import:zctas
+rails us_geo:import:zcta_mappings
 rails us_geo:import:urban_area_counties
 rails us_geo:import:urban_area_county_subdivisions
 rails us_geo:import:place_counties
 rails us_geo:import:zcta_counties
 rails us_geo:import:zcta_county_subdivisions
 rails us_geo:import:zcta_places
+rails us_geo:import:zcta_urban_areas
 ```
 
 By default this will download the data from files hosted with the project on GitHub and insert/update into the database. If any entity records are found that don't exist in the data files, the `removed` flag on the database rows will be set to `TRUE`.

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.3.0

data/db/migrate/20251029215800_add_locale_name_to_zctas.rb

@@ -0,0 +1,6 @@
+class AddLocaleNameToZctas < ActiveRecord::Migration[5.0]
+  def change
+    add_column :us_geo_zctas, :usps_locality, :string, limit: 30, null: true
+    add_column :us_geo_zctas, :usps_state_code, :string, limit: 2, null: true
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_04_21_004258) do
+ActiveRecord::Schema[7.0].define(version: 2025_10_29_215800) do
   create_table "us_geo_combined_statistical_areas", primary_key: "geoid", id: { type: :string, limit: 3 }, force: :cascade do |t|
     t.string "name", limit: 60, null: false
     t.float "land_area", null: false
@@ -296,7 +296,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_21_004258) do
     t.integer "status", limit: 1, default: 0, null: false
     t.string "primary_place_geoid", limit: 7
     t.string "primary_county_subdivision_geoid", limit: 10
+    t.string "usps_locality", limit: 30
+    t.string "usps_state_code", limit: 2
     t.index ["primary_county_geoid"], name: "index_us_geo_zctas_on_primary_county_geoid"
+    t.index ["primary_county_subdivision_geoid"], name: "index_us_geo_zctas_on_primary_county_subdivision_geoid"
+    t.index ["primary_place_geoid"], name: "index_us_geo_zctas_on_primary_place_geoid"
     t.index ["primary_urban_area_geoid"], name: "index_us_geo_zctas_on_primary_urban_area_geoid"
   end
 

data/explorer_app/Gemfile

@@ -4,13 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: "../"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4", ">= 7.0.4.3"
+gem "rails", "~> 8.1.2", ">= 8.1.2"
 
 # Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 2.9"
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem "puma", "~> 7.1"
 
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
 # gem "kredis"

data/explorer_app/Gemfile.lock

@@ -0,0 +1,344 @@
+PATH
+  remote: ..
+  specs:
+    us_geo (2.3.0)
+      activerecord (>= 5.2)
+      csv
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
+      mail (>= 2.8.0)
+    actionmailer (8.1.3)
+      actionpack (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activesupport (= 8.1.3)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.1.3)
+      actionview (= 8.1.3)
+      activesupport (= 8.1.3)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.1.3)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.1.3)
+      activesupport (= 8.1.3)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.1.3)
+      activesupport (= 8.1.3)
+      globalid (>= 0.3.6)
+    activemodel (8.1.3)
+      activesupport (= 8.1.3)
+    activerecord (8.1.3)
+      activemodel (= 8.1.3)
+      activesupport (= 8.1.3)
+      timeout (>= 0.4.0)
+    activestorage (8.1.3)
+      actionpack (= 8.1.3)
+      activejob (= 8.1.3)
+      activerecord (= 8.1.3)
+      activesupport (= 8.1.3)
+      marcel (~> 1.0)
+    activesupport (8.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
+    bindex (0.8.1)
+    builder (3.3.0)
+    concurrent-ruby (1.3.7)
+    connection_pool (3.0.2)
+    crass (1.0.7)
+    csv (3.3.5)
+    date (3.5.1)
+    debug (1.11.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    drb (2.2.3)
+    erb (6.0.4)
+    erubi (1.13.1)
+    globalid (1.4.0)
+      activesupport (>= 6.1)
+    i18n (1.15.2)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.20.0)
+    logger (1.7.0)
+    loofah (2.25.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.9.1)
+      logger
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.2.1)
+    mini_mime (1.1.5)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    net-imap (0.6.4.1)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.5)
+    nokogiri (1.19.4-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.4-x86_64-linux-musl)
+      racc (~> 1.4)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    puma (7.2.1)
+      nio4r (~> 2.0)
+    racc (1.8.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.3.1)
+      rack (>= 3)
+    rails (8.1.3)
+      actioncable (= 8.1.3)
+      actionmailbox (= 8.1.3)
+      actionmailer (= 8.1.3)
+      actionpack (= 8.1.3)
+      actiontext (= 8.1.3)
+      actionview (= 8.1.3)
+      activejob (= 8.1.3)
+      activemodel (= 8.1.3)
+      activerecord (= 8.1.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
+      bundler (>= 1.15.0)
+      railties (= 8.1.3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rake (13.4.2)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
+    securerandom (0.4.1)
+    sqlite3 (2.9.5-aarch64-linux-gnu)
+    sqlite3 (2.9.5-aarch64-linux-musl)
+    sqlite3 (2.9.5-arm-linux-gnu)
+    sqlite3 (2.9.5-arm-linux-musl)
+    sqlite3 (2.9.5-arm64-darwin)
+    sqlite3 (2.9.5-x86_64-darwin)
+    sqlite3 (2.9.5-x86_64-linux-gnu)
+    sqlite3 (2.9.5-x86_64-linux-musl)
+    thor (1.5.0)
+    timeout (0.6.1)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.1.1)
+    useragent (0.16.11)
+    web-console (4.3.0)
+      actionview (>= 8.0.0)
+      bindex (>= 0.4.0)
+      railties (>= 8.0.0)
+    websocket-driver (0.8.2)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.8.2)
+
+PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bundler
+  debug
+  puma (~> 7.1)
+  rails (~> 8.1.2, >= 8.1.2)
+  sqlite3 (~> 2.9)
+  tzinfo-data
+  us_geo!
+  web-console
+
+CHECKSUMS
+  action_text-trix (2.1.19) sha256=7012f59421009cf284aa651294896414d653a61a2417c9b8714c8476d2f74009
+  actioncable (8.1.3) sha256=e5bc7f75e44e6a22de29c4f43176927c3a9ce4824464b74ed18d8226e75a80f0
+  actionmailbox (8.1.3) sha256=df7da474eaa0e70df4ed5a6fef66eb3b3b0f2dbf7f14518deee8d77f1b4aae59
+  actionmailer (8.1.3) sha256=831f724891bb70d0aaa4d76581a6321124b6a752cb655c9346aae5479318448d
+  actionpack (8.1.3) sha256=af998cae4d47c5d581a2cc363b5c77eb718b7c4b45748d81b1887b25621c29a3
+  actiontext (8.1.3) sha256=d291019c00e1ea9e6463011fa214f6081a56d7b9a1d224e7d3f6384c1dafc7d2
+  actionview (8.1.3) sha256=1347c88c7f3edb38100c5ce0e9fb5e62d7755f3edc1b61cce2eb0b2c6ea2fd5d
+  activejob (8.1.3) sha256=a149b1766aa8204c3c3da7309e4becd40fcd5529c348cffbf6c9b16b565fe8d3
+  activemodel (8.1.3) sha256=90c05cbe4cef3649b8f79f13016191ea94c4525ce4a5c0fb7ef909c4b91c8219
+  activerecord (8.1.3) sha256=8003be7b2466ba0a2a670e603eeb0a61dd66058fccecfc49901e775260ac70ab
+  activestorage (8.1.3) sha256=0564ce9309143951a67615e1bb4e090ee54b8befed417133cae614479b46384d
+  activesupport (8.1.3) sha256=21a5e0dfbd4c3ddd9e1317ec6a4d782fa226e7867dc70b0743acda81a1dca20e
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
+  bindex (0.8.1) sha256=7b1ecc9dc539ed8bccfc8cb4d2732046227b09d6f37582ff12e50a5047ceb17e
+  builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
+  concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0
+  connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
+  crass (1.0.7) sha256=94868719948664c89ddcaf0a37c65048413dfcb1c869470a5f7a7ceb5390b295
+  csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
+  date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
+  debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
+  erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
+  globalid (1.4.0) sha256=037f12fbf1d9d7a014d501c2d5c77356fd4ddd96d7a7991d6700bba96706f427
+  i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
+  io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
+  irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
+  json (2.20.0) sha256=9362bc6e55a952b056abf9167cf053358181c904cb70cd6eee0808ea830fc32b
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  loofah (2.25.1) sha256=d436c73dbd0c1147b16c4a41db097942d217303e1f7728704b37e4df9f6d2e04
+  mail (2.9.1) sha256=06574eca475253d6c18145dd70af80d0eb970182d55053497c5f4d797ea160e8
+  marcel (1.2.1) sha256=1678e9360e32f9eafa917c80029e2f6d10b2715c66a4b87b6d0da9b9cd1f859f
+  mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
+  minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
+  net-imap (0.6.4.1) sha256=29f0360d75a7efd3539f16ac1957dea5c0a51ddeceb348db4553c3120914ea0d
+  net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3
+  net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
+  net-smtp (0.5.1) sha256=ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736
+  nio4r (2.7.5) sha256=6c90168e48fb5f8e768419c93abb94ba2b892a1d0602cb06eef16d8b7df1dca1
+  nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f
+  nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af
+  nokogiri (1.19.4-arm-linux-gnu) sha256=a301313e38bb065d68239e79734bcd6f56fb6efaacebde29e9abf2a4735340ca
+  nokogiri (1.19.4-arm-linux-musl) sha256=588923c101bcfa78869734d247d25b598674323e7f22474fc468f6e5647311eb
+  nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527
+  nokogiri (1.19.4-x86_64-darwin) sha256=7fd17057d3e1f00e9954a74b3cd76595d3d4a5ef233b7ed9599047c204f70551
+  nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a
+  nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b
+  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  puma (7.2.1) sha256=d7bf0e9cabd532e0d401e142cd94e3ac531e993610e2d80e6fbf9c26961414b0
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rack (3.2.6) sha256=5ed78e1f73b2e25679bec7d45ee2d4483cc4146eb1be0264fc4d94cb5ef212c2
+  rack-session (2.1.2) sha256=595434f8c0c3473ae7d7ac56ecda6cc6dfd9d37c0b2b5255330aa1576967ffe8
+  rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
+  rackup (2.3.1) sha256=6c79c26753778e90983761d677a48937ee3192b3ffef6bc963c0950f94688868
+  rails (8.1.3) sha256=6d017ba5348c98fc909753a8169b21d44de14d2a0b92d140d1a966834c3c9cd3
+  rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
+  rails-html-sanitizer (1.7.0) sha256=28b145cceaf9cc214a9874feaa183c3acba036c9592b19886e0e45efc62b1e89
+  railties (8.1.3) sha256=913eb0e0cb520aac687ffd74916bd726d48fa21f47833c6292576ef6a286de22
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14
+  rdoc (8.0.0) sha256=03bf8c08a9639658855a0cfd77c0abca8325c227693f7f33f82957811348c469
+  reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  sqlite3 (2.9.5-aarch64-linux-gnu) sha256=78075b6337d3d182c6d2b4691049ed45cd220826160c9ea18946bf6a1de200dc
+  sqlite3 (2.9.5-aarch64-linux-musl) sha256=18c801185deb4adc01ddb281e8f672a39e3d1729979ca91e39439cd3eac0402d
+  sqlite3 (2.9.5-arm-linux-gnu) sha256=1bdfca0c7d63998c60b0f4a8e3c8df2d33800ccc4abd2d612eddbbbc92a4c48b
+  sqlite3 (2.9.5-arm-linux-musl) sha256=bae1109d12b2e9f588455967729b008e1ff4feb7761749df695019c9079913c6
+  sqlite3 (2.9.5-arm64-darwin) sha256=d0cf444a70fc9395d513cfbcc1e6719e224aa645314e3824cb0474c721425aa2
+  sqlite3 (2.9.5-x86_64-darwin) sha256=8e9caae38bd7ebb29cbeee3e7ab1d12dc2327d9a1b92c7fcf0dda05589627a81
+  sqlite3 (2.9.5-x86_64-linux-gnu) sha256=233dbcb6714148dd23bc5aeb33e8efd6eac974969564ddd5794c23d5f52b231e
+  sqlite3 (2.9.5-x86_64-linux-musl) sha256=e7d3a7474e8af0f96150c21abc203fbab5437206bfcdf11deab7741c0ca516f2
+  thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
+  timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
+  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  us_geo (2.3.0)
+  useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844
+  web-console (4.3.0) sha256=e13b71301cdfc2093f155b5aa3a622db80b4672d1f2f713119cc7ec7ac6a6da4
+  websocket-driver (0.8.2) sha256=97c556b019bf3410b4961002ac501621e9322d3f8a7bc02161a09301cc4c4146
+  websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
+  zeitwerk (2.8.2) sha256=7212a61311083c604184b1ea2574b9aa05cd14f855a0841c06985cabe9181d12
+
+BUNDLED WITH
+  4.0.3

data/explorer_app/app/helpers/application_helper.rb

@@ -42,7 +42,7 @@ module ApplicationHelper
   end
 
   def overlap_percentage(entity, other_entity, association)
-    return nil unless entity && other_entity && entity.total_area > 0
+    return nil unless entity && other_entity && entity.total_area.to_f > 0
 
     belongs_to = other_entity.class.base_class.to_s.demodulize.underscore
     overlap = entity.send(association).detect { |r| r.send(belongs_to) == other_entity }

data/explorer_app/app/views/zctas/show.html.erb

@@ -24,6 +24,16 @@
         <% end %>
       </td>
     </tr>
+    <tr>
+      <th>USPS Locality</th>
+      <td>
+        <% if @zcta.usps_locality %>
+          <%= @zcta.usps_locality %>, <%= @zcta.usps_state_code %>
+        <% else %>
+          -
+        <% end %>
+      </td>
+    </tr>
     <% if @zcta.combined_statistical_area %>
       <tr>
         <th>Combined Statistical Area</th>

data/lib/tasks/us_geo/us_geo.rake

@@ -14,6 +14,7 @@ namespace :us_geo do
       urban_areas: USGeo::UrbanArea,
       places: USGeo::Place,
       zctas: USGeo::Zcta,
+      zcta_mappings: USGeo::ZctaMapping,
       zcta_counties: USGeo::ZctaCounty,
       zcta_urban_areas: USGeo::ZctaUrbanArea,
       zcta_county_subdivisions: USGeo::ZctaCountySubdivision,
@@ -24,24 +25,28 @@ namespace :us_geo do
     }
 
     klasses.each do |name, klass|
-      desc "Import data for #{klass}"
+      desc <<~DOC
+        Import data for #{klass}. Set US_GEO_BASE_DATA_URI to override the data source location.
+      DOC
       task name => :environment do
         t = Time.now
 
-        klass.load!
-        puts "Loaded #{klass.count} rows into #{klass.table_name} in #{(Time.now - t).round(1)}s"
+        imported_count, removed_count = klass.load!
+        puts "Loaded #{imported_count} rows into #{klass.table_name} in #{(Time.now - t).round(1)}s"
 
-        removed_count = klass.removed.count
         if removed_count > 0
           puts "  #{removed_count} previously imported records in #{klass.table_name} no longer exist in the current data source"
         end
       end
+    end
 
-      desc "Import data for all USGeo models"
-      task all: :environment do
-        klasses.each_key do |name|
-          Rake::Task["us_geo:import:#{name}"].invoke
-        end
+    desc <<~DOC
+      Import data for all USGeo models". Set US_GEO_BASE_DATA_URI to override the data source location.
+      The default data location is https://raw.githubusercontent.com/bdurand/us_geo/master/data/2020_dist
+    DOC
+    task all: :environment do
+      klasses.each_key do |name|
+        Rake::Task["us_geo:import:#{name}"].invoke
       end
     end
 
@@ -57,16 +62,13 @@ namespace :us_geo do
     task dump_removed: :environment do
       require "json"
 
-      puts "{"
+      data = {}
       klasses.each_value do |klass|
-        puts "  \"#{klass.table_name}\": ["
-        klass.removed.find_each do |record|
-          row_json JSON.dump(record.attributes.except("status", "updated_at"))
-          puts "#{row_json},"
+        data[klass.table_name] = klass.removed.collect do |record|
+          record.attributes.except("status", "updated_at")
         end
-        puts "]"
       end
-      puts "}"
+      puts JSON.pretty_generate(data)
     end
 
     desc "Remove all records from previously imported data that no longer exists in the current data source"

data/lib/us_geo/area.rb

@@ -24,7 +24,7 @@ module USGeo
     #
     # @return [Float, nil]
     def percent_land
-      land_area / total_area if land_area
+      land_area / total_area if land_area && total_area > 0
     end
 
     # Land area in square kilometers.

data/lib/us_geo/base_record.rb

@@ -21,7 +21,7 @@ module USGeo
     scope :not_removed, -> { where.not(status: STATUS_REMOVED) }
 
     class << self
-      def load!(location = nil, gzipped: true)
+      def load!(location = nil)
         raise NotImplementedError
       end
 
@@ -37,11 +37,19 @@ module USGeo
       end
 
       # Mark the status of any records not updated in the block as being no longer imported.
+      #
+      # @return [Array<Integer>] Count of the number of records imported and the number of records removed
       def import!(&block)
         start_time = Time.at(Time.now.to_i.floor)
+
         yield
-        raise LoadError.new("No data found") unless where("updated_at >= ?", start_time).exists?
-        where("updated_at < ?", start_time).imported.update_all(status: STATUS_REMOVED)
+
+        imported_count = where("updated_at >= ?", start_time).count
+        raise LoadError.new("No data found") if imported_count == 0
+
+        removed_count = where("updated_at < ?", start_time).imported.update_all(status: STATUS_REMOVED)
+
+        [imported_count, removed_count]
       end
 
       def data_uri(path)
@@ -60,7 +68,7 @@ module USGeo
         require "csv"
 
         file = if location.include?(":")
-          URI.parse(location).open(read_timeout: 5, open_timeout: 5)
+          URI.parse(location).open(read_timeout: 10, open_timeout: 5)
         else
           File.open(location)
         end

data/lib/us_geo/combined_statistical_area.rb

@@ -15,6 +15,7 @@ module USGeo
 
     validates :geoid, length: {is: 3}
     validates :name, presence: true, length: {maximum: 60}, uniqueness: true
+    validates :short_name, presence: true, length: {maximum: 60}, uniqueness: true
     validates :land_area, numericality: true, presence: true
     validates :water_area, numericality: true, presence: true
     validates :population, numericality: {only_integer: true}, presence: true

data/lib/us_geo/county_subdivision.rb

@@ -72,7 +72,11 @@ module USGeo
               record.lng = row["Longitude"]
 
               duplicate = where.not(geoid: record.geoid).find_by(name: record.name, county_geoid: record.county_geoid)
-              duplicate&.update!(name: "#{record.name} (deleted)", status: BaseRecord::STATUS_REMOVED)
+              if duplicate
+                suffix = " (deleted #{duplicate.geoid})"
+                deleted_name = "#{record.name[0, 60 - suffix.length]}#{suffix}"
+                duplicate.update!(name: deleted_name, status: BaseRecord::STATUS_REMOVED)
+              end
             end
           end
         end

data/lib/us_geo/state.rb

@@ -36,10 +36,6 @@ module USGeo
     # @!attribute type
     #   @return [String] Type of the state or territory.
 
-    # @!method :region
-    #   @return [Region] Region the state is in.
-    delegate :region, to: :division, allow_nil: true
-
     class << self
       def load!(uri = nil)
         location = data_uri(uri || "states.csv")

data/lib/us_geo/urban_area.rb

@@ -43,8 +43,8 @@ module USGeo
 
     validates :geoid, length: {is: 5}
     validates :primary_county_geoid, length: {is: 5}
-    validates :name, length: {maximum: 90}
-    validates :short_name, length: {maximum: 60}
+    validates :name, presence: true, length: {maximum: 90}
+    validates :short_name, presence: true, length: {maximum: 60}
     validates :land_area, numericality: true, presence: true
     validates :water_area, numericality: true, presence: true
     validates :population, numericality: {only_integer: true}, presence: true

data/lib/us_geo/urban_area_county.rb

@@ -30,22 +30,22 @@ module USGeo
 
     # Percentage of the urban area land area.
     def percent_urban_area_land_area
-      land_area / urban_area.land_area
+      land_area / urban_area.land_area if urban_area.land_area.to_f > 0
     end
 
     # Percentage of the urban area total area.
     def percent_urban_area_total_area
-      total_area / urban_area.total_area
+      total_area / urban_area.total_area if urban_area.total_area.to_f > 0
     end
 
     # Percentage of the county land area.
     def percent_county_land_area
-      land_area / county.land_area
+      land_area / county.land_area if county.land_area.to_f > 0
     end
 
     # Percentage of the county total area.
     def percent_county_total_area
-      total_area / county.total_area
+      total_area / county.total_area if county.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo/urban_area_county_subdivision.rb

@@ -30,22 +30,22 @@ module USGeo
 
     # Percentage of the urban area land area.
     def percent_urban_area_land_area
-      land_area / urban_area.land_area
+      land_area / urban_area.land_area if urban_area.land_area.to_f > 0
     end
 
     # Percentage of the urban area total area.
     def percent_urban_area_total_area
-      total_area / urban_area.total_area
+      total_area / urban_area.total_area if urban_area.total_area.to_f > 0
     end
 
-    # Percentage of the county land area.
+    # Percentage of the county subdivision land area.
     def percent_county_subdivision_land_area
-      land_area / county_subdivision.land_area
+      land_area / county_subdivision.land_area if county_subdivision.land_area.to_f > 0
     end
 
-    # Percentage of the county total area.
+    # Percentage of the county subdivision total area.
     def percent_county_subdivision_total_area
-      total_area / county_subdivision.total_area
+      total_area / county_subdivision.total_area if county_subdivision.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo/zcta.rb

@@ -11,6 +11,10 @@ module USGeo
   #
   # ZCTA's can span places, but the one with the majority of the residents is identified
   # as the primary place for when a single area is required.
+  #
+  # The city and state that the U.S. Postal Service delivers mail to for the ZIP code are
+  # available as +usps_locality+ and +usps_state_code+. These are derived from postal data
+  # rather than census data and can differ from the primary place and state.
   class Zcta < BaseRecord
     include Population
     include Area
@@ -22,7 +26,6 @@ module USGeo
     #   This scope will search for ZCTA's via the ZCTAMappings table. This is useful
     #   when you have a retired ZIP code and want to find the current ZCTA for that ZIP code.
     #
-    #   @param zipcode [String] ZIP code to search for.
     #   @return [ActiveRecord::Relation] ZCTA's matching the given ZIP code.
     scope :for_zipcode, ->(zipcode) { left_outer_joins(:zcta_mappings).where(ZctaMapping.table_name => {zipcode: zipcode}).or(left_outer_joins(:zcta_mappings).where(zipcode: zipcode)).distinct }
 
@@ -83,10 +86,26 @@ module USGeo
     validates :water_area, numericality: true, presence: true
     validates :population, numericality: {only_integer: true}, presence: true
     validates :housing_units, numericality: {only_integer: true}, presence: true
+    validates :usps_locality, length: {maximum: 30}, allow_nil: true
+    validates :usps_state_code, length: {is: 2}, allow_nil: true
 
     # @!attribute zipcode
     #   @return [String] 5-digit ZIP code.
 
+    # @!attribute usps_locality
+    #   The city the U.S. Postal Service associates with the ZIP code. This is the city
+    #   that mail addressed to the ZIP code should be sent to and is not necessarily the
+    #   same as the name of the primary place since the Postal Service organizes ZIP codes
+    #   around mail delivery routes rather than political boundaries. It will be nil if the
+    #   Postal Service does not deliver mail to the ZIP code.
+    #   @return [String, nil] USPS city name for the ZIP code.
+
+    # @!attribute usps_state_code
+    #   The state the U.S. Postal Service associates with the ZIP code. This can differ from
+    #   the state of the primary county for ZIP codes served by a post office across a state
+    #   line. It will be nil if the Postal Service does not deliver mail to the ZIP code.
+    #   @return [String, nil] 2-letter USPS state code for the ZIP code.
+
     # @!method combined_statistical_area
     #   @return [USGeo::CombinedStatisticalArea, nil] Combined statistical area that contains the ZCTA.
     delegate :combined_statistical_area, to: :primary_county, allow_nil: true
@@ -125,6 +144,8 @@ module USGeo
               record.primary_urban_area_geoid = row["Primary Urban Area"]
               record.primary_county_subdivision_geoid = row["Primary County Subdivision"]
               record.primary_place_geoid = row["Primary Place"]
+              record.usps_locality = row["USPS Locality"]
+              record.usps_state_code = row["USPS State Code"]
               record.population = row["Population"]
               record.housing_units = row["Housing Units"]
               record.land_area = row["Land Area"]

data/lib/us_geo/zcta_county.rb

@@ -30,22 +30,22 @@ module USGeo
 
     # Percentage of the ZCTA land area.
     def percent_zcta_land_area
-      land_area / zcta.land_area
+      land_area / zcta.land_area if zcta.land_area.to_f > 0
     end
 
     # Percentage of the ZCTA total area.
     def percent_zcta_total_area
-      total_area / zcta.total_area
+      total_area / zcta.total_area if zcta.total_area.to_f > 0
     end
 
     # Percentage of the county land area.
     def percent_county_land_area
-      land_area / county.land_area
+      land_area / county.land_area if county.land_area.to_f > 0
     end
 
     # Percentage of the county total area.
     def percent_county_total_area
-      total_area / county.total_area
+      total_area / county.total_area if county.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo/zcta_county_subdivision.rb

@@ -30,22 +30,22 @@ module USGeo
 
     # Percentage of the ZCTA land area.
     def percent_zcta_land_area
-      land_area / zcta.land_area
+      land_area / zcta.land_area if zcta.land_area.to_f > 0
     end
 
     # Percentage of the ZCTA total area.
     def percent_zcta_total_area
-      total_area / zcta.total_area
+      total_area / zcta.total_area if zcta.total_area.to_f > 0
     end
 
     # Percentage of the county subdivision land area.
     def percent_county_subdivision_land_area
-      land_area / county_subdivision.land_area
+      land_area / county_subdivision.land_area if county_subdivision.land_area.to_f > 0
     end
 
     # Percentage of the county subdivision total area.
     def percent_county_subdivision_total_area
-      total_area / county_subdivision.total_area
+      total_area / county_subdivision.total_area if county_subdivision.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo/zcta_place.rb

@@ -28,34 +28,26 @@ module USGeo
       end
     end
 
-    # Percentage of the ZCTA population.
-    def percent_zcta_population
-      population.to_f / zcta.population.to_f
-    end
-
     # Percentage of the ZCTA land area.
     def percent_zcta_land_area
-      land_area / zcta.land_area
+      land_area / zcta.land_area if zcta.land_area.to_f > 0
     end
 
     # Percentage of the ZCTA total area.
     def percent_zcta_total_area
-      total_area / zcta.total_area
-    end
-
-    # Percentage of the place population.
-    def percent_place_population
-      population.to_f / place.population.to_f
+      total_area / zcta.total_area if zcta.total_area.to_f > 0
     end
 
-    # Percentage of the place land area.
+    # Percentage of the place land area. Returns nil if the place does not have
+    # a land area (i.e. places not included in the Census gazetteer data).
     def percent_place_land_area
-      land_area / place.land_area
+      land_area / place.land_area if place.land_area.to_f > 0
     end
 
-    # Percentage of the place total area..
+    # Percentage of the place total area. Returns nil if the place does not have
+    # a land area (i.e. places not included in the Census gazetteer data).
     def percent_place_total_area
-      total_area / place.total_area
+      total_area / place.total_area if place.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo/zcta_urban_area.rb

@@ -30,22 +30,22 @@ module USGeo
 
     # Percentage of the ZCTA land area.
     def percent_zcta_land_area
-      land_area / zcta.land_area
+      land_area / zcta.land_area if zcta.land_area.to_f > 0
     end
 
     # Percentage of the ZCTA total area.
     def percent_zcta_total_area
-      total_area / zcta.total_area
+      total_area / zcta.total_area if zcta.total_area.to_f > 0
     end
 
     # Percentage of the urban area land area.
     def percent_urban_area_land_area
-      land_area / urban_area.land_area
+      land_area / urban_area.land_area if urban_area.land_area.to_f > 0
     end
 
     # Percentage of the urban area total area.
     def percent_urban_area_total_area
-      total_area / urban_area.total_area
+      total_area / urban_area.total_area if urban_area.total_area.to_f > 0
     end
   end
 end

data/lib/us_geo.rb

@@ -35,7 +35,7 @@ module USGeo
   autoload :ZctaPlace, "us_geo/zcta_place"
   autoload :ZctaUrbanArea, "us_geo/zcta_urban_area"
 
-  BASE_DATA_URI = "https://raw.githubusercontent.com/bdurand/us_geo/master/data/2020_dist"
+  BASE_DATA_URI = "https://raw.githubusercontent.com/bdurand/us_geo/main/data/2020_dist"
 
   class << self
     # The root URI as a string of where to find the data files. This can be a URL

data/us_geo.gemspec

@@ -8,10 +8,17 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/bdurand/us_geo"
   spec.license = "MIT"
 
+  spec.metadata = {
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => spec.homepage,
+    "changelog_uri" => "#{spec.homepage}/blob/main/CHANGELOG.md"
+  }
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   ignore_files = %w[
     .
+    AGENTS.md
     Appraisals
     Gemfile
     Gemfile.lock

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: us_geo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Brian Durand
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - bbdurand@gmail.com
 executables: []
@@ -98,10 +96,12 @@ files:
 - db/migrate/20230417000600_add_additional_time_zone_name_to_counties.rb
 - db/migrate/20230426000100_add_index_on_zctas_geoids.rb
 - db/migrate/20230620000100_fix_short_names.rb
+- db/migrate/20251029215800_add_locale_name_to_zctas.rb
 - db/schema.rb
 - explorer_app/.gitattributes
 - explorer_app/.gitignore
 - explorer_app/Gemfile
+- explorer_app/Gemfile.lock
 - explorer_app/Rakefile
 - explorer_app/app/assets/images/.keep
 - explorer_app/app/assets/stylesheets/application.css
@@ -217,8 +217,10 @@ files:
 homepage: https://github.com/bdurand/us_geo
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: https://github.com/bdurand/us_geo
+  source_code_uri: https://github.com/bdurand/us_geo
+  changelog_uri: https://github.com/bdurand/us_geo/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -233,8 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Collection of geographic data for the United States for use with ActiveRecord
 test_files: []