jma_feed 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c76dfa5b24cec264aa047de3a21871a1cce3fcf7bee5908a88ecd0029d8fda1
-  data.tar.gz: 10abdfb01733d13e2d733a6f2499e6a2a614f3fb181797852602db2f5b45441a
+  metadata.gz: 5f2d20e3b5f31fc0cb5726f48dceb280e6b49110da4dc110ec3df67b888cf4ad
+  data.tar.gz: 188051f02027907aec84fd0e8f58c1223daa46b4c4da6b3074f87252837cefd8
 SHA512:
-  metadata.gz: 31aa0529c9797ef626849ecf3392dbea29a449917751f142c765dc0818b4f73e35642d4e481d9f05fd92acf8ec23ef2d51a333f8c6d9cdc7af2a1b92ce2affc7
-  data.tar.gz: ca936a1a99345e281a278c8aa1d234397ca90c600c2a4e3efc500d2bcdb463276ee28faac9bd45ba5d5bbd0dc4fc67773c0148f620635023517b82784bcce3cf
+  metadata.gz: 05ca0c27158b6111371e3b2111f8d2041f77ad0f8708828216bc569745ccfd0493da0d94a30cb83ae8faba62216cc2d044ce989b67ff92b7b6393674f9a5e4e3
+  data.tar.gz: 94fd7457b4471845cff5f3d9542344da3de9962e8376581770d06562d304c5f6c06b857eef70aa938fd2a0ab333e42326f293df2d03b5390cf38b9def8b03026

data/lib/jma_feed/atom/eqvol.rb

@@ -0,0 +1,7 @@
+class JMAFeed::Eqvol
+  include JMAFeed::Atom
+  
+  def feed_type
+    :eqvol
+  end
+end

data/lib/jma_feed/{api → atom}/extra.rb

@@ -1,5 +1,5 @@
 class JMAFeed::Extra
-  include JMAFeed::Api
+  include JMAFeed::Atom
   
   def feed_type
     :extra

data/lib/jma_feed/atom/other.rb

@@ -0,0 +1,7 @@
+class JMAFeed::Other
+  include JMAFeed::Atom
+  
+  def feed_type
+    :other
+  end
+end

data/lib/jma_feed/{api → atom}/regular.rb

@@ -1,5 +1,5 @@
 class JMAFeed::Regular
-  include JMAFeed::Api
+  include JMAFeed::Atom
 
   def feed_type
     :regular

data/lib/jma_feed/{api.rb → atom.rb}

@@ -1,6 +1,6 @@
 require "net/http"
 
-module JMAFeed::Api
+module JMAFeed::Atom
 
   def self.type(feed_type, **args)
     feed_type = feed_type.to_sym
@@ -8,6 +8,10 @@ module JMAFeed::Api
       JMAFeed::Regular.new(**args)
     elsif feed_type == :extra
       JMAFeed::Extra.new(**args)
+    elsif feed_type == :eqvol
+      JMAFeed::Eqvol.new(**args)
+    elsif feed_type == :other
+      JMAFeed::Other.new(**args)
     else
       raise "feed_type=#{feed_type} not supported"
     end

data/lib/jma_feed/entity/weather_alert/metrics_item.rb

@@ -0,0 +1,14 @@
+class JMAFeed::WeatherAlert::MetricsItem < Struct.new(
+  :name, :value, :description, :time_define,
+  keyword_init: true
+)
+
+  def to_h
+    {
+      name: name,
+      value: value,
+      description: description,
+      time_define: time_define.to_h,
+    }
+  end
+end

data/lib/jma_feed/entity/weather_alert.rb

@@ -161,6 +161,171 @@ class JMAFeed::WeatherAlert < Struct.new(:code, :name, :risk_level, :cluster, ke
     },
   }
 
