tac_scribe 0.7.6-java → 0.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f82a0b04b2ff323c9d23b16afaed5420b51f96aaa745c38fab58de09eca450e
-  data.tar.gz: 4930d70de79e8f1c732f0cb810e6f45f8043242d3756e8101bfe7d522d7756d6
+  metadata.gz: 919cea3cc82c8e3c7b1341cf39d738adc9de5fc5f6c38860a6c865f430f72afc
+  data.tar.gz: 6f79e789707f2d93c77460ca7407547669a5b736cad0f3e04a6678449e6c9f30
 SHA512:
-  metadata.gz: 194a4241896ba3186b35d05481675dcc4ccf27585a855ba8695397dadbf95ff3763c6f926284080426b8d86cb0f7a38f721a55d9f5af847a12cb60bfa077a2d5
-  data.tar.gz: 6c9caa386972d7a3fcd70f0cba3f86c02d4c05683ced09ade1e5374725b758caa5f842f9e4327b9f48dd261d224704c2824af2ae857c771a88653830661b4632
+  metadata.gz: e994f93d31d05296c77ac2e6e92203e47772041641ffb68a5a54ff2f459b069345531c0619ad0a8b3cdcf31e5011937b7001381a7da1aafc82d13824f39eeb72
+  data.tar.gz: 17e15f0f0906944fa2ba1570b6814b06d9510e109b0b0e2a097086f0a0b1f349a604f073f59ed45a55d79ef4da9763dfd09c06c4e59647f919d878e471a1bb4a

data/CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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

data/exe/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,7 @@ module TacScribe
     end
 
     def write_object(object)
-      if (reference_latitude != 0 || reference_longitude != 0) && object[:type] != "Ground+Static+Aerodrome"
+      if (reference_latitude != 0 || reference_longitude != 0)
         localize_position(object)
       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,7 +109,6 @@ module TacScribe
     end
 
     def start_cinc_thread
-      return unless @cinc_client
       cinc_thread = Thread.new do
         loop do
           @cinc_client.connect
@@ -175,22 +170,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: java
 authors:
 - Jeffrey Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- data/airfields.json
 - data/whitelist.example
 - db/001_create_unit_table.rb
 - db/README.md
@@ -263,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: Write Tacview data to PostGIS database

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"
-  }
-]