tac_scribe 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff0ac2a2b50de43d81bb14f9a31d8e6db54f47c664c66fe29181d8c24db8561
-  data.tar.gz: afa2f8df4ecdc15ecd6065e1666bd543099bf3bbab2fa2a8ad447ff422d70384
+  metadata.gz: cf38acdc30414ac35e9d0d1e70db7eb3ab1dc418c0e7c723670cda13f395c6b7
+  data.tar.gz: 003a5394e4eb0009af74c0ec7456f3a032130e7401856a53e0d38fbe0520881c
 SHA512:
-  metadata.gz: ce3b927cc1faa08b68ac3b56ce45885e9f78be34ff68b435714316564a70e3d2e4a7920e2b27aa4928fb1f86a9d220f72a1eb60f72fc9fdb9382556796bf97db
-  data.tar.gz: 4a7eb6fee58a1663776980afc54fe56561fe27524a94077fde60211c964b5b64069edaafa2cf10be049c0430230d2e25007a80d88873e47a9863a8c15ff7c7a7
+  metadata.gz: d197e69207f49c7e75aa9996b2828e0598446844072bcfd627c18f67ebfcbd094f381c8f7ca789e576ca4df96d82db528f85c856b1bc87e3b197f471758d3c14
+  data.tar.gz: 7bdb158fc1528de0425a37555039a15137486d141aab2b4d92313e2beff7e0809214d91303ef07290eedd4d8436daadad92028e3cc74d4244881d89090051c90

data/CHANGELOG.md

@@ -6,9 +6,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Airfields retrieved using CinC will skip position localization
+
+## [0.8.0] - 2021-01-09
+### Changed
+- Remove airfield loading from json files
+- CinC is now mandatory
+
+### Fixed
+- Aerodromes (including oilrigs... ) no longer have special position handling.
+  This is in relation to the removal of airfields from json files and requiring
+  CinC. Side effect is oilrigs will now be positioned correctly.
+
+## [0.7.6] - 2020-08-13
+### Changed
+- Fix the default port number
+
+## [0.7.5] - 2020-08-12
+### Changed
+- Various fixes related to airfield population using CinC
+
+## [0.7.4] - 2020-08-10
+### Changed
+- Fix typo that was causing all objects to be registered as airbases
+
 ## [0.7.3] - 2020-08-10
 ### Changed
-- Bug fixes after adding CinC support.
+- Bug fixes after adding CinC support
 
 ## [0.7.2] - 2020-08-10
 ### Added

data/exe/tac_scribe

@@ -11,7 +11,7 @@ options = {
   tacview_password: nil,
   tacview_client_name: 'TacScribe',
   cinc_enabled: false,
-  cinc_port: 9000,
+  cinc_port: 9001,
   db_host: 'localhost',
   db_port: 5432,
   db_name: 'tac_scribe',
@@ -46,10 +46,6 @@ OptionParser.new do |opts|
   end
 
   opts.separator "\nCommander-In-Chief Options"
-  opts.on('-b', '--enable-cinc',
-          'Is Cinc enabled? (Default: false)') do |_v|
-    options[:cinc_enabled] = true
-  end
   opts.on('-m', '--cinc-port=port',
           'Cinc server port (Default: 9001)') do |v|
     options[:cinc_port] = v
@@ -78,10 +74,6 @@ OptionParser.new do |opts|
     options[:db_name] = v
   end
   opts.separator "\nMisc options"
-  opts.on('-f', '--populate-airfields',
-          'Populate DCS airfield locations') do |_v|
-    options[:populate_airfields] = true
-  end
   opts.on('-t', '--threads=threads',
           'Thread Count (Default: 1)') do |v|
     options[:threads] = v
@@ -122,8 +114,6 @@ TacScribe::Daemon.new(
   db_password: options[:db_password],
   verbose_logging: options[:verbose],
   thread_count: options[:threads].to_i,
-  populate_airfields: options[:populate_airfields],
   whitelist: options[:whitelist],
-  cinc_enabled: options[:cinc_enabled],
   cinc_port: options[:cinc_port]
 ).start_processing

data/lib/tac_scribe/cache.rb

@@ -23,7 +23,9 @@ module TacScribe
     end
 
     def write_object(object)
-      if (reference_latitude != 0 || reference_longitude != 0) && object[:type] != "Ground+Static+Aerodrome"
+      if (object.has_key? :skip_localization) 
+        object.delete(:skip_localization)
+      elsif (reference_latitude != 0 || reference_longitude != 0)
         localize_position(object)
       end
 
@@ -53,9 +55,9 @@ module TacScribe
                              end
       end
 
-      if object[:type] = "Ground+Static+Aerodrome"
-        object[:heading] = object[:wind_heading] ? object[:wind_heading] : 0
-        object[:speed] = object[:wind_speed] ? object[:wind_speec] : 0
+      if object[:type] == "Ground+Static+Aerodrome"
+        object[:heading] = object[:wind_heading] ? object[:wind_heading] : -1
+        object[:speed] = object[:wind_speed] ? object[:wind_speed] : 0
         object.delete(:wind_heading)
         object.delete(:wind_speed)
         object.delete(:category)
@@ -71,6 +73,10 @@ module TacScribe
         cache_object = object
       end
 
+      # Hack to make sure the :name field is present so that it is included
+      # in the SQL
+      cache_object[:name] = nil unless cache_object.has_key?(:name)
+
       if !cache_object.key?(:altitude) || !cache_object[:altitude]
         cache_object[:altitude] = 0
       end

data/lib/tac_scribe/daemon.rb

@@ -16,7 +16,7 @@ module TacScribe
     def initialize(db_host:, db_port:, db_name:, db_user:, db_password:,
                    tacview_host:, tacview_port:, tacview_password:,
                    tacview_client_name:, verbose_logging:, thread_count:,
-                   populate_airfields:, whitelist: nil, cinc_enabled:, cinc_port:)
+                   whitelist: nil, cinc_port:)
       Datastore.instance.configure do |config|
         config.host = db_host
         config.port = db_port
@@ -30,7 +30,6 @@ module TacScribe
 
       @verbose_logging = verbose_logging
 
-      @populate_airfields = populate_airfields
       @thread_count = thread_count
       @threads = {}
       @whitelist = Set.new(IO.read(whitelist).split) if whitelist
@@ -43,12 +42,10 @@ module TacScribe
         client_name: tacview_client_name
       )
 
-      if cinc_enabled
-        @cinc_client = Cinc::Client.new(
-          host: tacview_host,
-          port: cinc_port
-        )
-      end
+      @cinc_client = Cinc::Client.new(
+        host: tacview_host,
+        port: cinc_port
+      )
     end
 
     # Starts processing and reconnects if the client was disconnected.
@@ -66,7 +63,6 @@ module TacScribe
         start_cinc_thread
         start_db_sync_thread
         start_reporting_thread
-        populate_airfields if @populate_airfields
         @threads.each_pair do |key, _value|
           puts "#{key} thread started"
         end
@@ -113,12 +109,13 @@ module TacScribe
     end
 
     def start_cinc_thread
-      return unless @cinc_client
       cinc_thread = Thread.new do
         loop do
           @cinc_client.connect
           while true
             @cinc_client.get_airbases.each do |airbase|
+              airbase[:type] = "Ground+Static+Aerodrome"
+              airbase[:skip_localization] = true
               @event_queue.update_object Hash[airbase.map{ |k, v| [k.to_sym, v] }]
             end
             sleep 60
@@ -174,22 +171,5 @@ module TacScribe
       reporting_thread.name = 'Reporting'
       @threads[:reporting] = reporting_thread
     end
-
-    def populate_airfields
-      json = File.read(File.join(File.dirname(__FILE__),
-                                 '../../data/airfields.json'))
-      airfields = JSON.parse(json)
-      airfields.each_with_index do |airfield, i|
-        @event_queue.update_object(
-          object_id: (45_000_000 + i).to_s,
-          latitude: BigDecimal(airfield['lat'].to_s),
-          longitude: BigDecimal(airfield['lon'].to_s),
-          altitude: BigDecimal(airfield['alt'].to_s),
-          type: 'Ground+Static+Aerodrome',
-          name: airfield['name'],
-          coalition: 0 # Neutral
-        )
-      end
-    end
   end
 end

data/lib/tac_scribe/event_processor.rb

@@ -68,9 +68,6 @@ module TacScribe
     def update_object(event, time)
       return if ignore_unit?(event)
 
-      # Hack to make sure the :name field is present so that it is included
-      # in the SQL
-      event[:name] = nil unless event.has_key?(:name)
       event[:game_time] = time
 
       self.events_processed += 1

data/lib/tac_scribe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TacScribe
-  VERSION = '0.7.3'
+  VERSION = '0.8.1'
 end

data/tac_scribe.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'activerecord-jdbcpostgresql-adapter'
   else
     spec.add_dependency 'pg', '~>1.1'
+    spec.add_development_dependency 'pry-byebug', '~>3.9'
   end
 
   spec.add_dependency 'georuby', '~>2.5'
@@ -51,5 +52,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~>0.73'
   spec.add_development_dependency 'simplecov', '~>0.17'
   spec.add_development_dependency 'yard', '~>0.9'
-  spec.add_development_dependency 'pry-byebug', '~>3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.1
 platform: ruby
 authors:
 - Jeffrey Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: georuby
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
 description: Write Tacview data to PostGIS database
 email:
 - jeff@jones.be
@@ -242,7 +242,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- data/airfields.json
 - data/whitelist.example
 - db/001_create_unit_table.rb
 - db/README.md

data/data/airfields.json

@@ -1,121 +0,0 @@
-[{
-    "lon": 45.01909093846007,
-    "lat": 41.637735936261556,
-    "alt": 464.5004577636719,
-    "name": "Vaziani"
-  },
-  {
-    "lon": 44.94687659192431,
-    "lat": 41.67471935873423,
-    "alt": 479.69482421875,
-    "name": "Tbilisi-Lochini"
-  },
-  {
-    "lon": 43.62488628801948,
-    "lat": 43.50998473505967,
-    "alt": 430.01043701171875,
-    "name": "Nalchik"
-  },
-  {
-    "lon": 38.92520230077506,
-    "lat": 45.087429883845076,
-    "alt": 30.010032653808594,
-    "name": "Krasnodar-Center"
-  },
-  {
-    "lon": 37.35978347755592,
-    "lat": 45.01317473377168,
-    "alt": 43.00004196166992,
-    "name": "Anapa-Vityazevo"
-  },
-  {
-    "lon": 41.876483823101026,
-    "lat": 41.93210535345338,
-    "alt": 18.01001739501953,
-    "name": "Kobuleti"
-  },
-  {
-    "lon": 43.100679733081456,
-    "lat": 44.21864682380681,
-    "alt": 320.01031494140625,
-    "name": "Mineralnye Vody"
-  },
-  {
-    "lon": 44.62032726210201,
-    "lat": 43.79130325093825,
-    "alt": 154.61184692382812,
-    "name": "Mozdok"
-  },
-  {
-    "lon": 44.94718306531669,
-    "lat": 41.64116326678661,
-    "alt": 449.4102478027344,
-    "name": "Soganlug"
-  },
-  {
-    "lon": 44.588922553542936,
-    "lat": 43.20850098738094,
-    "alt": 524.0057983398438,
-    "name": "Beslan"
-  },
-  {
-    "lon": 42.49568635853585,
-    "lat": 42.179154028210135,
-    "alt": 45.010047912597656,
-    "name": "Kutaisi"
-  },
-  {
-    "lon": 37.786226060479564,
-    "lat": 44.6733296041269,
-    "alt": 40.010040283203125,
-    "name": "Novorossiysk"
-  },
-  {
-    "lon": 40.021427482235985,
-    "lat": 44.67144025735508,
-    "alt": 180.01019287109375,
-    "name": "Maykop-Khanskaya"
-  },
-  {
-    "lon": 39.924231880466095,
-    "lat": 43.43937843405085,
-    "alt": 30.010034561157227,
-    "name": "Sochi-Adler"
-  },
-  {
-    "lon": 41.142447588488196,
-    "lat": 42.852741071634995,
-    "alt": 13.339526176452637,
-    "name": "Sukhumi-Babushara"
-  },
-  {
-    "lon": 42.061021312855914,
-    "lat": 42.23872808157328,
-    "alt": 13.23994255065918,
-    "name": "Senaki-Kolkhi"
-  },
-  {
-    "lon": 40.56417576840064,
-    "lat": 43.124233340197144,
-    "alt": 21.01003074645996,
-    "name": "Gudauta"
-  },
-  {
-    "lon": 37.985886938697085,
-    "lat": 44.961383022734175,
-    "alt": 20.010303497314453,
-    "name": "Krymsk"
-  },
-  {
-    "lon": 38.0041463505281,
-    "lat": 44.56767458600406,
-    "alt": 22.00992202758789,
-    "name": "Gelendzhik"
-  },
-  {
-    "lon": 39.20306690632454,
-    "lat": 45.0460996415433,
-    "alt": 34.01003646850586,
-    "name": "Krasnodar-Pashkovsky"
-  }
-]