us_geo 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 711c99585d65af3e17634a5ae2a3d18927e2b110561b0514a045e8bcd5d1374f
-  data.tar.gz: b44bd355b23abf0d66dfad0a0f128877fe52243324a94e6be9c55064ee2a525d
+  metadata.gz: a6b963948f153ee9add87c2daa3d45fd79ec3ed1d79f156c94bec7cc8b9ca879
+  data.tar.gz: 69b5d532013234f466319b8fc52ba4ea1809579bedc663f80258c7fd80246fef
 SHA512:
-  metadata.gz: 70a6b4d77c0ce0493d36d7459f62cf54a34d7f1e19cecbccc30184329134177092d7bb77eda0110c7c939d0002f3d932360ef7d3aa7f5b9ae89f9d99d932d92c
-  data.tar.gz: '09443a88e94d09406a9630d2c1290c4641e0111e9f18b4239dc25d0c4667b5759cea11bc9c9036497c082ee78d9bc31e7c091276538a3b93e18812488af19df8'
+  metadata.gz: 51b285a6397f15652483f2c9f36eebbf423fa8ceb7b97fd672cb5361860e351333d562a6b36fb39388c21adb67ef4e7156ceaf1ccb88e727683fab5471ff8b1c
+  data.tar.gz: d3ff6ae39376c494ac87f4533f6aeee5017546547f56ac1a1bb1cb35f8ad84cfac89f41090792c494de889d31718db6fff15cecbb13f8eb39ad5ee4823e0ae84

data/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.0.4
+
+- Remove "Urbanized Area" from short name for urban areas.
+- Fix short name for Louisville, KY in the in the CBSA's, CSA's, and Urban Areas to omit "Jefferson County" so it matches convention for other short names of only showing the major city.
+
+
+
+## 2.0.3
+
+### Added
+
+- Added methods to calculate housing density.
+
 ## 2.0.2
 
 ### Fixed

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.4

data/db/migrate/20230620000100_fix_short_names.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+class FixShortNames < ActiveRecord::Migration[5.0]
+  def up
+    update <<~SQL
+      UPDATE us_geo_core_based_statistical_areas
+      SET short_name = 'Louisville, KY'
+      WHERE short_name = 'Louisville/Jefferson County, KY'
+    SQL
+
+    update <<~SQL
+      UPDATE us_geo_combined_statistical_areas
+      SET short_name = 'Louisville, KY'
+      WHERE short_name = 'Louisville/Jefferson County, KY'
+    SQL
+
+    update <<~SQL
+      UPDATE us_geo_urban_areas
+      SET short_name = 'Louisville, KY'
+      WHERE short_name = 'Louisville/Jefferson County, KY'
+    SQL
+
+    select_all("SELECT geoid, name, short_name FROM us_geo_urban_areas").each do |row|
+      name = row["name"].sub(/\s+Urban(?:ized)? (?:Area|Cluster)/, "")
+      city, state = name.split(", ", 2)
+      short_name = "#{city.split("-").first.split("/").first}, #{state.split("-").first}"
+      escaped_short_name = short_name.gsub("'", "''")
+
+      if short_name != row["short_name"]
+        update <<~SQL
+          UPDATE us_geo_urban_areas
+          SET short_name = '#{escaped_short_name}'
+          WHERE geoid = '#{row["geoid"]}'
+        SQL
+      end
+    end
+  end
+
+  def down
+    update <<~SQL
+      UPDATE us_geo_core_based_statistical_areas
+      SET short_name = 'Louisville/Jefferson County, KY'
+      WHERE short_name = 'Louisville, KY'
+    SQL
+
+    update <<~SQL
+      UPDATE us_geo_combined_statistical_areas
+      SET short_name = 'Louisville/Jefferson County, KY'
+      WHERE short_name = 'Louisville, KY'
+    SQL
+
+    update <<~SQL
+      UPDATE us_geo_urban_areas
+      SET short_name = 'Louisville/Jefferson County, KY'
+      WHERE short_name = 'Louisville, KY'
+    SQL
+  end
+end

data/explorer_app/app/helpers/application_helper.rb

@@ -25,8 +25,7 @@ module ApplicationHelper
     render "shared/demographics_cells", entity: entity, round_area: round_area
   end
 
-  def population_density(entity)
-    density = entity.population_density
+  def density(density)
     return nil unless density
 
     round = if density < 1

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

@@ -48,12 +48,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@county) %></td>
+      <td><%= density(@county.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@county.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@county.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@county.land_area, round: 0) %></td>

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

@@ -48,12 +48,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@county_subdivision) %></td>
+      <td><%= density(@county_subdivision.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@county_subdivision.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@county_subdivision.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@county_subdivision.land_area, round: 0) %></td>

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

@@ -56,12 +56,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@place) %></td>
+      <td><%= density(@place.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@place.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@place.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@place.land_area, round: 0) %></td>

data/explorer_app/app/views/shared/_demographics_cells.html.erb

@@ -1,5 +1,6 @@
 <%= content_tag(:td, (entity.population ? formatted_number(entity.population) : "-"), class: "text-end", data: {sort: entity.population.to_i}) %>
-<%= content_tag(:td, population_density(entity), class: "text-end", data: {sort: entity.population_density.to_f}) %>
+<%= content_tag(:td, density(entity.population_density), class: "text-end", data: {sort: entity.population_density.to_f}) %>
 <%= content_tag(:td, (entity.housing_units ? formatted_number(entity.housing_units) : "-"), class: "text-end", data: {sort: entity.housing_units.to_i}) %>
+<%= content_tag(:td, density(entity.housing_density), class: "text-end", data: {sort: entity.housing_density.to_f}) %>
 <%= content_tag(:td, (entity.land_area ? formatted_number(entity.land_area, round: round_area) : "-"), class: "text-end", data: {sort: entity.land_area.to_i}) %>
 <%= content_tag(:td, (entity.water_area ? formatted_number(entity.water_area, round: round_area) : "-"), class: "text-end", data: {sort: entity.water_area.to_i}) %>

data/explorer_app/app/views/shared/_demographics_headers.html.erb

@@ -1,5 +1,6 @@
 <th class="text-end">Population</th>
 <th class="text-end">Population Density</th>
 <th class="text-end">Housing Units</th>
+<th class="text-end">Housing Density</th>
 <th class="text-end">Land Area</th>
 <th class="text-end">Water Area</th>

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

@@ -54,12 +54,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@zcta) %></td>
+      <td><%= density(@zcta.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@zcta.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@zcta.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@zcta.land_area, round: 0) %></td>

data/lib/us_geo/population.rb

@@ -22,5 +22,19 @@ module USGeo
     def population_density_km
       population.to_f / land_area_km if population && land_area.to_f > 0
     end
+
+    # Housing units per square mile.
+    #
+    # @return [Float, nil]
+    def housing_density
+      housing_units.to_f / land_area if housing_units && land_area.to_f > 0
+    end
+
+    # Housing units per square kilometer.
+    #
+    # @return [Float, nil]
+    def housing_density_km
+      housing_units.to_f / land_area_km if housing_units && land_area.to_f > 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_geo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,6 +83,7 @@ files:
 - db/migrate/20230417000500_allow_null_zcta_urban_areas_demographics.rb
 - 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/schema.rb
 - explorer_app/.gitattributes
 - explorer_app/.gitignore