pumi 0.12.2 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c338fd7c9989d517c568b220fad0700b141044673b46ecf908fe40692890c96f
-  data.tar.gz: 57c0a0a287d5fd3fe892697eef9c5c480fdba8efa6fdf3106fda5af420d0d999
+  metadata.gz: c7df0e8620fb33e07db08efc84310967c1ce09c545de619b98c7b8294baab835
+  data.tar.gz: d752627f28b601a273508e7868de577dc2498b61278955152a88a7890552c992
 SHA512:
-  metadata.gz: 81a711486ae8400838a02c1253b406ef779a025426cddd9b545220b1508936635888a51132474f80733002fa8a4d8890c2cf83cf7001602a4fa5cdc6bcf961d9
-  data.tar.gz: 89038beb7b19c9e5f17693fcffac6f5cfba9451171d64d31377b06b1cb578ef5fe6e3a5f32dc7c66103623f8273c25bcf0021eb89d391fb3cbb73da5ca2c0d1e
+  metadata.gz: abebda567ad01aceb9ab68279f37456870dedb498c89e2b8465b215fb453da437a1963924fd1342a5f55a904a4ae76943ad76fd523f6af1f29d2f722509a3d20
+  data.tar.gz: 420fd418789d76c2eef6ce332c75d92c08fead8d99b902b8ccf43816e26f1bfa9ebc4d75cf3d58579906e0a1ca6202d85a5d6d4869bf9c0bf194a3a1a134c4e8

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.13.1](https://github.com/dwilkie/pumi/compare/v0.13.0...v0.13.1) (2023-03-02)
+
+
+### Bug Fixes
+
+* Improve data parser ([#35](https://github.com/dwilkie/pumi/issues/35)) ([f17ebf5](https://github.com/dwilkie/pumi/commit/f17ebf5eba26d88f4fff4fb5bb2461d1817a0829))
+
+## [0.13.0](https://github.com/dwilkie/pumi/compare/v0.12.2...v0.13.0) (2023-02-06)
+
+
+### Features
+
+* Update data ([#33](https://github.com/dwilkie/pumi/issues/33)) ([ab06018](https://github.com/dwilkie/pumi/commit/ab06018c19f1546c8d1c2c53b154623037301563))
+
 ## [0.12.2](https://github.com/dwilkie/pumi/compare/v0.12.1...v0.12.2) (2023-02-01)
 
 

data/README.md

@@ -8,13 +8,13 @@ Pumi (ភូមិ pronounced Poom, which means Village in Khmer) is an Open Sou
 
 ## Demo and API
 
-A [JSON API](https://pumiapp.herokuapp.com) is available to if you're not using Ruby or if you just don't want to install a local copy of the data. The [API Start Page](https://pumiapp.herokuapp.com) also shows a Demo of a UI for for entering any location in Cambodia.
+A [JSON API](https://pumi.onrender.com/) is available to if you're not using Ruby or if you just don't want to install a local copy of the data. The [API Start Page](https://pumi.onrender.com/) also shows a Demo of a UI for for entering any location in Cambodia.
 
 ## Usage
 
 ### Rails
 
-Using Pumi with Rails gives you some javascript helpers as well as an API to filter and select Provinces (ខេត្ត), Districts (ស្រុក / ខណ្ឌ), Communes (ឃុំ / សង្កាត់) and Villages (ភូមិ) in both latin and Khmer as seen below and in the [Pumi API Start Page](https://pumiapp.herokuapp.com)
+Using Pumi with Rails gives you some javascript helpers as well as an API to filter and select Provinces (ខេត្ត), Districts (ស្រុក / ខណ្ឌ), Communes (ឃុំ / សង្កាត់) and Villages (ភូមិ) in both latin and Khmer as seen below and in the [Pumi API Start Page](https://pumi.onrender.com/)
 
 ![Pumi UI Latin](https://raw.githubusercontent.com/dwilkie/pumi/master/pumi_ui_en.png)
 ![Pumi UI Khmer](https://raw.githubusercontent.com/dwilkie/pumi/master/pumi_ui_km.png)

data/bin/parse_data

@@ -4,63 +4,9 @@
 
 # $ parse_data
 
-require "pathname"
-require "csv"
-require "yaml"
+require "bundler/setup"
+require "pumi"
 
-DEFAULT_DATA_LOCATION = "tmp/*.csv".freeze
-HEADERS = %w[type code name_km name_latin reference note1 note2].freeze
-CODE_LENGTHS = {
-  4 => "districts",
-  6 => "communes",
-  8 => "villages"
-}.freeze
-
-# https://en.wikipedia.org/wiki/Administrative_divisions_of_Cambodia
-# https://en.wikipedia.org/wiki/Romanization_of_Khmer
-# https://en.wikipedia.org/wiki/United_Nations_Group_of_Experts_on_Geographical_Names
-
-AdministrativeUnit = Struct.new(:en, :km, :latin, keyword_init: true)
-ADMINISTRATIVE_UNITS = {
-  "ស្រុក" => AdministrativeUnit.new(en: "District", km: "ស្រុក", latin: "Srok"),
-  "ខណ្ឌ" => AdministrativeUnit.new(en: "Section", km: "ខណ្ឌ", latin: "Khan"),
-  "ឃុំ" => AdministrativeUnit.new(en: "Commune", km: "ឃុំ", latin: "Khum"),
-  "សង្កាត់" => AdministrativeUnit.new(en: "Quarter", km: "សង្កាត់", latin: "Sangkat"),
-  "ភូមិ" => AdministrativeUnit.new(en: "Village", km: "ភូមិ", latin: "Phum"),
-  "ក្រុង" => AdministrativeUnit.new(en: "Municipality", km: "ក្រុង", latin: "Krong")
-}.freeze
-
-data = {}
-
-Pathname.glob(DEFAULT_DATA_LOCATION).select(&:file?).each do |file|
-  CSV.read(file, headers: HEADERS).each do |row|
-    code = row.fetch("code")
-    next if code.to_s.gsub(/\D/, "").empty?
-
-    code = code.rjust(code.length + 1, "0") if code.length.odd?
-    location_type = CODE_LENGTHS.fetch(code.length)
-    administrative_unit = ADMINISTRATIVE_UNITS.fetch(row.fetch("type"))
-
-    data[location_type] ||= {}
-    data[location_type][code] = {
-      "name" => {
-        "km" => row.fetch("name_km"),
-        "latin" => row.fetch("name_latin")
-      },
-      "administrative_unit" => {
-        "km" => administrative_unit.km,
-        "latin" => administrative_unit.latin,
-        "en" => administrative_unit.en
-      }
-    }
-  end
-end
-
-if data.any?
-  CODE_LENGTHS.each do |_, type|
-    File.write(
-      "data/#{type}.yml",
-      { type => data.fetch(type).sort.to_h }.to_yaml
-    )
-  end
-end
+data_parser = Pumi::DataParser.new
+data = data_parser.load_data!
+data_parser.write_data!(data)