natural_earth 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b949dd9dd03defe0756b024029fd9d17c5d4a52ded4de271e0c2d4a5c4c6343d
-  data.tar.gz: 6b9eb2cecc4c2d4dc74713f5119b3698da4bcaef007e3ee2d2097ba138a04169
+  metadata.gz: 568c6687797f8ae95c34e80b649fcc766580e0d5eabc6d33bbd277fec128aad0
+  data.tar.gz: 89d2a695dc3fe4d7d529b97b51d85d024cd121069d10debaac10b85030a5b6f7
 SHA512:
-  metadata.gz: 900f15b21693e2fdcd01f09cfd983af002ca7b8ef56366e314a53c26c4bd1ecf16f0d36f2c028ae071aec82a3a4eb95896b4dfb8d8722d68ac6e10763f6b5613
-  data.tar.gz: 8b64b3fe44fbc0f13a5e0f8508e60f0222dee98d807aa8726af7969b82d3820637d4248339548b827cc2434840aca5a24f95087edfff0263f0bb6e75b60d4cb2
+  metadata.gz: fe3f7afbcf83dfea4aa789b1b6f99ad486760f241c163eceed525da3cfa744726ae2d198413da1f36c8067e15bacaf5cf4974755920b4a79e1b8a5e489c5f52c
+  data.tar.gz: 8dc9a4a3959b8302ebd201672874f20cc922aa33f5508a3a13c09589eece2627fd5b6251f5fa362665d15991842f1f493f2adb39f120277b0a3b6cc449378b8a

data/.gitlab-ci.yml

@@ -1,7 +1,6 @@
-image: ruby:3.0.2
+image: ruby:3.2.1
 
 before_script:
-  - gem install bundler -v 2.2.22
   - bundle install
 
 test:

data/.rubocop.yml

@@ -1,19 +1,11 @@
+require:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
-  SuggestExtensions: false
-
-Metrics/BlockLength:
-  Exclude:
-    - 'natural_earth.gemspec'
-    - 'spec/**/*.rb'
-    - '**/*.rake'
 
 Naming/VariableNumber:
   Enabled: false
-
-Style/AsciiComments:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
-## [0.1.0] - 2021-08-26
+## [4.1.1] - 2023-04-25
+
+### Fixed
+
+- Remove subdivisions without official ISO-3166-2 code (ex: `KI-X01~`)
+
+### Changed
+
+- Upgrade development environment to Ruby 3.2
+- Regenerate resources from the latest NaturalEarth release with:
+  * Taiwan (`TW`) as a China subdivision
+  * Kosovo (`XK`) as an unrecognized sovereign state
+  * Renamed subdivisions in some countries to match ISO-3166-2 codes
+
+## [4.1.0] - 2021-08-26
 
 - Initial release

data/Gemfile

@@ -4,3 +4,21 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in natural_earth.gemspec
 gemspec
+
+group :development, :test do
+  # Rake tasks
+  gem 'multi_json'
+  gem 'oj'
+  gem 'rake', '~> 13.0'
+  gem 'rgeo-shapefile', '~> 3.0'
+
+  # Tests
+  gem 'rspec', '~> 3.0'
+  gem 'twitter_cldr', '~> 6.7'
+
+  # Linting
+  gem 'rubocop', require: false
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rake', require: false
+  gem 'rubocop-rspec', require: false
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    natural_earth (4.1.0)
+    natural_earth (4.1.1)
       rgeo-geojson (~> 2.1)
 
 GEM
@@ -10,61 +10,71 @@ GEM
     ast (2.4.2)
     camertron-eprun (1.1.1)
     cldr-plurals-runtime-rb (1.1.0)
-    concurrent-ruby (1.1.9)
-    dbf (4.2.0)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.2.2)
+    dbf (4.2.2)
+    diff-lcs (1.5.0)
+    json (2.6.3)
     multi_json (1.15.0)