+  # 気象警報・注意（Ｈ２７）_解説資料.pdf > 別表４
+  METRICS = {
+    storm_metrics: {
+      "風危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "風向" => {
+        name: :wind_direction,
+        property_type: "風",
+      },
+      "最大風速" => {
+        name: :wind_speed,
+        property_type: "風",
+      },
+    },
+    rain_metrics: {
+      "土砂災害危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "浸水害危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "1時間最大雨量" => {
+        name: :precipitation,
+        property_type: "雨",
+      },
+      "3時間最大雨量" => {
+        name: :precipitation,
+        property_type: "雨",
+      },
+    },
+    flood_metrics: {
+      "洪水害危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    snow_metrics: {
+      "雪危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "6時間最大降雪量" => {
+        name: :snow_fall_depth,
+        property_type: "雪",
+      },
+      "12時間最大降雪量" => {
+        name: :snow_fall_depth,
+        property_type: "雪",
+      },
+      "24時間最大降雪量" => {
+        name: :snow_fall_depth,
+        property_type: "雪",
+      },
+    },
+    wave_metrics: {
+      "波危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "波高" => {
+        name: :wave_height,
+        property_type: "波",
+      },
+    },
+    tide_metrics: {
+      "高潮危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "最高潮位" => {
+        name: :tidal_level,
+        property_type: "高",
+      },
+    },
+    thunder_metrics: {
+      "雷危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    snow_melting_metrics: {
+      "融雪危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    fog_metrics: {
+      "濃霧危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "視程" => {
+        name: :visibility,
+        property_type: "濃霧",
+      },
+    },
+    dry_air_metrics: {
+      "乾燥危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+      "実効湿度" => {
+        name: :humidity,
+        property_type: "乾燥",
+      },
+      "最小湿度" => {
+        name: :humidity,
+        property_type: "乾燥",
+      },
+    },
+    avalanche_metrics: {
+      "なだれ危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    low_temperature_metrics: {
+      "低温危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    frost_metrics: {
+      "霜危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    ice_accretion_metrics: {
+      "着氷危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+    snow_accretion_metrics: {
+      "着雪危険度" => {
+        name: :significancy,
+        property_type: "危険度",
+      },
+    },
+  }
+
+  CLUSTER_METRICS = {
+    storm: METRICS[:storm_metrics],
+    snowstorm: METRICS[:storm_metrics],
+    heavy_rain: METRICS[:rain_metrics],
+    flood: METRICS[:flood_metrics],
+    heavy_snow: METRICS[:snow_metrics],
+    high_wave: METRICS[:wave_metrics],
+    storm_surge: METRICS[:tide_metrics],
+    thunderstorm: METRICS[:thunder_metrics],
+    snow_melting: METRICS[:snow_melting_metrics],
+    dense_fog: METRICS[:fog_metrics],
+    dry_air: METRICS[:dry_air_metrics],
+    avalanche: METRICS[:avalanche_metrics],
+    low_temperature: METRICS[:low_temperature_metrics],
+    frost: METRICS[:frost_metrics],
+    ice_accretion: METRICS[:ice_accretion_metrics],
+    snow_accretion: METRICS[:snow_accretion_metrics],
+  }
+
   def self.clusters
     all.group_by(&:cluster)
   end
@@ -168,4 +333,16 @@ class JMAFeed::WeatherAlert < Struct.new(:code, :name, :risk_level, :cluster, ke
   def self.all
     @all ||= LIST.map{|k,v| new(v.merge(code: k.to_s))}
   end
+
+  def self.metrics_properties
+    METRICS.values.reduce(&:merge)
+  end
+
+  def self.metrics_components
+    metrics_properties.values.uniq
+  end
+
+  def metrics
+    CLUSTER_METRICS[cluster.to_sym] || {}
+  end
 end

data/lib/jma_feed/node/base_node.rb

@@ -0,0 +1,4 @@
+class JMAFeed::BaseNode < Giri::BaseNode
+  self.with_name_default_for_node = :camelize
+  self.with_name_default_for_attribute = :lower_camelcase
+end

data/lib/jma_feed/report.rb

@@ -95,4 +95,11 @@ class JMAFeed::Report < Struct.new(
   def has_kind?(k)
     Array(kind).include?(k)
   end
+
+  def report_entry_class
+    return nil unless code_represented
+    JMAFeed.const_get(code_represented)
+  rescue NameError => e
+    JMAFeed::ReportEntry
+  end
 end

data/lib/jma_feed/report_entry/jmx/discharge.rb

@@ -4,4 +4,8 @@ class JMAFeed::JMX::Discharge < Giri::TextNodeBigDecimal
   xml_attribute :ref_id, with_name: "refID"
   xml_attribute :condition
   xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
 end

data/lib/jma_feed/report_entry/jmx/earthquake.rb

@@ -0,0 +1,22 @@
+# jmx_eb
+class JMAFeed::JMX::Earthquake < Giri::BaseNode
+  date_time_node :origin_time
+  date_time_node :arrival_time
+
+  xml_node :hypocenter do
+    xml_node :area do
+      text_node :name
+      text_node :code do
+        xml_attribute :type
+      end
+      text_node :coordinate do
+        text_node :description
+        text_node :datum
+      end
+    end
+  end
+  big_decimal_node :magnitude do
+    xml_attribute :type
+    xml_attribute :description
+  end
+end

data/lib/jma_feed/report_entry/jmx/earthquake_intensity.rb

@@ -0,0 +1,14 @@
+class JMAFeed::JMX::EarthquakeIntensity < Giri::TextNodeString
+  # self:
+  # 1, 2, 3, 4, 5-, 5+, 6-, 6+, 7, 震度5弱以上未入電
+
+  def intensity
+    value = self.sub(/\-\z/, '').sub(/\+\z/, '.5').to_f
+    value > 0 ? value : nil
+  end
+
+  def title
+    return self unless intensity
+    "震度" + self.sub(/\-\z/, '弱').sub(/\+\z/, '強')
+  end
+end

data/lib/jma_feed/report_entry/jmx/humidity.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::Humidity < Giri::TextNodeInteger
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  # xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/precipitation.rb

@@ -4,4 +4,17 @@ class JMAFeed::JMX::Precipitation < Giri::TextNodeInteger
   xml_attribute :ref_id, with_name: "refID"
   xml_attribute :condition
   xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
 end

data/lib/jma_feed/report_entry/jmx/significancy.rb

@@ -1,7 +1,21 @@
 # jmx_mete
 class JMAFeed::JMX::Significancy < Giri::BaseNode
   xml_attribute :type
+  xml_attribute :ref_id, with_name: "refID"
   text_node :name
   text_node :code
   text_node :condition
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: code,
+      description: name,
+      time_define: time_define,
+    )
+  end
 end

data/lib/jma_feed/report_entry/jmx/snow_fall_depth.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::SnowFallDepth < Giri::TextNodeInteger
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  # xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/tidal_level.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::TidalLevel < Giri::TextNodeBigDecimal
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  # xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/time_define.rb

@@ -0,0 +1,18 @@
+class JMAFeed::JMX::TimeDefine < Giri::BaseNode
+  xml_attribute :time_id, with_name: :lower_camelcase
+  date_time_node :date_time
+  duration_node :duration
+  text_node :name
+
+  def start_at
+    date_time
+  end
+
+  def end_at
+    start_at + duration.duration_time
+  end
+
+  def to_h
+    {name: name, start_at: start_at, end_at: end_at, duration: duration}
+  end
+end

data/lib/jma_feed/report_entry/jmx/visibility.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::Visibility < Giri::TextNodeInteger
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/water_level.rb

@@ -4,4 +4,8 @@ class JMAFeed::JMX::WaterLevel < Giri::TextNodeBigDecimal
   xml_attribute :ref_id, with_name: "refID"
   xml_attribute :condition
   xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
 end

data/lib/jma_feed/report_entry/jmx/wave_height.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::WaveHeight < Giri::TextNodeBigDecimal
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  # xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/wind_direction.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::WindDirection < Giri::TextNodeString
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/jmx/wind_speed.rb

@@ -0,0 +1,20 @@
+class JMAFeed::JMX::WindSpeed < Giri::TextNodeInteger
+  xml_attribute :type
+  xml_attribute :unit
+  xml_attribute :ref_id, with_name: "refID"
+  xml_attribute :condition
+  xml_attribute :description
+
+  def time_define
+    (context.time_define_list || []).find{ref_id && ref_id == _1.time_id}
+  end
+
+  def metrics_item
+    @metrics_item ||= JMAFeed::WeatherAlert::MetricsItem.new(
+      name: type,
+      value: self,
+      description: description,
+      time_define: time_define,
+    )
+  end
+end

data/lib/jma_feed/report_entry/vphw50.rb

@@ -22,19 +22,19 @@ class JMAFeed::VPHW50 < JMAFeed::ReportEntry
       end
     end
 
-    def warning_district_report
+    def warning_area_type1
       warning.find{|w| w.type == "竜巻注意情報（発表細分）"}
     end
 
-    def warning_district_1st
+    def warning_area_type2
       warning.find{|w| w.type == "竜巻注意情報（一次細分区域等）"}
     end
 
-    def warning_district_aggregated
+    def warning_area_type3
       warning.find{|w| w.type == "竜巻注意情報（市町村等をまとめた地域等）"}
     end
 
-    def warning_district_2nd
+    def warning_area_type4
       warning.find{|w| w.type == "竜巻注意情報（市町村等）"}
     end
   end

data/lib/jma_feed/report_entry/vprn50.rb

@@ -40,6 +40,7 @@ class JMAFeed::VPRN50 < JMAFeed::ReportEntry
 
   xml_node :body do
     xml_node_collection :meteorological_infos do
+      xml_attribute :type
       xml_node_collection :meteorological_info do
         date_time_node :date_time
         xml_node_collection :item do
@@ -82,19 +83,19 @@ class JMAFeed::VPRN50 < JMAFeed::ReportEntry
       end
     end
 
-    def info_district_forecast
+    def info_area_type1
       meteorological_infos[0].meteorological_info[0]
     end
 
-    def info_district_1st
+    def info_area_type2
       meteorological_infos[1].meteorological_info[0]
     end
 
-    def info_district_aggregated
+    def info_area_type3
       meteorological_infos[2].meteorological_info[0]
     end
 
-    def info_district_2nd
+    def info_area_type4
       meteorological_infos[3].meteorological_info[0]
     end
   end

data/lib/jma_feed/report_entry/vpww54.rb

@@ -11,26 +11,43 @@
 # </MeteorologicalInfos>
 # 
 class JMAFeed::VPWW54 < JMAFeed::ReportEntry
+  class WarningItemKind < Giri::BaseNode
+    text_node :name
+    text_node :code
+    text_node :status
+    text_node :condition
+    xml_node :last_kind do
+      text_node :name
+      text_node :code
+    end
+    xml_node_collection :next_kinds do
+      xml_node :next_kind do
+        text_node :name
+        text_node :code
+        date_time_node :date_time do
+          xml_attribute :precision, type: :duration
+        end
+        text_node :sentence
+      end
+    end
+    xml_node :attention do
+      text_node :note, collection: true
+    end
+    xml_node :addition do
+      text_node :note, collection: true
+    end
+
+    def weather_alert
+      @weather_alert ||= JMAFeed::WeatherAlert.all.find{|a| a.code == code}
+    end
+  end
+
   xml_node :body do
+    text_node :notice, collection: true
     xml_node_collection :warning do
       xml_attribute :type
       xml_node_collection :item do
-        xml_node_collection :kind do
-          text_node :name
-          text_node :code
-          text_node :status
-          text_node :condition
-          xml_node :attention do
-            text_node :note, collection: true
-          end
-          xml_node :addition do
-            text_node :note, collection: true
-          end
-
-          def weather_alert
-            @weather_alert ||= JMAFeed::WeatherAlert.all.find{|a| a.code == code}
-          end
-        end
+        xml_node_collection :kind, type: "JMAFeed::VPWW54::WarningItemKind"
         text_node :change_status
         xml_node :area, type: "JMAFeed::JMX::Area"
 
@@ -41,37 +58,209 @@ class JMAFeed::VPWW54 < JMAFeed::ReportEntry
         end
       end
     end
+
     xml_node :meteorological_infos do
       xml_attribute :type
       xml_node :time_series_info do
+        context :time_define_list do
+          time_defines.time_define
+        end
+
         xml_node :time_defines do
-          xml_node_collection :time_define do
-            xml_attribute :time_id, with_name: :lower_camelcase
-            date_time_node :date_time
-            duration_node :duration
-            text_node :name
-          end
+          xml_node_collection :time_define, type: "JMAFeed::JMX::TimeDefine"
         end
         xml_node_collection :item do
-          # TODO
+          xml_node_collection :kind do
+            text_node :name
+            text_node :code
+            text_node :condition
+            xml_node_collection :property do
+              text_node :type
+
+              JMAFeed::WeatherAlert.metrics_components.each do |metr_component|
+                xml_node_collection "#{metr_component[:name]}_part".to_sym do
+                  xml_node :base do
+                    xml_node_collection metr_component[:name], type: "JMAFeed::JMX::#{metr_component[:name].to_s.camelize}"
+
+                    xml_node_collection :local do
+                      text_node :area_name
+                      xml_node_collection metr_component[:name], type: "JMAFeed::JMX::#{metr_component[:name].to_s.camelize}"
+                    end
+                  end
+                end
+              end
+            end
+
+            def weather_alert
+              @weather_alert ||= JMAFeed::WeatherAlert.all.find{|a| a.code == code}
+            end
+
+            # EXAMPLE of data structure
+            # {
+            #   "土砂災害危険度" => {"全体" => [...]},
+            #   "浸水害危険度" => {"全体" => [...]},
+            #   "1時間最大雨量" => {"全体" => [...]},
+            #   "3時間最大雨量" => {"全体" => [...]},
+            # }
+            # or 
+            # {
+            #   "土砂災害危険度" => {"山地" => [...], "平地" => [...]},
+            #   "浸水害危険度" => {"山地" => [...], "平地" => [...]},
+            #   "1時間最大雨量" => {"山地" => [...], "平地" => [...]},
+            #   "3時間最大雨量" => {"山地" => [...], "平地" => [...]},
+            # }
+            def weather_alert_metrics
+              return nil unless weather_alert
+              weather_alert.metrics.map do |k,v|
+                metrics_part = property.find{_1.type == v[:property_type]}&.public_send("#{v[:name]}_part")
+                metrics_bases = metrics_part&.map(&:base)
+                metrics_items = if metrics_bases && metrics_bases.length > 0
+                  primary_base = metrics_bases.first
+                  metrics_bases_area_items = if primary_base.local && primary_base.local.length > 0
+                    metrics_bases.map{|b| 
+                      b.local.map{|l|
+                        [
+                          l.area_name, 
+                          l.public_send(v[:name]).map(&:metrics_item)
+                        ]
+                      }.to_h
+                    }
+                  else
+                    metrics_bases.map{|b|
+                      [
+                        [
+                          "全体", 
+                          b.public_send(v[:name]).map(&:metrics_item)
+                        ]
+                      ].to_h
+                    }
+                  end
+
+                  metrics_bases_area_items.find{|area_items| 
+                    local_area_name, area_metrics_items = area_items.first
+                    area_metrics_items.first.name == k
+                  }
+                else
+                  nil
+                end
+
+                if metrics_items
+                  [k, metrics_items]
+                else
+                  nil
+                end
+              end.compact.to_h
+            end
+          end
+
+          JMAFeed::WeatherAlert.clusters.each do |cluster,alerts|
+            define_method cluster do
+              kind.find{|k| alerts.map(&:code).include?(k.code)}
+            end
+          end
+
+          xml_node :area, type: "JMAFeed::JMX::Area"
         end
       end
     end
 
-    def warning_district_forecast
-      warning[0]
+    def warning_area_type1
+      warning.find{|w| w.type == "気象警報・注意報（府県予報区等）"}
+    end
+
+    def warning_area_type2
+      warning.find{|w| w.type == "気象警報・注意報（一次細分区域等）"}
+    end
+
+    def warning_area_type3
+      warning.find{|w| w.type == "気象警報・注意報（市町村等をまとめた地域等）"}
+    end
+
+    def warning_area_type4
+      warning.find{|w| w.type == "気象警報・注意報（市町村等）"}
+    end
+  end
+
+  def detect_with_area(area, weather_alert_clusters: nil)
+    weather_alert_clusters ||= JMAFeed::WeatherAlert.clusters.keys
+    warning_item = detect_warning_item_with_area(area)
+    return nil unless warning_item
+
+    warning_alerts = weather_alert_clusters.map{|cluster|
+      warning_item.public_send(cluster)
+    }.compact
+
+    info_item = detect_info_item_with_area(area)
+    info_alerts = info_item && weather_alert_clusters.map{|cluster|
+      info_item.public_send(cluster)
+    }.compact
+
+    AreaAlert.new(
+      entry: self, 
+      area: area, 
+      weather_warnings: warning_alerts.map{|w|
+        WeatherWarning.new(w, info: info_alerts&.find{|i| i.code == w.code})
+      }
+    )
+  end
+
+  def detect_warning_item_with_area(area)
+    items = if area.is_a?(JMACode::AreaInformationCity)
+      body.warning_area_type4.item
+    else
+      if area.used_by.include?("area_forecast_type3_in_weather_alert")
+        body.warning_area_type3.item
+      elsif area.used_by.include?("area_forecast_type2_in_weather_alert")
+        body.warning_area_type2.item
+      elsif area.used_by.include?("area_forecast_type1_in_weather_alert")
+        body.warning_area_type1.item
+      else
+        nil
+      end
+    end
+    items&.find{_1.area.code == area.code}
+  end
+
+  def detect_info_item_with_area(area)
+    # NOTE: 当該電文で特別警報・警報・注意報の全てが解除される場合、MeteorologicalInfos 部は省略される。 (気象警報・注意報（Ｈ２７）_解説資料.pdf > 3-3)
+    return nil unless body.meteorological_infos
+
+    if area.is_a?(JMACode::AreaInformationCity)
+      body.meteorological_infos.time_series_info.item.find{_1.area.code == area.code}
+    else
+      nil
+    end
+  end
+
+  class AreaAlert < Struct.new(:entry, :area, :weather_warnings, keyword_init: true)
+  end
+
+  class WeatherWarning < DelegateClass(WarningItemKind)
+    attr_reader :info
+    def initialize(warning, info:)
+      @warning = warning
+      @info = info
+      super(warning)
+    end
+
+    def cluster
+      weather_alert.cluster
+    end
+
+    def risk_level
+      weather_alert.risk_level
     end
 
-    def warning_district_1st
-      warning[1]
+    def attentions
+      attention&.note
     end
 
-    def warning_district_aggregated
-      warning[2]
+    def additions
+      addition&.note
     end
 
-    def warning_district_2nd
-      warning[3]
+    def metrics
+      info&.weather_alert_metrics
     end
   end
 end

data/lib/jma_feed/report_entry/vxse53.rb

@@ -0,0 +1,135 @@
+# 地震情報（震源・震度に関する情報）
+# https://xml.kishou.go.jp/tec_material.html
+# 電文毎の解説資料 > 解説資料セットzip > 地震火山関連_解説資料.pdf > (ウ)地震情報(震源・震度に関する情報)
+# 
+class JMAFeed::VXSE53 < JMAFeed::ReportEntry
+  xml_node :head do
+    text_node :event_id, with_name: "EventID"
+  end
+
+  xml_node :body do
+    xml_node :earthquake, type: "JMAFeed::JMX::Earthquake"
+
+    xml_node :intensity do
+      xml_node :observation do
+        xml_node :code_define do
+          text_node :type, collection: true do
+            xml_attribute :xpath
+          end
+        end
+
+        text_node :max_int
+
+        xml_node_collection :pref do
+          text_node :name
+          text_node :code
+          xml_node :max_int, type: "JMAFeed::JMX::EarthquakeIntensity"
+          text_node :revise
+          xml_node_collection :area do
+            text_node :name
+            text_node :code
+            xml_node :max_int, type: "JMAFeed::JMX::EarthquakeIntensity"
+            text_node :revise
+            xml_node_collection :city do
+              text_node :name
+              text_node :code
+              xml_node :max_int, type: "JMAFeed::JMX::EarthquakeIntensity"
+              text_node :revise
+              text_node :condition
+              xml_node_collection :intensity_station do
+                text_node :name
+                text_node :code
+                xml_node :int, type: "JMAFeed::JMX::EarthquakeIntensity"
+                text_node :revise
+              end
+            end
+          end
+        end
+      end
+    end
+
+    xml_node :comments do
+      xml_node :forecast_comment do
+        xml_attribute :code_type
+        text_node :text
+        text_node :code
+      end
+      xml_node :var_comment do
+        xml_attribute :code_type
+        text_node :text
+        text_node :code
+      end
+      xml_node :free_form_comment do
+        text_node :text
+      end
+    end
+  end
+
+  def detect_with_area(area)
+    pref = detect_pref_with_area(area)
+    return nil unless pref
+
+    earthquake = body.earthquake
+    comments = [
+      body.comments&.forecast_comment&.text,
+      body.comments&.var_comment&.text,
+      body.comments&.free_form_comment&.text,
+    ].compact
+    if area.is_a?(JMACode::Prefecture)
+      AreaAlert.new(entry: self, area: area, intensity: pref, earthquake: earthquake, comments: comments)
+    else
+      local_area = detect_local_area_with_area(area, pref)
+      if local_area && area.is_a?(JMACode::AreaForecastLocalE)
+        AreaAlert.new(entry: self, area: area, intensity: local_area, earthquake: earthquake, comments: comments)
+      else
+        city = detect_city_with_area(area, local_area)
+        if city && area.is_a?(JMACode::AreaInformationCity)
+          AreaAlert.new(entry: self, area: area, intensity: city, earthquake: earthquake, comments: comments)
+        end
+      end
+    end
+  end
+
+  def detect_pref_with_area(area)
+    intensity = body.intensity
+    return nil unless intensity
+    
+    prefs = intensity.observation.pref
+    pref_code = if area.is_a?(JMACode::Prefecture)
+      area.code
+    elsif area.is_a?(JMACode::AreaForecastLocalE)
+      area.prefecture_code
+    elsif area.is_a?(JMACode::AreaInformationCity)
+      area.prefecture_code
+    else
+      nil
+    end
+
+    prefs.find{|pr| pr.code == pref_code}
+  end
+
+  def detect_local_area_with_area(area, pref_node)
+    area_code = if area.is_a?(JMACode::AreaForecastLocalE)
+      area.code
+    elsif area.is_a?(JMACode::AreaInformationCity)
+      area.area_forecast_local_e_code
+    else
+      nil
+    end
+
+    pref_node.area.find{|ar| ar.code == area_code}
+  end
+
+  def detect_city_with_area(area, local_area_node)
+    city_code = if area.is_a?(JMACode::AreaInformationCity)
+      area.code
+    else
+      nil
+    end
+
+    local_area_node.city.find{|c| c.code == city_code}
+  end
+
+  class AreaAlert < Struct.new(:entry, :area, :intensity, :earthquake, :comments, keyword_init: true)
+  end
+end

data/lib/jma_feed/report_entry.rb

@@ -1,10 +1,13 @@
 require "nokogiri"
-require "giri"
 
-class JMAFeed::ReportEntry < Giri::BaseNode
+class JMAFeed::ReportEntry < JMAFeed::BaseNode
   class << self
     def get(url)
       xml = Net::HTTP.get(URI.parse(url))
+      build(xml)
+    end
+
+    def build(xml)
       doc = Nokogiri::XML(xml)
       new(doc.root)
     end
@@ -25,16 +28,30 @@ class JMAFeed::ReportEntry < Giri::BaseNode
     text_node :info_type
     text_node :info_kind
     text_node :info_kind_version
+    xml_node :headline do
+      text_node :text
+    end
   end
 end
 
 require "jma_feed/report_entry/jmx/area"
+require "jma_feed/report_entry/jmx/time_define"
 require "jma_feed/report_entry/jmx/significancy"
 require "jma_feed/report_entry/jmx/precipitation"
 require "jma_feed/report_entry/jmx/water_level"
 require "jma_feed/report_entry/jmx/discharge"
+require "jma_feed/report_entry/jmx/wind_direction"
+require "jma_feed/report_entry/jmx/wind_speed"
+require "jma_feed/report_entry/jmx/wave_height"
+require "jma_feed/report_entry/jmx/visibility"
+require "jma_feed/report_entry/jmx/snow_fall_depth"
+require "jma_feed/report_entry/jmx/humidity"
+require "jma_feed/report_entry/jmx/tidal_level"
+require "jma_feed/report_entry/jmx/earthquake"
+require "jma_feed/report_entry/jmx/earthquake_intensity"
 require "jma_feed/report_entry/vprn50"
 require "jma_feed/report_entry/vpww54"
 require "jma_feed/report_entry/vxko"
 require "jma_feed/report_entry/vphw50"
 require "jma_feed/report_entry/vptaii"
+require "jma_feed/report_entry/vxse53"

data/lib/jma_feed/result.rb

@@ -56,4 +56,8 @@ class JMAFeed::Result
   def entries
     doc.entries
   end
+
+  def all_entries
+    doc.all_entries
+  end
 end

data/lib/jma_feed/result_doc.rb

@@ -34,8 +34,8 @@ class JMAFeed::ResultDoc
     text('link[@rel="related"]/@href')
   end
 
-  def entries
-    @entries ||= doc.xpath('/atom:feed/atom:entry', namespace).map do |entry|
+  def all_entries
+    @all_entries ||= doc.xpath('/atom:feed/atom:entry', namespace).map do |entry|
       JMAFeed::ResultEntry.new(
         title: entry.xpath('atom:title', namespace).text,
         link: entry.xpath('atom:link/@href', namespace).text,
@@ -46,4 +46,8 @@ class JMAFeed::ResultDoc
       )
     end
   end
+
+  def entries
+    all_entries.uniq(&:identity)
+  end
 end

data/lib/jma_feed/result_entry.rb

@@ -9,16 +9,39 @@ class JMAFeed::ResultEntry < Struct.new(
     time, number, report_code, report_area_code = identifier.split('_')
   end
 
+  # 気象警報・注意報（Ｈ２７）_解説資料.pdf
+  # ---------------
+  # 「前回電文」とは、参照中の電文(当該電文)と、
+  # - 情報名称(Control/Title)
+  # - 運用種別(Control/Status)
+  # - 発信官署(Control/EditorialOffice)
+  # が同一である電文の中で、発表時刻(Head/ReportDateTime)が当該電文の直近過去である電文を指す。
+  # 
+  # idに記載されるファイル名アンダースコア区切りの2番目がStatusを意味しているのかどうかは2024Aug時点で不明
+  # Status="通常" の電文しか取得できておらず確証はないが、この値をidに含んでいる可能性が高いと見切っての実装
+  def identity
+    [report_code, report_status, report_area_code].join('_')
+  end
+
   def report_code
     @report_code ||= identifier_components[2]
   end
 
   def report
     return nil if report_code.nil?
-    @report ||= JMAFeed::Report.latest.detect{_1.has_code?(report_code)}
+    @report ||= JMAFeed::Report.get.detect{_1.has_code?(report_code)}
   end
 
   def report_area_code
     @report_area_code ||= identifier_components[3]
   end
+
+  def report_status
+    @report_status ||= identifier_components[1]
+  end
+
+  def get_report_entry!
+    return unless report
+    report.report_entry_class.get(id)
+  end
 end

data/lib/jma_feed/version.rb

@@ -1,3 +1,3 @@
 module JMAFeed
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/jma_feed.rb

@@ -11,10 +11,14 @@ require "jma_feed/report"
 require "jma_feed/result"
 require "jma_feed/result_doc"
 require "jma_feed/result_entry"
-require "jma_feed/api"
-require "jma_feed/api/extra"
-require "jma_feed/api/regular"
+require "jma_feed/atom"
+require "jma_feed/atom/extra"
+require "jma_feed/atom/regular"
+require "jma_feed/atom/eqvol"
+require "jma_feed/atom/other"
+require "jma_feed/node/base_node"
 require "jma_feed/entity/weather_alert"
+require "jma_feed/entity/weather_alert/metrics_item"
 require "jma_feed/entity/risk_level"
 
 require "jma_feed/report_entry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jma_feed
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - metheglin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: giri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: JMA Feed
 email: pigmybank@gmail.com
 executables: []
@@ -75,23 +75,38 @@ files:
 - README.md
 - data/jmaxml_20240216_format_v1_3_hyo1.csv
 - lib/jma_feed.rb
-- lib/jma_feed/api.rb
-- lib/jma_feed/api/extra.rb
-- lib/jma_feed/api/regular.rb
+- lib/jma_feed/atom.rb
+- lib/jma_feed/atom/eqvol.rb
+- lib/jma_feed/atom/extra.rb
+- lib/jma_feed/atom/other.rb
+- lib/jma_feed/atom/regular.rb
 - lib/jma_feed/entity/risk_level.rb
 - lib/jma_feed/entity/weather_alert.rb
+- lib/jma_feed/entity/weather_alert/metrics_item.rb
+- lib/jma_feed/node/base_node.rb
 - lib/jma_feed/report.rb
 - lib/jma_feed/report_entry.rb
 - lib/jma_feed/report_entry/jmx/area.rb
 - lib/jma_feed/report_entry/jmx/discharge.rb
+- lib/jma_feed/report_entry/jmx/earthquake.rb
+- lib/jma_feed/report_entry/jmx/earthquake_intensity.rb
+- lib/jma_feed/report_entry/jmx/humidity.rb
 - lib/jma_feed/report_entry/jmx/precipitation.rb
 - lib/jma_feed/report_entry/jmx/significancy.rb
+- lib/jma_feed/report_entry/jmx/snow_fall_depth.rb
+- lib/jma_feed/report_entry/jmx/tidal_level.rb
+- lib/jma_feed/report_entry/jmx/time_define.rb
+- lib/jma_feed/report_entry/jmx/visibility.rb
 - lib/jma_feed/report_entry/jmx/water_level.rb
+- lib/jma_feed/report_entry/jmx/wave_height.rb
+- lib/jma_feed/report_entry/jmx/wind_direction.rb
+- lib/jma_feed/report_entry/jmx/wind_speed.rb
 - lib/jma_feed/report_entry/vphw50.rb
 - lib/jma_feed/report_entry/vprn50.rb
 - lib/jma_feed/report_entry/vptaii.rb
 - lib/jma_feed/report_entry/vpww54.rb
 - lib/jma_feed/report_entry/vxko.rb
+- lib/jma_feed/report_entry/vxse53.rb
 - lib/jma_feed/result.rb
 - lib/jma_feed/result_doc.rb
 - lib/jma_feed/result_entry.rb