2.2.4 (#216)

* changes for eve-scout API

* updates composer for new pathfinder-esi version

* updates public files

* updates signature and jump info

* adds public files

* typo fix: Turnur, not Turner

Signed-off-by: Tyr Heimdal <tyr.heimdal@warning.no>

---------

Signed-off-by: Tyr Heimdal <tyr.heimdal@warning.no>
Co-authored-by: Tyr Heimdal <tyr.heimdal@warning.no>

app/Controller/Api/Rest/SystemThera.php

@@ -3,6 +3,7 @@
 
 namespace Exodus4D\Pathfinder\Controller\Api\Rest;
 
+use Exodus4D\Pathfinder\Controller\Ccp\Universe;
 use Exodus4D\Pathfinder\Lib\Config;
 
 class SystemThera extends AbstractRestController {
@@ -35,7 +36,6 @@ class SystemThera extends AbstractRestController {
      */
     protected function getEveScoutTheraConnections() : array {
         $connectionsData = [];
-
         /**
          * map system data from eveScout response to Pathfinder´s 'system' format
          * @param string $key
@@ -44,17 +44,19 @@ class SystemThera extends AbstractRestController {
          */
         $enrichWithSystemData = function(string $key, array $eveScoutConnection, array &$connectionData) : void {
             $eveScoutSystem = (array)$eveScoutConnection[$key];
+            $universe = new Universe();
+            $staticData = $universe->getSystemData($eveScoutSystem['id']);
+
             $systemData = [
-                'id' => (int)$eveScoutSystem['id'],
-                'name' => (string)$eveScoutSystem['name'],
-                'trueSec' => round((float)$eveScoutSystem['security'], 4)
+                'id' => (int)$staticData->id,
+                'name' => (string)$staticData->name,
+                'system_class' => round((float)$staticData->trueSec, 4),
+                'constellation' => ['id' => (int)$staticData->constellation->id],
+                'region' => [
+                    'id' => (int)$staticData->constellation->region->id,
+                    'name' => (string)$staticData->constellation->region->name
+                ]
             ];
-            if(!empty($eveScoutSystem['constellationID'])){
-                $systemData['constellation'] = ['id' => (int)$eveScoutSystem['constellationID']];
-            }
-            if(!empty($region = (array)$eveScoutSystem['region']) && !empty($region['id'])){
-                $systemData['region'] = ['id' => (int)$region['id'], 'name' => (string)$region['name']];
-            }
             $connectionData[$key] = $systemData;
         };
 
@@ -66,10 +68,14 @@ class SystemThera extends AbstractRestController {
         $enrichWithSignatureData = function(string $key, array $eveScoutConnection, array &$connectionData) : void {
             $eveScoutSignature = (array)$eveScoutConnection[$key];
             $signatureData = [
-                'name' => $eveScoutSignature['name'] ? : null
+                'name' => $eveScoutSignature['name'] ? : null,
+                'short_name' => str_split($eveScoutSignature['name'],3)[0] ? : null
             ];
-            if(!empty($sigType = (array)$eveScoutSignature['type']) && !empty($sigType['name'])){
-                $signatureData['type'] = ['name' => strtoupper((string)$sigType['name'])];
+            if($key == 'sourceSignature' && $eveScoutConnection['wh_exits_outward']) {
+                $signatureData['type'] = ['name' => strtoupper((string)$eveScoutConnection['wh_type'])];
+            }
+            if($key == 'targetSignature' && !$eveScoutConnection['wh_exits_outware']) {
+                $signatureData['type'] = ['name' => strtoupper((string)$eveScoutConnection['wh_type'])];
             }
             $connectionData[$key] = $signatureData;
         };
@@ -81,17 +87,31 @@ class SystemThera extends AbstractRestController {
          */
         $enrichWithWormholeData = function(array $wormholeData, array &$connectionsData) : void {
             $type = [];
-            if($wormholeData['mass'] === 'reduced'){
-                $type[] = 'wh_reduced';
-            }else if($wormholeData['mass'] === 'critical'){
-                $type[] = 'wh_critical';
-            }else{
-                $type[] = 'wh_fresh';
-            }
+            $type[] = 'wh_fresh';
 
-            if($wormholeData['eol'] === 'critical'){
+            if($wormholeData['estimatedEol'] <= 4){
                 $type[] = 'wh_eol';
             }
+            switch($wormholeData['jumpMass']) {
+                case "capital":
+                    $type[] = 'wh_jump_mass_xl';
+                    break;
+                case "xlarge":
+                    $type[] = 'wh_jump_mass_xl';
+                    break;
+                case "large":
+                    $type[] = 'wh_jump_mass_l';
+                    break;
+                case "medium":
+                    $type[] = 'wh_jump_mass_m';
+                    break;
+                case "small":
+                    $type[] = 'wh_jump_mass_s';
+                    break;
+                default:
+                    break;
+            }
+
             $connectionsData['type'] = $type;
             $connectionsData['estimatedEol'] = $wormholeData['estimatedEol'];
         };
@@ -101,7 +121,8 @@ class SystemThera extends AbstractRestController {
             foreach((array)$eveScoutResponse['connections'] as $eveScoutConnection){
                 if(
                     $eveScoutConnection['type'] === 'wormhole' &&
-                    isset($eveScoutConnection['source']) && isset($eveScoutConnection['target'])
+                    isset($eveScoutConnection['source']) && isset($eveScoutConnection['target']) &&
+                    $eveScoutConnection['source']['id'] === 31000005 // Check it's thera and not a turnur connection
                 ){
                     try{
                         $data = [

app/pathfinder.ini

@@ -13,8 +13,8 @@ NAME                        =   Pathfinder
 ;           Version is used for CSS/JS cache busting and is part of the URL for static resources:
 ;           e.g. public/js/vX.X.X/app.js
 ; Syntax:   String (current version)
-; Default:  v2.2.3
-VERSION                     =   v2.2.3
+; Default:  v2.2.4
+VERSION                     =   v2.2.4
 
 ; Contact information [optional]
 ;           Shown on 'licence', 'contact' page.
@@ -387,7 +387,7 @@ Z_KILLBOARD                 =   https://zkillboard.com/api
 EVEEYE                      =   https://eveeye.com
 DOTLAN                      =   http://evemaps.dotlan.net
 ANOIK                       =   http://anoik.is
-EVE_SCOUT                   =   https://www.eve-scout.com/api
+EVE_SCOUT                   =   https://api.eve-scout.com
 ; GitHub Developer API
 GIT_HUB                     =   https://api.github.com
 

composer.json

@@ -46,7 +46,7 @@
     "react/promise-stream": "1.3.*",
     "clue/ndjson-react": "1.2.*",
     "firebase/php-jwt": "6.*",
-    "goryn-clade/pathfinder_esi": "2.1.3"
+    "goryn-clade/pathfinder_esi": "2.1.4"
   },
   "suggest": {
     "ext-redis": "Redis can be used as cache backend."

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7e1ba3417676d615428a08e60a51ae99",
+    "content-hash": "1cb2e1085d3134dd283f3087462060c8",
     "packages": [
         {
             "name": "bcosca/fatfree-core",
@@ -709,16 +709,16 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
-                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
                 "shasum": ""
             },
             "require": {
@@ -750,22 +750,22 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
             },
-            "time": "2023-09-27T20:04:15+00:00"
+            "time": "2024-01-30T19:34:25+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124"
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
-                "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
+                "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6",
                 "shasum": ""
             },
             "require": {
@@ -773,11 +773,11 @@
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9 || ^10",
+                "doctrine/coding-standard": "^9 || ^12",
                 "phpstan/phpstan": "^1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^4.11 || ^5.0"
+                "vimeo/psalm": "^4.11 || ^5.21"
             },
             "type": "library",
             "autoload": {
@@ -814,7 +814,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/2.1.0"
+                "source": "https://github.com/doctrine/lexer/tree/2.1.1"
             },
             "funding": [
                 {
@@ -830,7 +830,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-14T08:49:07+00:00"
+            "time": "2024-02-05T11:35:39+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -1011,16 +1011,16 @@
         },
         {
             "name": "goryn-clade/pathfinder_esi",
-            "version": "v2.1.3",
+            "version": "v2.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/goryn-clade/pathfinder_esi.git",
-                "reference": "bedfb07a9979fb51158e4248e33c0c1ecb77111c"
+                "reference": "c7c92adb26457fcf954fa88f9273df7409687031"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/goryn-clade/pathfinder_esi/zipball/bedfb07a9979fb51158e4248e33c0c1ecb77111c",
-                "reference": "bedfb07a9979fb51158e4248e33c0c1ecb77111c",
+                "url": "https://api.github.com/repos/goryn-clade/pathfinder_esi/zipball/c7c92adb26457fcf954fa88f9273df7409687031",
+                "reference": "c7c92adb26457fcf954fa88f9273df7409687031",
                 "shasum": ""
             },
             "require": {
@@ -1050,9 +1050,9 @@
             "homepage": "https://github.com/goryn-clade/pathfinder_esi",
             "support": {
                 "issues": "https://github.com/goryn-clade/pathfinder_esi/issues",
-                "source": "https://github.com/goryn-clade/pathfinder_esi/tree/v2.1.3"
+                "source": "https://github.com/goryn-clade/pathfinder_esi/tree/v2.1.4"
             },
-            "time": "2022-09-02T23:53:15+00:00"
+            "time": "2024-03-16T09:12:11+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -1392,9 +1392,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ikkez/f3-cortex/issues",
-                "source": "https://github.com/ikkez/f3-cortex/tree/v1.7.6"
+                "source": "https://github.com/ikkez/f3-cortex/tree/v1.7.7"
             },
-            "time": "2023-01-23T22:28:35+00:00"
+            "time": "2024-03-06T16:05:14+00:00"
         },
         {
             "name": "ikkez/f3-schema-builder",
@@ -1438,16 +1438,16 @@
         },
         {
             "name": "ikkez/f3-sheet",
-            "version": "v0.4.2",
+            "version": "v0.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ikkez/f3-sheet.git",
-                "reference": "e2a3691a87db48f83cc4e617cc60c5314d540cea"
+                "reference": "53b04ec0305254b04192b4feed8aa22dd466422c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ikkez/f3-sheet/zipball/e2a3691a87db48f83cc4e617cc60c5314d540cea",
-                "reference": "e2a3691a87db48f83cc4e617cc60c5314d540cea",
+                "url": "https://api.github.com/repos/ikkez/f3-sheet/zipball/53b04ec0305254b04192b4feed8aa22dd466422c",
+                "reference": "53b04ec0305254b04192b4feed8aa22dd466422c",
                 "shasum": ""
             },
             "type": "library",
@@ -1472,9 +1472,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ikkez/f3-sheet/issues",
-                "source": "https://github.com/ikkez/f3-sheet/tree/v0.4.2"
+                "source": "https://github.com/ikkez/f3-sheet/tree/v0.4.3"
             },
-            "time": "2022-09-12T21:17:10+00:00"
+            "time": "2024-03-06T16:19:08+00:00"
         },
         {
             "name": "league/flysystem",
@@ -2758,16 +2758,16 @@
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1"
+                "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6de50471469b8c9afc38164452ab2b6170ee71c1",
-                "reference": "6de50471469b8c9afc38164452ab2b6170ee71c1",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f",
+                "reference": "cd4226d140ecd3d0f13d32ed0a4a095ffe871d2f",
                 "shasum": ""
             },
             "require": {
@@ -2781,9 +2781,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -2821,7 +2818,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -2837,20 +2834,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                 "shasum": ""
             },
             "require": {
@@ -2863,9 +2860,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -2908,7 +2902,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -2924,20 +2918,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:30:37+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -2948,9 +2942,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -2992,7 +2983,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3008,20 +2999,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                 "shasum": ""
             },
             "require": {
@@ -3035,9 +3026,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3075,7 +3063,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3091,20 +3079,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                 "shasum": ""
             },
             "require": {
@@ -3112,9 +3100,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3151,7 +3136,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -3167,7 +3152,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "xfra35/f3-cron",

js/app/conf/signature_type.js

@@ -6,7 +6,7 @@
  * proofed, signature names (copy & paste from scanning window)
  */
 
- define([], () => {
+define([], () => {
     'use strict';
 
     // signature sources
@@ -397,8 +397,9 @@
         6:  'S804 - C6',
         7:  'N110 - H',
         8:  'J244 - L',
-        9:  'Z060 - 0.0',
-        10: 'F353 - C12 Thera'
+        9:  'J377 - L Turnur',
+        10:  'Z060 - 0.0',
+        11: 'F353 - C12 Thera'
     };
 
     // all w-space -> w-space are statics or K162
@@ -411,9 +412,10 @@
         6:  'R474 - C6',
         7:  'B274 - H',
         8:  'A239 - L',
-        9:  'E545 - 0.0',
-        10: 'F135 - C12 Thera',
-        11: 'F216 - T Pochven'
+        9:  'J377 - L Turnur',
+        10: 'E545 - 0.0',
+        11: 'F135 - C12 Thera',
+        12: 'F216 - T Pochven'
     };
 
     // all k-space exits are static or K162
@@ -426,9 +428,10 @@
         6:  'A982 - C6',
         7:  'D845 - H',
         8:  'U210 - L',
-        9:  'K346 - 0.0',
-        10: 'F135 - C12 Thera',
-        11: 'F216 - T Pochven'
+        9:  'J377 - L Turnur',
+        10: 'K346 - 0.0',
+        11: 'F135 - C12 Thera',
+        12: 'F216 - T Pochven'
     };
 
     // no *wandering* w-space -> w-space
@@ -442,8 +445,9 @@
         6:  'U574 - C6',
         7:  'S047 - H',
         8:  'N290 - L',
-        9:  'K329 - 0.0',
-        10: 'F216 - T Pochven'
+        9:  'J377 - L Turnur',
+        10: 'K329 - 0.0',
+        11: 'F216 - T Pochven'
     };
 
     let c5WH = {
@@ -455,8 +459,9 @@
         6:  'V753 - C6',
         7:  'D792 - H',
         8:  'C140 - L',
-        9:  'Z142 - 0.0',
-        10: 'F216 - T Pochven'
+        9:  'J377 - L Turnur',
+        10: 'Z142 - 0.0',
+        11: 'F216 - T Pochven'
     };
 
     let c6WH = {
@@ -470,9 +475,10 @@
         8:  'D792 - H',
         9:  'C140 - L',
         10: 'C391 - L',
-        11: 'C248 - 0.0',
-        12: 'Z142 - 0.0',
-        13: 'F216 - T Pochven'
+        11: 'J377 - L Turnur',
+        12: 'C248 - 0.0',
+        13: 'Z142 - 0.0',
+        14: 'F216 - T Pochven'
     };
 
     // Shattered WH (some of them are static)
@@ -502,12 +508,13 @@
         23: 'A239 - L',
         24: 'C391 - L',
         25: 'J244 - L',
-        26: 'U201 - L',    // ??
-        27: 'U210 - L',
-        28: 'C248 - 0.0',
-        29: 'E545 - 0.0',
-        30: 'K346 - 0.0',
-        31: 'Z060 - 0.0'
+        26: 'J377 - L Turnur',
+        27: 'U201 - L',    // ??
+        28: 'U210 - L',
+        29: 'C248 - 0.0',
+        30: 'E545 - 0.0',
+        31: 'K346 - 0.0',
+        32: 'Z060 - 0.0'
     };
 
     let hsWH = {
@@ -519,9 +526,10 @@
         6: 'B041 - C6',
         7: 'A641 - H',
         8: 'R051 - L',
-        9: 'V283 - 0.0',
-        10: 'T458 - C12 Thera',
-        11: 'C729 - T Pochven'
+        9: 'J377 - L Turnur',
+        10: 'V283 - 0.0',
+        11: 'T458 - C12 Thera',
+        12: 'C729 - T Pochven'
     };
 
     let lsWH = {
@@ -533,9 +541,10 @@
         6: 'U319 - C6',
         7: 'B449 - H',
         8: 'N944 - L',
-        9: 'S199 - 0.0',
-        10: 'M164 - C12 Thera',
-        11: 'C729 - T Pochven'
+        9: 'J377 - L Turnur',
+        10: 'S199 - 0.0',
+        11: 'M164 - C12 Thera',
+        12: 'C729 - T Pochven'
     };
 
     let nullWH = {
@@ -547,10 +556,11 @@
         6: 'U319 - C6',
         7: 'B449 - H',
         8: 'N944 - L',
-        9: 'S199 - 0.0',
-        10: 'L031 - C12 Thera',
-        11: 'C729 - T Pochven',
-        12: 'U372 - T Pochven'
+        9: 'J377 - L Turnur',
+        10: 'S199 - 0.0',
+        11: 'L031 - C12 Thera',
+        12: 'C729 - T Pochven',
+        13: 'U372 - T Pochven'
     };
 
     let pochWH = {

js/app/ui/dialog/jump_info.js

@@ -62,16 +62,16 @@ define([
             ];
 
             let matrixBodyFirst = [
-                ['C1',  'H121', 'C125', 'O883', 'M609', 'L614', 'S804', 'N110', 'J244', 'Z060', 'F353', ''],
-                ['C2',  'Z647', 'D382', 'O477', 'Y683', 'N062', 'R474', 'B274', 'A239', 'E545', 'F135', ''],
-                ['C3',  'V301', 'I182', 'N968', 'T405', 'N770', 'A982', 'D845', 'U210', 'K346', 'F135', ''],
-                ['C4',  'P060', 'N766', 'C247', 'X877', 'H900', 'U574', 'S047', 'N290', 'K329', ''    , ''],
-                ['C5',  'Y790', 'D364', 'M267', 'E175', 'H296', 'V753', 'D792', 'C140', 'Z142', ''    , ''],
-                ['C6',  'Q317', 'G024', 'L477', 'Z457', 'V911', 'W237', ['B520', 'D792'], ['C140', 'C391'], ['C248', 'Z142'], '', ''],
-                ['H',   'Z971', 'R943', 'X702', 'O128', 'M555', 'B041', 'A641', 'R051', 'V283', 'T458', ''],
-                ['L',   'Z971', 'R943', 'X702', 'O128', 'N432', 'U319', 'B449', 'N944', 'S199', 'M164', ''],
-                ['0.0', 'Z971', 'R943', 'X702', 'O128', 'N432', 'U319', 'B449', 'N944', 'S199', 'L031', ''],
-                ['C12', ''    , ''    , ''    , ''    , ''    , ''    , 'Q063', 'V898', 'E587', ''    , ''],
+                ['C1',  'H121', 'C125', 'O883', 'M609', 'L614', 'S804', 'N110', ['J244', 'J377'], 'Z060', 'F353', ''],
+                ['C2',  'Z647', 'D382', 'O477', 'Y683', 'N062', 'R474', 'B274', ['A239', 'J377'], 'E545', 'F135', ''],
+                ['C3',  'V301', 'I182', 'N968', 'T405', 'N770', 'A982', 'D845', ['U210', 'J377'], 'K346', 'F135', ''],
+                ['C4',  'P060', 'N766', 'C247', 'X877', 'H900', 'U574', 'S047', ['N290', 'J377'], 'K329', ''    , ''],
+                ['C5',  'Y790', 'D364', 'M267', 'E175', 'H296', 'V753', 'D792', ['C140', 'J377'], 'Z142', ''    , ''],
+                ['C6',  'Q317', 'G024', 'L477', 'Z457', 'V911', 'W237', ['B520', 'D792'], ['C140', 'C391', 'J377'], ['C248', 'Z142'], '', ''],
+                ['H',   'Z971', 'R943', 'X702', 'O128', 'M555', 'B041', 'A641', ['R051', 'J377'], 'V283', 'T458', ''],
+                ['L',   'Z971', 'R943', 'X702', 'O128', 'N432', 'U319', 'B449', ['N944', 'J377'], 'S199', 'M164', ''],
+                ['0.0', 'Z971', 'R943', 'X702', 'O128', 'N432', 'U319', 'B449', ['N944', 'J377'], 'S199', 'L031', ''],
+                ['C12', ''    , ''    , ''    , ''    , ''    , ''    , 'Q063', ['V898', 'J377'], 'E587', ''    , ''],
                 ['?',   'E004', 'L005', 'Z006', 'M001', 'C008', 'G008', ''    , ''    , 'Q003', ''    , 'A009']
             ];
 

js/app/ui/module/global_thera.js

@@ -175,15 +175,16 @@ define([
                         targets: 1,
                         name: 'trueSec',
                         title: 'sec',
-                        width: 15,
+                        width: 10,
                         className:'text-center',
-                        data: 'target.trueSec',
+                        data: 'target.system_class',
                         defaultContent: module.getIconForUndefinedCellValue(),
                         render: {
                             display: (cellData, type, rowData, meta) => {
                                 if(cellData !== undefined){
                                     let systemTrueSecClass = BaseModule.Util.getTrueSecClassForSystem(cellData);
                                     return '<span class="' + systemTrueSecClass + '">' + cellData.toFixed(1) + '</span>';
+                                    return cellData
                                 }
                             }
                         }
@@ -221,12 +222,12 @@ define([
                         targets: 4,
                         name: 'outSig',
                         title: '<i title="Out signature" data-toggle="tooltip" class="fas fa-sign-out-alt fa-rotate-270"></i>',
-                        width: 12,
+                        width: 20,
                         className: ['text-center', module._config.fontUppercaseClass].join(' '),
                         data: 'sourceSignature',
                         defaultContent: module.getIconForUndefinedCellValue(),
                         render: {
-                            _: 'name'
+                            _: 'short_name'
                         }
                     },{
                         targets: 5,
@@ -241,12 +242,12 @@ define([
                         targets: 6,
                         name: 'inSig',
                         title: '<i title="In signature" data-toggle="tooltip" class="fas fa-sign-in-alt fa-rotate-90"></i>',
-                        width: 12,
+                        width: 20,
                         className: ['text-center', module._config.fontUppercaseClass].join(' '),
                         data: 'targetSignature',
                         defaultContent: module.getIconForUndefinedCellValue(),
                         render: {
-                            _: 'name'
+                            _: 'short_name'
                         }
                     },{
                         targets: 7,
@@ -279,15 +280,11 @@ define([
                         defaultContent: module.getIconForUndefinedCellValue(),
                         render: {
                             display: (cellData, type, rowData, meta) => {
-                                try{
-                                    let timeNow = (new Date()).getTime();
-                                    let timeEol = Date.parse(cellData);
-                                    if(!isNaN(timeNow) && !isNaN(timeEol) ){
-                                        let diff = (timeEol - timeNow) / 1000;
-                                        diff /= (60 * 60);
-                                        return `< ${Math.ceil(diff)}h`;
-                                    }
-                                }catch(e){}
+                                if(cellData > 0){
+                                    return `< ${cellData}h`;
+                                } else if (cellData == 0 ){
+                                    return `< 1h`;
+                                }
                             },
                             sort: dateVal => Date.parse(dateVal)
                         }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pathfinder-eve",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pathfinder-eve",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "engines": {
     "node": "12.x"
   },