gps_pvt 0.1.5 → 0.2.1

data/lib/gps_pvt/receiver.rb

@@ -7,115 +7,148 @@ require_relative 'GPS'
 
 module GPS_PVT
 class Receiver
-  OUTPUT_PVT_ITEMS = [[
-    [:week, :itow_rcv, :year, :month, :mday, :hour, :min, :sec],
-    proc{|pvt|
-      [:week, :seconds, :c_tm].collect{|f| pvt.receiver_time.send(f)}.flatten
-    }
-  ]] + [[
-    [:receiver_clock_error_meter, :longitude, :latitude, :height],
-    proc{|pvt|
-      next [nil] * 4 unless pvt.position_solved? 
+  def self.pvt_items(opt = {})
+    opt = {
+      :system => [[:GPS, 1..32]],
+      :satellites => (1..32).to_a,
+    }.merge(opt)
+    [[
+      [:week, :itow_rcv, :year, :month, :mday, :hour, :min, :sec],
+      proc{|pvt|
+        [:week, :seconds, :c_tm].collect{|f| pvt.receiver_time.send(f)}.flatten
+      }
+    ]] + [[
+      [:receiver_clock_error_meter, :longitude, :latitude, :height, :rel_E, :rel_N, :rel_U],
+      proc{|pvt|
+        next [nil] * 7 unless pvt.position_solved?
+        [
+          pvt.receiver_error,
+          pvt.llh.lng / Math::PI * 180,
+          pvt.llh.lat / Math::PI * 180,
+          pvt.llh.alt,
+        ] + (pvt.rel_ENU.to_a rescue [nil] * 3)
+      } 
+    ]] + [proc{
+      labels = [:g, :p, :h, :v, :t].collect{|k| "#{k}dop".to_sym}
       [
-        pvt.receiver_error,
-        pvt.llh.lng / Math::PI * 180,
-        pvt.llh.lat / Math::PI * 180,
-        pvt.llh.alt,
+        labels,
+        proc{|pvt|
+          next [nil] * 5 unless pvt.position_solved?
+          labels.collect{|k| pvt.send(k)}
+        }
       ]
-    } 
-  ]] + [proc{
-    labels = [:g, :p, :h, :v, :t].collect{|k| "#{k}dop".to_sym}
-    [
-      labels,
+    }.call] + [[
+      [:v_north, :v_east, :v_down, :receiver_clock_error_dot_ms],
       proc{|pvt|
-        next [nil] * 5 unless pvt.position_solved?
-        labels.collect{|k| pvt.send(k)}
+        next [nil] * 4 unless pvt.velocity_solved?
+        [:north, :east, :down].collect{|k| pvt.velocity.send(k)} \
+            + [pvt.receiver_error_rate] 
       }
-    ]
-  }.call] + [[
-    [:v_north, :v_east, :v_down, :receiver_clock_error_dot_ms],
-    proc{|pvt|
-      next [nil] * 4 unless pvt.velocity_solved?
-      [:north, :east, :down].collect{|k| pvt.velocity.send(k)} \
-          + [pvt.receiver_error_rate] 
-    }
-  ]] + [
-    [:used_satellites, proc{|pvt| pvt.used_satellites}],
-    [:PRN, proc{|pvt|
-      ("%32s"%[pvt.used_satellite_list.collect{|i|
-        1 << (i - 1)
-      }.inject(0){|res, v| res | v}.to_s(2)]).scan(/.{8}/).collect{|str|
-        str.gsub(' ', '0')
-      }.join('_')
-    }],
-  ] + [[
-    (1..32).collect{|prn|
-      [:range_residual, :weight, :azimuth, :elevation, :slopeH, :slopeV].collect{|str| "#{str}(#{prn})"}
-    }.flatten,
-    proc{|pvt|
-      next ([nil] * 6 * 32) unless pvt.position_solved?
-      sats = pvt.used_satellite_list
-      r, w = [:delta_r, :W].collect{|f| pvt.send(f)}
-      (1..32).collect{|i|
-        next ([nil] * 6) unless i2 = sats.index(i)
-        [r[i2, 0], w[i2, i2]] +
-            [:azimuth, :elevation].collect{|f|
-              pvt.send(f)[i] / Math::PI * 180
-            } + [pvt.slopeH[i], pvt.slopeV[i]]
-      }.flatten
-    },
-  ]] + [[
-    [:wssr, :wssr_sf, :weight_max,
-        :slopeH_max, :slopeH_max_PRN, :slopeH_max_elevation,
-        :slopeV_max, :slopeV_max_PRN, :slopeV_max_elevation],
-    proc{|pvt|
-      next [nil] * 9 unless fd = pvt.fd
-      el_deg = [4, 6].collect{|i| pvt.elevation[fd[i]] / Math::PI * 180}
-      fd[0..4] + [el_deg[0]] + fd[5..6] + [el_deg[1]]
-    }
-  ]] + [[
-    [:wssr_FDE_min, :wssr_FDE_min_PRN, :wssr_FDE_2nd, :wssr_FDE_2nd_PRN],
-    proc{|pvt|
-      [:fde_min, :fde_2nd].collect{|f|
-        info = pvt.send(f)
-        next ([nil] * 2) if (!info) || info.empty?
-        [info[0], info[-3]] 
-      }.flatten
-    }
-  ]]
+    ]] + [
+      [:used_satellites, proc{|pvt| pvt.used_satellites}],
+    ] + opt[:system].collect{|sys, range|
+      bit_flip = if range.kind_of?(Array) then
+        proc{|res, i|
+          res[i] = "1" if i = range.index(i)
+          res
+        }
+      else # expect Range
+        base_prn = range.min
+        proc{|res, i|
+          res[i - base_prn] = "1" if range.include?(i)
+          res
+        }
+      end
+      ["#{sys}_PRN", proc{|pvt|
+        pvt.used_satellite_list.inject("0" * range.size, &bit_flip) \
+            .scan(/.{1,8}/).join('_').reverse
+      }]
+    } + [[
+      opt[:satellites].collect{|prn, label|
+        [:range_residual, :weight, :azimuth, :elevation, :slopeH, :slopeV].collect{|str|
+          "#{str}(#{label || prn})"
+        }
+      }.flatten,
+      proc{|pvt|
+        next ([nil] * 6 * opt[:satellites].size) unless pvt.position_solved?
+        sats = pvt.used_satellite_list
+        r, w = [:delta_r, :W].collect{|f| pvt.send(f)}
+        opt[:satellites].collect{|i|
+          next ([nil] * 6) unless i2 = sats.index(i)
+          [r[i2, 0], w[i2, i2]] +
+              [:azimuth, :elevation].collect{|f|
+                pvt.send(f)[i] / Math::PI * 180
+              } + [pvt.slopeH[i], pvt.slopeV[i]]
+        }.flatten
+      },
+    ]] + [[
+      [:wssr, :wssr_sf, :weight_max,
+          :slopeH_max, :slopeH_max_PRN, :slopeH_max_elevation,
+          :slopeV_max, :slopeV_max_PRN, :slopeV_max_elevation],
+      proc{|pvt|
+        next [nil] * 9 unless fd = pvt.fd
+        el_deg = [4, 6].collect{|i| pvt.elevation[fd[i]] / Math::PI * 180}
+        fd[0..4] + [el_deg[0]] + fd[5..6] + [el_deg[1]]
+      }
+    ]] + [[
+      [:wssr_FDE_min, :wssr_FDE_min_PRN, :wssr_FDE_2nd, :wssr_FDE_2nd_PRN],
+      proc{|pvt|
+        [:fde_min, :fde_2nd].collect{|f|
+          info = pvt.send(f)
+          next ([nil] * 2) if (!info) || info.empty?
+          [info[0], info[-3]] 
+        }.flatten
+      }
+    ]]
+  end
 
