vatsim_online_redux 1.0.1 → 2.1.1

data/lib/vatsim_online/station.rb

@@ -12,27 +12,44 @@ module VatsimTools
 
     def initialize(station, args = nil)
 
-      @callsign, @cid,  @name, @role, @frequency, @latitude, @longitude,  @altitude, @groundspeed, @aircraft, @origin,
-        @planned_altitude, @destination, @transponder, @facility, @flight_type, @remarks, @route, @logon, @heading,
-        @qnh_in, @qnh_mb = station[0], station[1], station[2], station[3], station[4], station[5], station[6], station[7],
-        station[8], station[9], station[11], station[12], station[13], station[17], station[18], station[21], station[29],
-        station[30], station[37], station[38], station[39], station[40]
+      @callsign = station['callsign']
+      @cid = station['cid'].to_s
+      @name = station['name']
+      @role = station['role']
+      @frequency = station['frequency']
+      @latitude = station['latitude'].to_s
+      @longitude = station['longitude'].to_s
+      @altitude = station['altitude']
+      @groundspeed = station['groundspeed']
+      @aircraft = station['flight_plan']['aircraft'] rescue ''
+      @origin = station['flight_plan']['departure'] rescue ''
+      @planned_altitude = station['flight_plan']['altitude'] rescue ''
+      @destination = station['flight_plan']['arrival'] rescue ''
+      @transponder = station['transponder']
+      @facility = station['facility'].to_s
+      @flight_type = station['flight_plan']['flight_rules'] rescue ''
+      @remarks = station['flight_plan']['remarks'] rescue ''
+      @route  = station['flight_plan']['route'] rescue ''
+      @logon = station['logon_time']
+      @heading = station['heading'].to_s
+      @qnh_in = station['qnh_i_hg'].to_s
+      @qnh_mb = station['qnh_mb'].to_s
 
-      @atis = atis_cleaner(station[35]) if station[35]
-      @rating = humanized_rating(station[16])
-      @latitude_humanized = latitude_parser(station[5].to_f)
-      @longitude_humanized = longitude_parser(station[6].to_f)
+      @atis = atis_cleaner(station['text_atis']) if station['text_atis']
+      @rating = humanized_rating(station['rating'].to_s)
+      @latitude_humanized = latitude_parser(station['latitude'])
+      @longitude_humanized = longitude_parser(station['longitude'])
       @online_since = utc_logon_time if @logon
       @gcmap_width = args[:gcmap_width].to_i if args && args[:gcmap_width]
       @gcmap_height = args[:gcmap_height].to_i if args && args[:gcmap_height]
       @gcmap = gcmap_generator
-      @atis_message = construct_atis_message(station[35]) if station[35]
+      @atis_message = construct_atis_message(station['text_atis']) if station['text_atis']
     end
 
   private
 
     def gcmap_generator
-      return "No map for ATC stations" if @role != "PILOT"
+      return "No map for ATC stations" if @role != "pilot"
       construct_gcmap_url.gcmap(:width => @gcmap_width, :height => @gcmap_height)
     end
 
@@ -47,22 +64,26 @@ module VatsimTools
       route
     end
 
-    def latitude_parser(lat)
+    def latitude_parser(lat_s)
+      return nil if lat_s == nil
+      lat = lat_s.to_f
       lat > 0 ? hemisphere = "N" : hemisphere = "S"
       hemisphere + lat.abs.to_s
     end
 
-    def longitude_parser(lon)
+    def longitude_parser(lon_s)
+      return nil if lon_s == nil
+      lon = lon_s.to_f
       lon > 0 ? hemisphere = "E" : hemisphere = "W"
       hemisphere + lon.abs.to_s
     end
 
     def atis_cleaner(raw_atis)
-      raw_atis.gsub(/[\^]/, '. ')
+      raw_atis.join(' ').gsub(/[\^]/, '. ')
     end
 
     def utc_logon_time
-      Time.parse ("#{@logon[0...4]}-#{@logon[4...6]}-#{@logon[6...8]} #{@logon[8...10]}:#{@logon[10...12]}:#{@logon[12...14]} UTC")
+      Time.parse(@logon)
     end
 
     def humanized_rating(rating_number)
@@ -84,7 +105,7 @@ module VatsimTools
     end
 
     def construct_atis_message(raw_atis)
-      message = raw_atis.gsub(/[\^]/, '<br />')
+      message = raw_atis.join(' ').gsub(/[\^]/, '<br />')
       message.index('>') ? message = message[message.index('>')+1...message.length] : message = "No published remark"
     end
 

data/lib/vatsim_online/station_parser.rb

@@ -7,9 +7,9 @@ module VatsimTools
     require_relative "station"
 
     attributes = %w{role icao excluded gcmap_width gcmap_height}
-    attributes.each {|attribute| attr_accessor attribute.to_sym }
+    attributes.each { |attribute| attr_accessor attribute.to_sym }
 
-    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.txt"
+    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
 
     def initialize(icao, args = nil)
       VatsimTools::DataDownloader.new
@@ -17,7 +17,7 @@ module VatsimTools
       if icao == "ALL"
         @icao = nil
       else
-        @icao = icao.upcase.split(',').each {|s| s.strip!}
+        @icao = icao.upcase.split(',').each { |s| s.strip! }
       end
       @excluded = args[:exclude].upcase if args && args[:exclude]
       @gcmap_width = args[:gcmap_width] if args && args[:gcmap_width]
@@ -32,44 +32,53 @@ module VatsimTools
     end
 
     def stations
-      stations = []
-      CSV.foreach(LOCAL_DATA, :col_sep =>':') do |row|
-        callsign, origin, destination, client = row[0].to_s, row[11].to_s, row[13].to_s, row[3].to_s
+      matching_stations = []
+      raw_data = File.read(LOCAL_DATA)
+      data = JSON.parse(raw_data)
+      pilots = data['pilots'].each { |p| p['role'] = 'pilot' }
+      controllers = data['controllers'].each { |p| p['role'] = 'controller' }
+      atis = data['atis'].each { |p| p['role'] = 'atis' }
+      stations = pilots + controllers + atis
+      stations.each do |station|
+        callsign = station['callsign']
+        destination = station['flight_plan']['arrival'] rescue ''
+        origin = station['flight_plan']['departure'] rescue ''
+        client = station['role']
         unless @icao
-          stations << row if (client == "ATC") unless @role == "pilot"
-          stations << row if (client == "PILOT") unless @role == "atc"
+          matching_stations << station if (client == "controller") unless @role == "pilot"
+          matching_stations << station if (client == "pilot") unless @role == "atc"
         else
-          for icao in @icao
-            stations << row if (callsign[0...icao.length] == icao && client == "ATC") unless @role == "pilot"
-            stations << row if (origin[0...icao.length] == icao || destination[0...icao.length] == icao) unless @role == "atc"
+          @icao.each do |icao|
+            matching_stations << station if (callsign[0...icao.length] == icao && client == "controller") unless @role == "pilot"
+            matching_stations << station if (origin[0...icao.length] == icao || destination[0...icao.length] == icao) unless @role == "atc"
           end
         end
       end
-      stations
+      matching_stations
     end
 
     def station_objects
-      station_objects= []
+      station_objects = []
       args = {}
       args[:gcmap_width] = @gcmap_width if @gcmap_width
       args[:gcmap_height] = @gcmap_height if @gcmap_height
-      stations.each {|station| station_objects << VatsimTools::Station.new(station, args) }
+      stations.each { |station| station_objects << VatsimTools::Station.new(station, args) }
       station_objects
     end
 
     def sorted_station_objects
       atc = []; pilots = []; arrivals = []; departures = []
-      station_objects.each {|sobj| sobj.role == "ATC" ? atc << sobj : pilots << sobj}
+      station_objects.each { |sobj| sobj.role == "controller" ? atc << sobj : pilots << sobj }
       if @icao
-        for icao in @icao
-          for pilot in pilots
+        @icao.each do |icao|
+          pilots.each do |pilot|
             departures << pilot if pilot.origin[0...icao.length] == icao
             arrivals << pilot if pilot.destination[0...icao.length] == icao
           end
         end
       end
-      atc.delete_if {|a| @excluded && a.callsign[0...@excluded.length] == @excluded }
-      {:atc => atc, :pilots => pilots, :arrivals => arrivals, :departures => departures}
+      atc.delete_if { |a| @excluded && a.callsign[0...@excluded.length] == @excluded }
+      { :atc => atc, :pilots => pilots, :arrivals => arrivals, :departures => departures }
     end
 
   end

data/lib/vatsim_online/version.rb

@@ -1,3 +1,3 @@
-module VatsimOnline
-  VERSION = "1.0.1"
-end
+module VatsimOnline
+  VERSION = "2.1.1"
+end

data/lib/vatsim_online.rb

@@ -1,5 +1,5 @@
 %w{vatsim_online/version vatsim_online/station vatsim_online/data_downloader
-   vatsim_online/station_parser vatsim_online/callsign_parser}.each { |lib| require lib }
+   vatsim_online/station_parser vatsim_online/callsign_parser vatsim_online/callsign_regex_parser}.each { |lib| require lib }
 
 class String
   def vatsim_online(args={})
@@ -9,6 +9,10 @@ class String
   def vatsim_callsign(args={})
     VatsimOnline.vatsim_callsign(self, args)
   end
+
+  def vatsim_regex_callsign(args={})
+    VatsimOnline.vatsim_regex_callsign(self, args)
+  end
 end
 
 module VatsimOnline
@@ -21,4 +25,8 @@ module VatsimOnline
     VatsimTools::CallsignParser.new(callsign,args).station_objects
   end
 
+  def self.vatsim_regex_callsign(callsign, args)
+    VatsimTools::CallsignRegexParser.new(callsign, args).station_objects
+  end
+
 end

data/spec/callsign_parser_spec.rb

@@ -1,27 +1,33 @@
 require 'vatsim_online'
-require 'callsign_parser_spec_helper.rb'
+require 'data_downloader_spec_helper'
 
 describe VatsimTools::CallsignParser do
 
   target = VatsimTools::CallsignParser
 
+  before(:each) do
+    delete_local_files
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
+
   describe "stations" do
     it "should return an expected result" do
-      gem_data_file
-      callsign = "WMKK"
-      target.new(callsign).stations.first[0].should eq("WMKK_APP")
+      callsign = "EGAC"
+      target.new(callsign).stations.first['callsign'].should eq("EGAC_APP")
       target.new(callsign).stations.class.should eq(Array)
     end   
   end
 
   describe "station_objects" do
     it "should return an array of Station objects" do
-      gem_data_file
-      callsign = "LO"
+      callsign = "VFE"
       target.new(callsign).station_objects.class.should eq(Array)
       target.new(callsign).station_objects.size.should eq(2)
       target.new(callsign).station_objects.first.class.should eq(VatsimTools::Station)
-      target.new(callsign).station_objects.first.callsign.should eq("LOT282")
+      target.new(callsign).station_objects.first.callsign.should eq("VFE1625")
     end
   end
 

data/spec/callsign_regex_parser_spec.rb

@@ -0,0 +1,43 @@
+require 'vatsim_online'
+require 'data_downloader_spec_helper'
+
+describe VatsimTools::CallsignRegexParser do
+
+  target = VatsimTools::CallsignRegexParser
+
+  before(:each) do
+    delete_local_files
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
+
+  describe "stations" do
+    it "should return an expected result" do
+      callsign = "EGAC.*_APP"
+      target.new(callsign).stations.first['callsign'].should eq("EGAC_APP")
+      target.new(callsign).stations.class.should eq(Array)
+    end   
+  end
+
+  describe "station_objects" do
+    it "should return an array of Station objects" do
+      callsign = "VFE.*"
+      target.new(callsign).station_objects.class.should eq(Array)
+      target.new(callsign).station_objects.size.should eq(2)
+      target.new(callsign).station_objects.first.class.should eq(VatsimTools::Station)
+      target.new(callsign).station_objects.first.callsign.should eq("VFE1625")
+    end
+
+    it "should return an array of Station objects" do
+      callsign = "\\w{3}21\\d{2}"
+      target.new(callsign).station_objects.class.should eq(Array)
+      target.new(callsign).station_objects.size.should eq(2)
+      target.new(callsign).station_objects.first.class.should eq(VatsimTools::Station)
+      target.new(callsign).station_objects.first.callsign.should eq("VFE2157")
+    end
+  end
+
+  
+end

data/spec/data_downloader_spec.rb

@@ -4,8 +4,15 @@ require 'data_downloader_spec_helper.rb'
 describe VatsimTools::DataDownloader do
 
   target = VatsimTools::DataDownloader
-  LOCAL_STATUS = "#{Dir.tmpdir}/vatsim_status.txt"
-  LOCAL_DATA = "#{Dir.tmpdir}/vatsim_data.txt"
+  LOCAL_STATUS = "#{Dir.tmpdir}/vatsim_online/vatsim_status.json"
+  LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
+
+  before(:each) do
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net:443/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
 
   describe "create_status_tempfile" do
     it "should create a file" do
@@ -14,7 +21,7 @@ describe VatsimTools::DataDownloader do
       target.new.create_status_tempfile
       File.exists?(LOCAL_STATUS).should be true
       status = File.open(LOCAL_STATUS)
-      status.path.should eq("#{Dir.tmpdir}/vatsim_status.txt")
+      status.path.should eq("#{Dir.tmpdir}/vatsim_online/vatsim_status.json")
       status.size.should be > 100
       status.close
     end
@@ -35,9 +42,9 @@ describe VatsimTools::DataDownloader do
       delete_local_files
       File.exists?(LOCAL_STATUS).should be false
       target.new.status_file.class.should eq(String)
-      target.new.status_file.should include("vatsim_status.txt")
+      target.new.status_file.should include("vatsim_status.json")
       target.new.status_file.should eq(LOCAL_STATUS)
-      target.new.status_file.should eq("#{Dir.tmpdir}/vatsim_status.txt")
+      target.new.status_file.should eq("#{Dir.tmpdir}/vatsim_online/vatsim_status.json")
       File.exists?(LOCAL_STATUS).should be true
     end
   end
@@ -46,7 +53,7 @@ describe VatsimTools::DataDownloader do
     it "should contain an array of server URLs" do
       File.exists?(LOCAL_STATUS).should be true
       target.new.servers.class.should eq(Array)
-      target.new.servers.size.should eq(5)
+      target.new.servers.size.should eq(1)
     end
   end
 
@@ -57,7 +64,7 @@ describe VatsimTools::DataDownloader do
       target.new.create_local_data_file
       File.exists?(LOCAL_DATA).should be true
       data = File.open(LOCAL_DATA)
-      data.path.should eq("#{Dir.tmpdir}/vatsim_data.txt")
+      data.path.should eq("#{Dir.tmpdir}/vatsim_online/vatsim_data.json")
       data.size.should be > 100
       data.close
     end
@@ -78,9 +85,9 @@ describe VatsimTools::DataDownloader do
       delete_local_files
       File.exists?(LOCAL_DATA).should be false
       target.new.data_file.class.should eq(String)
-      target.new.data_file.should include("vatsim_data.txt")
+      target.new.data_file.should include("vatsim_data.json")
       target.new.data_file.should eq(LOCAL_DATA)
-      target.new.data_file.should eq("#{Dir.tmpdir}/vatsim_data.txt")
+      target.new.data_file.should eq("#{Dir.tmpdir}/vatsim_online/vatsim_data.json")
       File.exists?(LOCAL_DATA).should be true
     end
   end

data/spec/data_downloader_spec_helper.rb

@@ -1,8 +1,10 @@
 def delete_local_files
-  if File.exists?(LOCAL_STATUS)
-    File.delete(LOCAL_STATUS)
+  local_Status = "#{Dir.tmpdir}/vatsim_online/vatsim_status.json"
+  lOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
+  if File.exists?(local_Status)
+    File.delete(local_Status)
   end
-  if File.exists?(LOCAL_DATA)
-    File.delete(LOCAL_DATA)
+  if File.exists?(lOCAL_DATA)
+    File.delete(lOCAL_DATA)
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require 'webmock/rspec'
 Bundler.setup
 
 require 'vatsim_online'

data/spec/station_parser_spec.rb

@@ -1,10 +1,18 @@
 require 'vatsim_online'
-require 'station_parser_spec_helper.rb'
+require 'data_downloader_spec_helper'
 
 describe VatsimTools::StationParser do
 
   target = VatsimTools::StationParser
 
+  before(:each) do
+    delete_local_files
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net:443/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
+
   describe "determine role" do
     it "should return a role" do
       args = {:pilots => true, :atc => true}
@@ -35,68 +43,62 @@ describe VatsimTools::StationParser do
   describe "stations" do
     args = {:pilots => true, :atc => true}
     it "should return an expected result" do
-      gem_data_file
-      icao = "WMKK"
-      target.new(icao, args).stations.first[0].should eq("WMKK_APP")
+      icao = "EGAC"
+      target.new(icao, args).stations.first['callsign'].should eq("EGAC_APP")
       target.new(icao, args).stations.class.should eq(Array)
     end
 
     it "should distinguish roles" do
-      gem_data_file
-      icao = "WMKK"
+      icao = "EGAC"
       args = {:pilots => false, :atc => true}
-      target.new(icao, args).stations.first[0].should eq("WMKK_APP")
+      target.new(icao, args).stations.first['callsign'].should eq("EGAC_APP")
       target.new(icao, args).stations.class.should eq(Array)
       args = {:pilots => true, :atc => false}
       target.new(icao, args).stations.length.should be(0)
     end
 
     it "should combine all stations" do
-      gem_data_file
-      icao = "LO"
+      icao = "EDU"
       args = {:pilots => true, :atc => true}
-      target.new(icao, args).stations.first[0].should eq("AMZ1105")
-      target.new(icao, args).stations.last[0].should eq("OS601")
-      target.new(icao, args).stations.last[11].should eq("LOWW")
-      target.new(icao, args).stations.last[13].should eq("UUDD")
+      target.new(icao, args).stations.first['callsign'].should eq("AFR352")
+      target.new(icao, args).stations.last['callsign'].should eq("EDUU_W_CTR")
+      target.new(icao, args).stations.first['flight_plan']['departure'].should eq("EDUU")
+      target.new(icao, args).stations.first['flight_plan']['arrival'].should eq("LSGG")
       target.new(icao, args).stations.class.should eq(Array)
-      target.new(icao, args).stations.count.should eq(12)
+      target.new(icao, args).stations.count.should eq(2)
       args = {:pilots => false, :atc => true}
-      target.new(icao, args).stations.count.should eq(0)
+      target.new(icao, args).stations.count.should eq(1)
     end
   end
 
   describe "station_objects" do
     it "should return an array of Station objects" do
-      gem_data_file
       icao = "LO"
       target.new(icao).station_objects.class.should eq(Array)
-      target.new(icao).station_objects.size.should eq(12)
+      target.new(icao).station_objects.size.should eq(1)
       args = {:pilots => false}
       target.new(icao, args).station_objects.size.should eq(0)
       args = {:atc => false}
-      target.new(icao, args).station_objects.size.should eq(12)
+      target.new(icao, args).station_objects.size.should eq(1)
       target.new(icao, args).station_objects.first.class.should eq(VatsimTools::Station)
-      target.new(icao, args).station_objects.first.callsign.should eq("AMZ1105")
+      target.new(icao, args).station_objects.first.callsign.should eq("VFE1625")
     end
   end
 
   describe "sorted_station_objects" do
     it "should return an hash with arrays of Station objects" do
