jma_code 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f70649fc434ee1ccde5bcc78c5ea605b5efe485a90dffbb03cd61b21bc3d288
-  data.tar.gz: 8deba1d4d6591f77cb209d1d59a894abec00c7c1ee3a768f8e6f0495d4f43610
+  metadata.gz: bbdf42a7d23265f5ef359b28bf5c6d44fe2effb7d73cd620b3a6f38c1339ebd2
+  data.tar.gz: 269adeeb6213bf011b44a35c20872e7cde18600f4e038d8c2d60cbb5380d65a1
 SHA512:
-  metadata.gz: 2619f3d4a9975ddcecb7b6ce36ec629212d44d73a4b9be69e79a2d190f6f390cd4f161907b36e8d39c62d4e08cdd43c96e074c7e58e0fdf63331fdde13d52f36
-  data.tar.gz: 8d75d838146264b051a82339e809ff463d1289f0f423acce1586dba6339af2863b0ed625fb667b338fa829a65111053b76484a6dd3dc020348698d921f737fec
+  metadata.gz: 8b24c689d7f69eb67e27b04a460895104e7a18a32afce639dbbc9788a224a20fd7c6f7a2e5ec0bdac16e5c45da4ca2452c3ebe3c4b8b246e89451513424bfdff
+  data.tar.gz: acd1941675e1c09ec4d8f8e47707586a53f41d2d95bfd4bd9f4b447252d7f32d0ac46d18ad650b10fbffc5dfcf98db93d09df1f6256a5f35ac3a37472360915d

data/lib/jma_code/area_forecast_local.rb

@@ -92,6 +92,67 @@ module JMACode
           used_by: used_by_fields.select{|f| row[f] == '1'}.map{|f| f.to_s.sub(/\Aused_by_/, '').to_sym}
         )
       end
+
+      def build_tree(areas=nil, cities=nil)
+        areas ||= get
+        cities ||= JMACode::AreaInformationCity.get
+
+        toplevels, areas = areas.partition{|a| a.any_belonging_locals.blank?}
+        pref_areas = areas.group_by(&:prefecture_code)
+        pref_cities = cities.group_by(&:prefecture_code)
+        toplevels.group_by(&:prefecture).map{|pref, pref_toplevels|
+          current_areas = pref_areas[pref.code]
+          current_cities = pref_cities[pref.code]
+
+          [
+            block_given? ? yield(pref) : pref, 
+            pref_toplevels.map{|t|
+              secondlevels = (current_areas+current_cities).select{|a| a.child_of?(t)}
+              secondlevels_children = secondlevels.map{|s|
+                thirdlevels = (current_areas+current_cities).select{|a| a.child_of?(s)}
+                thirdlevels_children = thirdlevels.map{|th| 
+                  forthlevels = current_cities.select{|c| c.child_of?(th)}
+                  [
+                    block_given? ? yield(th) : th, 
+                    forthlevels.map{|f|
+                      [block_given? ? yield(f) : f, nil]
+                    }
+                  ]
+                }
+                [
+                  block_given? ? yield(s) : s,
+                  thirdlevels_children
+                ]
+              }
+              [
+                block_given? ? yield(t) : t,
+                secondlevels_children
+              ]
+            }
+          ]
+
+        }
+      end
+
+      def walk_tree(tree, &block)
+        tree.map do |area, children|
+          a = block.call(area)
+          c = if children.is_a?(Array) and children.present?
+            walk_tree(children, &block)
+          else
+            children
+          end
+          [a, c]
+        end
+      end
+    end
+
+    def prefecture_code
+      @prefecture_code ||= code[0, 2]
+    end
+
+    def prefecture
+      @prefecture ||= Prefecture.get.find{|pref| pref.code == prefecture_code}
     end
 
     def area_information_cities
@@ -113,7 +174,20 @@ module JMACode
     end
 
     def any_belonging_locals
-      [belonging_local_in_weather_alert, belonging_local_in_tornado_alert].compact.uniq(&:code)
+      @any_belonging_locals ||= [belonging_local_in_weather_alert, belonging_local_in_tornado_alert].compact.uniq(&:code)
+    end
+
+    def any_ancestry_locals
+      @any_ancestry_locals ||= [
+        belonging_local_in_weather_alert, 
+        belonging_local_in_tornado_alert, 
+        belonging_local_in_weather_alert&.belonging_local_in_weather_alert, 
+        belonging_local_in_tornado_alert&.belonging_local_in_tornado_alert, 
+      ].compact.uniq(&:code)
+    end
+
+    def child_of?(area_or_city)
+      any_belonging_locals.map(&:code).include?(area_or_city.code)
     end
 
     def to_csv_row

data/lib/jma_code/area_information_city.rb