-  OUTPUT_MEAS_ITEMS = [[
-    (1..32).collect{|prn|
-      [:L1_range, :L1_rate].collect{|str| "#{str}(#{prn})"}
-    }.flatten,
-    proc{|meas|
-      meas_hash = Hash[*(meas.collect{|prn, k, v| [[prn, k], v]}.flatten(1))]
-      (1..32).collect{|prn|
-        [:L1_PSEUDORANGE, [:L1_DOPPLER, GPS::SpaceNode.L1_WaveLength]].collect{|k, sf|
-          meas_hash[[prn, GPS::Measurement.const_get(k)]] * (sf || 1) rescue nil
+  def self.meas_items(opt = {})
+    opt = {
+      :satellites => (1..32).to_a,
+    }.merge(opt)
+    [[
+      opt[:satellites].collect{|prn, label|
+        [:L1_range, :L1_rate].collect{|str| "#{str}(#{label || prn})"}
+      }.flatten,
+      proc{|meas|
+        meas_hash = Hash[*(meas.collect{|prn, k, v| [[prn, k], v]}.flatten(1))]
+        opt[:satellites].collect{|prn|
+          [:L1_PSEUDORANGE, [:L1_DOPPLER, GPS::SpaceNode.L1_WaveLength]].collect{|k, sf|
+            meas_hash[[prn, GPS::Measurement.const_get(k)]] * (sf || 1) rescue nil
+          }
         }
       }
-    }
-  ]]
-  
-  def self.header
-    (OUTPUT_PVT_ITEMS + OUTPUT_MEAS_ITEMS).transpose[0].flatten.join(',')
+    ]]
+  end
+
+  def header
+    (@output[:pvt] + @output[:meas]).transpose[0].flatten.join(',')
   end
     
   attr_accessor :solver
+  attr_accessor :base_station
 
   def initialize(options = {})
     @solver = GPS::Solver::new
-    @solver.hooks[:relative_property] = proc{|prn, rel_prop, rcv_e, t_arv, usr_pos, usr_vel|
+    @solver.hooks[:relative_property] = proc{|prn, rel_prop, meas, rcv_e, t_arv, usr_pos, usr_vel|
       rel_prop[0] = 1 if rel_prop[0] > 0 # weight = 1
       rel_prop
     }
+    @debug = {}
+    output_options = {
+      :system => [[:GPS, 1..32], [:QZSS, 193..202]],
+      :satellites => (1..32).to_a + (193..202).to_a, # [idx, ...] or [[idx, label], ...] is acceptable
+    }
     options = options.reject{|k, v|
       case k
+      when :debug
+        v = v.split(/,/)
+        @debug[v[0].upcase.to_sym] = v[1..-1]
+        next true
       when :weight
         case v.to_sym
         when :elevation # (same as underneath C++ library)
-          @solver.hooks[:relative_property] = proc{|prn, rel_prop, rcv_e, t_arv, usr_pos, usr_vel|
+          @solver.hooks[:relative_property] = proc{|prn, rel_prop, meas, rcv_e, t_arv, usr_pos, usr_vel|
             if rel_prop[0] > 0 then
               elv = Coordinate::ENU::relative_rel(
                   Coordinate::XYZ::new(*rel_prop[4..6]), usr_pos).elevation
@@ -127,6 +160,77 @@ class Receiver
         when :identical # same as default
           next true
         end
+      when :base_station
+        crd, sys = v.split(/ *, */).collect.with_index{|item, i|
+          case item
+          when /^([\+-]?\d+\.?\d*)([XYZNEDU]?)$/ # ex) meter[X], degree[N]
+            [$1.to_f, ($2 + "XY?"[i])[0]]
+          when /^([\+-]?\d+)_(?:(\d+)_(\d+\.?\d*)|(\d+\.?\d*))([NE])$/ # ex) deg_min_secN
+            [$1.to_f + ($2 || $4).to_f / 60 + ($3 || 0).to_f / 3600, $5]
+          else
+            raise "Unknown coordinate spec.: #{item}"
+          end
+        }.transpose
+        raise "Unknown base station: #{v}" if crd.size != 3
+        @base_station = case (sys = sys.join.to_sym)
+        when :XYZ, :XY?
+          Coordinate::XYZ::new(*crd)
+        when :NED, :ENU, :NE?, :EN? # :NE? => :NEU, :EN? => :ENU
+          (0..1).each{|i| crd[i] *= (Math::PI / 180)}
+          ([:NED, :NE?].include?(sys) ?
+              Coordinate::LLH::new(crd[0], crd[1], crd[2] * (:NED == sys ? -1 : 1)) :
+              Coordinate::LLH::new(crd[1], crd[0], crd[2])).xyz
+        else
+          raise "Unknown coordinate system: #{sys}"
+        end
+        $stderr.puts "Base station (LLH): #{
+          llh = @base_station.llh.to_a
+          llh[0..1].collect{|rad| rad / Math::PI * 180} + [llh[2]]
+        }"
+        next true
+      when :with, :without
+        [v].flatten.each{|spec| # array is acceptable
+          sys, svid = case spec
+          when Integer
+            [nil, spec]
+          when /([a-zA-Z]+)(?::(-?\d+))?/
+            [$1.upcase.to_sym, (Integre($2) rescue nil)]
+          when /-?\d+/
+            [nil, $&.to_i]
+          else
+            next false
+          end
+          mode = if svid && (svid < 0) then
+            svid *= -1
+            (k == :with) ? :exclude : :include
+          else
+            (k == :with) ? :include : :exclude
+          end
+          if (sys == :GPS) || (sys == :QZSS) \
+              || (svid && ((1..32).include?(svid) || (193..202).include?(svid))) then
+            [svid || ((1..32).to_a + (193..202).to_a)].flatten.each{
+              @solver.gps_options.send(mode, svid)
+            }
+          elsif (sys == :SBAS) || (svid && (120..158).include?(svid)) then
+            prns = [svid || (120..158).to_a].flatten
+            unless (i = output_options[:system].index{|sys, range| sys == :SBAS}) then
+              i = -1
+              output_options[:system] << [:SBAS, []]
+            else
+              output_options[:system][i].reject!{|prn| prns.include?(prn)}
+            end
+            output_options[:satellites].reject!{|prn, label| prns.include?(prn)}
+            if mode == :include then
+              output_options[:system][i][1] += prns
+              output_options[:satellites] += prns
+            end
+            prns.each{|prn| @solver.sbas_options.send(mode, prn)}
+          else
+            next false  
+          end
+          $stderr.puts "#{mode.capitalize} satellite: #{[sys, svid].compact.join(':')}"
+        }
+        next true
       end
       false
     }
@@ -135,9 +239,35 @@ class Receiver
       opt.elevation_mask = 0.0 / 180 * Math::PI # 0 deg
       opt.residual_mask = 1E4 # 10 km
     }.call(@solver.gps_options)
+    @output = {
+      :pvt => Receiver::pvt_items(output_options),
+      :meas => Receiver::meas_items(output_options),
+    }
   end
 
-  def run(meas, t_meas)
+  GPS::Measurement.class_eval{
+    proc{
+      key2sym = []
+      GPS::Measurement.constants.each{|k|
+        i = GPS::Measurement.const_get(k)
+        key2sym[i] = k if i.kind_of?(Integer)
+      }
+      define_method(:to_a2){
+        to_a.collect{|prn, k, v| [prn, key2sym[k] || k, v]}
+      }
+      define_method(:to_hash2){
+        Hash[*(to_hash.collect{|prn, k_v|
+          [prn, Hash[*(k_v.collect{|k, v| [key2sym[k] || k, v]}.flatten(1))]]
+        }.flatten(1))]
+      }
+    }.call
+    alias_method(:add_orig, :add)
+    define_method(:add){|prn, key, value|
+      add_orig(prn, key.kind_of?(Symbol) ? GPS::Measurement.const_get(key) : key, value)
+    }
+  }
+
+  def run(meas, t_meas, ref_pos = @base_station)
 =begin
     $stderr.puts "Measurement time: #{t_meas.to_a} (a.k.a #{"%d/%d/%d %d:%d:%d UTC"%[*t_meas.c_tm]})"
     meas.to_a.collect{|prn, k, v| prn}.uniq.each{|prn|
@@ -148,10 +278,14 @@ class Receiver
 
     #@solver.gps_space_node.update_all_ephemeris(t_meas) # internally called in the following solver.solve
     pvt = @solver.solve(meas, t_meas)
+    pvt.define_singleton_method(:rel_ENU){
+      Coordinate::ENU::relative(xyz, ref_pos)
+    } if (ref_pos && pvt.position_solved?)
+    output = @output
     pvt.define_singleton_method(:to_s){
-      (OUTPUT_PVT_ITEMS.transpose[1].collect{|task|
+      (output[:pvt].transpose[1].collect{|task|
         task.call(pvt)
-      } + OUTPUT_MEAS_ITEMS.transpose[1].collect{|task|
+      } + output[:meas].transpose[1].collect{|task|
         task.call(meas)
       }).flatten.join(',')
     }
@@ -172,7 +306,7 @@ class Receiver
         self.instance_variable_set(k, Hash[*(sats.zip(values).flatten(1))])
       }
       [:@slopeH, :@slopeV] \
-          .zip((self.slope_HV_enu.to_a.transpose rescue [nil, nil])) \
+          .zip((self.fd ? self.slope_HV_enu.to_a.transpose : [nil, nil])) \
           .each{|k, values|
         self.instance_variable_set(k,
             Hash[*(values ? sats.zip(values).flatten(1) : [])])
@@ -185,30 +319,41 @@ class Receiver
   }
   
   proc{
-    eph_list = Hash[*(1..32).collect{|prn|
+    eph_list = Hash[*((1..32).to_a + (193..202).to_a).collect{|prn|
       eph = GPS::Ephemeris::new
       eph.svid = prn
       [prn, eph]
     }.flatten(1)]
-    define_method(:register_ephemeris){|t_meas, prn, bcast_data|
-      next unless eph = eph_list[prn]
-      sn = @solver.gps_space_node
-      subframe, iodc_or_iode = eph.parse(bcast_data)
-      if iodc_or_iode < 0 then
-        begin
-          sn.update_iono_utc(
-              GPS::Ionospheric_UTC_Parameters::parse(bcast_data))
-          [:alpha, :beta].each{|k|
-            $stderr.puts "Iono #{k}: #{sn.iono_utc.send(k)}"
-          } if false
-        rescue
+    define_method(:register_ephemeris){|t_meas, sys, prn, bcast_data|
+      case sys
+      when :GPS, :QZSS
+        next unless eph = eph_list[prn]
+        sn = @solver.gps_space_node
+        subframe, iodc_or_iode = eph.parse(bcast_data)
+        if iodc_or_iode < 0 then
+          begin
+            sn.update_iono_utc(
+                GPS::Ionospheric_UTC_Parameters::parse(bcast_data))
+            [:alpha, :beta].each{|k|
+              $stderr.puts "Iono #{k}: #{sn.iono_utc.send(k)}"
+            } if false
+          rescue
+          end
+          next
+        end
+        if t_meas and eph.consistent? then
+          eph.WN = ((t_meas.week / 1024).to_i * 1024) + (eph.WN % 1024)
+          sn.register_ephemeris(prn, eph)
+          eph.invalidate
+        end
+      when :SBAS
+        case @solver.sbas_space_node.decode_message(bcast_data[0..7], prn, t_meas)
+        when 26
+          ['', "IGP broadcasted by PRN#{prn} @ #{Time::utc(*t_meas.c_tm)}",
+              @solver.sbas_space_node.ionospheric_grid_points(prn)].each{|str|
+            $stderr.puts str
+          } if @debug[:SBAS_IGP] 
         end
-        next
-      end
-      if t_meas and eph.consistent? then
-        eph.WN = ((t_meas.week / 1024).to_i * 1024) + (eph.WN % 1024)
-        sn.register_ephemeris(prn, eph)
-        eph.invalidate
       end
     }
   }.call
@@ -222,6 +367,24 @@ class Receiver
     
     after_run = b || proc{|pvt| puts pvt.to_s}
     
+    gnss_serial = proc{|svid, sys|
+      if sys then # new numbering
+        sys = [:GPS, :SBAS, :Galileo, :BeiDou, :IMES, :QZSS, :GLONASS][sys] if sys.kind_of?(Integer)
+        case sys
+        when :QZSS; svid += 192
+        end
+      else # old numbering
+        sys = case svid
+        when 1..32; :GPS
+        when 120..158; :SBAS
+        when 193..202; :QZSS
+        when 65..96; svid -= 64; :GLONASS
+        when 255; :GLONASS
+        end
+      end
+      [sys, svid]
+    }
+    
     t_meas = nil
     ubx.each_packet.with_index(1){|packet, i|
       $stderr.print '.' if i % 1000 == 0
@@ -245,11 +408,11 @@ class Receiver
             :L1_CARRIER_PHASE => [8, 8, "E"],
             :L1_SIGNAL_STRENGTH_dBHz => [30, 1, "c"],
           }.each{|k, prop|
-            meas.add(prn, GPS::Measurement.const_get(k), loader.call(*prop))
+            meas.add(prn, k, loader.call(*prop))
           }
           # bit 0 of RINEX LLI (loss of lock indicator) shows lost lock
           # between previous and current observation, which maps negative lock seconds
-          meas.add(prn, GPS::Measurement::L1_LOCK_SEC,
+          meas.add(prn, :L1_LOCK_SEC,
               (packet[6 + 31 + (i * 24)] & 0x01 == 0x01) ? -1 : 0)
         }
         after_run.call(run(meas, t_meas), [meas, t_meas])
@@ -266,8 +429,11 @@ class Receiver
             v = post.call(v) if post
             v
           }
-          next unless (gnss = loader.call(36, 1)[0]) == 0
-          svid = loader.call(37, 1)[0]
+          sys, svid = gnss_serial.call(*loader.call(36, 2).reverse)
+          case sys
+          when :GPS, :QZSS; 
+          else; next
+          end
           trk_stat = loader.call(46, 1)[0]
           {
             :L1_PSEUDORANGE => [16, 8, "E", proc{|v| (trk_stat & 0x1 == 0x1) ? v : nil}],
@@ -280,26 +446,28 @@ class Receiver
             :L1_CARRIER_PHASE_SIGMA => [44, 1, nil, proc{|v|
               (trk_stat & 0x2 == 0x2) ? (0.004 * (v[0] & 0xF)) : nil
             }],
-            :L1_SIGNAL_STRENGTH_dBHz => [42, 1],
+            :L1_SIGNAL_STRENGTH_dBHz => [42, 1, "C"],
             :L1_LOCK_SEC => [40, 2, "v", proc{|v| 1E-3 * v}],
           }.each{|k, prop|
             next unless v = loader.call(*prop)
-            meas.add(svid, GPS::Measurement.const_get(k), v)
+            meas.add(svid, k, v)
           }
         }
         after_run.call(run(meas, t_meas), [meas, t_meas])
       when [0x02, 0x11] # RXM-SFRB
+        sys, svid = gnss_serial.call(packet[6 + 1])
         register_ephemeris(
             t_meas,
-            packet[6 + 1],
+            sys, svid,
             packet.slice(6 + 2, 40).each_slice(4).collect{|v|
-              (v.pack("C*").unpack("V")[0] & 0xFFFFFF) << 6
+              res = v.pack("C*").unpack("V")[0]
+              (sys == :GPS) ? ((res & 0xFFFFFF) << 6) : res
             })
       when [0x02, 0x13] # RXM-SFRBX
-        next unless (gnss = packet[6]) == 0
+        sys, svid = gnss_serial.call(packet[6 + 1], packet[6])
         register_ephemeris(
             t_meas,
-            packet[6 + 1],
+            sys, svid,
             packet.slice(6 + 8, 4 * packet[6 + 4]).each_slice(4).collect{|v|
               v.pack("C*").unpack("V")[0]
             })
@@ -309,8 +477,15 @@ class Receiver
   end
   
   def parse_rinex_nav(fname)
-    $stderr.puts "Read RINEX NAV file (%s): %d items."%[
-        fname, @solver.gps_space_node.read(fname)]
+    items = [
+      @solver.gps_space_node,
+      @solver.sbas_space_node,
+    ].inject(0){|res, sn|
+      loaded_items = sn.send(:read, fname)
+      raise "Format error! (Not RINEX) #{fname}" if loaded_items < 0
+      res + loaded_items
+    }
+    $stderr.puts "Read RINEX NAV file (%s): %d items."%[fname, items]
   end
   
   def parse_rinex_obs(fname, &b)
@@ -321,30 +496,37 @@ class Receiver
     GPS::RINEX_Observation::read(fname){|item|
       $stderr.print '.' if (count += 1) % 1000 == 0
       t_meas = item[:time]
-      
+
+      types ||= Hash[*(item[:meas_types].collect{|sys, values|
+        [sys, values.collect.with_index{|type_, i|
+          case type_
+          when "C1", "C1C"
+            [i, :L1_PSEUDORANGE]
+          when "L1", "L1C"
+            [i, :L1_CARRIER_PHASE]
+          when "D1", "D1C"
+            [i, :L1_DOPPLER]
+          when "S1", "S1C"
+            [i, :L1_SIGNAL_STRENGTH_dBHz]
+          else
+            nil 
+          end
+        }.compact]
+      }.flatten(1))]
+
       meas = GPS::Measurement::new
-      types ||= (item[:meas_types]['G'] || item[:meas_types][' ']).collect.with_index{|type_, i|
-        case type_
-        when "C1", "C1C"
-          [i, GPS::Measurement::L1_PSEUDORANGE]
-        when "L1", "L1C"
-          [i, GPS::Measurement::L1_CARRIER_PHASE]
-        when "D1", "D1C"
-          [i, GPS::Measurement::L1_DOPPLER]
-        when "S1", "S1C"
-          [i, GPS::Measurement::L1_SIGNAL_STRENGTH_dBHz]
-        else
-          nil 
-        end
-      }.compact
       item[:meas].each{|k, v|
         sys, prn = k
-        next unless sys == 'G' # GPS only
-        types.each{|i, type_|
+        case sys
+        when 'G', ' '
+        when 'J'; prn += 192
+        else; next
+        end
+        types[sys] = (types[' '] || []) unless types[sys]
+        types[sys].each{|i, type_|
           meas.add(prn, type_, v[i][0]) if v[i]
         }
       }
-      p meas.to_hash
       after_run.call(run(meas, t_meas), [meas, t_meas])
     }
     $stderr.puts ", %d epochs."%[count] 

data/lib/gps_pvt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GPS_PVT
-  VERSION = "0.1.5"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gps_pvt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - fenrir(M.Naruoka)
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,7 +69,10 @@ files:
 - ext/ninja-scan-light/tool/navigation/GPS_Solver_RAIM.h
 - ext/ninja-scan-light/tool/navigation/MagneticField.h
 - ext/ninja-scan-light/tool/navigation/NTCM.h
+- ext/ninja-scan-light/tool/navigation/QZSS.h
 - ext/ninja-scan-light/tool/navigation/RINEX.h
+- ext/ninja-scan-light/tool/navigation/SBAS.h
+- ext/ninja-scan-light/tool/navigation/SBAS_Solver.h
 - ext/ninja-scan-light/tool/navigation/WGS84.h
 - ext/ninja-scan-light/tool/navigation/coordinate.h
 - ext/ninja-scan-light/tool/param/bit_array.h
@@ -86,7 +89,6 @@ files:
 - ext/ninja-scan-light/tool/swig/makefile
 - ext/ninja-scan-light/tool/swig/spec/GPS_spec.rb
 - ext/ninja-scan-light/tool/swig/spec/SylphideMath_spec.rb
-- gps_pvt.gemspec
 - lib/gps_pvt.rb
 - lib/gps_pvt/receiver.rb
 - lib/gps_pvt/ubx.rb
@@ -97,7 +99,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/fenrir-naru/gps_pvt
   source_code_uri: https://github.com/fenrir-naru/gps_pvt
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: GPS position, velocity, and time (PVT) solver
 test_files: []