-      gem_data_file
-      icao = "WM"
+      icao = "ED"
       target.new(icao).sorted_station_objects.class.should eq(Hash)
       target.new(icao).sorted_station_objects.size.should eq(4)
       target.new(icao).sorted_station_objects[:atc].class.should eq(Array)
       target.new(icao).sorted_station_objects[:pilots].class.should eq(Array)
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(0)
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(1)
       target.new(icao).sorted_station_objects[:atc].size.should eq(4)
       target.new(icao).sorted_station_objects[:atc].first.class.should eq(VatsimTools::Station)
     end
 
     it "should handle roles" do
-      gem_data_file
-      icao = "WM"
+      icao = "ED"
       atc = {:pilots => false}
       pilots = {:atc => false}
       target.new(icao, atc).sorted_station_objects.class.should eq(Hash)
@@ -107,53 +109,49 @@ describe VatsimTools::StationParser do
       target.new(icao, atc).sorted_station_objects[:pilots].size.should eq(0)
       target.new(icao, atc).sorted_station_objects[:atc].size.should eq(4)
       target.new(icao, pilots).sorted_station_objects[:atc].size.should eq(0)
-      target.new(icao, pilots).sorted_station_objects[:pilots].size.should eq(0)
-      target.new(icao, atc).sorted_station_objects[:atc].first.callsign.should eq("WMKK_APP")
+      target.new(icao, pilots).sorted_station_objects[:pilots].size.should eq(1)
+      target.new(icao, atc).sorted_station_objects[:atc].first.callsign.should eq("EDUU_W_CTR")
     end
 
     it "should recognize arrivals and departures" do
-      gem_data_file
       icao = "LO"
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(12)
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(1)
       target.new(icao).sorted_station_objects[:pilots].size.should eq(target.new(icao).sorted_station_objects[:arrivals].size + target.new(icao).sorted_station_objects[:departures].size)
-      target.new(icao).sorted_station_objects[:arrivals].size.should eq(6)
-      target.new(icao).sorted_station_objects[:departures].size.should eq(6)
+      target.new(icao).sorted_station_objects[:arrivals].size.should eq(0)
+      target.new(icao).sorted_station_objects[:departures].size.should eq(1)
     end
 
     it "should recognize exclusions" do
-      gem_data_file
-      icao = "LB"
+      icao = "ED"
       target.new(icao).sorted_station_objects[:atc].size.should eq(4)
-      args = {:exclude => "LBGO"}
-      target.new(icao, args).excluded.should eq("LBGO")
+      args = {:exclude => "EDBB"}
+      target.new(icao, args).excluded.should eq("EDBB")
       target.new(icao, args).excluded.length.should eq(4)
       target.new(icao, args).sorted_station_objects[:atc].size.should eq(3)
-      args = {:exclude => "LBSF"}
+      args = {:exclude => "EDGG"}
       target.new(icao, args).sorted_station_objects[:atc].size.should eq(2)
-      args = {:exclude => "lbsf"}
+      args = {:exclude => "edgg"}
       target.new(icao, args).sorted_station_objects[:atc].size.should eq(2)
     end
 
     it "should support multiple icaos" do
-      gem_data_file
-      icao = "LB"
+      icao = "ED"
       target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(1)
+      icao = "EG"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(1)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(1)
+      icao = "ED,EG"
       target.new(icao).sorted_station_objects[:pilots].size.should eq(2)
-      icao = "LO"
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(12)
-      target.new(icao).sorted_station_objects[:atc].size.should eq(0)
-      gem_data_file
-      icao = "LO,LB"
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
-      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
-      icao = "LO, LB"
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
-      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
-      icao = "LO , LB"
-      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
-      target.new(icao).sorted_station_objects[:arrivals].size.should eq(7)
-      target.new(icao).sorted_station_objects[:departures].size.should eq(7)
-      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(5)
+      icao = "ED, EG"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(2)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(5)
+      icao = "ED , EG"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(2)
+      target.new(icao).sorted_station_objects[:arrivals].size.should eq(1)
+      target.new(icao).sorted_station_objects[:departures].size.should eq(1)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(5)
     end
 
   end