-    oj (3.13.2)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    oj (3.14.3)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rgeo (2.3.0)
+    rgeo (3.0.0)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
     rgeo-shapefile (3.0.0)
       dbf (~> 4.0)
       rgeo (>= 1.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.20.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    ruby-progressbar (1.11.0)
-    twitter_cldr (6.7.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    twitter_cldr (6.11.5)
       camertron-eprun
       cldr-plurals-runtime-rb (~> 1.1)
       tzinfo
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-darwin-20
 
 DEPENDENCIES
@@ -75,8 +85,10 @@ DEPENDENCIES
   rgeo-shapefile (~> 3.0)
   rspec (~> 3.0)
   rubocop
+  rubocop-performance
+  rubocop-rake
   rubocop-rspec
   twitter_cldr (~> 6.7)
 
 BUNDLED WITH
-   2.2.22
+   2.4.6

data/lib/natural_earth/countries.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 module NaturalEarth
+  # Give access to the list of supported countries
   module Countries
     class << self
       include ISO3166
       alias normalize as_iso3166_1
 
+      # Return the list of supported countries as iso-3166-1 alpha-2 codes
       def supported
         COUNTRIES.keys
       end
 
+      # Check if a country is supported
       def supported?(iso3166_1)
         COUNTRIES.key?(normalize(iso3166_1))
       end
 
+      # Fetch information about a country, as a NaturalEarth::Country instance
       def fetch(iso3166_1)
         raise KeyError unless supported?(iso3166_1)
 

data/lib/natural_earth/country.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module NaturalEarth
+  # A NaturalEarth country
   class Country
     attr_reader :data
 

data/lib/natural_earth/geometries.rb

@@ -4,7 +4,7 @@ require 'multi_json'
 require 'rgeo/geo_json'
 
 module NaturalEarth
-  module Geometries
+  module Geometries # :nodoc:
     COUNTRY_PATH = 'geometries/%<iso3166_1>s/%<iso3166_1>s.json'
     SUBDIVISION_PATH = 'geometries/%<iso3166_1>s/%<iso3166_2>s.json'
 

data/lib/natural_earth/iso3166.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module NaturalEarth
-  module ISO3166
+  module ISO3166 # :nodoc:
     # Normalize an ISO-3166-1 code (alpha-2, alpha-3 or numeric) or ISO-3166-2 code to ISO-3166 alpha-2
     def as_iso3166_1(iso3166)
       return numeric_to_alpha2(iso3166) if numeric? iso3166
@@ -25,11 +25,11 @@ module NaturalEarth
     protected
 
     def reformat(code)
-      code.to_s.upcase.gsub('_', '-')
+      code.to_s.upcase.tr('_', '-')
     end
 
     def extract(code)
-      return code.split('-').first if code.match?(/-/)
+      return code.split('-').first if code.include?('-')
 
       code
     end

data/lib/natural_earth/subdivision.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module NaturalEarth
+  # A NaturalEarth subdivision
   class Subdivision
     attr_reader :data
 

data/lib/natural_earth/subdivisions.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 module NaturalEarth
+  # Give access to the list of supported subdivisions
   module Subdivisions
     class << self
       include ISO3166
       alias normalize as_iso3166_2
 
+      # Return the list of supported subdivisions, as iso-3166-2 codes
       def supported
         SUBDIVISIONS.keys
       end
 
+      # Check if a subdivision is supported
       def supported?(iso3166)
         SUBDIVISIONS.key?(normalize(iso3166))
       end
 
+      # Fetch information about a subdivision, as a NaturalEarth::Subdivision instance
       def fetch(iso3166)
         raise KeyError unless supported?(iso3166)
 

data/lib/natural_earth/tasks/import.rake

@@ -18,6 +18,8 @@ require_relative '../../natural_earth'
 #
 # [1]: <https://www.naturalearthdata.com/> / <https://github.com/nvkelso/natural-earth-vector>
 # [2]: <https://www.naturalearthdata.com/downloads/10m-cultural-vectors/>
+#
+# rubocop:disable Metrics/BlockLength
 namespace :import do
   desc 'Build GeoJSON resources from Natural Earth full release files'
   task :cultural, [:dir] => :cleanup do |_t, args|
@@ -42,6 +44,9 @@ namespace :import do
       end
     end
 
+    # Also exist with another name
+    duplicate_countries = %w[FR-971 FR-972 FR-973 FR-974 FR-976]
+
     data = {
       'UM' => {
         'iso-3166-1' => {
@@ -61,6 +66,7 @@ namespace :import do
     RGeo::Shapefile::Reader.open(map_units_shp) do |shapefile|
       shapefile.each do |entry|
         next if entry['ISO_A2'].empty? || entry['ISO_A2'].to_i == -99
+        next if duplicate_countries.include?(entry['ISO_A2'])
 
         data[entry['ISO_A2']] = {
           'iso-3166-1' => {
@@ -82,6 +88,7 @@ namespace :import do
     RGeo::Shapefile::Reader.open(countries_shp) do |shapefile|
       shapefile.each do |entry|
         next if entry['ISO_A2'].empty? || entry['ISO_A2'].to_i == -99
+        next if duplicate_countries.include?(entry['ISO_A2'])
         next if data.key?(entry['ISO_A2'])
 
         data[entry['ISO_A2']] = {
@@ -128,7 +135,7 @@ namespace :import do
     end
 
     # …and some subdivisions.
-    unrecognized_sovereign_states = ['Somaliland', 'Northern Cyprus']
+    unrecognized_sovereign_states = ['Kosovo', 'Northern Cyprus', 'Somaliland']
     nope = ['West Bank', 'Siachen Glacier'] # Just wikipedia them and you'll understand
 
     subdivisions = {
@@ -168,7 +175,7 @@ namespace :import do
     RGeo::Shapefile::Reader.open(map_units_shp) do |shapefile|
       shapefile.each do |entry|
         next unless entry['ISO_A2'].empty? || entry['ISO_A2'].to_i == -99
-        next if countries.keys.include?(entry['GEOUNIT'])
+        next if countries.key?(entry['GEOUNIT'])
         next if unrecognized_sovereign_states.include?(entry['GEOUNIT']) || nope.include?(entry['GEOUNIT'])
 
         subdivision = subdivisions[entry['GEOUNIT']]
@@ -182,13 +189,38 @@ namespace :import do
       end
     end
 
-    # Some countries are so small they are considered as subdivisions in Natural Earth.
+    # Some countries are wrongly considered as subdivisions in Natural Earth.
     country_as_subdivisions = {
+      'Guyane française' => {
+        'iso-3166-1' => { 'alpha-2' => 'GF', 'alpha-3' => 'GUF', 'numeric' => 254 },
+        'continent' => 'South America',
+        'region' => 'South America'
+      },
       'Gibraltar' => {
         'iso-3166-1' => { 'alpha-2' => 'GI', 'alpha-3' => 'GIB', 'numeric' => 292 },
         'continent' => data['ES']['continent'],
         'region' => data['ES']['region']
       },
+      'Guadeloupe' => {
+        'iso-3166-1' => { 'alpha-2' => 'GP', 'alpha-3' => 'GLP', 'numeric' => 312 },
+        'continent' => 'North America',
+        'region' => 'Caribbean'
+      },
+      'Martinique' => {
+        'iso-3166-1' => { 'alpha-2' => 'MQ', 'alpha-3' => 'MTQ', 'numeric' => 474 },
+        'continent' => 'North America',
+        'region' => 'Caribbean'
+      },
+      'Mayotte' => {
+        'iso-3166-1' => { 'alpha-2' => 'YT', 'alpha-3' => 'MYT', 'numeric' => 175 },
+        'continent' => 'Africa',
+        'region' => 'Eastern Africa'
+      },
+      'La Réunion' => {
+        'iso-3166-1' => { 'alpha-2' => 'RE', 'alpha-3' => 'REU', 'numeric' => 638 },
+        'continent' => 'Seven seas (open ocean)',
+        'region' => 'Eastern Africa'
+      },
       'Tuvalu' => {
         'iso-3166-1' => { 'alpha-2' => 'TV', 'alpha-3' => 'TUV', 'numeric' => 798 },
         'continent' => data['SB']['continent'],
@@ -203,7 +235,7 @@ namespace :import do
 
     # Some countries have non official subdivisions in Natural Earth.
     countries_without_subdivisions = %w[
-      AI AQ AS AW AX BL CK CW EH FK FO GG GS GU HK HM IM IO JE KY MF MP NC NF NU PF PM PN TC TF VA VG VI
+      AI AQ AS AW AX BL CK CW EH FK FO GG GS GU HK HM IM IO JE KY MC MF MP NC NF NU PF PM PN TC TF TW VA VG VI XK
     ]
 
     # Some subdivisions have incorrect ISO-3166-2.
@@ -216,6 +248,11 @@ namespace :import do
       'TJ-X01~' => 'TJ-RA'
     }
 
+    # Some subdivisions have missing names.
+    subdivisions_missing_names = {
+      'CO-DC' => 'Bogotá'
+    }
+
     subdivisions_shp = File.join(dir, format(file_patterns[:subdivisions], ext: 'shp'))
     RGeo::Shapefile::Reader.open(subdivisions_shp) do |shapefile|
       shapefile.each do |entry|
@@ -244,13 +281,15 @@ namespace :import do
             entry['iso_3166_2']
           end
 
-        if iso_3166_2.match?(/~\z/)
-          puts format('Unknown subdivision: %<name>s (%<iso_3166>s)', name: entry['name'], iso_3166: iso_3166_2)
+        if iso_3166_2.end_with?('~')
+          puts format('Warning: unknown subdivision %<name>s (%<iso_3166>s)', name: entry['name'], iso_3166: iso_3166_2)
+          next
         end
 
-        data[entry['iso_a2']]['subdivisions'][entry['iso_3166_2']] = {
-          'name' => entry['name'],
-          'iso-3166-2' => entry['iso_3166_2'],
+        name = subdivisions_missing_names.key?(iso_3166_2) ? subdivisions_missing_names[iso_3166_2] : entry['name']
+        data[entry['iso_a2']]['subdivisions'][iso_3166_2] = {
+          'name' => name,
+          'iso-3166-2' => iso_3166_2,
           'geometry' => RGeo::GeoJSON.encode(entry.geometry)
         }
       end
@@ -285,7 +324,7 @@ namespace :import do
         file.puts MultiJson.dump(country['geometry'])
       end
 
-      next if country['subdivisions'].size.zero?
+      next if country['subdivisions'].empty?
 
       country['subdivisions'].each do |(iso_3166_2, subdivision)|
         File.open(File.join(geometries_dir, iso_3166_1, "#{iso_3166_2}.json"), 'wb') do |file|
@@ -295,6 +334,7 @@ namespace :import do
     end
   end
 
+  desc 'Remove generated GeoJSON resources'
   task :cleanup do
     dir = NaturalEarth::RESOURCES_DIR
     next unless File.exist?(dir)
@@ -306,3 +346,4 @@ namespace :import do
     puts "#{dir} removed."
   end
 end
+# rubocop:enable Metrics/BlockLength

data/lib/natural_earth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NaturalEarth
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/lib/natural_earth.rb

@@ -9,7 +9,7 @@ require_relative 'natural_earth/geometries'
 require_relative 'natural_earth/country'
 require_relative 'natural_earth/subdivision'
 
-module NaturalEarth
+module NaturalEarth # :nodoc:
   class << self
     protected
 

data/natural_earth.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = 'Ruby wrapper around data from Natural Earth, free vector and raster map data @ naturalearthdata.com.'
   s.homepage    = 'https://gitlab.com/vaolo-public/ruby/natural-earth-gem'
 
+  s.metadata['rubygems_mfa_required'] = 'true'
   s.metadata['allowed_push_host'] = 'https://rubygems.org'
   s.metadata['homepage_uri'] = s.homepage
   s.metadata['source_code_uri'] = s.homepage
@@ -28,16 +29,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7.0'
 
   s.add_dependency 'rgeo-geojson', '~> 2.1'
-
-  # Rake tasks
-  s.add_development_dependency 'multi_json'
-  s.add_development_dependency 'oj'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rgeo-shapefile', '~> 3.0'
-  # Tests
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'twitter_cldr', '~> 6.7'
-  # Linting
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rubocop-rspec'
 end