@@ -3,7 +3,7 @@ module JMACode
   using Blank
 
   class AreaInformationCity < Struct.new(
-    :code, :name, :alt_name, :alt_name_phonetic,
+    :code, :long_name, :alt_name, :alt_name_phonetic,
     :area_forecast_local_code, :used_by,
     keyword_init: true
   )
@@ -11,24 +11,24 @@ module JMACode
     NUM_HEADER_ROWS = 3
     HEADERS = %i(
       code
-      name
+      long_name
       name_used_by_weather
       name_phonetic_used_by_weather
       area_forecast_local_code
-      used_by_weather_alert
-      used_by_tornado_alert
-      used_by_storm_surge_alert
-      used_by_high_wave_alert
-      used_by_landslide_alert
-      used_by_flood_alert
+      used_by_weather
+      used_by_tornado
+      used_by_storm_surge
+      used_by_high_wave
+      used_by_landslide
+      used_by_flood
       name_used_by_earthquake
       name_phonetic_used_by_earthquake
       name_used_by_volcano
       name_phonetic_used_by_volcano
       name_used_by_uv
       name_phonetic_used_by_uv
-      name_used_by_rainstorm_alert
-      name_phonetic_used_by_rainstorm_alert
+      name_used_by_rainstorm
+      name_phonetic_used_by_rainstorm
     )
 
     class << self
@@ -63,36 +63,62 @@ module JMACode
           [row[:name_used_by_volcano], row[:name_phonetic_used_by_volcano]]
         elsif row[:name_used_by_uv].present?
           [row[:name_used_by_uv], row[:name_phonetic_used_by_uv]]
-        elsif row[:name_used_by_rainstorm_alert].present?
-          [row[:name_used_by_rainstorm_alert], row[:name_phonetic_used_by_rainstorm_alert]]
+        elsif row[:name_used_by_rainstorm].present?
+          [row[:name_used_by_rainstorm], row[:name_phonetic_used_by_rainstorm]]
         else
           []
         end
 
         new(
           code: row[:code], 
-          name: row[:name], 
+          long_name: row[:long_name], 
           alt_name: alt_name,
           alt_name_phonetic: alt_name_phonetic,
           area_forecast_local_code: row[:area_forecast_local_code],
           used_by: [
-            row[:used_by_weather_alert] == '1' ? :weather_alert : nil,
-            row[:used_by_tornado_alert] == '1' ? :tornado_alert : nil,
-            row[:used_by_storm_surge_alert] == '1' ? :storm_surge_alert : nil,
-            row[:used_by_high_wave_alert] == '1' ? :high_wave_alert : nil,
-            row[:used_by_landslide_alert] == '1' ? :landslide_alert : nil,
-            row[:used_by_flood_alert] == '1' ? :flood_alert : nil,
+            row[:used_by_weather] == '1' ? :weather : nil,
+            row[:used_by_tornado] == '1' ? :tornado : nil,
+            row[:used_by_storm_surge] == '1' ? :storm_surge : nil,
+            row[:used_by_high_wave] == '1' ? :high_wave : nil,
+            row[:used_by_landslide] == '1' ? :landslide : nil,
+            row[:used_by_flood] == '1' ? :flood : nil,
             row[:name_used_by_earthquake].present? ? :earthquake : nil,
             row[:name_used_by_volcano].present? ? :volcano : nil,
             row[:name_used_by_uv].present? ? :uv : nil,
-            row[:name_used_by_rainstorm_alert].present? ? :rainstorm_alert : nil,
+            row[:name_used_by_rainstorm].present? ? :rainstorm : nil,
           ].compact
         )
       end
     end
 
+    def name
+      alt_name.presence || long_name
+    end
+
+    def name_phonetic
+      alt_name_phonetic
+    end
+
+    def prefecture_code
+      @prefecture_code ||= code[0, 2]
+    end
+
     def area_forecast_local
       @area_forecast_local ||= AreaForecastLocal.get.find{|x| x.code == area_forecast_local_code}
     end
+
+    def child_of?(area_or_city)
+      area_forecast_local_code == area_or_city.code
+    end
+
+    def to_h
+      {
+        code: code,
+        name: name,
+        name_phonetic: name_phonetic,
+        area_forecast_local_code: area_forecast_local_code,
+        used_by: used_by,
+      }
+    end
   end
 end

data/lib/jma_code/prefecture.rb

@@ -24,7 +24,7 @@ module JMACode
       [18, '福井県', '福井', 'fukui'],
       [19, '山梨県', '山梨', 'yamanashi'],
       [20, '長野県', '長野', 'nagano'],
-      [20, '岐阜県', '岐阜', 'gifu'],
+      [21, '岐阜県', '岐阜', 'gifu'],
       [22, '静岡県', '静岡', 'shizuoka'],
       [23, '愛知県', '愛知', 'aichi'],
       [24, '三重県', '三重', 'mie'],

data/lib/jma_code/version.rb

@@ -1,3 +1,3 @@
 module JMACode
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jma_code
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - metheglin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake