chore: release version v1.64.0

Develop

CHANGELOG.md

@@ -2,6 +2,132 @@
 
 <!-- changelog -->
 
+## [v1.64.0](https://github.com/wanderer-industries/wanderer/compare/v1.63.0...v1.64.0) (2025-05-13)
+
+
+
+
+### Features:
+
+* api: add additional structure/signature methods (#365)
+
+* api: add additional system/connections methods (#351)
+
+### Bug Fixes:
+
+* Core: Fixed EOL connections cleanup
+
+* Core: Avoid Zarzakh system in routes widget
+
+* remove repeat errors for token refresh (#375)
+
+* updated openapi spec for character activity (#374)
+
+* removed error from characters endpoint, and updated routes (#372)
+
+* cleanup examples for system and connections (#370)
+
+* remove error on websocket reconnect (#367)
+
+## [v1.63.0](https://github.com/wanderer-industries/wanderer/compare/v1.62.4...v1.63.0) (2025-05-11)
+
+
+
+
+### Features:
+
+* Core: Updated map active characters page
+
+## [v1.62.4](https://github.com/wanderer-industries/wanderer/compare/v1.62.3...v1.62.4) (2025-05-10)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fixed map characters got untracked
+
+## [v1.62.3](https://github.com/wanderer-industries/wanderer/compare/v1.62.2...v1.62.3) (2025-05-08)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fixed map characters got untracked
+
+## [v1.62.2](https://github.com/wanderer-industries/wanderer/compare/v1.62.1...v1.62.2) (2025-05-05)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fixed audit export API
+
+## [v1.62.1](https://github.com/wanderer-industries/wanderer/compare/v1.62.0...v1.62.1) (2025-05-05)
+
+
+
+
+## [v1.62.0](https://github.com/wanderer-industries/wanderer/compare/v1.61.2...v1.62.0) (2025-05-05)
+
+
+
+
+### Features:
+
+* Core: added user routes support
+
+### Bug Fixes:
+
+* Map: Fixed link signature modal crash afrer destination system removed
+
+* Map: Change design for tags (#358)
+
+* Map: Removed paywall restriction from public routes
+
+* Core: Fixed issues with structures loading
+
+* Map: Removed unnecessary logs
+
+* Map: Add support user routes
+
+* Map: Add support for User Routes on FE side.
+
+* Map: Refactor Local - show ship name, change placement of ship name. Refactor On the Map - show corp and ally logo. Fixed problem with ellipsis at long character and ship names.
+
+* Map: Refactored routes widget. Add loader for routes. Prepared for custom hubs
+
+* Map: Refactor init and update of mapper
+
+## [v1.61.2](https://github.com/wanderer-industries/wanderer/compare/v1.61.1...v1.61.2) (2025-04-29)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fixed main character checking & manual systems delete logic
+
+## [v1.61.1](https://github.com/wanderer-industries/wanderer/compare/v1.61.0...v1.61.1) (2025-04-26)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fixed additional price calc for map sub updates
+
+## [v1.61.0](https://github.com/wanderer-industries/wanderer/compare/v1.60.1...v1.61.0) (2025-04-24)
+
+
+
+
+### Features:
+
+* Core: force checking main character set for all map activity
+
 ## [v1.60.1](https://github.com/wanderer-industries/wanderer/compare/v1.60.0...v1.60.1) (2025-04-22)
 
 

assets/js/hooks/Mapper/common-styles/fixes.scss

@@ -99,6 +99,11 @@
 .p-dropdown-item {
   padding: 0.25rem 0.5rem;
   font-size: 14px;
+  width: 100%;
+
+  .p-dropdown-item-label {
+    width: 100%;
+  }
 }
 
 .p-dropdown-item-group {
@@ -180,3 +185,16 @@
 .p-datatable .p-datatable-tbody > tr.p-highlight {
   background: initial;
 }
+
+.suppress-menu-behaviour {
+  pointer-events: none;
+
+  .p-menuitem-content {
+    pointer-events: initial;
+    background-color: initial !important;
+  }
+  .p-menuitem-content:hover {
+    background-color: initial !important;
+  }
+}
+

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/ContextMenuSystem.tsx

@@ -6,6 +6,7 @@ import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/ty
 
 export interface ContextMenuSystemProps {
   hubs: string[];
+  userHubs: string[];
   contextMenuRef: RefObject<ContextMenu>;
   systemId: string | undefined;
   systems: SolarSystemRawType[];
@@ -13,6 +14,7 @@ export interface ContextMenuSystemProps {
   onLockToggle(): void;
   onOpenSettings(): void;
   onHubToggle(): void;
+  onUserHubToggle(): void;
   onSystemTag(val?: string): void;
   onSystemStatus(val: number): void;
   onSystemLabels(val: string): void;
@@ -25,7 +27,7 @@ export const ContextMenuSystem: React.FC<ContextMenuSystemProps> = ({ contextMen
 
   return (
     <>
-      <ContextMenu model={items} ref={contextMenuRef} breakpoint="767px" />
+      <ContextMenu className="min-w-[200px]" model={items} ref={contextMenuRef} breakpoint="767px" />
     </>
   );
 };

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/hooks/useTagMenu/index.ts

@@ -1 +1 @@
-export * from './useTagMenu.ts';
+export * from './useTagMenu.tsx';

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/hooks/useTagMenu/useTagMenu.ts

@@ -1,68 +0,0 @@
-import { MenuItem } from 'primereact/menuitem';
-import { PrimeIcons } from 'primereact/api';
-import { useCallback, useRef } from 'react';
-import { SolarSystemRawType } from '@/hooks/Mapper/types';
-import { getSystemById } from '@/hooks/Mapper/helpers';
-import clsx from 'clsx';
-import { GRADIENT_MENU_ACTIVE_CLASSES } from '@/hooks/Mapper/constants.ts';
-
-const AVAILABLE_LETTERS = ['A', 'B', 'C', 'D', 'E', 'F', 'X', 'Y', 'Z'];
-const AVAILABLE_NUMBERS = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-
-export const useTagMenu = (
-  systems: SolarSystemRawType[],
-  systemId: string | undefined,
-  onSystemTag: (val?: string) => void,
-): (() => MenuItem) => {
-  const ref = useRef({ onSystemTag, systems, systemId });
-  ref.current = { onSystemTag, systems, systemId };
-
-  return useCallback(() => {
-    const { onSystemTag, systemId, systems } = ref.current;
-    const system = systemId ? getSystemById(systems, systemId) : undefined;
-
-    const isSelectedLetters = AVAILABLE_LETTERS.includes(system?.tag ?? '');
-    const isSelectedNumbers = AVAILABLE_NUMBERS.includes(system?.tag ?? '');
-
-    const menuItem: MenuItem = {
-      label: 'Tag',
-      icon: PrimeIcons.HASHTAG,
-      className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: isSelectedLetters || isSelectedNumbers }),
-      items: [
-        ...(system?.tag !== '' && system?.tag !== null
-          ? [
-              {
-                label: 'Clear',
-                icon: PrimeIcons.BAN,
-                command: () => onSystemTag(),
-              },
-            ]
-          : []),
-        {
-          label: 'Letter',
-          icon: PrimeIcons.TAGS,
-          className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: isSelectedLetters }),
-          items: AVAILABLE_LETTERS.map(x => ({
-            label: x,
-            icon: PrimeIcons.TAG,
-            command: () => onSystemTag(x),
-            className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: system?.tag === x }),
-          })),
-        },
-        {
-          label: 'Digit',
-          icon: PrimeIcons.TAGS,
-          className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: isSelectedNumbers }),
-          items: AVAILABLE_NUMBERS.map(x => ({
-            label: x,
-            icon: PrimeIcons.TAG,
-            command: () => onSystemTag(x),
-            className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: system?.tag === x }),
-          })),
-        },
-      ],
-    };
-
-    return menuItem;
-  }, []);
-};

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/hooks/useTagMenu/useTagMenu.tsx

@@ -0,0 +1,95 @@
+import { MenuItem } from 'primereact/menuitem';
+import { PrimeIcons } from 'primereact/api';
+import { useCallback, useRef } from 'react';
+import { SolarSystemRawType } from '@/hooks/Mapper/types';
+import { getSystemById } from '@/hooks/Mapper/helpers';
+import clsx from 'clsx';
+import { GRADIENT_MENU_ACTIVE_CLASSES } from '@/hooks/Mapper/constants.ts';
+import { LayoutEventBlocker } from '@/hooks/Mapper/components/ui-kit';
+import { Button } from 'primereact/button';
+
+const AVAILABLE_TAGS = [
+  'A',
+  'B',
+  'C',
+  'D',
+  'E',
+  'F',
+  'G',
+  'H',
+  'I',
+  'X',
+  'Y',
+  'Z',
+  '0',
+  '1',
+  '2',
+  '3',
+  '4',
+  '5',
+  '6',
+  '7',
+  '8',
+  '9',
+];
+
+export const useTagMenu = (
+  systems: SolarSystemRawType[],
+  systemId: string | undefined,
+  onSystemTag: (val?: string) => void,
+): (() => MenuItem) => {
+  const ref = useRef({ onSystemTag, systems, systemId });
+  ref.current = { onSystemTag, systems, systemId };
+
+  return useCallback(() => {
+    const { onSystemTag, systemId, systems } = ref.current;
+    const system = systemId ? getSystemById(systems, systemId) : undefined;
+
+    const isSelectedTag = AVAILABLE_TAGS.includes(system?.tag ?? '');
+
+    const menuItem: MenuItem = {
+      label: 'Tag',
+      icon: PrimeIcons.HASHTAG,
+      className: clsx({ [GRADIENT_MENU_ACTIVE_CLASSES]: isSelectedTag }),
+      items: [
+        {
+          label: 'Digit',
+          icon: PrimeIcons.TAGS,
+          className: '!h-[128px] suppress-menu-behaviour',
+          template: () => {
+            return (
+              <LayoutEventBlocker className="flex flex-col gap-1 w-[200px] h-full px-2">
+                <div className="grid grid-cols-[auto_auto_auto_auto_auto_auto] gap-1">
+                  {AVAILABLE_TAGS.map(x => (
+                    <Button
+                      outlined={system?.tag !== x}
+                      severity="warning"
+                      key={x}
+                      value={x}
+                      size="small"
+                      className="p-[3px] justify-center"
+                      onClick={() => system?.tag !== x && onSystemTag(x)}
+                    >
+                      {x}
+                    </Button>
+                  ))}
+                  <Button
+                    disabled={!isSelectedTag}
+                    icon="pi pi-ban"
+                    size="small"
+                    className="!p-0 !w-[initial] justify-center"
+                    outlined
+                    severity="help"
+                    onClick={() => onSystemTag()}
+                  ></Button>
+                </div>
+              </LayoutEventBlocker>
+            );
+          },
+        },
+      ],
+    };
+
+    return menuItem;
+  }, []);
+};

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemHandlers.ts

@@ -8,19 +8,25 @@ import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 
 interface UseContextMenuSystemHandlersProps {
   hubs: string[];
+  userHubs: string[];
   systems: SolarSystemRawType[];
   outCommand: OutCommandHandler;
 }
 
-export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseContextMenuSystemHandlersProps) => {
+export const useContextMenuSystemHandlers = ({
+  systems,
+  hubs,
+  userHubs,
+  outCommand,
+}: UseContextMenuSystemHandlersProps) => {
   const contextMenuRef = useRef<ContextMenu | null>(null);
 
   const [system, setSystem] = useState<string>();
 
   const { deleteSystems } = useDeleteSystems();
 
-  const ref = useRef({ hubs, system, systems, outCommand, deleteSystems });
-  ref.current = { hubs, system, systems, outCommand, deleteSystems };
+  const ref = useRef({ hubs, userHubs, system, systems, outCommand, deleteSystems });
+  ref.current = { hubs, userHubs, system, systems, outCommand, deleteSystems };
 
   const open = useCallback((ev: any, systemId: string) => {
     setSystem(systemId);
@@ -72,6 +78,21 @@ export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseC
     setSystem(undefined);
   }, []);
 
+  const onUserHubToggle = useCallback(() => {
+    const { userHubs, system, outCommand } = ref.current;
+    if (!system) {
+      return;
+    }
+
+    outCommand({
+      type: !userHubs.includes(system) ? OutCommand.addUserHub : OutCommand.deleteUserHub,
+      data: {
+        system_id: system,
+      },
+    });
+    setSystem(undefined);
+  }, []);
+
   const onSystemTag = useCallback((tag?: string) => {
     const { system, outCommand } = ref.current;
     if (!system) {
@@ -104,7 +125,6 @@ export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseC
     setSystem(undefined);
   }, []);
 
-
   const onSystemStatus = useCallback((status: number) => {
     const { system, outCommand } = ref.current;
     if (!system) {
@@ -177,6 +197,7 @@ export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseC
     onDeleteSystem,
     onLockToggle,
     onHubToggle,
+    onUserHubToggle,
     onSystemTag,
     onSystemTemporaryName,
     onSystemStatus,

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemItems.tsx

@@ -10,11 +10,13 @@ import { useMapCheckPermissions } from '@/hooks/Mapper/mapRootProvider/hooks/api
 import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';
 import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
 import { getSystemStaticInfo } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic';
+import { MapAddIcon, MapDeleteIcon, MapUserAddIcon, MapUserDeleteIcon } from '@/hooks/Mapper/icons';
 
 export const useContextMenuSystemItems = ({
   onDeleteSystem,
   onLockToggle,
   onHubToggle,
+  onUserHubToggle,
   onSystemTag,
   onSystemStatus,
   onSystemLabels,
@@ -23,6 +25,7 @@ export const useContextMenuSystemItems = ({
   onWaypointSet,
   systemId,
   hubs,
+  userHubs,
   systems,
 }: Omit<ContextMenuSystemProps, 'contextMenuRef'>) => {
   const getTags = useTagMenu(systems, systemId, onSystemTag);
@@ -61,10 +64,23 @@ export const useContextMenuSystemItems = ({
       ...getLabels(),
       ...getWaypointMenu(systemId, systemStaticInfo.system_class),
       {
-        label: !hubs.includes(systemId) ? 'Add in Routes' : 'Remove from Routes',
-        icon: PrimeIcons.MAP_MARKER,
+        label: !hubs.includes(systemId) ? 'Add Route' : 'Remove Route',
+        icon: !hubs.includes(systemId) ? (
+          <MapAddIcon className="mr-1 relative left-[-2px]" />
+        ) : (
+          <MapDeleteIcon className="mr-1 relative left-[-2px]" />
+        ),
         command: onHubToggle,
       },
+      {
+        label: !userHubs.includes(systemId) ? 'Add User Route' : 'Remove User Route',
+        icon: !userHubs.includes(systemId) ? (
+          <MapUserAddIcon className="mr-1 relative left-[-2px]" />
+        ) : (
+          <MapUserDeleteIcon className="mr-1 relative left-[-2px]" />
+        ),
+        command: onUserHubToggle,
+      },
       ...(system.locked
         ? canLockSystem
           ? [

assets/js/hooks/Mapper/components/contexts/ContextMenuSystemInfo/ContextMenuSystemInfo.tsx

@@ -11,6 +11,7 @@ import { FastSystemActions } from '@/hooks/Mapper/components/contexts/components
 import { useJumpPlannerMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { Route } from '@/hooks/Mapper/types/routes.ts';
 import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
+import { MapAddIcon, MapDeleteIcon } from '@/hooks/Mapper/icons';
 
 export interface ContextMenuSystemInfoProps {
   systemStatics: Map<number, SolarSystemStaticInfoRaw>;
@@ -69,8 +70,12 @@ export const ContextMenuSystemInfo: React.FC<ContextMenuSystemInfoProps> = ({
       ...getJumpPlannerMenu(system, routes),
       ...getWaypointMenu(systemId, system.system_class),
       {
-        label: !hubs.includes(systemId) ? 'Add in Routes' : 'Remove from Routes',
-        icon: PrimeIcons.MAP_MARKER,
+        label: !hubs.includes(systemId) ? 'Add Route' : 'Remove Route',
+        icon: !hubs.includes(systemId) ? (
+          <MapAddIcon className="mr-1 relative left-[-2px]" />
+        ) : (
+          <MapDeleteIcon className="mr-1 relative left-[-2px]" />
+        ),
         command: onHubToggle,
       },
       ...(!systemOnMap

assets/js/hooks/Mapper/components/contexts/ContextMenuSystemInfo/useContextMenuSystemInfoHandlers.ts

@@ -1,25 +1,25 @@
 import * as React from 'react';
 import { useCallback, useRef, useState } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
-import { Commands, OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.ts';
+import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/types.ts';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
 import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
 import { emitMapEvent } from '@/hooks/Mapper/events';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useRouteProvider } from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesProvider.tsx';
 
-interface UseContextMenuSystemHandlersProps {
-  hubs: string[];
-  outCommand: OutCommandHandler;
-}
+export const useContextMenuSystemInfoHandlers = () => {
+  const { outCommand } = useMapRootState();
+  const { hubs = [], toggleHubCommand } = useRouteProvider();
 
-export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContextMenuSystemHandlersProps) => {
   const contextMenuRef = useRef<ContextMenu | null>(null);
 
   const [system, setSystem] = useState<string>();
   const routeRef = useRef<(SolarSystemStaticInfoRaw | undefined)[]>([]);
 
-  const ref = useRef({ hubs, system, outCommand });
-  ref.current = { hubs, system, outCommand };
+  const ref = useRef({ hubs, system, outCommand, toggleHubCommand });
+  ref.current = { hubs, system, outCommand, toggleHubCommand };
 
   const open = useCallback(
     (ev: React.SyntheticEvent, systemId: string, route: (SolarSystemStaticInfoRaw | undefined)[]) => {
@@ -33,17 +33,12 @@ export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContex
   );
 
   const onHubToggle = useCallback(() => {
-    const { hubs, system, outCommand } = ref.current;
+    const { system } = ref.current;
     if (!system) {
       return;
     }
 
-    outCommand({
-      type: !hubs.includes(system) ? OutCommand.addHub : OutCommand.deleteHub,
-      data: {
-        system_id: system,
-      },
-    });
+    ref.current.toggleHubCommand(system);
     setSystem(undefined);
   }, []);
 
@@ -59,6 +54,8 @@ export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContex
         system_id: solarSystemId,
       },
     });
+
+    // TODO add it to some queue
     setTimeout(() => {
       emitMapEvent({
         name: Commands.centerSystem,

assets/js/hooks/Mapper/components/contexts/components/FastSystemActions/FastSystemActions.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useRef } from 'react';
 import { LayoutEventBlocker, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
-import { ANOIK_ICON, DOTLAN_ICON, ZKB_ICON } from '@/hooks/Mapper/icons.ts';
+import { ANOIK_ICON, DOTLAN_ICON, ZKB_ICON } from '@/hooks/Mapper/icons';
 
 import classes from './FastSystemActions.module.scss';
 import clsx from 'clsx';

assets/js/hooks/Mapper/components/hooks/useSystemInfo.ts

@@ -1,6 +1,6 @@
+import { getSystemById } from '@/hooks/Mapper/helpers';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { useMemo } from 'react';
-import { getSystemById } from '@/hooks/Mapper/helpers';
 import { getSystemStaticInfo } from '../../mapRootProvider/hooks/useLoadSystemStatic';
 
 interface UseSystemInfoProps {
@@ -17,7 +17,7 @@ export const useSystemInfo = ({ systemId }: UseSystemInfoProps) => {
     const dynamicInfo = getSystemById(systems, systemId);
 
     if (!staticInfo || !dynamicInfo) {
-      throw new Error(`Error on getting system ${systemId}`);
+      return { dynamicInfo, staticInfo, leadsTo: [] };
     }
 
     const leadsTo = connections

assets/js/hooks/Mapper/components/map/MapProvider.tsx

@@ -38,6 +38,8 @@ const INITIAL_DATA: MapData = {
   systemSignatures: {} as Record<string, SystemSignature[]>,
   options: {} as Record<string, string | boolean>,
   isSubscriptionActive: false,
+  mainCharacterEveId: null,
+  followingCharacterEveId: null,
 };
 
 export interface MapContextProps {

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemKillsCounter.tsx

@@ -26,11 +26,7 @@ export const KillsCounter = ({
   children,
   size = TooltipSize.xs,
 }: KillsBookmarkTooltipProps) => {
-  const {
-    isLoading,
-    kills: detailedKills,
-    systemNameMap,
-  } = useKillsCounter({
+  const { isLoading, kills: detailedKills } = useKillsCounter({
     realSystemId: systemId,
   });
 

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemLocalCounter.tsx

@@ -6,8 +6,8 @@ import { CharItemProps, LocalCharactersList } from '../../../mapInterface/widget
 import { useLocalCharactersItemTemplate } from '../../../mapInterface/widgets/LocalCharacters/hooks/useLocalCharacters';
 import { useLocalCharacterWidgetSettings } from '../../../mapInterface/widgets/LocalCharacters/hooks/useLocalWidgetSettings';
 import classes from './SolarSystemLocalCounter.module.scss';
-import { AvailableThemes } from '@/hooks/Mapper/mapRootProvider';
 import { useTheme } from '@/hooks/Mapper/hooks/useTheme.ts';
+import { AvailableThemes } from '@/hooks/Mapper/mapRootProvider/types.ts';
 
 interface LocalCounterProps {
   localCounterCharacters: Array<CharItemProps>;

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.tsx

@@ -16,22 +16,20 @@ import { LocalCounter } from './SolarSystemLocalCounter';
 import { KillsCounter } from './SolarSystemKillsCounter';
 import { TooltipSize } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper/utils.ts';
 import { TooltipPosition, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
+import { Tag } from 'primereact/tag';
 
+// let render = 0;
 export const SolarSystemNodeDefault = memo((props: NodeProps<MapSolarSystemType>) => {
   const nodeVars = useSolarSystemNode(props);
   const { localCounterCharacters } = useLocalCounter(nodeVars);
   const localKillsCount = useNodeKillsCount(nodeVars.solarSystemId, nodeVars.killsCount);
 
+  // console.log('JOipP', `render ${nodeVars.id}`, render++);
+
   return (
     <>
       {nodeVars.visible && (
         <div className={classes.Bookmarks}>
-          {nodeVars.labelCustom !== '' && (
-            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
-              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">{nodeVars.labelCustom}</span>
-            </div>
-          )}
-
           {nodeVars.isShattered && (
             <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.shattered, '!pr-[2px]')}>
               <WdTooltipWrapper content="Shattered" position={TooltipPosition.top}>
@@ -55,6 +53,12 @@ export const SolarSystemNodeDefault = memo((props: NodeProps<MapSolarSystemType>
             </KillsCounter>
           )}
 
+          {nodeVars.labelCustom !== '' && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
+              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">{nodeVars.labelCustom}</span>
+            </div>
+          )}
+
           {nodeVars.labelsInfo.map(x => (
             <div key={x.id} className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[x.id])}>
               {x.shortName}
@@ -86,7 +90,11 @@ export const SolarSystemNodeDefault = memo((props: NodeProps<MapSolarSystemType>
               </div>
 
               {nodeVars.tag != null && nodeVars.tag !== '' && (
-                <div className={clsx(classes.TagTitle, 'text-sky-400 font-medium')}>{nodeVars.tag}</div>
+                <Tag
+                  value={nodeVars.tag}
+                  severity="warning"
+                  className="py-0 px-[2px] text-[9px] [&_.p-tag-value]:leading-[1.3]"
+                ></Tag>
               )}
 
               <div

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.tsx

@@ -17,21 +17,18 @@ import { KillsCounter } from './SolarSystemKillsCounter';
 import { TooltipPosition, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
 import { TooltipSize } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper/utils.ts';
 
+// let render = 0;
 export const SolarSystemNodeTheme = memo((props: NodeProps<MapSolarSystemType>) => {
   const nodeVars = useSolarSystemNode(props);
   const { localCounterCharacters } = useLocalCounter(nodeVars);
   const localKillsCount = useNodeKillsCount(nodeVars.solarSystemId, nodeVars.killsCount);
 
+  // console.log('JOipP', `render ${nodeVars.id}`, render++);
+
   return (
     <>
       {nodeVars.visible && (
         <div className={classes.Bookmarks}>
-          {nodeVars.labelCustom !== '' && (
-            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
-              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">{nodeVars.labelCustom}</span>
-            </div>
-          )}
-
           {nodeVars.isShattered && (
             <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.shattered, '!pr-[2px]')}>
               <WdTooltipWrapper content="Shattered" position={TooltipPosition.top}>
@@ -55,6 +52,12 @@ export const SolarSystemNodeTheme = memo((props: NodeProps<MapSolarSystemType>)
             </KillsCounter>
           )}
 
+          {nodeVars.labelCustom !== '' && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
+              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">{nodeVars.labelCustom}</span>
+            </div>
+          )}
+
           {nodeVars.labelsInfo.map(x => (
             <div key={x.id} className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[x.id])}>
               {x.shortName}

assets/js/hooks/Mapper/components/map/hooks/api/useMapCommands.ts

@@ -1,6 +1,6 @@
 import { MapData, useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
-import { useCallback, useRef } from 'react';
 import { CommandKillsUpdated, CommandMapUpdated } from '@/hooks/Mapper/types';
+import { useCallback, useRef } from 'react';
 
 export const useMapCommands = () => {
   const { update } = useMapState();
@@ -8,13 +8,21 @@ export const useMapCommands = () => {
   const ref = useRef({ update });
   ref.current = { update };
 
-  const mapUpdated = useCallback(({ hubs }: CommandMapUpdated) => {
+  const mapUpdated = useCallback(({ hubs, system_signatures, kills }: CommandMapUpdated) => {
     const out: Partial<MapData> = {};
 
     if (hubs) {
       out.hubs = hubs;
     }
 
+    if (system_signatures) {
+      out.systemSignatures = system_signatures;
+    }
+
+    if (kills) {
+      out.kills = kills.reduce((acc, x) => ({ ...acc, [x.solar_system_id]: x.kills }), {});
+    }
+
     ref.current.update(out);
   }, []);
 

assets/js/hooks/Mapper/components/map/hooks/useNodeKillsCount.ts

@@ -13,28 +13,26 @@ interface MapEvent {
   payload?: Kill[];
 }
 
-export function useNodeKillsCount(
-  systemId: number | string,
-  initialKillsCount: number | null
-): number | null {
+export function useNodeKillsCount(systemId: number | string, initialKillsCount: number | null): number | null {
   const [killsCount, setKillsCount] = useState<number | null>(initialKillsCount);
 
   useEffect(() => {
     setKillsCount(initialKillsCount);
   }, [initialKillsCount]);
 
-  const handleEvent = useCallback((event: MapEvent): boolean => {
-    if (event.name === Commands.killsUpdated && Array.isArray(event.payload)) {
-      const killForSystem = event.payload.find(
-        kill => kill.solar_system_id.toString() === systemId.toString()
-      );
-      if (killForSystem && typeof killForSystem.kills === 'number') {
-        setKillsCount(killForSystem.kills);
+  const handleEvent = useCallback(
+    (event: MapEvent): boolean => {
+      if (event.name === Commands.killsUpdated && Array.isArray(event.payload)) {
+        const killForSystem = event.payload.find(kill => kill.solar_system_id.toString() === systemId.toString());
+        if (killForSystem && typeof killForSystem.kills === 'number') {
+          setKillsCount(killForSystem.kills);
+        }
+        return true;
       }
-      return true;
-    }
-    return false;
-  }, [systemId]);
+      return false;
+    },
+    [systemId],
+  );
 
   useMapEventListener(handleEvent);
 

assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts

@@ -55,7 +55,7 @@ export function useSolarSystemNode(props: NodeProps<MapSolarSystemType>): SolarS
   } = data;
 
   const {
-    interfaceSettings,
+    storedSettings: { interfaceSettings },
     data: { systemSignatures: mapSystemSignatures },
   } = useMapRootState();
 

assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx

@@ -1,23 +1,23 @@
-import { useCallback, useMemo, useRef } from 'react';
 import { Dialog } from 'primereact/dialog';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 
-import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
-import { CommandLinkSignatureToSystem, SignatureGroup, SystemSignature, TimeStatus } from '@/hooks/Mapper/types';
-import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { SystemSignaturesContent } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent';
-import { parseSignatureCustomInfo } from '@/hooks/Mapper/helpers/parseSignatureCustomInfo';
-import { getWhSize } from '@/hooks/Mapper/helpers/getWhSize';
 import { useSystemInfo } from '@/hooks/Mapper/components/hooks';
 import {
   SOLAR_SYSTEM_CLASS_IDS,
   SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
   WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME,
 } from '@/hooks/Mapper/components/map/constants.ts';
-import { K162_TYPES_MAP } from '@/hooks/Mapper/constants.ts';
 import {
   SETTINGS_KEYS,
   SignatureSettingsType,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
+import { SystemSignaturesContent } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent';
+import { K162_TYPES_MAP } from '@/hooks/Mapper/constants.ts';
+import { getWhSize } from '@/hooks/Mapper/helpers/getWhSize';
+import { parseSignatureCustomInfo } from '@/hooks/Mapper/helpers/parseSignatureCustomInfo';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { CommandLinkSignatureToSystem, SignatureGroup, SystemSignature, TimeStatus } from '@/hooks/Mapper/types';
+import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 
 const K162_SIGNATURE_TYPE = WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME['K162'].shortName;
 
@@ -49,7 +49,9 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
   ref.current = { outCommand };
 
   // Get system info for the target system
-  const { staticInfo: targetSystemInfo } = useSystemInfo({ systemId: `${data.solar_system_target}` });
+  const { staticInfo: targetSystemInfo, dynamicInfo: targetSystemDynamicInfo } = useSystemInfo({
+    systemId: `${data.solar_system_target}`,
+  });
 
   // Get the system class group for the target system
   const targetSystemClassGroup = useMemo(() => {
@@ -160,6 +162,12 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
     [data, setVisible, wormholes],
   );
 
+  useEffect(() => {
+    if (!targetSystemDynamicInfo) {
+      handleHide();
+    }
+  }, [targetSystemDynamicInfo]);
+
   return (
     <Dialog
       header="Select signature to link"

assets/js/hooks/Mapper/components/mapInterface/constants.tsx

@@ -1,13 +1,14 @@
 import { WindowProps } from '@/hooks/Mapper/components/ui-kit/WindowManager/types.ts';
 import {
+  CommentsWidget,
   LocalCharacters,
-  RoutesWidget,
   SystemInfo,
   SystemSignatures,
   SystemStructures,
+  WRoutesPublic,
+  WRoutesUser,
   WSystemKills,
 } from '@/hooks/Mapper/components/mapInterface/widgets';
-import { CommentsWidget } from '@/hooks/Mapper/components/mapInterface/widgets/CommentsWidget';
 
 export const CURRENT_WINDOWS_VERSION = 9;
 export const WINDOWS_LOCAL_STORE_KEY = 'windows:settings:v2';
@@ -20,6 +21,7 @@ export enum WidgetsIds {
   structures = 'structures',
   kills = 'kills',
   comments = 'comments',
+  userRoutes = 'userRoutes',
 }
 
 export const STORED_VISIBLE_WIDGETS_DEFAULT = [
@@ -56,7 +58,14 @@ export const DEFAULT_WIDGETS: WindowProps[] = [
     position: { x: 10, y: 530 },
     size: { width: 510, height: 200 },
     zIndex: 0,
-    content: () => <RoutesWidget />,
+    content: () => <WRoutesPublic />,
+  },
+  {
+    id: WidgetsIds.userRoutes,
+    position: { x: 10, y: 530 },
+    size: { width: 510, height: 200 },
+    zIndex: 0,
+    content: () => <WRoutesUser />,
   },
   {
     id: WidgetsIds.structures,
@@ -103,6 +112,10 @@ export const WIDGETS_CHECKBOXES_PROPS: WidgetsCheckboxesType = [
     id: WidgetsIds.routes,
     label: 'Routes',
   },
+  {
+    id: WidgetsIds.userRoutes,
+    label: 'User Routes',
+  },
   {
     id: WidgetsIds.structures,
     label: 'Structures',

assets/js/hooks/Mapper/components/mapInterface/widgets/LocalCharacters/components/LocalCharactersItemTemplate/LocalCharactersItemTemplate.tsx

@@ -22,7 +22,7 @@ export const LocalCharactersItemTemplate = ({ showShipName, ...options }: LocalC
       )}
       style={{ height: `${options.props.itemSize}px` }}
     >
-      <CharacterCard showShipName={showShipName} {...options} />
+      <CharacterCard showShipName={showShipName} showTicker {...options} />
     </div>
   );
 };

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesProvider.tsx

@@ -1,79 +1,34 @@
-import React, { createContext, useContext, useEffect } from 'react';
-import { ContextStoreDataUpdate, useContextStore } from '@/hooks/Mapper/utils';
-import { SESSION_KEY } from '@/hooks/Mapper/constants.ts';
+import React, { createContext, forwardRef, useContext, useImperativeHandle, useState } from 'react';
+import {
+  RoutesImperativeHandle,
+  RoutesProviderInnerProps,
+  RoutesWidgetProps,
+} from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts';
 
-export type RoutesType = {
-  path_type: 'shortest' | 'secure' | 'insecure';
-  include_mass_crit: boolean;
-  include_eol: boolean;
-  include_frig: boolean;
-  include_cruise: boolean;
-  include_thera: boolean;
-  avoid_wormholes: boolean;
-  avoid_pochven: boolean;
-  avoid_edencom: boolean;
-  avoid_triglavian: boolean;
-  avoid: number[];
-};
-
-interface MapProviderProps {
+type MapProviderProps = {
   children: React.ReactNode;
-}
+} & RoutesWidgetProps;
 
-export const DEFAULT_SETTINGS: RoutesType = {
-  path_type: 'shortest',
-  include_mass_crit: true,
-  include_eol: true,
-  include_frig: true,
-  include_cruise: true,
-  include_thera: true,
-  avoid_wormholes: false,
-  avoid_pochven: false,
-  avoid_edencom: false,
-  avoid_triglavian: false,
-  avoid: [],
-};
-
-export interface MapContextProps {
-  update: ContextStoreDataUpdate<RoutesType>;
-  data: RoutesType;
-}
-
-const RoutesContext = createContext<MapContextProps>({
+const RoutesContext = createContext<RoutesProviderInnerProps>({
   update: () => {},
-  data: { ...DEFAULT_SETTINGS },
+  // @ts-ignore
+  data: {},
 });
 
-export const RoutesProvider: React.FC<MapProviderProps> = ({ children }) => {
-  const { update, ref } = useContextStore<RoutesType>(
-    { ...DEFAULT_SETTINGS },
-    {
-      onAfterAUpdate: values => {
-        localStorage.setItem(SESSION_KEY.routes, JSON.stringify(values));
-      },
+export const RoutesProvider = forwardRef<RoutesImperativeHandle, MapProviderProps>(({ children, ...props }, ref) => {
+  const [loading, setLoading] = useState(false);
+
+  useImperativeHandle(ref, () => ({
+    stopLoading() {
+      setLoading(false);
     },
-  );
+  }));
 
-  useEffect(() => {
-    const items = localStorage.getItem(SESSION_KEY.routes);
-    if (items) {
-      update(JSON.parse(items));
-    }
-  }, [update]);
-
-  return (
-    <RoutesContext.Provider
-      value={{
-        update,
-        data: ref,
-      }}
-    >
-      {children}
-    </RoutesContext.Provider>
-  );
-};
+  return <RoutesContext.Provider value={{ ...props, loading, setLoading }}>{children}</RoutesContext.Provider>;
+});
+RoutesProvider.displayName = 'RoutesProvider';
 
 export const useRouteProvider = () => {
-  const context = useContext<MapContextProps>(RoutesContext);
+  const context = useContext<RoutesProviderInnerProps>(RoutesContext);
   return context;
 };

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesWidget.tsx

@@ -2,13 +2,14 @@ import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import {
   LayoutEventBlocker,
+  LoadingWrapper,
   SystemViewStandalone,
   TooltipPosition,
   WdCheckbox,
   WdImgButton,
 } from '@/hooks/Mapper/components/ui-kit';
 import { useLoadSystemStatic } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts';
-import { MouseEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { forwardRef, MouseEvent, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { getSystemById } from '@/hooks/Mapper/helpers/getSystemById.ts';
 import classes from './RoutesWidget.module.scss';
 import { useLoadRoutes } from './hooks';
@@ -25,7 +26,10 @@ import {
   AddSystemDialog,
   SearchOnSubmitCallback,
 } from '@/hooks/Mapper/components/mapInterface/components/AddSystemDialog';
-import { OutCommand } from '@/hooks/Mapper/types';
+import {
+  RoutesImperativeHandle,
+  RoutesWidgetProps,
+} from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts';
 
 const sortByDist = (a: Route, b: Route) => {
   const distA = a.has_connection ? a.systems?.length || 0 : Infinity;
@@ -36,19 +40,16 @@ const sortByDist = (a: Route, b: Route) => {
 
 export const RoutesWidgetContent = () => {
   const {
-    data: { selectedSystems, hubs = [], systems, routes },
-    outCommand,
+    data: { selectedSystems, systems, isSubscriptionActive },
   } = useMapRootState();
+  const { hubs = [], routesList, isRestricted } = useRouteProvider();
 
   const [systemId] = selectedSystems;
 
   const { loading } = useLoadRoutes();
 
   const { systems: systemStatics, loadSystems, lastUpdateKey } = useLoadSystemStatic({ systems: hubs ?? [] });
-  const { open, ...systemCtxProps } = useContextMenuSystemInfoHandlers({
-    outCommand,
-    hubs,
-  });
+  const { open, ...systemCtxProps } = useContextMenuSystemInfoHandlers();
 
   const preparedHubs = useMemo(() => {
     return hubs.map(x => {
@@ -61,20 +62,20 @@ export const RoutesWidgetContent = () => {
 
   const preparedRoutes: Route[] = useMemo(() => {
     return (
-      routes?.routes
+      routesList?.routes
         .sort(sortByDist)
-        .filter(x => x.destination.toString() !== systemId)
+        // .filter(x => x.destination.toString() !== systemId)
         .map(route => ({
           ...route,
           mapped_systems:
             route.systems?.map(solar_system_id =>
-              routes?.systems_static_data.find(
+              routesList?.systems_static_data.find(
                 system_static_data => system_static_data.solar_system_id === solar_system_id,
               ),
             ) ?? [],
         })) ?? []
     );
-  }, [routes?.routes, routes?.systems_static_data, systemId]);
+  }, [routesList?.routes, routesList?.systems_static_data, systemId]);
 
   const refData = useRef({ open, loadSystems, preparedRoutes });
   refData.current = { open, loadSystems, preparedRoutes };
@@ -97,9 +98,13 @@ export const RoutesWidgetContent = () => {
     [handleClick],
   );
 
-  if (loading) {
+  if (isRestricted && !isSubscriptionActive) {
     return (
-      <div className="w-full h-full flex justify-center items-center select-none text-center">Loading routes...</div>
+      <div className="w-full h-full flex items-center justify-center">
+        <span className="select-none text-center text-stone-400/80 text-sm">
+          User Routes available with &#39;Active&#39; map subscription only (contact map administrators)
+        </span>
+      </div>
     );
   }
 
@@ -117,7 +122,7 @@ export const RoutesWidgetContent = () => {
 
   return (
     <>
-      {systemId !== undefined && routes && (
+      <LoadingWrapper loading={loading}>
         <div className={clsx(classes.RoutesGrid, 'px-2 py-2')}>
           {preparedRoutes.map(route => {
             const sys = preparedHubs.find(x => x.solar_system_id === route.destination)!;
@@ -132,7 +137,11 @@ export const RoutesWidgetContent = () => {
                   <WdImgButton
                     className={clsx(PrimeIcons.BARS, classes.RemoveBtn)}
                     onClick={e => handleClick(e, route.destination.toString())}
-                    tooltip={{ content: 'Click here to open system menu', position: TooltipPosition.top, offset: 10 }}
+                    tooltip={{
+                      content: 'Click here to open system menu',
+                      position: TooltipPosition.top,
+                      offset: 10,
+                    }}
                   />
 
                   <SystemViewStandalone
@@ -151,7 +160,7 @@ export const RoutesWidgetContent = () => {
             );
           })}
         </div>
-      )}
+      </LoadingWrapper>
 
       <ContextMenuSystemInfo
         hubs={hubs}
@@ -165,15 +174,13 @@ export const RoutesWidgetContent = () => {
   );
 };
 
-export const RoutesWidgetComp = () => {
-  const [routeSettingsVisible, setRouteSettingsVisible] = useState(false);
-  const { data, update } = useRouteProvider();
-  const {
-    data: { hubs = [] },
-    outCommand,
-  } = useMapRootState();
+type RoutesWidgetCompProps = {
+  title: ReactNode | string;
+};
 
-  const preparedHubs = useMemo(() => hubs.map(x => parseInt(x)), [hubs]);
+export const RoutesWidgetComp = ({ title }: RoutesWidgetCompProps) => {
+  const [routeSettingsVisible, setRouteSettingsVisible] = useState(false);
+  const { data, update, addHubCommand } = useRouteProvider();
 
   const isSecure = data.path_type === 'secure';
   const handleSecureChange = useCallback(() => {
@@ -190,24 +197,15 @@ export const RoutesWidgetComp = () => {
   const onAddSystem = useCallback(() => setOpenAddSystem(true), []);
 
   const handleSubmitAddSystem: SearchOnSubmitCallback = useCallback(
-    async item => {
-      if (preparedHubs.includes(item.value)) {
-        return;
-      }
-
-      await outCommand({
-        type: OutCommand.addHub,
-        data: { system_id: item.value },
-      });
-    },
-    [hubs, outCommand],
+    async item => addHubCommand(item.value.toString()),
+    [addHubCommand],
   );
 
   return (
     <Widget
       label={
         <div className="flex justify-between items-center text-xs w-full" ref={ref}>
-          <span className="select-none">Routes</span>
+          <span className="select-none">{title}</span>
           <LayoutEventBlocker className="flex items-center gap-2">
             <WdImgButton
               className={PrimeIcons.PLUS_CIRCLE}
@@ -231,6 +229,7 @@ export const RoutesWidgetComp = () => {
               className={PrimeIcons.SLIDERS_H}
               onClick={() => setRouteSettingsVisible(true)}
               tooltip={{
+                position: TooltipPosition.top,
                 content: 'Click here to open Routes settings',
               }}
             />
@@ -251,10 +250,13 @@ export const RoutesWidgetComp = () => {
   );
 };
 
-export const RoutesWidget = () => {
-  return (
-    <RoutesProvider>
-      <RoutesWidgetComp />
-    </RoutesProvider>
-  );
-};
+export const RoutesWidget = forwardRef<RoutesImperativeHandle, RoutesWidgetProps & RoutesWidgetCompProps>(
+  ({ title, ...props }, ref) => {
+    return (
+      <RoutesProvider {...props} ref={ref}>
+        <RoutesWidgetComp title={title} />
+      </RoutesProvider>
+    );
+  },
+);
+RoutesWidget.displayName = 'RoutesWidget';

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/hooks/useLoadRoutes.ts

@@ -1,10 +1,7 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { OutCommand } from '@/hooks/Mapper/types';
+import { useCallback, useEffect, useRef } from 'react';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import {
-  RoutesType,
-  useRouteProvider,
-} from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesProvider.tsx';
+import { useRouteProvider } from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesProvider.tsx';
+import { RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
 
 function usePrevious<T>(value: T): T | undefined {
   const ref = useRef<T>();
@@ -17,12 +14,10 @@ function usePrevious<T>(value: T): T | undefined {
 }
 
 export const useLoadRoutes = () => {
-  const [loading, setLoading] = useState(false);
-  const { data: routesSettings } = useRouteProvider();
+  const { data: routesSettings, loadRoutesCommand, hubs, routesList, loading, setLoading } = useRouteProvider();
 
   const {
-    outCommand,
-    data: { selectedSystems, hubs, systems, connections },
+    data: { selectedSystems, systems, connections },
   } = useMapRootState();
 
   const prevSys = usePrevious(systems);
@@ -31,17 +26,16 @@ export const useLoadRoutes = () => {
 
   const loadRoutes = useCallback(
     (systemId: string, routesSettings: RoutesType) => {
-      outCommand({
-        type: OutCommand.getRoutes,
-        data: {
-          system_id: systemId,
-          routes_settings: routesSettings,
-        },
-      });
+      loadRoutesCommand(systemId, routesSettings);
+      setLoading(true);
     },
-    [outCommand],
+    [loadRoutesCommand],
   );
 
+  useEffect(() => {
+    setLoading(false);
+  }, [routesList]);
+
   useEffect(() => {
     if (selectedSystems.length !== 1) {
       return;

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts

@@ -0,0 +1,27 @@
+import { RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
+import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
+
+export type LoadRoutesCommand = (systemId: string, routesSettings: RoutesType) => Promise<void>;
+export type AddHubCommand = (systemId: string) => Promise<void>;
+export type ToggleHubCommand = (systemId: string) => Promise<void>;
+
+export type RoutesWidgetProps = {
+  data: RoutesType;
+  update: (d: RoutesType) => void;
+  hubs: string[];
+  routesList: RoutesList | undefined;
+
+  loadRoutesCommand: LoadRoutesCommand;
+  addHubCommand: AddHubCommand;
+  toggleHubCommand: ToggleHubCommand;
+  isRestricted?: boolean;
+};
+
+export type RoutesProviderInnerProps = RoutesWidgetProps & {
+  loading: boolean;
+  setLoading(loading: boolean): void;
+};
+
+export type RoutesImperativeHandle = {
+  stopLoading: () => void;
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/WRoutesPublic/WRoutesPublic.tsx

@@ -0,0 +1,83 @@
+import { Commands, OutCommand } from '@/hooks/Mapper/types';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import {
+  AddHubCommand,
+  LoadRoutesCommand,
+  RoutesImperativeHandle,
+} from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts';
+import { useCallback, useRef } from 'react';
+import { RoutesWidget } from '@/hooks/Mapper/components/mapInterface/widgets';
+import { useMapEventListener } from '@/hooks/Mapper/events';
+
+export const WRoutesPublic = () => {
+  const {
+    outCommand,
+    storedSettings: { settingsRoutes, settingsRoutesUpdate },
+    data: { hubs, routes },
+  } = useMapRootState();
+
+  const ref = useRef<RoutesImperativeHandle>(null);
+
+  const loadRoutesCommand: LoadRoutesCommand = useCallback(
+    async (systemId, routesSettings) => {
+      outCommand({
+        type: OutCommand.getRoutes,
+        data: {
+          system_id: systemId,
+          routes_settings: routesSettings,
+        },
+      });
+    },
+    [outCommand],
+  );
+
+  const addHubCommand: AddHubCommand = useCallback(
+    async systemId => {
+      if (hubs.includes(systemId)) {
+        return;
+      }
+
+      await outCommand({
+        type: OutCommand.addHub,
+        data: { system_id: systemId },
+      });
+    },
+    [hubs, outCommand],
+  );
+
+  const toggleHubCommand: AddHubCommand = useCallback(
+    async (systemId: string | undefined) => {
+      if (!systemId) {
+        return;
+      }
+
+      outCommand({
+        type: !hubs.includes(systemId) ? OutCommand.addHub : OutCommand.deleteHub,
+        data: {
+          system_id: systemId,
+        },
+      });
+    },
+    [hubs, outCommand],
+  );
+
+  useMapEventListener(event => {
+    if (event.name === Commands.routes) {
+      ref.current?.stopLoading();
+    }
+  });
+
+  return (
+    <RoutesWidget
+      ref={ref}
+      title="Routes"
+      data={settingsRoutes}
+      update={settingsRoutesUpdate}
+      hubs={hubs}
+      routesList={routes}
+      loadRoutesCommand={loadRoutesCommand}
+      addHubCommand={addHubCommand}
+      toggleHubCommand={toggleHubCommand}
+    />
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/WRoutesPublic/index.ts

@@ -0,0 +1 @@
+export * from './WRoutesPublic';

assets/js/hooks/Mapper/components/mapInterface/widgets/WRoutesUser/WRoutesUser.tsx

@@ -0,0 +1,85 @@
+import { Commands, OutCommand } from '@/hooks/Mapper/types';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import {
+  AddHubCommand,
+  LoadRoutesCommand,
+  RoutesImperativeHandle,
+} from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/types.ts';
+import { useCallback, useRef } from 'react';
+import { RoutesWidget } from '@/hooks/Mapper/components/mapInterface/widgets';
+import { useMapEventListener } from '@/hooks/Mapper/events';
+
+export const WRoutesUser = () => {
+  const {
+    outCommand,
+    storedSettings: { settingsRoutes, settingsRoutesUpdate },
+    data: { userHubs, userRoutes },
+  } = useMapRootState();
+
+  const ref = useRef<RoutesImperativeHandle>(null);
+
+  const loadRoutesCommand: LoadRoutesCommand = useCallback(
+    async (systemId, routesSettings) => {
+      outCommand({
+        type: OutCommand.getUserRoutes,
+        data: {
+          system_id: systemId,
+          routes_settings: routesSettings,
+        },
+      });
+    },
+    [outCommand],
+  );
+
+  const addHubCommand: AddHubCommand = useCallback(
+    async systemId => {
+      if (userHubs.includes(systemId)) {
+        return;
+      }
+
+      await outCommand({
+        type: OutCommand.addUserHub,
+        data: { system_id: systemId },
+      });
+    },
+    [userHubs, outCommand],
+  );
+
+  const toggleHubCommand: AddHubCommand = useCallback(
+    async (systemId: string | undefined) => {
+      if (!systemId) {
+        return;
+      }
+
+      outCommand({
+        type: !userHubs.includes(systemId) ? OutCommand.addUserHub : OutCommand.deleteUserHub,
+        data: {
+          system_id: systemId,
+        },
+      });
+    },
+    [userHubs, outCommand],
+  );
+
+  useMapEventListener(event => {
+    if (event.name === Commands.userRoutes) {
+      ref.current?.stopLoading();
+    }
+    return true;
+  });
+
+  return (
+    <RoutesWidget
+      ref={ref}
+      title="User Routes"
+      data={settingsRoutes}
+      update={settingsRoutesUpdate}
+      hubs={userHubs}
+      routesList={userRoutes}
+      loadRoutesCommand={loadRoutesCommand}
+      addHubCommand={addHubCommand}
+      toggleHubCommand={toggleHubCommand}
+      isRestricted
+    />
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/WRoutesUser/index.ts

@@ -0,0 +1 @@
+export * from './WRoutesUser';

assets/js/hooks/Mapper/components/mapInterface/widgets/index.ts

@@ -4,3 +4,6 @@ export * from './RoutesWidget';
 export * from './SystemSignatures';
 export * from './SystemStructures';
 export * from './WSystemKills';
+export * from './WRoutesUser';
+export * from './WRoutesPublic';
+export * from './CommentsWidget';

assets/js/hooks/Mapper/components/mapRootContent/MapRootContent.tsx

@@ -18,7 +18,10 @@ export interface MapRootContentProps {}
 
 // eslint-disable-next-line no-empty-pattern
 export const MapRootContent = ({}: MapRootContentProps) => {
-  const { interfaceSettings, data } = useMapRootState();
+  const {
+    storedSettings: { interfaceSettings },
+    data,
+  } = useMapRootState();
   const { isShowMenu } = interfaceSettings;
   const { showCharacterActivity } = data;
   const { handleHideCharacterActivity } = useCharacterActivityHandlers();

assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/MapSettingsProvider.tsx

@@ -31,13 +31,16 @@ type MapSettingsContextType = {
 const MapSettingsContext = createContext<MapSettingsContextType | undefined>(undefined);
 
 export const MapSettingsProvider = ({ children }: { children: ReactNode }) => {
-  const { outCommand, interfaceSettings, setInterfaceSettings } = useMapRootState();
+  const {
+    outCommand,
+    storedSettings: { interfaceSettings, setInterfaceSettings },
+  } = useMapRootState();
 
   const [userRemoteSettings, setUserRemoteSettings] = useState<UserSettingsRemote>({
     ...DEFAULT_REMOTE_SETTINGS,
   });
 
-  const mergedSettings = useMemo(() => {
+  const mergedSettings: UserSettings = useMemo(() => {
     return {
       ...userRemoteSettings,
       ...interfaceSettings,
@@ -75,7 +78,7 @@ export const MapSettingsProvider = ({ children }: { children: ReactNode }) => {
       if (item.type === 'checkbox') {
         return (
           <PrettySwitchbox
-            key={item.prop}
+            key={item.prop.toString()}
             label={item.label}
             checked={!!currentValue}
             setChecked={checked => handleSettingChange(item.prop, checked)}
@@ -85,7 +88,7 @@ export const MapSettingsProvider = ({ children }: { children: ReactNode }) => {
 
       if (item.type === 'dropdown' && item.options) {
         return (
-          <div key={item.prop} className="flex items-center gap-2 mt-2">
+          <div key={item.prop.toString()} className="flex items-center gap-2 mt-2">
             <label className="text-sm">{item.label}:</label>
             <Dropdown
               className="text-sm"

assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/constants.ts

@@ -1,5 +1,6 @@
 import { SettingsListItem, UserSettingsRemoteProps } from './types.ts';
-import { AvailableThemes, InterfaceStoredSettingsProps } from '@/hooks/Mapper/mapRootProvider';
+import { InterfaceStoredSettingsProps } from '@/hooks/Mapper/mapRootProvider';
+import { AvailableThemes } from '@/hooks/Mapper/mapRootProvider/types.ts';
 
 export const DEFAULT_REMOTE_SETTINGS = {
   [UserSettingsRemoteProps.link_signature_on_splash]: false,

assets/js/hooks/Mapper/components/mapRootContent/components/OnTheMap/OnTheMap.module.scss

@@ -3,7 +3,7 @@
 }
 
 .SidebarOnTheMap {
-  width: 400px;
+  width: 500px;
   padding: 0 !important;
 
   :global {

assets/js/hooks/Mapper/components/mapRootContent/components/OnTheMap/OnTheMap.tsx

@@ -1,15 +1,17 @@
 import classes from './OnTheMap.module.scss';
 import { Sidebar } from 'primereact/sidebar';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { sortCharacters } from '@/hooks/Mapper/components/mapInterface/helpers/sortCharacters.ts';
 import { VirtualScroller, VirtualScrollerTemplateOptions } from 'primereact/virtualscroller';
 import clsx from 'clsx';
 import { CharacterTypeRaw, WithIsOwnCharacter } from '@/hooks/Mapper/types';
-import { CharacterCard, WdCheckbox } from '@/hooks/Mapper/components/ui-kit';
+import { CharacterCard, TooltipPosition, WdCheckbox, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
 import useLocalStorageState from 'use-local-storage-state';
 import { useMapCheckPermissions, useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
 import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';
+import { InputText } from 'primereact/inputtext';
+import { IconField } from 'primereact/iconfield';
 
 type WindowLocalSettingsType = {
   compact: boolean;
@@ -33,7 +35,7 @@ const itemTemplate = (item: CharacterTypeRaw & WithIsOwnCharacter, options: Virt
       })}
       style={{ height: options.props.itemSize + 'px' }}
     >
-      <CharacterCard showSystem {...item} />
+      <CharacterCard showCorporationLogo showAllyLogo showSystem showTicker {...item} />
     </div>
   );
 };
@@ -48,6 +50,8 @@ export const OnTheMap = ({ show, onHide }: OnTheMapProps) => {
     data: { characters, userCharacters },
   } = useMapRootState();
 
+  const [searchVal, setSearchVal] = useState('');
+
   const [settings, setSettings] = useLocalStorageState<WindowLocalSettingsType>('window:onTheMap:settings', {
     defaultValue: STORED_DEFAULT_VALUES,
   });
@@ -61,13 +65,54 @@ export const OnTheMap = ({ show, onHide }: OnTheMapProps) => {
   );
 
   const sorted = useMemo(() => {
-    const out = characters.map(x => ({ ...x, isOwn: userCharacters.includes(x.eve_id) })).sort(sortCharacters);
+    let out = characters.map(x => ({ ...x, isOwn: userCharacters.includes(x.eve_id) })).sort(sortCharacters);
+
+    if (searchVal !== '') {
+      out = out.filter(x => {
+        const normalized = searchVal.toLowerCase();
+
+        if (x.name.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.corporation_name.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.alliance_name?.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.corporation_ticker.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.alliance_ticker?.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.ship?.ship_name?.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.ship?.ship_type_info.name?.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        if (x.ship?.ship_type_info.group_name?.toLowerCase().includes(normalized)) {
+          return true;
+        }
+
+        return false;
+      });
+    }
+
     if (showOffline && !settings.hideOffline) {
       return out;
     }
 
     return out.filter(x => x.online);
-  }, [showOffline, characters, settings.hideOffline, userCharacters]);
+  }, [showOffline, searchVal, characters, settings.hideOffline, userCharacters]);
 
   return (
     <Sidebar
@@ -79,7 +124,30 @@ export const OnTheMap = ({ show, onHide }: OnTheMapProps) => {
       icons={<></>}
     >
       <div className={clsx(classes.SidebarContent, '')}>
-        <div className={'flex justify-end items-center gap-2 px-3'}>
+        <div className={'flex justify-between items-center gap-2 px-2 pt-1'}>
+          <IconField>
+            {searchVal.length > 0 && (
+              <WdImgButton
+                className="pi pi-trash"
+                textSize={WdImageSize.large}
+                tooltip={{
+                  content: 'Clear',
+                  className: 'pi p-input-icon',
+                  position: TooltipPosition.top,
+                }}
+                onClick={() => setSearchVal('')}
+              />
+            )}
+            <InputText
+              id="label"
+              aria-describedby="label"
+              autoComplete="off"
+              value={searchVal}
+              placeholder="Type to search"
+              onChange={e => setSearchVal(e.target.value)}
+            />
+          </IconField>
+
           {showOffline && (
             <WdCheckbox
               size="m"

assets/js/hooks/Mapper/components/mapRootContent/components/RightBar/RightBar.tsx

@@ -15,7 +15,9 @@ interface RightBarProps {
 }
 
 export const RightBar = ({ onShowOnTheMap, onShowMapSettings, onShowTrackingDialog }: RightBarProps) => {
-  const { interfaceSettings, setInterfaceSettings } = useMapRootState();
+  const {
+    storedSettings: { interfaceSettings, setInterfaceSettings },
+  } = useMapRootState();
 
   const canTrackCharacters = useMapCheckPermissions([UserPermission.TRACK_CHARACTER]);
 

assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingCharactersList.tsx

@@ -44,7 +44,7 @@ export const TrackingCharactersList = () => {
         bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
         headerClassName="[&_div]:ml-2"
         body={row => {
-          return <CharacterCard showShipName={false} showSystem={false} isOwn {...row.character} />;
+          return <CharacterCard showCorporationLogo showTicker isOwn {...row.character} />;
         }}
       />
     </DataTable>

assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingSettings.tsx

@@ -10,8 +10,8 @@ const renderValCharacterTemplate = (row: TrackingCharacter | undefined) => {
   }
 
   return (
-    <div className="py-1">
-      <CharacterCard compact showShipName={false} showSystem={false} isOwn {...row.character} />
+    <div className="py-1 w-full">
+      <CharacterCard compact isOwn {...row.character} />
     </div>
   );
 };
@@ -21,7 +21,11 @@ const renderCharacterTemplate = (row: TrackingCharacter | undefined) => {
     return <div className="h-[33px] flex items-center">Character is not selected</div>;
   }
 
-  return <CharacterCard showShipName={false} showSystem={false} isOwn {...row.character} />;
+  return (
+    <div className="w-full">
+      <CharacterCard isOwn {...row.character} />
+    </div>
+  );
 };
 
 export const TrackingSettings = () => {

assets/js/hooks/Mapper/components/mapRootContent/hooks/useCharacterActivityHandlers.ts

@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers';
-import type { ActivitySummary } from '@/hooks/Mapper/components/mapRootContent/components/CharacterActivity/CharacterActivity';
+import { ActivitySummary } from '@/hooks/Mapper/types';
 
 /**
  * Hook for character activity related handlers

assets/js/hooks/Mapper/components/mapWrapper/MapWrapper.tsx

@@ -20,7 +20,6 @@ import { Node, useReactFlow, XYPosition } from 'reactflow';
 import { useCommandsSystems } from '@/hooks/Mapper/mapRootProvider/hooks/api';
 import { emitMapEvent, useMapEventListener } from '@/hooks/Mapper/events';
 
-import { STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/MapRootProvider';
 import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 import { useCommonMapEventProcessor } from '@/hooks/Mapper/components/mapWrapper/hooks/useCommonMapEventProcessor.ts';
 import {
@@ -28,30 +27,34 @@ import {
   SearchOnSubmitCallback,
 } from '@/hooks/Mapper/components/mapInterface/components/AddSystemDialog';
 import { useHotkey } from '../../hooks/useHotkey';
+import { STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/constants.ts';
 
 // TODO: INFO - this component needs for abstract work with Map instance
 export const MapWrapper = () => {
   const {
     update,
     outCommand,
-    data: { selectedConnections, selectedSystems, hubs, systems, linkSignatureToSystem, systemSignatures },
-    interfaceSettings: {
-      isShowMenu,
-      isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap,
-      isShowKSpace,
-      isThickConnections,
-      isShowBackgroundPattern,
-      isShowUnsplashedSignatures,
-      isSoftBackground,
-      theme,
-    },
+    data: { selectedConnections, selectedSystems, hubs, userHubs, systems, linkSignatureToSystem, systemSignatures },
+    storedSettings: { interfaceSettings },
   } = useMapRootState();
+
+  const {
+    isShowMenu,
+    isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap,
+    isShowKSpace,
+    isThickConnections,
+    isShowBackgroundPattern,
+    isShowUnsplashedSignatures,
+    isSoftBackground,
+    theme,
+  } = interfaceSettings;
+
   const { deleteSystems } = useDeleteSystems();
   const { mapRef, runCommand } = useCommonMapEventProcessor();
   const { getNodes } = useReactFlow();
 
   const { updateLinkSignatureToSystem } = useCommandsSystems();
-  const { open, ...systemContextProps } = useContextMenuSystemHandlers({ systems, hubs, outCommand });
+  const { open, ...systemContextProps } = useContextMenuSystemHandlers({ systems, hubs, userHubs, outCommand });
   const { handleSystemMultipleContext, ...systemMultipleCtxProps } = useContextMenuSystemMultipleHandlers();
 
   const [openSettings, setOpenSettings] = useState<string | null>(null);
@@ -107,17 +110,20 @@ export const MapWrapper = () => {
     [outCommand],
   );
 
-  const handleSystemContextMenu = useCallback((ev: any, systemId: string) => {
-    const { selectedSystems, systems } = ref.current;
-    if (selectedSystems.length > 1) {
-      const systemsInfo: Node[] = selectedSystems.map(x => ({ data: getSystemById(systems, x), id: x }) as Node);
+  const handleSystemContextMenu = useCallback(
+    (ev: any, systemId: string) => {
+      const { selectedSystems, systems } = ref.current;
+      if (selectedSystems.length > 1) {
+        const systemsInfo: Node[] = selectedSystems.map(x => ({ data: getSystemById(systems, x), id: x }) as Node);
 
-      handleSystemMultipleContext(ev, systemsInfo);
-      return;
-    }
+        handleSystemMultipleContext(ev, systemsInfo);
+        return;
+      }
 
-    open(ev, systemId);
-  }, []);
+      open(ev, systemId);
+    },
+    [handleSystemMultipleContext, open],
+  );
 
   const handleConnectionDbClick = useCallback((e: SolarSystemConnection) => setSelectedConnection(e), []);
 
@@ -215,6 +221,7 @@ export const MapWrapper = () => {
       <ContextMenuSystem
         systems={systems}
         hubs={hubs}
+        userHubs={userHubs}
         {...systemContextProps}
         onOpenSettings={() => {
           systemContextProps.systemId && setOpenSettings(systemContextProps.systemId);

assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx

@@ -4,15 +4,24 @@ import { SystemView } from '@/hooks/Mapper/components/ui-kit/SystemView';
 import { CharacterTypeRaw, WithIsOwnCharacter } from '@/hooks/Mapper/types';
 import { Commands } from '@/hooks/Mapper/types/mapHandlers';
 import { emitMapEvent } from '@/hooks/Mapper/events';
-import { CharacterPortrait, CharacterPortraitSize } from '@/hooks/Mapper/components/ui-kit';
+import {
+  TooltipPosition,
+  WdEveEntityPortrait,
+  WdEveEntityPortraitSize,
+  WdEveEntityPortraitType,
+  WdTooltipWrapper,
+} from '@/hooks/Mapper/components/ui-kit';
 import { isDocked } from '@/hooks/Mapper/helpers/isDocked.ts';
 import classes from './CharacterCard.module.scss';
 
 type CharacterCardProps = {
   compact?: boolean;
   showSystem?: boolean;
+  showTicker?: boolean;
   showShipName?: boolean;
   useSystemsCache?: boolean;
+  showCorporationLogo?: boolean;
+  showAllyLogo?: boolean;
 } & CharacterTypeRaw &
   WithIsOwnCharacter;
 
@@ -29,6 +38,9 @@ export const CharacterCard = ({
   isOwn,
   showSystem,
   showShipName,
+  showCorporationLogo,
+  showAllyLogo,
+  showTicker,
   useSystemsCache,
   ...char
 }: CharacterCardProps) => {
@@ -46,26 +58,80 @@ export const CharacterCard = ({
 
   if (compact) {
     return (
-      <div className={clsx('w-full text-xs box-border')} onClick={handleSelect}>
+      <div className="text-xs box-border w-full" onClick={handleSelect}>
         <div className="w-full flex items-center gap-1 relative">
-          <CharacterPortrait characterEveId={char.eve_id} size={CharacterPortraitSize.w18} />
+          <WdEveEntityPortrait eveId={char.eve_id} size={WdEveEntityPortraitSize.w18} />
+
+          {showCorporationLogo && (
+            <WdTooltipWrapper position={TooltipPosition.top} content={char.corporation_name}>
+              <WdEveEntityPortrait
+                type={WdEveEntityPortraitType.corporation}
+                eveId={char.corporation_id.toString()}
+                size={WdEveEntityPortraitSize.w18}
+              />
+            </WdTooltipWrapper>
+          )}
+
+          {showAllyLogo && char.alliance_id && (
+            <WdTooltipWrapper position={TooltipPosition.top} content={char.alliance_name}>
+              <WdEveEntityPortrait
+                type={WdEveEntityPortraitType.alliance}
+                eveId={char.alliance_id.toString()}
+                size={WdEveEntityPortraitSize.w18}
+              />
+            </WdTooltipWrapper>
+          )}
+
           {isDocked(char.location) && <span className={classes.Docked} />}
-          <div className="flex flex-grow overflow-hidden text-left">
-            <div className="overflow-hidden text-ellipsis whitespace-nowrap">
-              <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>{char.name}</span>{' '}
-              <span className="text-gray-400">
-                {!locationShown && showShipName && shipNameText ? `- ${shipNameText}` : `[${tickerText}]`}
+          <div className="flex flex-grow-[2] overflow-hidden text-left w-[50px]">
+            <div className="flex min-w-0">
+              <span
+                className={clsx(
+                  'overflow-hidden text-ellipsis whitespace-nowrap',
+                  isOwn ? 'text-orange-400' : 'text-gray-200',
+                )}
+                title={char.name}
+              >
+                {char.name}
               </span>
+              {showTicker && <span className="flex-shrink-0 text-gray-400 ml-1">[{tickerText}]</span>}
             </div>
           </div>
+
           {shipType && (
-            <div
-              className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap flex-shrink-0"
-              style={{ maxWidth: '120px' }}
-              title={shipType}
-            >
-              {shipType}
-            </div>
+            <>
+              {!showShipName && (
+                <div
+                  className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap flex-shrink-0"
+                  style={{ maxWidth: '120px' }}
+                  title={shipType}
+                >
+                  {shipType}
+                </div>
+              )}
+              {showShipName && (
+                <div className="flex flex-grow-[1] justify-end w-[50px]">
+                  <div className="min-w-0">
+                    <div
+                      className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap flex-shrink-0"
+                      style={{ maxWidth: '120px' }}
+                      title={shipNameText}
+                    >
+                      {shipNameText}
+                    </div>
+                  </div>
+                </div>
+              )}
+              {char.ship && (
+                <WdTooltipWrapper position={TooltipPosition.top} content={char.ship.ship_type_info.name}>
+                  <WdEveEntityPortrait
+                    type={WdEveEntityPortraitType.ship}
+                    eveId={char.ship.ship_type_id.toString()}
+                    size={WdEveEntityPortraitSize.w18}
+                  />
+                </WdTooltipWrapper>
+              )}
+            </>
           )}
         </div>
       </div>
@@ -75,11 +141,41 @@ export const CharacterCard = ({
   return (
     <div className={clsx('w-full text-xs box-border')} onClick={handleSelect}>
       <div className="w-full flex items-center gap-2">
-        <CharacterPortrait characterEveId={char.eve_id} size={CharacterPortraitSize.w33} />
-        <div className="flex flex-col flex-grow overflow-hidden">
-          <div className="overflow-hidden text-ellipsis whitespace-nowrap">
-            <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>{char.name}</span>{' '}
-            <span className="text-gray-400">[{tickerText}]</span>
+        <div className="flex items-center gap-1">
+          <WdEveEntityPortrait eveId={char.eve_id} size={WdEveEntityPortraitSize.w33} />
+
+          {showCorporationLogo && (
+            <WdTooltipWrapper position={TooltipPosition.top} content={char.corporation_name}>
+              <WdEveEntityPortrait
+                type={WdEveEntityPortraitType.corporation}
+                eveId={char.corporation_id.toString()}
+                size={WdEveEntityPortraitSize.w33}
+              />
+            </WdTooltipWrapper>
+          )}
+
+          {showAllyLogo && char.alliance_id && (
+            <WdTooltipWrapper position={TooltipPosition.top} content={char.alliance_name}>
+              <WdEveEntityPortrait
+                type={WdEveEntityPortraitType.alliance}
+                eveId={char.alliance_id.toString()}
+                size={WdEveEntityPortraitSize.w33}
+              />
+            </WdTooltipWrapper>
+          )}
+        </div>
+
+        <div className="flex flex-col flex-grow overflow-hidden  w-[50px]">
+          <div className="flex min-w-0">
+            <span
+              className={clsx(
+                'overflow-hidden text-ellipsis whitespace-nowrap',
+                isOwn ? 'text-orange-400' : 'text-gray-200',
+              )}
+            >
+              {char.name}
+            </span>
+            {showTicker && <span className="flex-shrink-0 text-gray-400 ml-1">[{tickerText}]</span>}
           </div>
           {locationShown ? (
             <div className="text-gray-300 text-xs overflow-hidden text-ellipsis whitespace-nowrap">
@@ -97,15 +193,30 @@ export const CharacterCard = ({
           )}
         </div>
         {shipType && (
-          <div className="flex-shrink-0 self-start">
-            <div
-              className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap"
-              style={{ maxWidth: '200px' }}
-              title={shipType}
-            >
-              {shipType}
+          <>
+            <div className="flex flex-col flex-shrink-0 items-end self-start">
+              <div
+                className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap max-w-[200px]"
+                title={shipType}
+              >
+                {shipType}
+              </div>
+              <div
+                className="flex justify-end text-stone-500 overflow-hidden text-ellipsis whitespace-nowrap max-w-[200px]"
+                title={shipNameText}
+              >
+                {shipNameText}
+              </div>
             </div>
-          </div>
+
+            {char.ship && (
+              <WdEveEntityPortrait
+                type={WdEveEntityPortraitType.ship}
+                eveId={char.ship.ship_type_id.toString()}
+                size={WdEveEntityPortraitSize.w33}
+              />
+            )}
+          </>
         )}
       </div>
     </div>

assets/js/hooks/Mapper/components/ui-kit/CharacterPortrait/CharacterPortrait.tsx

@@ -1,47 +0,0 @@
-import clsx from 'clsx';
-import { WithClassName } from '@/hooks/Mapper/types/common.ts';
-
-export enum CharacterPortraitSize {
-  default,
-  w18,
-  w33,
-}
-
-// TODO IF YOU NEED ANOTHER ONE SIZE PLEASE ADD IT HERE and IN CharacterPortraitSize
-const getSize = (size: CharacterPortraitSize) => {
-  switch (size) {
-    case CharacterPortraitSize.w18:
-      return 'min-w-[18px] min-h-[18px] w-[18px] h-[18px]';
-    case CharacterPortraitSize.w33:
-      return 'min-w-[33px] min-h-[33px] w-[33px] h-[33px]';
-    default:
-      return '';
-  }
-};
-
-export type CharacterPortraitProps = {
-  characterEveId: string | undefined;
-  size?: CharacterPortraitSize;
-} & WithClassName;
-
-export const CharacterPortrait = ({
-  characterEveId,
-  size = CharacterPortraitSize.default,
-  className,
-}: CharacterPortraitProps) => {
-  if (characterEveId == null) {
-    return null;
-  }
-
-  return (
-    <span
-      className={clsx(
-        getSize(size),
-        'flex transition-[border-color,opacity] duration-250 border border-gray-800 bg-transparent rounded-none',
-        'wd-bg-default',
-        className,
-      )}
-      style={{ backgroundImage: `url(https://images.evetech.net/characters/${characterEveId}/portrait)` }}
-    />
-  );
-};

assets/js/hooks/Mapper/components/ui-kit/CharacterPortrait/index.ts

@@ -1 +0,0 @@
-export * from './CharacterPortrait';

assets/js/hooks/Mapper/components/ui-kit/LoadingWrapper.tsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import { ProgressSpinner } from 'primereact/progressspinner';
+
+type LoadingWrapperProps = {
+  loading?: boolean;
+  children: React.ReactNode;
+};
+
+export const LoadingWrapper: React.FC<LoadingWrapperProps> = ({ loading, children }) => {
+  return (
+    <div className="relative w-full h-full">
+      {children}
+      {loading && (
+        <div className="absolute inset-0 bg-stone-950/50 flex items-center justify-center z-10">
+          <ProgressSpinner
+            style={{ width: '50px', height: '50px' }}
+            strokeWidth="2"
+            fill="transparent"
+            animationDuration="2s"
+          />
+        </div>
+      )}
+    </div>
+  );
+};

assets/js/hooks/Mapper/components/ui-kit/SvgIconWrapper.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import clsx from 'clsx';
+
+export type SvgIconProps = React.SVGAttributes<SVGElement> & {
+  width?: number;
+  height?: number;
+  className?: string;
+};
+
+export const SvgIconWrapper = ({
+  width = 24,
+  height = 24,
+  children,
+  className,
+  ...props
+}: SvgIconProps & { children: React.ReactNode }) => {
+  return (
+    <svg
+      width={width}
+      height={height}
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={clsx('w-[19px] h-[19px]', className)}
+      {...props}
+    >
+      {children}
+    </svg>
+  );
+};

assets/js/hooks/Mapper/components/ui-kit/WdEveEntityPortrait/WdEveEntityPortrait.tsx

@@ -0,0 +1,71 @@
+import clsx from 'clsx';
+import { WithClassName } from '@/hooks/Mapper/types/common.ts';
+
+export enum WdEveEntityPortraitType {
+  character,
+  corporation,
+  alliance,
+  ship,
+}
+
+export enum WdEveEntityPortraitSize {
+  default,
+  w18,
+  w33,
+}
+
+export const getLogo = (type: WdEveEntityPortraitType, eveId: string | number) => {
+  switch (type) {
+    case WdEveEntityPortraitType.alliance:
+      return `url(https://images.evetech.net/alliances/${eveId}/logo?size=64)`;
+    case WdEveEntityPortraitType.corporation:
+      return `url(https://images.evetech.net/corporations/${eveId}/logo?size=64)`;
+    case WdEveEntityPortraitType.character:
+      return `url(https://images.evetech.net/characters/${eveId}/portrait)`;
+    case WdEveEntityPortraitType.ship:
+      return `url(https://images.evetech.net/types/${eveId}/icon)`;
+  }
+
+  return '';
+};
+
+// TODO IF YOU NEED ANOTHER ONE SIZE PLEASE ADD IT HERE and IN WdEveEntityPortraitSize
+const getSize = (size: WdEveEntityPortraitSize) => {
+  switch (size) {
+    case WdEveEntityPortraitSize.w18:
+      return 'min-w-[18px] min-h-[18px] w-[18px] h-[18px]';
+    case WdEveEntityPortraitSize.w33:
+      return 'min-w-[33px] min-h-[33px] w-[33px] h-[33px]';
+    default:
+      return '';
+  }
+};
+
+export type WdEveEntityPortraitProps = {
+  eveId: string | undefined;
+  type?: WdEveEntityPortraitType;
+  size?: WdEveEntityPortraitSize;
+} & WithClassName;
+
+export const WdEveEntityPortrait = ({
+  eveId,
+  size = WdEveEntityPortraitSize.default,
+  type = WdEveEntityPortraitType.character,
+  className,
+}: WdEveEntityPortraitProps) => {
+  if (eveId == null) {
+    return null;
+  }
+
+  return (
+    <span
+      className={clsx(
+        getSize(size),
+        'flex transition-[border-color,opacity] duration-250 border border-gray-800 bg-transparent rounded-none',
+        'wd-bg-default',
+        className,
+      )}
+      style={{ backgroundImage: getLogo(type, eveId) }}
+    />
+  );
+};

assets/js/hooks/Mapper/components/ui-kit/WdEveEntityPortrait/index.ts

@@ -0,0 +1 @@
+export * from './WdEveEntityPortrait.tsx';

assets/js/hooks/Mapper/components/ui-kit/index.ts

@@ -14,5 +14,6 @@ export * from './TimeAgo';
 export * from './WdTooltipWrapper';
 export * from './WdResponsiveCheckBox';
 export * from './WdRadioButton';
-export * from './CharacterPortrait';
+export * from './WdEveEntityPortrait';
 export * from './WdTransition';
+export * from './LoadingWrapper';

assets/js/hooks/Mapper/hooks/index.ts

@@ -2,3 +2,4 @@ export * from './usePageVisibility';
 export * from './useClipboard';
 export * from './useHotkey';
 export * from './useSkipContextMenu';
+export * from './useActualizeSettings';

assets/js/hooks/Mapper/hooks/useActualizeSettings.ts

@@ -0,0 +1,23 @@
+import { useEffect } from 'react';
+
+type Settings = Record<string, unknown>;
+export const useActualizeSettings = <T extends Settings>(defaultVals: T, vals: T, setVals: (newVals: T) => void) => {
+  useEffect(() => {
+    let foundNew = false;
+    const newVals = Object.keys(defaultVals).reduce((acc, x) => {
+      if (Object.keys(acc).includes(x)) {
+        return acc;
+      }
+
+      foundNew = true;
+
+      // @ts-ignore
+      return { ...acc, [x]: defaultVals[x] };
+    }, vals);
+
+    if (foundNew) {
+      setVals(newVals);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+};

assets/js/hooks/Mapper/hooks/useTheme.ts

@@ -1,7 +1,8 @@
-import { AvailableThemes, useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { AvailableThemes } from '@/hooks/Mapper/mapRootProvider/types.ts';
 
 export const useTheme = (): AvailableThemes => {
-  const { interfaceSettings } = useMapRootState();
+  const { storedSettings } = useMapRootState();
 
-  return interfaceSettings.theme;
+  return storedSettings.interfaceSettings.theme;
 };

assets/js/hooks/Mapper/icons/MapAddIcon.tsx

@@ -0,0 +1,18 @@
+import { SvgIconProps, SvgIconWrapper } from '@/hooks/Mapper/components/ui-kit/SvgIconWrapper.tsx';
+
+export const MapAddIcon = (props: SvgIconProps) => (
+  <SvgIconWrapper width={800} height={800} viewBox="0 0 800 800" {...props}>
+    <path
+      d="M416.667 234.716C411.247 233.807 405.68 233.333 400 233.333C344.77 233.333 300 278.105 300 333.333C300 388.563 344.77 433.333 400 433.333C455.23 433.333 500 388.563 500 333.333C500 327.655 499.527 322.087 498.617 316.667"
+      stroke="currentColor"
+      strokeWidth="50"
+      strokeLinecap="round"
+    />
+    <path
+      d="M166.667 507.203C145.085 452.073 133.333 393.377 133.333 338.11C133.333 188.196 252.724 66.6667 400 66.6667C547.277 66.6667 666.667 188.196 666.667 338.11C666.667 486.85 581.557 660.413 448.763 722.48C417.81 736.95 382.19 736.95 351.237 722.48C308.825 702.657 271.277 671.463 239.813 633.333"
+      stroke="currentColor"
+      strokeWidth="50"
+      strokeLinecap="round"
+    />
+  </SvgIconWrapper>
+);

assets/js/hooks/Mapper/icons/MapDeleteIcon.tsx

@@ -0,0 +1,19 @@
+import { SvgIconProps, SvgIconWrapper } from '@/hooks/Mapper/components/ui-kit/SvgIconWrapper.tsx';
+
+export const MapDeleteIcon = (props: SvgIconProps) => (
+  <SvgIconWrapper width={800} height={800} viewBox="0 0 800 800" {...props}>
+    <path
+      d="M416.667 234.716C411.247 233.807 405.68 233.333 400 233.333C344.77 233.333 300 278.105 300 333.333C300 388.563 344.77 433.333 400 433.333C455.23 433.333 500 388.563 500 333.333C500 327.655 499.527 322.087 498.617 316.667"
+      stroke="currentColor"
+      strokeWidth="50"
+      strokeLinecap="round"
+    />
+    <path
+      d="M166.667 507.203C145.085 452.073 133.333 393.377 133.333 338.11C133.333 188.196 252.724 66.6666 400 66.6666C547.277 66.6666 666.667 188.196 666.667 338.11C666.667 486.85 581.557 660.413 448.763 722.48C417.81 736.95 382.19 736.95 351.237 722.48C308.825 702.657 271.277 671.463 239.813 633.333"
+      stroke="currentColor"
+      strokeWidth="50"
+      strokeLinecap="round"
+    />
+    <path d="M747.901 90L105 732.9" stroke="currentColor" strokeWidth="63" strokeLinecap="round" />
+  </SvgIconWrapper>
+);

assets/js/hooks/Mapper/icons/MapUserAddIcon.tsx

@@ -0,0 +1,14 @@
+import { SvgIconProps, SvgIconWrapper } from '@/hooks/Mapper/components/ui-kit/SvgIconWrapper.tsx';
+
+export const MapUserAddIcon = (props: SvgIconProps) => (
+  <SvgIconWrapper width={800} height={800} viewBox="0 0 800 800" {...props}>
+    <path
+      d="M259.095 617.422C288.199 652.691 322.293 680.967 360.022 698.982L361.822 699.832L361.823 699.833L362.963 700.355C371.571 704.236 380.618 706.7 389.783 707.749L392.258 758.116C374.601 757.137 357.082 752.809 340.65 745.128V745.129C294.272 723.452 253.892 689.676 220.529 649.245L239.812 633.334L259.095 617.422ZM223.9 614.051C234.55 605.263 250.307 606.773 259.095 617.422L220.529 649.245C211.742 638.596 213.251 622.839 223.9 614.051ZM400 41.667C515.7 41.6671 615.317 110.002 662.514 208.804C653.511 207.614 644.327 207 635 207C625.128 207 615.417 207.686 605.911 209.017C563.301 138.509 486.858 91.6671 400 91.667C266.948 91.6672 158.333 201.583 158.333 338.11C158.333 389.156 169.046 443.842 188.989 495.627L189.946 498.09L190.174 498.694C194.779 511.398 188.435 525.529 175.779 530.483C163.123 535.437 148.873 529.369 143.63 516.915L143.387 516.317L142.334 513.607C120.393 456.639 108.333 395.871 108.333 338.11C108.333 174.81 238.5 41.6672 400 41.667ZM400 208.334C406.63 208.334 413.153 208.852 419.529 209.854L420.803 210.061L421.438 210.176C434.704 212.748 443.57 225.448 441.321 238.853C439.072 252.257 426.546 261.369 413.167 259.471L412.529 259.372L411.768 259.248C407.948 258.648 404.02 258.334 400 258.334C358.578 258.334 325 291.913 325 333.334C325 374.756 358.577 408.334 400 408.334C409.643 408.334 418.861 406.513 427.329 403.198C427.111 407.104 427 411.039 427 415C427 428.513 428.289 441.725 430.75 454.521C420.913 457.009 410.611 458.334 400 458.334C330.963 458.334 275 402.371 275 333.334C275 264.299 330.963 208.334 400 208.334Z"
+      fill="currentColor"
+    />
+    <path
+      d="M661.071 406.777C661.071 381.914 640.868 361.666 615.833 361.666C590.798 361.666 570.595 381.914 570.595 406.777C570.595 431.641 590.798 451.889 615.833 451.889C640.868 451.889 661.071 431.641 661.071 406.777ZM727.737 406.777C727.737 457.286 694.219 499.913 648.248 513.79C727.063 528.912 786.666 598.136 786.666 681.333C786.666 699.742 771.742 714.666 753.333 714.666C734.924 714.666 720 699.742 720 681.333C720 623.977 673.414 577.389 615.833 577.389C558.253 577.389 511.666 623.977 511.666 681.333C511.666 699.742 496.742 714.666 478.333 714.666C459.924 714.666 445 699.742 445 681.333C445 598.136 504.603 528.912 583.417 513.79C537.446 499.913 503.929 457.286 503.929 406.777C503.929 344.993 554.081 295 615.833 295C677.584 295 727.737 344.993 727.737 406.777Z"
+      fill="currentColor"
+    />
+  </SvgIconWrapper>
+);

assets/js/hooks/Mapper/icons/MapUserDeleteIcon.tsx

@@ -0,0 +1,15 @@
+import { SvgIconProps, SvgIconWrapper } from '@/hooks/Mapper/components/ui-kit/SvgIconWrapper.tsx';
+
+export const MapUserDeleteIcon = (props: SvgIconProps) => (
+  <SvgIconWrapper width={800} height={800} viewBox="0 0 800 800" {...props}>
+    <path
+      d="M259.095 617.422C288.199 652.691 322.293 680.967 360.022 698.982L361.822 699.832L361.823 699.833L362.963 700.355C371.571 704.236 380.618 706.7 389.783 707.749L392.258 758.116C374.601 757.137 357.082 752.809 340.65 745.128V745.129C294.272 723.452 253.892 689.676 220.529 649.245L239.812 633.334L259.095 617.422ZM223.9 614.051C234.55 605.263 250.307 606.773 259.095 617.422L220.529 649.245C211.742 638.596 213.251 622.839 223.9 614.051ZM400 41.667C515.7 41.6671 615.317 110.002 662.514 208.804C653.511 207.614 644.327 207 635 207C625.128 207 615.417 207.686 605.911 209.017C563.301 138.509 486.858 91.6671 400 91.667C266.948 91.6672 158.333 201.583 158.333 338.11C158.333 389.156 169.046 443.842 188.989 495.627L189.946 498.09L190.174 498.694C194.779 511.398 188.435 525.529 175.779 530.483C163.123 535.437 148.873 529.369 143.63 516.915L143.387 516.317L142.334 513.607C120.393 456.639 108.333 395.871 108.333 338.11C108.333 174.81 238.5 41.6672 400 41.667ZM400 208.334C406.63 208.334 413.153 208.852 419.529 209.854L420.803 210.061L421.438 210.176C434.704 212.748 443.57 225.448 441.321 238.853C439.072 252.257 426.546 261.369 413.167 259.471L412.529 259.372L411.768 259.248C407.948 258.648 404.02 258.334 400 258.334C358.578 258.334 325 291.913 325 333.334C325 374.756 358.577 408.334 400 408.334C409.643 408.334 418.861 406.513 427.329 403.198C427.111 407.104 427 411.039 427 415C427 428.513 428.289 441.725 430.75 454.521C420.913 457.009 410.611 458.334 400 458.334C330.963 458.334 275 402.371 275 333.334C275 264.299 330.963 208.334 400 208.334Z"
+      fill="currentColor"
+    />
+    <path
+      d="M661.071 406.777C661.071 381.914 640.868 361.666 615.833 361.666C590.798 361.666 570.595 381.914 570.595 406.777C570.595 431.641 590.798 451.889 615.833 451.889C640.868 451.889 661.071 431.641 661.071 406.777ZM727.737 406.777C727.737 457.286 694.219 499.913 648.248 513.79C727.063 528.912 786.666 598.136 786.666 681.333C786.666 699.742 771.742 714.666 753.333 714.666C734.924 714.666 720 699.742 720 681.333C720 623.977 673.414 577.389 615.833 577.389C558.253 577.389 511.666 623.977 511.666 681.333C511.666 699.742 496.742 714.666 478.333 714.666C459.924 714.666 445 699.742 445 681.333C445 598.136 504.603 528.912 583.417 513.79C537.446 499.913 503.929 457.286 503.929 406.777C503.929 344.993 554.081 295 615.833 295C677.584 295 727.737 344.993 727.737 406.777Z"
+      fill="currentColor"
+    />
+    <path d="M750.901 72L108 714.9" stroke="currentColor" strokeWidth="63" strokeLinecap="round" />
+  </SvgIconWrapper>
+);

assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx

@@ -1,5 +1,5 @@
 import { ContextStoreDataUpdate, useContextStore } from '@/hooks/Mapper/utils';
-import { createContext, Dispatch, ForwardedRef, forwardRef, SetStateAction, useContext, useEffect } from 'react';
+import { createContext, Dispatch, ForwardedRef, forwardRef, SetStateAction, useContext } from 'react';
 import {
   ActivitySummary,
   CommandLinkSignatureToSystem,
@@ -12,7 +12,6 @@ import {
 } from '@/hooks/Mapper/types';
 import { useCharactersCache, useComments, useMapRootHandlers } from '@/hooks/Mapper/mapRootProvider/hooks';
 import { WithChildren } from '@/hooks/Mapper/types/common.ts';
-import useLocalStorageState from 'use-local-storage-state';
 import {
   ToggleWidgetVisibility,
   useStoreWidgets,
@@ -20,6 +19,9 @@ import {
 } from '@/hooks/Mapper/mapRootProvider/hooks/useStoreWidgets.ts';
 import { WindowsManagerOnChange } from '@/hooks/Mapper/components/ui-kit/WindowManager';
 import { DetailedKill } from '../types/kills';
+import { InterfaceStoredSettings, RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
+import { DEFAULT_ROUTES_SETTINGS, STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/constants.ts';
+import { useMapUserSettings } from '@/hooks/Mapper/mapRootProvider/hooks/useMapUserSettings.ts';
 
 export type MapRootData = MapUnionTypes & {
   selectedSystems: string[];
@@ -50,7 +52,9 @@ const INITIAL_DATA: MapRootData = {
   systems: [],
   systemSignatures: {},
   hubs: [],
+  userHubs: [],
   routes: undefined,
+  userRoutes: undefined,
   kills: [],
   connections: [],
   detailedKills: {},
@@ -64,11 +68,6 @@ const INITIAL_DATA: MapRootData = {
   followingCharacterEveId: null,
 };
 
-export enum AvailableThemes {
-  default = 'default',
-  pathfinder = 'pathfinder',
-}
-
 export enum InterfaceStoredSettingsProps {
   isShowMenu = 'isShowMenu',
   isShowMinimap = 'isShowMinimap',
@@ -80,40 +79,28 @@ export enum InterfaceStoredSettingsProps {
   theme = 'theme',
 }
 
-export type InterfaceStoredSettings = {
-  isShowMenu: boolean;
-  isShowMinimap: boolean;
-  isShowKSpace: boolean;
-  isThickConnections: boolean;
-  isShowUnsplashedSignatures: boolean;
-  isShowBackgroundPattern: boolean;
-  isSoftBackground: boolean;
-  theme: AvailableThemes;
-};
-
-export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
-  isShowMenu: false,
-  isShowMinimap: true,
-  isShowKSpace: false,
-  isThickConnections: false,
-  isShowUnsplashedSignatures: false,
-  isShowBackgroundPattern: true,
-  isSoftBackground: false,
-  theme: AvailableThemes.default,
-};
-
 export interface MapRootContextProps {
   update: ContextStoreDataUpdate<MapRootData>;
   data: MapRootData;
   outCommand: OutCommandHandler;
-  interfaceSettings: InterfaceStoredSettings;
-  setInterfaceSettings: Dispatch<SetStateAction<InterfaceStoredSettings>>;
   windowsSettings: WindowStoreInfo;
   toggleWidgetVisibility: ToggleWidgetVisibility;
   updateWidgetSettings: WindowsManagerOnChange;
   resetWidgets: () => void;
   comments: UseCommentsData;
   charactersCache: UseCharactersCacheData;
+
+  /**
+   * !!!
+   * DO NOT PASS THIS PROP INTO COMPONENT
+   * !!!
+   * */
+  storedSettings: {
+    interfaceSettings: InterfaceStoredSettings;
+    setInterfaceSettings: Dispatch<SetStateAction<InterfaceStoredSettings>>;
+    settingsRoutes: RoutesType;
+    settingsRoutesUpdate: Dispatch<SetStateAction<RoutesType>>;
+  };
 }
 
 const MapRootContext = createContext<MapRootContextProps>({
@@ -121,8 +108,6 @@ const MapRootContext = createContext<MapRootContextProps>({
   data: { ...INITIAL_DATA },
   // @ts-ignore
   outCommand: async () => void 0,
-  interfaceSettings: STORED_INTERFACE_DEFAULT_VALUES,
-  setInterfaceSettings: () => null,
   comments: {
     loadComments: async () => {},
     comments: new Map(),
@@ -141,6 +126,12 @@ const MapRootContext = createContext<MapRootContextProps>({
     characters: new Map(),
     lastUpdateKey: 0,
   },
+  storedSettings: {
+    interfaceSettings: STORED_INTERFACE_DEFAULT_VALUES,
+    setInterfaceSettings: () => null,
+    settingsRoutes: DEFAULT_ROUTES_SETTINGS,
+    settingsRoutesUpdate: () => null,
+  },
 });
 
 type MapRootProviderProps = {
@@ -159,49 +150,25 @@ const MapRootHandlers = forwardRef(({ children }: WithChildren, fwdRef: Forwarde
 export const MapRootProvider = ({ children, fwdRef, outCommand }: MapRootProviderProps) => {
   const { update, ref } = useContextStore<MapRootData>({ ...INITIAL_DATA });
 
-  const [interfaceSettings, setInterfaceSettings] = useLocalStorageState<InterfaceStoredSettings>(
-    'window:interface:settings',
-    {
-      defaultValue: STORED_INTERFACE_DEFAULT_VALUES,
-    },
-  );
+  const storedSettings = useMapUserSettings();
+
   const { windowsSettings, toggleWidgetVisibility, updateWidgetSettings, resetWidgets } = useStoreWidgets();
   const comments = useComments({ outCommand });
   const charactersCache = useCharactersCache({ outCommand });
 
-  useEffect(() => {
-    let foundNew = false;
-    const newVals = Object.keys(STORED_INTERFACE_DEFAULT_VALUES).reduce((acc, x) => {
-      if (Object.keys(acc).includes(x)) {
-        return acc;
-      }
-
-      foundNew = true;
-
-      // @ts-ignore
-      return { ...acc, [x]: STORED_INTERFACE_DEFAULT_VALUES[x] };
-    }, interfaceSettings);
-
-    if (foundNew) {
-      setInterfaceSettings(newVals);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
   return (
     <MapRootContext.Provider
       value={{
         update,
         data: ref,
         outCommand,
-        setInterfaceSettings,
-        interfaceSettings,
         windowsSettings,
         updateWidgetSettings,
         toggleWidgetVisibility,
         resetWidgets,
         comments,
         charactersCache,
+        storedSettings,
       }}
     >
       <MapRootHandlers ref={fwdRef}>{children}</MapRootHandlers>

assets/js/hooks/Mapper/mapRootProvider/constants.ts

@@ -0,0 +1,26 @@
+import { AvailableThemes, InterfaceStoredSettings, RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
+
+export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
+  isShowMenu: false,
+  isShowMinimap: true,
+  isShowKSpace: false,
+  isThickConnections: false,
+  isShowUnsplashedSignatures: false,
+  isShowBackgroundPattern: true,
+  isSoftBackground: false,
+  theme: AvailableThemes.default,
+};
+
+export const DEFAULT_ROUTES_SETTINGS: RoutesType = {
+  path_type: 'shortest',
+  include_mass_crit: true,
+  include_eol: true,
+  include_frig: true,
+  include_cruise: true,
+  include_thera: true,
+  avoid_wormholes: false,
+  avoid_pochven: false,
+  avoid_edencom: false,
+  avoid_triglavian: false,
+  avoid: [],
+};

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts

@@ -26,6 +26,7 @@ export const useMapInit = () => {
         is_subscription_active,
         main_character_eve_id,
         following_character_eve_id,
+        user_hubs,
       } = props;
 
       const updateData: Partial<MapRootData> = {};
@@ -71,6 +72,10 @@ export const useMapInit = () => {
         updateData.hubs = hubs;
       }
 
+      if (user_hubs) {
+        updateData.userHubs = user_hubs;
+      }
+
       if (options) {
         updateData.options = options;
       }

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapUpdated.ts

@@ -8,13 +8,33 @@ export const useMapUpdated = () => {
   const ref = useRef({ update });
   ref.current = { update };
 
-  return useCallback(({ hubs }: CommandMapUpdated) => {
+  return useCallback((props: CommandMapUpdated) => {
     const { update } = ref.current;
 
     const out: Partial<MapRootData> = {};
 
-    if (hubs) {
-      out.hubs = hubs;
+    if ('hubs' in props) {
+      out.hubs = props.hubs;
+    }
+
+    if ('user_hubs' in props) {
+      out.userHubs = props.user_hubs;
+    }
+
+    if ('system_signatures' in props) {
+      out.systemSignatures = props.system_signatures;
+    }
+
+    if ('following_character_eve_id' in props) {
+      out.userCharacters = props.user_characters;
+    }
+
+    if ('following_character_eve_id' in props) {
+      out.followingCharacterEveId = props.following_character_eve_id;
+    }
+
+    if ('main_character_eve_id' in props) {
+      out.mainCharacterEveId = props.main_character_eve_id;
     }
 
     update(out);

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useRoutes.ts

@@ -92,3 +92,23 @@ export const useRoutes = () => {
     update({ routes: value });
   }, []);
 };
+
+export const useUserRoutes = () => {
+  const {
+    update,
+    data: { userRoutes },
+  } = useMapRootState();
+
+  const ref = useRef({ update, userRoutes });
+  ref.current = { update, userRoutes };
+
+  return useCallback((value: CommandRoutes) => {
+    const { update, userRoutes } = ref.current;
+
+    if (areRoutesListsEqual(userRoutes, value)) {
+      return;
+    }
+
+    update({ userRoutes: value });
+  }, []);
+};

assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts

@@ -33,6 +33,7 @@ import {
   useMapInit,
   useMapUpdated,
   useRoutes,
+  useUserRoutes,
 } from './api';
 
 import { useCommandsActivity } from './api/useCommandsActivity';
@@ -54,6 +55,7 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
     useCommandsCharacters();
   const mapUpdated = useMapUpdated();
   const mapRoutes = useRoutes();
+  const mapUserRoutes = useUserRoutes();
   const { addComment, removeComment } = useCommandComments();
   const { characterActivityData, trackingCharactersData, userSettingsUpdated } = useCommandsActivity();
 
@@ -105,6 +107,9 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
             case Commands.routes:
               mapRoutes(data as CommandRoutes);
               break;
+            case Commands.userRoutes:
+              mapUserRoutes(data as CommandRoutes);
+              break;
 
             case Commands.signaturesUpdated: // USED
               updateSystemSignatures(data as CommandSignaturesUpdated);

assets/js/hooks/Mapper/mapRootProvider/hooks/useMapUserSettings.ts

@@ -0,0 +1,39 @@
+import useLocalStorageState from 'use-local-storage-state';
+import { InterfaceStoredSettings, RoutesType } from '@/hooks/Mapper/mapRootProvider/types.ts';
+import { DEFAULT_ROUTES_SETTINGS, STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/constants.ts';
+import { useActualizeSettings } from '@/hooks/Mapper/hooks';
+import { useEffect } from 'react';
+import { SESSION_KEY } from '@/hooks/Mapper/constants.ts';
+
+export const useMigrationRoutesSettingsV1 = (update: (upd: RoutesType) => void) => {
+  //TODO if current Date is more than 01.01.2026 - remove this hook.
+
+  useEffect(() => {
+    const items = localStorage.getItem(SESSION_KEY.routes);
+    if (items) {
+      update(JSON.parse(items));
+      localStorage.removeItem(SESSION_KEY.routes);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+};
+
+export const useMapUserSettings = () => {
+  const [interfaceSettings, setInterfaceSettings] = useLocalStorageState<InterfaceStoredSettings>(
+    'window:interface:settings',
+    {
+      defaultValue: STORED_INTERFACE_DEFAULT_VALUES,
+    },
+  );
+
+  const [settingsRoutes, settingsRoutesUpdate] = useLocalStorageState<RoutesType>('window:interface:routes', {
+    defaultValue: DEFAULT_ROUTES_SETTINGS,
+  });
+
+  useActualizeSettings(STORED_INTERFACE_DEFAULT_VALUES, interfaceSettings, setInterfaceSettings);
+  useActualizeSettings(DEFAULT_ROUTES_SETTINGS, settingsRoutes, settingsRoutesUpdate);
+
+  useMigrationRoutesSettingsV1(settingsRoutesUpdate);
+
+  return { interfaceSettings, setInterfaceSettings, settingsRoutes, settingsRoutesUpdate };
+};

assets/js/hooks/Mapper/mapRootProvider/types.ts

@@ -0,0 +1,29 @@
+export enum AvailableThemes {
+  default = 'default',
+  pathfinder = 'pathfinder',
+}
+
+export type InterfaceStoredSettings = {
+  isShowMenu: boolean;
+  isShowMinimap: boolean;
+  isShowKSpace: boolean;
+  isThickConnections: boolean;
+  isShowUnsplashedSignatures: boolean;
+  isShowBackgroundPattern: boolean;
+  isSoftBackground: boolean;
+  theme: AvailableThemes;
+};
+
+export type RoutesType = {
+  path_type: 'shortest' | 'secure' | 'insecure';
+  include_mass_crit: boolean;
+  include_eol: boolean;
+  include_frig: boolean;
+  include_cruise: boolean;
+  include_thera: boolean;
+  avoid_wormholes: boolean;
+  avoid_pochven: boolean;
+  avoid_edencom: boolean;
+  avoid_triglavian: boolean;
+  avoid: number[];
+};

assets/js/hooks/Mapper/types/character.ts

@@ -28,8 +28,8 @@ export type CharacterTypeRaw = {
   ship: ShipTypeRaw | null;
 
   alliance_id: number | null;
-  alliance_name: number | null;
-  alliance_ticker: number | null;
+  alliance_name: string | null;
+  alliance_ticker: string | null;
   corporation_id: number;
   corporation_name: string;
   corporation_ticker: string;

assets/js/hooks/Mapper/types/mapHandlers.ts

@@ -24,6 +24,7 @@ export enum Commands {
   killsUpdated = 'kills_updated',
   detailedKillsUpdated = 'detailed_kills_updated',
   routes = 'routes',
+  userRoutes = 'user_routes',
   centerSystem = 'center_system',
   selectSystem = 'select_system',
   linkSignatureToSystem = 'link_signature_to_system',
@@ -55,6 +56,7 @@ export type Command =
   | Commands.killsUpdated
   | Commands.detailedKillsUpdated
   | Commands.routes
+  | Commands.userRoutes
   | Commands.selectSystem
   | Commands.centerSystem
   | Commands.linkSignatureToSystem
@@ -82,6 +84,7 @@ export type CommandInit = {
   user_characters: string[];
   user_permissions: UserPermissions;
   hubs: string[];
+  user_hubs: string[];
   routes: RoutesList;
   options: Record<string, string | boolean>;
   reset?: boolean;
@@ -104,6 +107,7 @@ export type CommandUpdateConnection = SolarSystemConnection;
 export type CommandSignaturesUpdated = string;
 export type CommandMapUpdated = Partial<CommandInit>;
 export type CommandRoutes = RoutesList;
+export type CommandUserRoutes = RoutesList;
 export type CommandKillsUpdated = Kill[];
 export type CommandDetailedKillsUpdated = Record<string, DetailedKill[]>;
 export type CommandSelectSystem = string | undefined;
@@ -170,6 +174,7 @@ export interface CommandData {
   [Commands.updateConnection]: CommandUpdateConnection;
   [Commands.mapUpdated]: CommandMapUpdated;
   [Commands.routes]: CommandRoutes;
+  [Commands.userRoutes]: CommandUserRoutes;
   [Commands.killsUpdated]: CommandKillsUpdated;
   [Commands.detailedKillsUpdated]: CommandDetailedKillsUpdated;
   [Commands.selectSystem]: CommandSelectSystem;
@@ -194,7 +199,10 @@ export interface MapHandlers {
 export enum OutCommand {
   addHub = 'add_hub',
   deleteHub = 'delete_hub',
+  addUserHub = 'add_user_hub',
+  deleteUserHub = 'delete_user_hub',
   getRoutes = 'get_routes',
+  getUserRoutes = 'get_user_routes',
   getCharacterJumps = 'get_character_jumps',
   getStructures = 'get_structures',
   getSignatures = 'get_signatures',

assets/js/hooks/Mapper/types/mapUnionTypes.ts

@@ -15,9 +15,11 @@ export type MapUnionTypes = {
   userCharacters: string[];
   presentCharacters: string[];
   hubs: string[];
+  userHubs: string[];
   systems: SolarSystemRawType[];
   systemSignatures: Record<string, SystemSignature[]>;
   routes?: RoutesList;
+  userRoutes?: RoutesList;
   kills: Record<number, number>;
   connections: SolarSystemConnection[];
   userPermissions: Partial<UserPermissions>;

assets/js/hooks/Mapper/useMapperHandlers.ts

@@ -1,8 +1,8 @@
 import { MapHandlers } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { RefObject, useCallback } from 'react';
 
-// Force reload the page after 30 minutes of inactivity
-const FORCE_PAGE_RELOAD_TIMEOUT = 1000 * 60 * 30;
+// Force reload the page after 5 minutes of inactivity
+const FORCE_PAGE_RELOAD_TIMEOUT = 1000 * 60 * 5;
 
 export const useMapperHandlers = (handlerRefs: RefObject<MapHandlers>[], hooksRef: RefObject<any>) => {
   const handleCommand = useCallback(

lib/wanderer_app/api/map_character_settings.ex

@@ -5,6 +5,16 @@ defmodule WandererApp.Api.MapCharacterSettings do
     domain: WandererApp.Api,
     data_layer: AshPostgres.DataLayer
 
+  @derive {Jason.Encoder, only: [
+    :id,
+    :map_id,
+    :character_id,
+    :tracked,
+    :followed,
+    :inserted_at,
+    :updated_at
+  ]}
+
   postgres do
     repo(WandererApp.Repo)
     table("map_character_settings_v1")

lib/wanderer_app/api/map_system_signature.ex

@@ -164,4 +164,23 @@ defmodule WandererApp.Api.MapSystemSignature do
   identities do
     identity :uniq_system_eve_id, [:system_id, :eve_id]
   end
+
+  @derive {Jason.Encoder,
+    only: [
+      :id,
+      :system_id,
+      :eve_id,
+      :character_eve_id,
+      :name,
+      :description,
+      :type,
+      :linked_system_id,
+      :kind,
+      :group,
+      :custom_info,
+      :updated,
+      :inserted_at,
+      :updated_at
+    ]
+  }
 end

lib/wanderer_app/api/map_system_structure.ex

@@ -4,6 +4,27 @@ defmodule WandererApp.Api.MapSystemStructure do
 
   """
 
+  @derive {Jason.Encoder,
+    only: [
+      :id,
+      :system_id,
+      :solar_system_id,
+      :solar_system_name,
+      :structure_type_id,
+      :structure_type,
+      :character_eve_id,
+      :name,
+      :notes,
+      :owner_name,
+      :owner_ticker,
+      :owner_id,
+      :status,
+      :end_time,
+      :inserted_at,
+      :updated_at
+    ]
+  }
+
   use Ash.Resource,
     domain: WandererApp.Api,
     data_layer: AshPostgres.DataLayer

lib/wanderer_app/api/map_user_settings.ex

@@ -21,6 +21,8 @@ defmodule WandererApp.Api.MapUserSettings do
     define(:update_settings, action: :update_settings)
     define(:update_main_character, action: :update_main_character)
     define(:update_following_character, action: :update_following_character)
+
+    define(:update_hubs, action: :update_hubs)
   end
 
   actions do
@@ -43,6 +45,10 @@ defmodule WandererApp.Api.MapUserSettings do
     update :update_following_character do
       accept [:following_character_eve_id]
     end
+
+    update :update_hubs do
+      accept [:hubs]
+    end
   end
 
   attributes do
@@ -59,6 +65,12 @@ defmodule WandererApp.Api.MapUserSettings do
     attribute :following_character_eve_id, :string do
       allow_nil? true
     end
+
+    attribute :hubs, {:array, :string} do
+      allow_nil?(true)
+
+      default([])
+    end
   end
 
   relationships do

lib/wanderer_app/application.ex

@@ -13,35 +13,40 @@ defmodule WandererApp.Application do
         WandererAppWeb.Telemetry,
         WandererApp.Vault,
         WandererApp.Repo,
-
         {Phoenix.PubSub, name: WandererApp.PubSub, adapter_name: Phoenix.PubSub.PG2},
-
         {
           Finch,
           name: WandererApp.Finch,
           pools: %{
             default: [
-              size: 25,           # number of connections per pool
-              count: 2,           # number of pools (so total 50 connections)
+              # number of connections per pool
+              size: 25,
+              # number of pools (so total 50 connections)
+              count: 2
             ]
           }
         },
-
         WandererApp.Cache,
-
-        Supervisor.child_spec({Cachex, name: :system_static_info_cache}, id: :system_static_info_cache_worker),
-        Supervisor.child_spec({Cachex, name: :ship_types_cache},          id: :ship_types_cache_worker),
-        Supervisor.child_spec({Cachex, name: :character_cache},           id: :character_cache_worker),
-        Supervisor.child_spec({Cachex, name: :map_cache},                 id: :map_cache_worker),
-        Supervisor.child_spec({Cachex, name: :character_state_cache},     id: :character_state_cache_worker),
+        Supervisor.child_spec({Cachex, name: :api_cache}, id: :api_cache_worker),
+        Supervisor.child_spec({Cachex, name: :system_static_info_cache},
+          id: :system_static_info_cache_worker
+        ),
+        Supervisor.child_spec({Cachex, name: :ship_types_cache}, id: :ship_types_cache_worker),
+        Supervisor.child_spec({Cachex, name: :character_cache}, id: :character_cache_worker),
+        Supervisor.child_spec({Cachex, name: :map_cache}, id: :map_cache_worker),
+        Supervisor.child_spec({Cachex, name: :character_state_cache},
+          id: :character_state_cache_worker
+        ),
         Supervisor.child_spec({Cachex, name: :tracked_characters},
           id: :tracked_characters_cache_worker
         ),
         WandererApp.Scheduler,
         {Registry, keys: :unique, name: WandererApp.MapRegistry},
         {Registry, keys: :unique, name: WandererApp.Character.TrackerRegistry},
-        {PartitionSupervisor, child_spec: DynamicSupervisor, name: WandererApp.Map.DynamicSupervisors},
-        {PartitionSupervisor, child_spec: DynamicSupervisor, name: WandererApp.Character.DynamicSupervisors},
+        {PartitionSupervisor,
+         child_spec: DynamicSupervisor, name: WandererApp.Map.DynamicSupervisors},
+        {PartitionSupervisor,
+         child_spec: DynamicSupervisor, name: WandererApp.Character.DynamicSupervisors},
         WandererApp.Zkb.Supervisor,
         WandererApp.Server.ServerStatusTracker,
         WandererApp.Server.TheraDataFetcher,
@@ -49,11 +54,10 @@ defmodule WandererApp.Application do
         WandererApp.Character.TrackerManager,
         WandererApp.Map.Manager,
         WandererApp.Map.ZkbDataFetcher,
-
         WandererAppWeb.Presence,
         WandererAppWeb.Endpoint
-      ]
-      ++ maybe_start_corp_wallet_tracker(WandererApp.Env.map_subscriptions_enabled?())
+      ] ++
+        maybe_start_corp_wallet_tracker(WandererApp.Env.map_subscriptions_enabled?())
 
     opts = [strategy: :one_for_one, name: WandererApp.Supervisor]
 

lib/wanderer_app/character/tracker.ex

@@ -33,7 +33,7 @@ defmodule WandererApp.Character.Tracker do
           status: binary()
         }
 
-  @online_error_timeout :timer.minutes(2)
+  @online_error_timeout :timer.minutes(3)
   @forbidden_ttl :timer.minutes(1)
   @pubsub_client Application.compile_env(:wanderer_app, :pubsub_client)
 
@@ -49,7 +49,7 @@ defmodule WandererApp.Character.Tracker do
     |> new()
   end
 
-  def update_track_settings(character_id, track_settings) do
+  def update_settings(character_id, track_settings) do
     {:ok, character_state} = WandererApp.Character.get_character_state(character_id)
 
     {:ok,
@@ -494,7 +494,7 @@ defmodule WandererApp.Character.Tracker do
            state,
          location
        ) do
-         location = get_location(location)
+    location = get_location(location)
 
     if not is_location_started?(character_id) do
       WandererApp.Cache.lookup!("character:#{character_id}:start_solar_system_id", nil)
@@ -544,14 +544,18 @@ defmodule WandererApp.Character.Tracker do
       )
 
   defp is_location_updated?(
-         %{solar_system_id: new_solar_system_id, station_id: new_station_id, structure_id: new_structure_id} = _location,
+         %{
+           solar_system_id: new_solar_system_id,
+           station_id: new_station_id,
+           structure_id: new_structure_id
+         } = _location,
          solar_system_id,
          structure_id,
          station_id
        ),
        do:
          solar_system_id != new_solar_system_id ||
-         solar_system_id != new_solar_system_id ||
+           solar_system_id != new_solar_system_id ||
            structure_id != new_structure_id ||
            station_id != new_station_id
 
@@ -724,14 +728,7 @@ defmodule WandererApp.Character.Tracker do
       )
     end
 
-    WandererApp.Character.update_character(character_id, %{online: false})
-
-    %{
-      state
-      | track_ship: false,
-        track_online: false,
-        track_location: false
-    }
+    state
   end
 
   defp maybe_stop_tracking(

lib/wanderer_app/character/tracker_manager.ex

@@ -31,9 +31,7 @@ defmodule WandererApp.Character.TrackerManager do
   def init(args) do
     Logger.info("#{__MODULE__} started")
 
-    {:ok, tracked_characters} = WandererApp.Cache.lookup("tracked_characters", [])
-
-    {:ok, Impl.init(args |> Keyword.merge(characters: tracked_characters)), {:continue, :start}}
+    {:ok, Impl.init(args), {:continue, :start}}
   end
 
   @impl true

lib/wanderer_app/character/tracker_manager_impl.ex

@@ -32,71 +32,65 @@ defmodule WandererApp.Character.TrackerManager.Impl do
     |> new()
   end
 
-  def start(%{opts: opts} = state) do
-    opts[:characters]
-    |> Enum.reduce(state, fn character_id, acc ->
-      start_tracking(acc, character_id, %{})
+  def start(state) do
+    {:ok, tracked_characters} = WandererApp.Cache.lookup("tracked_characters", [])
+
+    tracked_characters
+    |> Enum.each(fn character_id ->
+      start_tracking(state, character_id, %{})
     end)
+
+    state
   end
 
-  def start_tracking(%__MODULE__{characters: characters} = state, character_id, opts) do
-    case Enum.member?(characters, character_id) do
-      true ->
-        state
+  def start_tracking(state, character_id, opts) do
+    with {:ok, characters} <- WandererApp.Cache.lookup("tracked_characters", []),
+         false <- Enum.member?(characters, character_id) do
+      Logger.debug(fn -> "Start character tracker: #{inspect(character_id)}" end)
 
-      false ->
-        Logger.debug(fn -> "Start character tracker: #{inspect(character_id)}" end)
+      tracked_characters = [character_id | characters] |> Enum.uniq()
+      WandererApp.Cache.insert("tracked_characters", tracked_characters)
 
-        WandererApp.TaskWrapper.start_link(WandererApp.Character, :update_character_state, [
-          character_id,
-          %{opts: opts}
-        ])
+      WandererApp.Character.TrackerPoolDynamicSupervisor.start_tracking(character_id)
 
-        tracked_characters = [character_id | state.characters] |> Enum.uniq()
-        WandererApp.Cache.insert("tracked_characters", tracked_characters)
-
-        WandererApp.Character.TrackerPoolDynamicSupervisor.start_tracking(character_id)
-
-        %{state | characters: tracked_characters}
+      WandererApp.TaskWrapper.start_link(WandererApp.Character, :update_character_state, [
+        character_id,
+        %{opts: opts}
+      ])
     end
+
+    state
   end
 
-  def stop_tracking(%__MODULE__{characters: characters} = state, character_id) do
-    case Enum.member?(characters, character_id) do
-      true ->
-        {:ok, character_state} = WandererApp.Character.get_character_state(character_id, false)
+  def stop_tracking(state, character_id) do
+    with {:ok, characters} <- WandererApp.Cache.lookup("tracked_characters", []),
+         true <- Enum.member?(characters, character_id),
+         {:ok, %{start_time: start_time}} <-
+           WandererApp.Character.get_character_state(character_id, false) do
+      Logger.debug(fn -> "Shutting down character tracker: #{inspect(character_id)}" end)
 
-        case character_state do
-          nil ->
-            state
+      WandererApp.Cache.delete("character:#{character_id}:last_active_time")
+      WandererApp.Cache.delete("character:#{character_id}:location_started")
+      WandererApp.Cache.delete("character:#{character_id}:start_solar_system_id")
+      WandererApp.Character.delete_character_state(character_id)
 
-          %{start_time: start_time} ->
-            duration = DateTime.diff(DateTime.utc_now(), start_time, :second)
+      tracked_characters =
+        characters |> Enum.reject(fn c_id -> c_id == character_id end)
 
-            :telemetry.execute([:wanderer_app, :character, :tracker, :running], %{
-              duration: duration
-            })
+      WandererApp.Cache.insert("tracked_characters", tracked_characters)
 
-            :telemetry.execute([:wanderer_app, :character, :tracker, :stopped], %{count: 1})
-            Logger.debug(fn -> "Shutting down character tracker: #{inspect(character_id)}" end)
+      WandererApp.Character.TrackerPoolDynamicSupervisor.stop_tracking(character_id)
 
-            WandererApp.Cache.delete("character:#{character_id}:location_started")
-            WandererApp.Cache.delete("character:#{character_id}:start_solar_system_id")
-            WandererApp.Character.delete_character_state(character_id)
+      duration = DateTime.diff(DateTime.utc_now(), start_time, :second)
 
-            tracked_characters =
-              state.characters |> Enum.reject(fn c_id -> c_id == character_id end)
+      :telemetry.execute([:wanderer_app, :character, :tracker, :running], %{
+        duration: duration
+      })
 
-            WandererApp.Cache.insert("tracked_characters", tracked_characters)
-
-            WandererApp.Character.TrackerPoolDynamicSupervisor.stop_tracking(character_id)
-
-            %{state | characters: tracked_characters}
-        end
-
-      false ->
-        state
+      :telemetry.execute([:wanderer_app, :character, :tracker, :stopped], %{count: 1})
     end
+
+    state
   end
 
   def update_track_settings(
@@ -118,7 +112,7 @@ defmodule WandererApp.Character.TrackerManager.Impl do
       )
 
       {:ok, character_state} =
-        WandererApp.Character.Tracker.update_track_settings(character_id, track_settings)
+        WandererApp.Character.Tracker.update_settings(character_id, track_settings)
 
       WandererApp.Character.update_character_state(character_id, character_state)
     else
@@ -135,12 +129,12 @@ defmodule WandererApp.Character.TrackerManager.Impl do
   end
 
   def get_characters(
-        %{
-          characters: characters
-        } = state,
+        state,
         _opts \\ []
-      ),
-      do: {characters, state}
+      ) do
+    {:ok, characters} = WandererApp.Cache.lookup("tracked_characters", [])
+    {characters, state}
+  end
 
   def handle_event({ref, result}, state) do
     Process.demonitor(ref, [:flush])
@@ -163,13 +157,12 @@ defmodule WandererApp.Character.TrackerManager.Impl do
 
   def handle_info(
         :garbage_collect,
-        %{
-          characters: characters
-        } =
-          state
+        state
       ) do
     Process.send_after(self(), :garbage_collect, @garbage_collection_interval)
 
+    {:ok, characters} = WandererApp.Cache.lookup("tracked_characters", [])
+
     characters
     |> Task.async_stream(
       fn character_id ->
@@ -213,15 +206,15 @@ defmodule WandererApp.Character.TrackerManager.Impl do
     WandererApp.Cache.get_and_remove!("character_untrack_queue", [])
     |> Task.async_stream(
       fn {map_id, character_id} ->
-        WandererApp.Cache.delete("map_#{map_id}:character_#{character_id}:tracked")
+        if not character_is_present(map_id, character_id) do
+          {:ok, character_state} =
+            WandererApp.Character.Tracker.update_settings(character_id, %{
+              map_id: map_id,
+              track: false
+            })
 
-        {:ok, character_state} =
-          WandererApp.Character.Tracker.update_track_settings(character_id, %{
-            map_id: map_id,
-            track: false
-          })
-
-        WandererApp.Character.update_character_state(character_id, character_state)
+          WandererApp.Character.update_character_state(character_id, character_state)
+        end
       end,
       max_concurrency: System.schedulers_online(),
       on_timeout: :kill_task,
@@ -233,21 +226,23 @@ defmodule WandererApp.Character.TrackerManager.Impl do
   end
 
   def handle_info({:stop_track, character_id}, state) do
-    WandererApp.Cache.has_key?("character:#{character_id}:is_stop_tracking")
-    |> case do
-      false ->
-        WandererApp.Cache.insert("character:#{character_id}:is_stop_tracking", true)
-        Logger.debug(fn -> "Stopping character tracker: #{inspect(character_id)}" end)
-        state = state |> stop_tracking(character_id)
-        WandererApp.Cache.delete("character:#{character_id}:is_stop_tracking")
-
-        state
-
-      _ ->
-        state
+    if not WandererApp.Cache.has_key?("character:#{character_id}:is_stop_tracking") do
+      WandererApp.Cache.insert("character:#{character_id}:is_stop_tracking", true)
+      Logger.debug(fn -> "Stopping character tracker: #{inspect(character_id)}" end)
+      stop_tracking(state, character_id)
+      WandererApp.Cache.delete("character:#{character_id}:is_stop_tracking")
     end
+
+    state
   end
 
   def handle_info(_event, state),
     do: state
+
+  defp character_is_present(map_id, character_id) do
+    {:ok, presence_character_ids} =
+      WandererApp.Cache.lookup("map_#{map_id}:presence_character_ids", [])
+
+    Enum.member?(presence_character_ids, character_id)
+  end
 end

lib/wanderer_app/character/tracker_pool.ex

@@ -17,11 +17,11 @@ defmodule WandererApp.Character.TrackerPool do
   @unique_registry :unique_tracker_pool_registry
 
   @update_location_interval :timer.seconds(2)
-  @update_online_interval :timer.seconds(10)
+  @update_online_interval :timer.seconds(5)
   @check_online_errors_interval :timer.seconds(30)
-  @update_ship_interval :timer.seconds(5)
+  @update_ship_interval :timer.seconds(2)
   @update_info_interval :timer.minutes(1)
-  @update_wallet_interval :timer.minutes(5)
+  @update_wallet_interval :timer.minutes(1)
   @inactive_character_timeout :timer.minutes(5)
 
   @logger Application.compile_env(:wanderer_app, :logger)
@@ -167,10 +167,18 @@ defmodule WandererApp.Character.TrackerPool do
 
   def handle_info(
         :update_online,
-        state
+        %{
+          characters: characters
+        } =
+          state
       ) do
     Process.send_after(self(), :update_online, @update_online_interval)
 
+    characters
+    |> Enum.each(fn character_id ->
+      WandererApp.Character.update_character(character_id, %{online: false})
+    end)
+
     {:noreply, state}
   end
 

lib/wanderer_app/character/tracking_utils.ex

@@ -68,15 +68,22 @@ defmodule WandererApp.Character.TrackingUtils do
       {:ok, main_character} =
         get_main_character(user_settings, characters_with_access, characters_with_access)
 
-      following_character_eve_id = case user_settings do
-        nil -> nil
-        %{following_character_eve_id: following_character_eve_id} -> following_character_eve_id
-      end
+      following_character_eve_id =
+        case user_settings do
+          nil -> nil
+          %{following_character_eve_id: following_character_eve_id} -> following_character_eve_id
+        end
+
+      main_character_eve_id =
+        case main_character do
+          nil -> nil
+          %{eve_id: eve_id} -> eve_id
+        end
 
       {:ok,
        %{
          characters: characters_data,
-         main: main_character.eve_id,
+         main: main_character_eve_id,
          following: following_character_eve_id
        }}
     else
@@ -113,7 +120,7 @@ defmodule WandererApp.Character.TrackingUtils do
           {:ok, updated_settings} =
             WandererApp.MapCharacterSettingsRepo.untrack(existing_settings)
 
-          :ok = untrack_characters([character], map_id, caller_pid)
+          :ok = untrack([character], map_id, caller_pid)
           :ok = remove_characters([character], map_id)
           {:ok, updated_settings}
         else
@@ -124,7 +131,7 @@ defmodule WandererApp.Character.TrackingUtils do
       {:ok, %{tracked: false} = existing_settings} ->
         if track do
           {:ok, updated_settings} = WandererApp.MapCharacterSettingsRepo.track(existing_settings)
-          :ok = track_characters([character], map_id, true, caller_pid)
+          :ok = track([character], map_id, true, caller_pid)
           :ok = add_characters([character], map_id, true)
           {:ok, updated_settings}
         else
@@ -141,7 +148,7 @@ defmodule WandererApp.Character.TrackingUtils do
               tracked: true
             })
 
-          :ok = track_characters([character], map_id, true, caller_pid)
+          :ok = track([character], map_id, true, caller_pid)
           :ok = add_characters([character], map_id, true)
           {:ok, settings}
         else
@@ -154,61 +161,86 @@ defmodule WandererApp.Character.TrackingUtils do
   end
 
   # Helper functions for character tracking
-  def track_characters(_, _, false, _), do: :ok
-  def track_characters([], _map_id, _is_track_character?, _), do: :ok
 
-  def track_characters([character | characters], map_id, true, caller_pid) do
-    with :ok <- track_character(character, map_id, caller_pid) do
-      track_characters(characters, map_id, true, caller_pid)
+  def track([], _map_id, _is_track_character?, _), do: :ok
+
+  def track([character | characters], map_id, is_track_allowed, caller_pid) do
+    with :ok <- track_character(character, map_id, is_track_allowed, caller_pid) do
+      track(characters, map_id, is_track_allowed, caller_pid)
     end
   end
 
-  def track_character(
-        %{
-          id: character_id,
-          eve_id: eve_id,
-          corporation_id: corporation_id,
-          alliance_id: alliance_id
-        },
-        map_id,
-        caller_pid
-      ) do
-    with false <- is_nil(caller_pid) do
-      WandererAppWeb.Presence.track(caller_pid, map_id, character_id, %{})
+  defp track_character(
+         %{
+           id: character_id,
+           eve_id: eve_id
+         },
+         map_id,
+         is_track_allowed,
+         caller_pid
+       )
+       when not is_nil(caller_pid) do
+    WandererAppWeb.Presence.update(caller_pid, map_id, character_id, %{
+      tracked: is_track_allowed,
+      from: DateTime.utc_now()
+    })
+    |> case do
+      {:ok, _} ->
+        :ok
 
-      cache_key = "#{inspect(caller_pid)}_map_#{map_id}:character_#{character_id}:tracked"
+      {:error, :nopresence} ->
+        WandererAppWeb.Presence.track(caller_pid, map_id, character_id, %{
+          tracked: is_track_allowed,
+          from: DateTime.utc_now()
+        })
 
-      case WandererApp.Cache.lookup!(cache_key, false) do
-        true ->
-          :ok
+      error ->
+        Logger.error("Failed to update presence: #{inspect(error)}")
+        {:error, "Failed to update presence"}
+    end
 
-        _ ->
-          :ok = Phoenix.PubSub.subscribe(WandererApp.PubSub, "character:#{eve_id}")
-          :ok = WandererApp.Cache.put(cache_key, true)
-      end
+    cache_key = "#{inspect(caller_pid)}_map_#{map_id}:character_#{character_id}:tracked"
 
-      :ok = WandererApp.Character.TrackerManager.start_tracking(character_id)
-    else
+    case WandererApp.Cache.lookup!(cache_key, false) do
       true ->
-        Logger.error("caller_pid is required for tracking characters")
-        {:error, "caller_pid is required"}
+        :ok
+
+      _ ->
+        :ok = Phoenix.PubSub.subscribe(WandererApp.PubSub, "character:#{eve_id}")
+        :ok = WandererApp.Cache.put(cache_key, true)
     end
+
+    if is_track_allowed do
+      :ok = WandererApp.Character.TrackerManager.start_tracking(character_id)
+    end
+
+    :ok
   end
 
-  def untrack_characters(characters, map_id, caller_pid) do
+  defp track_character(
+         _character,
+         _map_id,
+         _is_track_allowed,
+         _caller_pid
+       ) do
+    Logger.error("caller_pid is required for tracking characters")
+    {:error, "caller_pid is required"}
+  end
+
+  def untrack(characters, map_id, caller_pid) do
     with false <- is_nil(caller_pid) do
+      character_ids = characters |> Enum.map(& &1.id)
+
       characters
       |> Enum.each(fn character ->
-        WandererAppWeb.Presence.untrack(caller_pid, map_id, character.id)
-
-        WandererApp.Cache.put(
-          "#{inspect(caller_pid)}_map_#{map_id}:character_#{character.id}:tracked",
-          false
-        )
-
-        :ok = Phoenix.PubSub.unsubscribe(WandererApp.PubSub, "character:#{character.eve_id}")
+        WandererAppWeb.Presence.update(caller_pid, map_id, character.id, %{
+          tracked: false,
+          from: DateTime.utc_now()
+        })
       end)
 
+      WandererApp.Map.Server.untrack_characters(map_id, character_ids)
+
       :ok
     else
       true ->

lib/wanderer_app/esi/api_client.ex

@@ -31,8 +31,11 @@ defmodule WandererApp.Esi.ApiClient do
     avoid: []
   }
 
+  @zarzakh_system 30_100_000
+  @default_avoid_systems [@zarzakh_system]
+
   @cache_opts [cache: true]
-  @retry_opts [max_retries: 1, retry_log_level: :warning]
+  @retry_opts [max_retries: 0, retry_log_level: :warning]
   @timeout_opts [pool_timeout: 15_000, receive_timeout: :timer.seconds(30)]
   @api_retry_count 1
 
@@ -170,7 +173,10 @@ defmodule WandererApp.Esi.ApiClient do
           avoidance_list
       end
 
-    avoidance_list = [routes_settings.avoid | avoidance_list] |> List.flatten() |> Enum.uniq()
+    avoidance_list =
+      (@default_avoid_systems ++ [routes_settings.avoid | avoidance_list])
+      |> List.flatten()
+      |> Enum.uniq()
 
     params =
       %{
@@ -487,12 +493,28 @@ defmodule WandererApp.Esi.ApiClient do
       )
 
   defp get(path, api_opts \\ [], opts \\ []) do
+    case Cachex.get(:api_cache, path) do
+      {:ok, cached_data} when not is_nil(cached_data) ->
+        {:ok, cached_data}
+
+      _ ->
+        do_get_request(path, api_opts, opts)
+    end
+  end
+
+  defp do_get_request(path, api_opts \\ [], opts \\ []) do
     try do
       case Req.get(
              "#{@base_url}#{path}",
-             api_opts |> with_user_agent_opts() |> with_cache_opts() |> Keyword.merge(@retry_opts) |> Keyword.merge(@timeout_opts)
+             api_opts
+             |> with_user_agent_opts()
+             |> with_cache_opts()
+             |> Keyword.merge(@retry_opts)
+             |> Keyword.merge(@timeout_opts)
            ) do
-        {:ok, %{status: 200, body: body}} ->
+        {:ok, %{status: 200, body: body, headers: headers}} ->
+          maybe_cache_response(path, body, headers)
+
           {:ok, body}
 
         {:ok, %{status: 504}} ->
@@ -508,9 +530,11 @@ defmodule WandererApp.Esi.ApiClient do
           get_retry(path, api_opts, opts, :error_limited)
 
         {:ok, %{status: status}} ->
+          IO.inspect(status)
           {:error, "Unexpected status: #{status}"}
 
         {:error, _reason} ->
+          IO.inspect(_reason)
           {:error, "Request failed"}
       end
     rescue
@@ -521,6 +545,28 @@ defmodule WandererApp.Esi.ApiClient do
     end
   end
 
+  defp maybe_cache_response(path, body, %{"expires" => [expires]})
+       when is_binary(path) and not is_nil(expires) do
+    try do
+      cached_ttl =
+        DateTime.diff(Timex.parse!(expires, "{RFC1123}"), DateTime.utc_now(), :millisecond)
+
+      Cachex.put(
+        :api_cache,
+        path,
+        body,
+        ttl: cached_ttl
+      )
+    rescue
+      e ->
+        @logger.error(Exception.message(e))
+
+        :ok
+    end
+  end
+
+  defp maybe_cache_response(_path, _body, _headers), do: :ok
+
   defp post(url, opts) do
     try do
       case Req.post("#{url}", opts |> with_user_agent_opts()) do
@@ -578,63 +624,91 @@ defmodule WandererApp.Esi.ApiClient do
     {:ok, %{expires_at: expires_at, refresh_token: refresh_token, scopes: scopes} = character} =
       WandererApp.Character.get_character(character_id)
 
-    case WandererApp.Ueberauth.Strategy.Eve.OAuth.get_refresh_token([],
-           with_wallet: WandererApp.Character.can_track_wallet?(character),
-           is_admin?: WandererApp.Character.can_track_corp_wallet?(character),
-           token: %OAuth2.AccessToken{refresh_token: refresh_token}
-         ) do
-      {:ok, %OAuth2.AccessToken{} = token} ->
-        {:ok, _character} =
-          character
-          |> WandererApp.Api.Character.update(%{
-            access_token: token.access_token,
-            expires_at: token.expires_at,
-            scopes: scopes
-          })
+    refresh_token_result =
+      WandererApp.Ueberauth.Strategy.Eve.OAuth.get_refresh_token([],
+        with_wallet: WandererApp.Character.can_track_wallet?(character),
+        is_admin?: WandererApp.Character.can_track_corp_wallet?(character),
+        token: %OAuth2.AccessToken{refresh_token: refresh_token}
+      )
 
-        WandererApp.Character.update_character(character_id, %{
-          access_token: token.access_token,
-          expires_at: token.expires_at
-        })
+    handle_refresh_token_result(refresh_token_result, character, character_id, expires_at, scopes)
+  end
 
-        Phoenix.PubSub.broadcast(
-          WandererApp.PubSub,
-          "character:#{character_id}",
-          :token_updated
-        )
+  defp handle_refresh_token_result(
+         {:ok, %OAuth2.AccessToken{} = token},
+         character,
+         character_id,
+         _expires_at,
+         scopes
+       ) do
+    {:ok, _character} =
+      character
+      |> WandererApp.Api.Character.update(%{
+        access_token: token.access_token,
+        expires_at: token.expires_at,
+        scopes: scopes
+      })
 
-        {:ok, token}
+    WandererApp.Character.update_character(character_id, %{
+      access_token: token.access_token,
+      expires_at: token.expires_at
+    })
 
-      {:error, {"invalid_grant", error_message}} ->
-        {:ok, _character} =
-          character
-          |> WandererApp.Api.Character.update(%{
-            access_token: nil,
-            refresh_token: nil,
-            expires_at: expires_at,
-            scopes: scopes
-          })
+    Phoenix.PubSub.broadcast(
+      WandererApp.PubSub,
+      "character:#{character_id}",
+      :token_updated
+    )
 
-        WandererApp.Character.update_character(character_id, %{
-          access_token: nil,
-          refresh_token: nil,
-          expires_at: expires_at,
-          scopes: scopes
-        })
+    {:ok, token}
+  end
 
-        Phoenix.PubSub.broadcast(
-          WandererApp.PubSub,
-          "character:#{character_id}",
-          :character_token_invalid
-        )
+  defp handle_refresh_token_result(
+         {:error, {"invalid_grant", error_message}},
+         character,
+         character_id,
+         expires_at,
+         scopes
+       ) do
+    invalidate_character_tokens(character, character_id, expires_at, scopes)
+    Logger.warning("Failed to refresh token for #{character_id}: #{error_message}")
+    {:error, :invalid_grant}
+  end
 
-        Logger.warning("Failed to refresh token for #{character_id}: #{error_message}")
-        {:error, :invalid_grant}
+  defp handle_refresh_token_result(
+         {:error, %OAuth2.Error{} = error},
+         character,
+         character_id,
+         expires_at,
+         scopes
+       ) do
+    invalidate_character_tokens(character, character_id, expires_at, scopes)
+    Logger.warning("Failed to refresh token for #{character_id}: #{inspect(error)}")
+    {:error, :invalid_grant}
+  end
 
+  defp handle_refresh_token_result(error, character, character_id, expires_at, scopes) do
+    Logger.warning("Failed to refresh token for #{character_id}: #{inspect(error)}")
+    invalidate_character_tokens(character, character_id, expires_at, scopes)
+    {:error, :failed}
+  end
+
+  defp invalidate_character_tokens(character, character_id, expires_at, scopes) do
+    attrs = %{access_token: nil, refresh_token: nil, expires_at: expires_at, scopes: scopes}
+
+    with {:ok, _} <- WandererApp.Api.Character.update(character, attrs),
+         {:ok, _} <- WandererApp.Character.update_character(character_id, attrs) do
+      :ok
+    else
       error ->
-        Logger.warning("Failed to refresh token for #{character_id}: #{inspect(error)}")
-        {:error, :failed}
+        Logger.error("Failed to clear tokens for #{character_id}: #{inspect(error)}")
     end
+
+    Phoenix.PubSub.broadcast(
+      WandererApp.PubSub,
+      "character:#{character_id}",
+      :character_token_invalid
+    )
   end
 
   defp map_route_info(

lib/wanderer_app/map.ex

@@ -72,6 +72,9 @@ defmodule WandererApp.Map do
   def get_characters_limit(map_id),
     do: {:ok, map_id |> get_map!() |> Map.get(:characters_limit, 50)}
 
+  def get_hubs_limit(map_id),
+    do: {:ok, map_id |> get_map!() |> Map.get(:hubs_limit, 20)}
+
   def is_subscription_active?(map_id),
     do: is_subscription_active?(map_id, WandererApp.Env.map_subscriptions_enabled?())
 
@@ -105,10 +108,14 @@ defmodule WandererApp.Map do
 
   def list_hubs(map_id) do
     {:ok, map} = map_id |> get_map()
-    hubs = map |> Map.get(:hubs, [])
-    hubs_limit = map |> Map.get(:hubs_limit, 20)
 
-    {:ok, hubs |> _maybe_limit_list(hubs_limit)}
+    {:ok, map |> Map.get(:hubs, [])}
+  end
+
+  def list_hubs(map_id, hubs) do
+    {:ok, map} = map_id |> get_map()
+
+    {:ok, hubs}
   end
 
   def list_connections(map_id),
@@ -148,15 +155,16 @@ defmodule WandererApp.Map do
 
     case not (characters |> Enum.member?(character_id)) do
       true ->
-        {:ok, %{
-          alliance_id: alliance_id,
-          corporation_id: corporation_id,
-          solar_system_id: solar_system_id,
-          structure_id: structure_id,
-          station_id: station_id,
-          ship: ship_type_id,
-          ship_name: ship_name
-        }} = WandererApp.Character.get_character(character_id)
+        {:ok,
+         %{
+           alliance_id: alliance_id,
+           corporation_id: corporation_id,
+           solar_system_id: solar_system_id,
+           structure_id: structure_id,
+           station_id: station_id,
+           ship: ship_type_id,
+           ship_name: ship_name
+         }} = WandererApp.Character.get_character(character_id)
 
         map_id
         |> update_map(%{characters: [character_id | characters]})
@@ -536,9 +544,6 @@ defmodule WandererApp.Map do
     end
   end
 
-  defp _maybe_limit_list(list, nil), do: list
-  defp _maybe_limit_list(list, limit), do: Enum.take(list, limit)
-
   @doc """
   Returns the raw activity data that can be processed by WandererApp.Character.Activity.
   Only includes characters that are on the map's ACL.
@@ -549,7 +554,8 @@ defmodule WandererApp.Map do
     _map_with_acls = Ash.load!(map, :acls)
 
     # Calculate cutoff date if days is provided
-    cutoff_date = if days, do: DateTime.utc_now() |> DateTime.add(-days * 24 * 3600, :second), else: nil
+    cutoff_date =
+      if days, do: DateTime.utc_now() |> DateTime.add(-days * 24 * 3600, :second), else: nil
 
     # Get activity data
     passages_activity = get_passages_activity(map_id, cutoff_date)

lib/wanderer_app/map/map_operations.ex

@@ -0,0 +1,128 @@
+# File: lib/wanderer_app/map/operations.ex
+defmodule WandererApp.Map.Operations do
+  @moduledoc """
+  Central entrypoint for map operations. Delegates responsibilities to specialized submodules:
+    - Owner: Fetching and caching owner character info
+    - Systems: CRUD and batch upsert for systems
+    - Connections: CRUD and batch upsert for connections
+    - Structures: CRUD for structures
+    - Signatures: CRUD for signatures
+  """
+
+  alias WandererApp.Map.Operations.{
+    Owner,
+    Systems,
+    Connections,
+    Structures,
+    Signatures
+  }
+
+  # -- Owner Info -------------------------------------------------------------
+
+  @doc "Fetch cached main character info for a map owner"
+  @spec get_owner_character_id(String.t()) ::
+          {:ok, %{id: term(), user_id: term()}} | {:error, String.t()}
+  defdelegate get_owner_character_id(map_id), to: Owner
+
+  # -- Systems ----------------------------------------------------------------
+
+  @doc "List visible systems"
+  @spec list_systems(String.t()) :: [map()]
+  defdelegate list_systems(map_id), to: Systems
+
+  @doc "Get a specific system"
+  @spec get_system(String.t(), integer()) :: {:ok, map()} | {:error, :not_found}
+  defdelegate get_system(map_id, system_id), to: Systems
+
+  @doc "Create a system"
+  @spec create_system(String.t(), map()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate create_system(map_id, params), to: Systems
+
+  @doc "Update a system"
+  @spec update_system(String.t(), integer(), map()) ::
+          {:ok, map()} | {:error, String.t()}
+  defdelegate update_system(map_id, system_id, attrs), to: Systems
+
+  @doc "Delete a system"
+  @spec delete_system(String.t(), integer()) :: {:ok, integer()} | {:error, term()}
+  defdelegate delete_system(map_id, system_id), to: Systems
+
+  @doc "Upsert systems and connections in batch"
+  @spec upsert_systems_and_connections(String.t(), [map()], [map()]) ::
+          {:ok, map()} | {:error, String.t()}
+  defdelegate upsert_systems_and_connections(map_id, systems, connections), to: Systems
+
+  # -- Connections -----------------------------------------------------------
+
+  @doc "List all connections"
+  @spec list_connections(String.t()) :: [map()]
+  defdelegate list_connections(map_id), to: Connections
+
+  @doc "List connections for a specific system"
+  @spec list_connections(String.t(), integer()) :: [map()]
+  defdelegate list_connections(map_id, system_id), to: Connections
+
+  @doc "Get a connection"
+  @spec get_connection(String.t(), String.t()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate get_connection(map_id, connection_id), to: Connections
+
+  @doc "Create a connection"
+  @spec create_connection(String.t(), map()) ::
+          {:ok, map()} | {:skip, :exists} | {:error, String.t()}
+  defdelegate create_connection(map_id, attrs), to: Connections
+
+  @doc "Force-create a connection with explicit character ID"
+  @spec create_connection(String.t(), map(), integer()) ::
+          {:ok, map()} | {:skip, :exists} | {:error, String.t()}
+  defdelegate create_connection(map_id, attrs, char_id), to: Connections
+
+  @doc "Update a connection"
+  @spec update_connection(String.t(), String.t(), map()) ::
+          {:ok, map()} | {:error, String.t()}
+  defdelegate update_connection(map_id, connection_id, attrs), to: Connections
+
+  @doc "Delete a connection"
+  @spec delete_connection(String.t(), integer(), integer()) :: :ok | {:error, term()}
+  defdelegate delete_connection(map_id, src_id, tgt_id), to: Connections
+
+  @doc "Get a connection by source and target system IDs"
+  @spec get_connection_by_systems(String.t(), integer(), integer()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate get_connection_by_systems(map_id, source, target), to: Connections
+
+  # -- Structures ------------------------------------------------------------
+
+  @doc "List all structures"
+  @spec list_structures(String.t()) :: [map()]
+  defdelegate list_structures(map_id), to: Structures
+
+  @doc "Create a structure"
+  @spec create_structure(String.t(), map()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate create_structure(map_id, params), to: Structures
+
+  @doc "Update a structure"
+  @spec update_structure(String.t(), String.t(), map()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate update_structure(map_id, struct_id, params), to: Structures
+
+  @doc "Delete a structure"
+  @spec delete_structure(String.t(), String.t()) :: :ok | {:error, String.t()}
+  defdelegate delete_structure(map_id, struct_id), to: Structures
+
+  # -- Signatures ------------------------------------------------------------
+
+  @doc "List all signatures"
+  @spec list_signatures(String.t()) :: [map()]
+  defdelegate list_signatures(map_id), to: Signatures
+
+  @doc "Create a signature"
+  @spec create_signature(String.t(), map()) :: {:ok, map()} | {:error, String.t()}
+  defdelegate create_signature(map_id, params), to: Signatures
+
+  @doc "Update a signature"
+  @spec update_signature(String.t(), String.t(), map()) ::
+          {:ok, map()} | {:error, String.t()}
+  defdelegate update_signature(map_id, sig_id, params), to: Signatures
+
+  @doc "Delete a signature in a map"
+  @spec delete_signature(String.t(), String.t()) :: :ok | {:error, String.t()}
+  defdelegate delete_signature(map_id, sig_id), to: Signatures
+end

lib/wanderer_app/map/map_subscription_manager.ex

@@ -137,7 +137,7 @@ defmodule WandererApp.Map.SubscriptionManager do
     total_price = estimated_price * period
 
     {:ok, discount} =
-      _calc_discount(
+      calc_discount(
         period,
         total_price,
         current_plan,
@@ -147,7 +147,65 @@ defmodule WandererApp.Map.SubscriptionManager do
     {:ok, total_price, discount}
   end
 
-  defp _calc_discount(
+  def calc_additional_price(
+        %{"characters_limit" => characters_limit, "hubs_limit" => hubs_limit},
+        selected_subscription
+      ) do
+    %{
+      plans: plans,
+      extra_characters_100: extra_characters_100,
+      extra_hubs_10: extra_hubs_10
+    } = WandererApp.Env.subscription_settings()
+
+    current_plan = plans |> Enum.find(fn p -> p.id == "omega" end)
+
+    additional_price = 0
+
+    characters_limit = characters_limit |> String.to_integer()
+    hubs_limit = hubs_limit |> String.to_integer()
+    sub_characters_limit = selected_subscription.characters_limit
+    sub_hubs_limit = selected_subscription.hubs_limit
+
+    additional_price =
+      case characters_limit > sub_characters_limit do
+        true ->
+          additional_price +
+            (characters_limit - sub_characters_limit) / 100 * extra_characters_100
+
+        _ ->
+          additional_price
+      end
+
+    additional_price =
+      case hubs_limit > sub_hubs_limit do
+        true ->
+          additional_price + (hubs_limit - sub_hubs_limit) / 10 * extra_hubs_10
+
+        _ ->
+          additional_price
+      end
+
+    period = get_active_months(selected_subscription)
+    total_price = additional_price * period
+
+    {:ok, discount} =
+      calc_discount(
+        period,
+        total_price,
+        current_plan,
+        false
+      )
+
+    {:ok, total_price, discount}
+  end
+
+  defp get_active_months(subscription) do
+    subscription.active_till
+    |> Timex.shift(days: 5)
+    |> Timex.diff(Timex.now(), :months)
+  end
+
+  defp calc_discount(
          period,
          _total_price,
          _current_plan,
@@ -156,29 +214,7 @@ defmodule WandererApp.Map.SubscriptionManager do
        when period <= 1 or renew?,
        do: {:ok, 0.0}
 
-  defp _calc_discount(
-         period,
-         total_price,
-         %{
-           month_3_discount: month_3_discount
-         },
-         _renew?
-       )
-       when period == 3,
-       do: {:ok, round(total_price * month_3_discount)}
-
-  defp _calc_discount(
-         period,
-         total_price,
-         %{
-           month_6_discount: month_6_discount
-         },
-         _renew?
-       )
-       when period == 6,
-       do: {:ok, round(total_price * month_6_discount)}
-
-  defp _calc_discount(
+  defp calc_discount(
          period,
          total_price,
          %{
@@ -186,9 +222,31 @@ defmodule WandererApp.Map.SubscriptionManager do
          },
          _renew?
        )
-       when period == 12,
+       when period >= 12,
        do: {:ok, round(total_price * month_12_discount)}
 
+  defp calc_discount(
+         period,
+         total_price,
+         %{
+           month_6_discount: month_6_discount
+         },
+         _renew?
+       )
+       when period >= 6,
+       do: {:ok, round(total_price * month_6_discount)}
+
+  defp calc_discount(
+         period,
+         total_price,
+         %{
+           month_3_discount: month_3_discount
+         },
+         _renew?
+       )
+       when period >= 3,
+       do: {:ok, round(total_price * month_3_discount)}
+
   def get_balance(map) do
     map
     |> WandererApp.MapRepo.load_relationships([
@@ -282,7 +340,7 @@ defmodule WandererApp.Map.SubscriptionManager do
                   end)
 
                 {:error, :no_active_subscription} ->
-                  Logger.warn(
+                  Logger.warning(
                     "Cannot create license for map #{map.id}: No active subscription found"
                   )
 

lib/wanderer_app/map/map_zkb_data_fetcher.ex

@@ -196,7 +196,7 @@ defmodule WandererApp.Map.ZkbDataFetcher do
     end
   end
 
-  defp with_started_map(map_id, label \\ "operation", fun) when is_function(fun, 0) do
+  defp with_started_map(map_id, label, fun) when is_function(fun, 0) do
     if WandererApp.Cache.lookup!("map_#{map_id}:started", false) do
       fun.()
     else

lib/wanderer_app/map/operations/connections.ex

@@ -0,0 +1,259 @@
+defmodule WandererApp.Map.Operations.Connections do
+  @moduledoc """
+  CRUD and batch upsert for map connections.
+  """
+
+  alias Ash.Error.Invalid
+  alias WandererApp.MapConnectionRepo
+  alias WandererApp.Map.Server
+  require Logger
+
+  @spec list_connections(String.t()) :: [map()] | {:error, atom()}
+  def list_connections(map_id) do
+    with {:ok, conns} <- MapConnectionRepo.get_by_map(map_id) do
+      conns
+    else
+      {:error, err} ->
+        Logger.warning("[list_connections] Repo error: #{inspect(err)}")
+        {:error, :repo_error}
+      other ->
+        Logger.error("[list_connections] Unexpected repo result: #{inspect(other)}")
+        {:error, :unexpected_repo_result}
+    end
+  end
+
+  @spec list_connections(String.t(), integer()) :: [map()]
+  def list_connections(map_id, system_id) do
+    list_connections(map_id)
+    |> Enum.filter(fn c ->
+      c.solar_system_source == system_id or c.solar_system_target == system_id
+    end)
+  end
+
+  @spec get_connection(String.t(), String.t()) :: {:ok, map()} | {:error, String.t()}
+  def get_connection(map_id, conn_id) do
+    case MapConnectionRepo.get_by_id(map_id, conn_id) do
+      {:ok, conn} -> {:ok, conn}
+      _ -> {:error, "Connection not found"}
+    end
+  end
+
+  @spec create_connection(Plug.Conn.t(), map()) :: {:ok, map()} | {:skip, :exists} | {:error, atom()}
+  def create_connection(%{assigns: %{map_id: map_id, owner_character_id: char_id}} = _conn, attrs) do
+    do_create(attrs, map_id, char_id)
+  end
+
+  def create_connection(map_id, attrs, char_id) do
+    do_create(attrs, map_id, char_id)
+  end
+
+  defp do_create(attrs, map_id, char_id) do
+    with {:ok, source} <- parse_int(attrs["solar_system_source"], "solar_system_source"),
+         {:ok, target} <- parse_int(attrs["solar_system_target"], "solar_system_target") do
+      info = %{
+        solar_system_source_id: source,
+        solar_system_target_id: target,
+        character_id: char_id,
+        type: parse_type(attrs["type"])
+      }
+      add_result = Server.add_connection(map_id, info)
+      case add_result do
+        :ok -> {:ok, :created}
+        {:ok, []} ->
+          Logger.warning("[do_create] Server.add_connection returned :ok, [] for map_id=#{inspect(map_id)}, source=#{inspect(source)}, target=#{inspect(target)}")
+          {:error, :inconsistent_state}
+        {:error, %Invalid{errors: errors}} = err ->
+          if Enum.any?(errors, &is_unique_constraint_error?/1), do: {:skip, :exists}, else: err
+        {:error, _} = err ->
+          Logger.error("[do_create] Server.add_connection error: #{inspect(err)}")
+          {:error, :server_error}
+        _ ->
+          Logger.error("[do_create] Unexpected add_result: #{inspect(add_result)}")
+          {:error, :unexpected_error}
+      end
+    else
+      {:ok, []} ->
+        Logger.warning("[do_create] Source or target system not found: attrs=#{inspect(attrs)}")
+        {:error, :inconsistent_state}
+      {:error, _} = err ->
+        Logger.error("[do_create] parse_int error: #{inspect(err)}, attrs=#{inspect(attrs)}")
+        {:error, :parse_error}
+      _ ->
+        Logger.error("[do_create] Unexpected error in preconditions: attrs=#{inspect(attrs)}")
+        {:error, :unexpected_precondition_error}
+    end
+  end
+
+  @spec update_connection(Plug.Conn.t(), String.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def update_connection(%{assigns: %{map_id: map_id, owner_character_id: char_id}} = _conn, conn_id, attrs) do
+    with {:ok, conn_struct} <- MapConnectionRepo.get_by_id(map_id, conn_id),
+         result <- (
+           try do
+             _allowed_keys = [
+               :mass_status,
+               :ship_size_type,
+               :type
+             ]
+             _update_map =
+               attrs
+               |> Enum.filter(fn {k, _v} -> k in ["mass_status", "ship_size_type", "type"] end)
+               |> Enum.map(fn {k, v} -> {String.to_atom(k), v} end)
+               |> Enum.into(%{})
+             res = apply_connection_updates(map_id, conn_struct, attrs, char_id)
+             res
+           rescue
+             error ->
+               Logger.error("[update_connection] Exception: #{inspect(error)}")
+               {:error, :exception}
+           end
+         ),
+         :ok <- result,
+         {:ok, updated_conn} <- MapConnectionRepo.get_by_id(map_id, conn_id) do
+      {:ok, updated_conn}
+    else
+      {:error, err} -> {:error, err}
+      _ -> {:error, :unexpected_error}
+    end
+  end
+  def update_connection(_conn, _conn_id, _attrs), do: {:error, :missing_params}
+
+  @spec delete_connection(Plug.Conn.t(), integer(), integer()) :: :ok | {:error, atom()}
+  def delete_connection(%{assigns: %{map_id: map_id}} = _conn, src, tgt) do
+    case Server.delete_connection(map_id, %{solar_system_source_id: src, solar_system_target_id: tgt}) do
+      :ok -> :ok
+      {:error, :not_found} ->
+        Logger.warning("[delete_connection] Connection not found: source=#{inspect(src)}, target=#{inspect(tgt)}")
+        {:error, :not_found}
+      {:error, _} = err ->
+        Logger.error("[delete_connection] Server error: #{inspect(err)}")
+        {:error, :server_error}
+      _ ->
+        Logger.error("[delete_connection] Unknown error")
+        {:error, :unknown}
+    end
+  end
+  def delete_connection(_conn, _src, _tgt), do: {:error, :missing_params}
+
+  @doc "Batch upsert for connections"
+  @spec upsert_batch(Plug.Conn.t(), [map()]) :: %{created: integer(), updated: integer(), skipped: integer()}
+  def upsert_batch(%{assigns: %{map_id: map_id, owner_character_id: char_id}} = conn, conns) do
+    _assigns = %{map_id: map_id, char_id: char_id}
+    Enum.reduce(conns, %{created: 0, updated: 0, skipped: 0}, fn conn_attrs, acc ->
+      case upsert_single(conn, conn_attrs) do
+        {:ok, :created} -> %{acc | created: acc.created + 1}
+        {:ok, :updated} -> %{acc | updated: acc.updated + 1}
+        _ -> %{acc | skipped: acc.skipped + 1}
+      end
+    end)
+  end
+  def upsert_batch(_conn, _conns), do: %{created: 0, updated: 0, skipped: 0}
+
+  @doc "Upsert a single connection"
+  @spec upsert_single(Plug.Conn.t(), map()) :: {:ok, :created | :updated} | {:error, atom()}
+  def upsert_single(%{assigns: %{map_id: map_id, owner_character_id: char_id}} = conn, conn_data) do
+    source = conn_data["solar_system_source"] || conn_data[:solar_system_source]
+    target = conn_data["solar_system_target"] || conn_data[:solar_system_target]
+    with {:ok, %{} = existing_conn} <- get_connection_by_systems(map_id, source, target),
+         {:ok, _} <- update_connection(conn, existing_conn.id, conn_data) do
+      {:ok, :updated}
+    else
+      {:ok, nil} ->
+        case create_connection(map_id, conn_data, char_id) do
+          {:ok, _} -> {:ok, :created}
+          {:skip, :exists} -> {:ok, :updated}
+          err -> {:error, err}
+        end
+      {:error, _} = err ->
+        Logger.warning("[upsert_single] Connection lookup error: #{inspect(err)}")
+        {:error, :lookup_error}
+      err ->
+        Logger.error("[upsert_single] Update failed: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+  def upsert_single(_conn, _conn_data), do: {:error, :missing_params}
+
+  @doc "Get a connection by source and target system IDs"
+  @spec get_connection_by_systems(String.t(), integer(), integer()) :: {:ok, map()} | {:error, String.t()}
+  def get_connection_by_systems(map_id, source, target) do
+    with {:ok, conn} <- WandererApp.Map.find_connection(map_id, source, target) do
+      if conn, do: {:ok, conn}, else: WandererApp.Map.find_connection(map_id, target, source)
+    else
+      {:error, reason} -> {:error, reason}
+    end
+  end
+
+  # -- Helpers ---------------------------------------------------------------
+
+  defp parse_int(val, _field) when is_integer(val), do: {:ok, val}
+  defp parse_int(val, field) when is_binary(val) do
+    case Integer.parse(val) do
+      {i, _} -> {:ok, i}
+      _ -> {:error, "Invalid #{field}: #{val}"}
+    end
+  end
+  defp parse_int(nil, field), do: {:error, "Missing #{field}"}
+  defp parse_int(val, field), do: {:error, "Invalid #{field} type: #{inspect(val)}"}
+
+  defp parse_type(val) when is_integer(val), do: val
+  defp parse_type(val) when is_binary(val) do
+    case Integer.parse(val) do
+      {i, _} -> i
+      _ -> 0
+    end
+  end
+  defp parse_type(_), do: 0
+
+  defp is_unique_constraint_error?(%{constraint: :unique}), do: true
+  defp is_unique_constraint_error?(%{constraint: :unique_constraint}), do: true
+  defp is_unique_constraint_error?(_), do: false
+
+  defp apply_connection_updates(map_id, conn, attrs, _char_id) do
+    Enum.reduce_while(attrs, :ok, fn {key, val}, _acc ->
+      result =
+        case key do
+          "mass_status" -> maybe_update_mass_status(map_id, conn, val)
+          "ship_size_type" -> maybe_update_ship_size_type(map_id, conn, val)
+          "type" -> maybe_update_type(map_id, conn, val)
+          _ -> :ok
+        end
+      if result == :ok do
+        {:cont, :ok}
+      else
+        {:halt, result}
+      end
+    end)
+    |> case do
+      :ok -> :ok
+      err -> err
+    end
+  end
+
+  defp maybe_update_mass_status(_map_id, _conn, nil), do: :ok
+  defp maybe_update_mass_status(map_id, conn, value) do
+    Server.update_connection_mass_status(map_id, %{
+      solar_system_source_id: conn.solar_system_source,
+      solar_system_target_id: conn.solar_system_target,
+      mass_status: value
+    })
+  end
+
+  defp maybe_update_ship_size_type(_map_id, _conn, nil), do: :ok
+  defp maybe_update_ship_size_type(map_id, conn, value) do
+    Server.update_connection_ship_size_type(map_id, %{
+      solar_system_source_id: conn.solar_system_source,
+      solar_system_target_id: conn.solar_system_target,
+      ship_size_type: value
+    })
+  end
+
+  defp maybe_update_type(_map_id, _conn, nil), do: :ok
+  defp maybe_update_type(map_id, conn, value) do
+    Server.update_connection_type(map_id, %{
+      solar_system_source_id: conn.solar_system_source,
+      solar_system_target_id: conn.solar_system_target,
+      type: value
+    })
+  end
+
+end

lib/wanderer_app/map/operations/owner.ex

@@ -0,0 +1,75 @@
+defmodule WandererApp.Map.Operations.Owner do
+  @moduledoc """
+  Handles fetching and caching of the main character info for a map owner.
+  """
+
+  # Cache TTL in milliseconds (24 hours)
+  @owner_info_cache_ttl 86_400_000
+
+  alias WandererApp.{
+    MapRepo,
+    MapCharacterSettingsRepo,
+    MapUserSettingsRepo,
+    Cache
+  }
+  alias WandererApp.Character
+  alias WandererApp.Character.TrackingUtils
+
+  @spec get_owner_character_id(String.t()) :: {:ok, %{id: term(), user_id: term()}} | {:error, String.t()}
+  def get_owner_character_id(map_id) do
+    cache_key = "map_#{map_id}:owner_info"
+
+    case Cache.lookup!(cache_key) do
+      nil ->
+        with {:ok, owner} <- fetch_map_owner(map_id),
+             {:ok, char_ids} <- fetch_character_ids(map_id),
+             {:ok, characters} <- load_characters(char_ids),
+             {:ok, user_settings} <- MapUserSettingsRepo.get(map_id, owner.id),
+             {:ok, main} <- TrackingUtils.get_main_character(user_settings, characters, characters) do
+          result = %{id: main.id, user_id: main.user_id}
+          Cache.insert(cache_key, result, ttl: @owner_info_cache_ttl)
+          {:ok, result}
+        else
+          {:error, msg} -> {:error, msg}
+          _ -> {:error, "Failed to resolve main character"}
+        end
+
+      cached ->
+        {:ok, cached}
+    end
+  end
+
+  defp fetch_map_owner(map_id) do
+    case MapRepo.get(map_id, [:owner]) do
+      {:ok, %{owner: %_{} = owner}} -> {:ok, owner}
+      {:ok, %{owner: nil}} -> {:error, "Map has no owner"}
+      {:error, _} -> {:error, "Map not found"}
+    end
+  end
+
+  defp fetch_character_ids(map_id) do
+    case MapCharacterSettingsRepo.get_all_by_map(map_id) do
+      {:ok, settings} when is_list(settings) and settings != [] ->
+        {:ok, Enum.map(settings, & &1.character_id)}
+
+      {:ok, []} ->
+        {:error, "No character settings found"}
+
+      {:error, _} ->
+        {:error, "Failed to fetch character settings"}
+    end
+  end
+
+  defp load_characters(ids) when is_list(ids) do
+    ids
+    |> Enum.map(&Character.get_character/1)
+    |> Enum.flat_map(fn
+      {:ok, ch} -> [ch]
+      _ -> []
+    end)
+    |> case do
+      [] -> {:error, "No valid characters found"}
+      chars -> {:ok, chars}
+    end
+  end
+end

lib/wanderer_app/map/operations/signatures.ex

@@ -0,0 +1,114 @@
+defmodule WandererApp.Map.Operations.Signatures do
+  @moduledoc """
+  CRUD for map signatures.
+  """
+
+  require Logger
+  alias WandererApp.Map.Operations
+  alias WandererApp.Api.{MapSystem, MapSystemSignature}
+  alias WandererApp.Map.Server
+
+  @spec list_signatures(String.t()) :: [map()]
+  def list_signatures(map_id) do
+    systems = Operations.list_systems(map_id)
+    if systems != [] do
+      systems
+      |> Enum.flat_map(fn sys ->
+        with {:ok, sigs} <- MapSystemSignature.by_system_id(sys.id) do
+          sigs
+        else
+          err ->
+            Logger.error("[list_signatures] error: #{inspect(err)}")
+            []
+        end
+      end)
+    else
+      []
+    end
+  end
+
+  @spec create_signature(Plug.Conn.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def create_signature(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, %{"solar_system_id" => _solar_system_id} = params) do
+    attrs = Map.put(params, "character_eve_id", char_id)
+    case Server.update_signatures(map_id, %{
+      added_signatures: [attrs],
+      updated_signatures: [],
+      removed_signatures: [],
+      solar_system_id: params["solar_system_id"],
+      character_id: char_id,
+      user_id: user_id,
+      delete_connection_with_sigs: false
+    }) do
+      :ok -> {:ok, attrs}
+      err ->
+        Logger.error("[create_signature] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def create_signature(_conn, _params), do: {:error, :missing_params}
+
+  @spec update_signature(Plug.Conn.t(), String.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def update_signature(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, sig_id, params) do
+    with {:ok, sig} <- MapSystemSignature.by_id(sig_id),
+         {:ok, system} <- MapSystem.by_id(sig.system_id) do
+      base = %{
+        "eve_id" => sig.eve_id,
+        "name" => sig.name,
+        "kind" => sig.kind,
+        "group" => sig.group,
+        "type" => sig.type,
+        "custom_info" => sig.custom_info,
+        "character_eve_id" => char_id,
+        "description" => sig.description,
+        "linked_system_id" => sig.linked_system_id
+      }
+      attrs = Map.merge(base, params)
+      :ok = Server.update_signatures(map_id, %{
+        added_signatures: [],
+        updated_signatures: [attrs],
+        removed_signatures: [],
+        solar_system_id: system.solar_system_id,
+        character_id: char_id,
+        user_id: user_id,
+        delete_connection_with_sigs: false
+      })
+      {:ok, attrs}
+    else
+      err ->
+        Logger.error("[update_signature] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def update_signature(_conn, _sig_id, _params), do: {:error, :missing_params}
+
+  @spec delete_signature(Plug.Conn.t(), String.t()) :: :ok | {:error, atom()}
+  def delete_signature(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, sig_id) do
+    with {:ok, sig} <- MapSystemSignature.by_id(sig_id),
+         {:ok, system} <- MapSystem.by_id(sig.system_id) do
+      removed = [%{
+        "eve_id" => sig.eve_id,
+        "name" => sig.name,
+        "kind" => sig.kind,
+        "group" => sig.group
+      }]
+      :ok = Server.update_signatures(map_id, %{
+        added_signatures: [],
+        updated_signatures: [],
+        removed_signatures: removed,
+        solar_system_id: system.solar_system_id,
+        character_id: char_id,
+        user_id: user_id,
+        delete_connection_with_sigs: false
+      })
+      :ok
+    else
+      err ->
+        Logger.error("[delete_signature] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def delete_signature(_conn, _sig_id), do: {:error, :missing_params}
+end

lib/wanderer_app/map/operations/structures.ex

@@ -0,0 +1,104 @@
+defmodule WandererApp.Map.Operations.Structures do
+  @moduledoc """
+  CRUD for map structures.
+  """
+
+  alias WandererApp.Map.Operations
+  alias WandererApp.Api.MapSystem
+  alias WandererApp.Api.MapSystemStructure
+  alias WandererApp.Structure
+  require Logger
+
+  @spec list_structures(String.t()) :: [map()]
+  def list_structures(map_id) do
+    with systems when is_list(systems) and systems != [] <- (
+           case Operations.list_systems(map_id) do
+             {:ok, systems} -> systems
+             systems when is_list(systems) -> systems
+             _ -> []
+           end
+         ) do
+      systems
+      |> Enum.flat_map(fn sys ->
+        with {:ok, structs} <- MapSystemStructure.by_system_id(sys.id) do
+          structs
+        else
+          _other -> []
+        end
+      end)
+    else
+      _ -> []
+    end
+  end
+
+  @spec create_structure(Plug.Conn.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def create_structure(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, %{"solar_system_id" => _solar_system_id} = params) do
+    with {:ok, system} <- MapSystem.read_by_map_and_solar_system(%{map_id: map_id, solar_system_id: params["solar_system_id"]}),
+         attrs <- Map.put(prepare_attrs(params), "system_id", system.id),
+         :ok <- Structure.update_structures(system, [attrs], [], [], char_id, user_id),
+         name = Map.get(attrs, "name"),
+         structure_type_id = Map.get(attrs, "structureTypeId"),
+         struct when not is_nil(struct) <-
+           MapSystemStructure.by_system_id!(system.id)
+           |> Enum.find(fn s -> s.name == name and s.structure_type_id == structure_type_id end) do
+      {:ok, struct}
+    else
+      nil ->
+        Logger.warning("[create_structure] Structure not found after creation")
+        {:error, :structure_not_found}
+      err ->
+        Logger.error("[create_structure] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def create_structure(_conn, _params), do: {:error, "missing params"}
+
+  @spec update_structure(Plug.Conn.t(), String.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def update_structure(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, struct_id, params) do
+    with {:ok, struct} <- MapSystemStructure.by_id(struct_id),
+         {:ok, system} <- MapSystem.read_by_map_and_solar_system(%{map_id: map_id, solar_system_id: struct.solar_system_id}) do
+      attrs = Map.merge(prepare_attrs(params), %{"id" => struct_id})
+      :ok = Structure.update_structures(system, [], [attrs], [], char_id, user_id)
+      case MapSystemStructure.by_id(struct_id) do
+        {:ok, updated} -> {:ok, updated}
+        err ->
+          Logger.error("[update_structure] Unexpected error: #{inspect(err)}")
+          {:error, :unexpected_error}
+      end
+    else
+      err ->
+        Logger.error("[update_structure] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def update_structure(_conn, _struct_id, _params), do: {:error, "missing params"}
+
+  @spec delete_structure(Plug.Conn.t(), String.t()) :: :ok | {:error, atom()}
+  def delete_structure(%{assigns: %{map_id: _map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, struct_id) do
+    with {:ok, struct} <- MapSystemStructure.by_id(struct_id),
+         {:ok, system} <- MapSystem.by_id(struct.system_id) do
+      :ok = Structure.update_structures(system, [], [], [%{"id" => struct_id}], char_id, user_id)
+      :ok
+    else
+      err ->
+        Logger.error("[delete_structure] Unexpected error: #{inspect(err)}")
+        {:error, :unexpected_error}
+    end
+  end
+
+  def delete_structure(_conn, _struct_id), do: {:error, "missing params"}
+
+  defp prepare_attrs(params) do
+    params
+    |> Enum.map(fn
+      {"structure_type", v} -> {"structureType", v}
+      {"structure_type_id", v} -> {"structureTypeId", v}
+      {"end_time", v} -> {"endTime", v}
+      {k, v} -> {k, v}
+    end)
+    |> Map.new()
+    |> Map.take(["name", "structureType", "structureTypeId", "status", "notes", "endTime"])
+  end
+end

lib/wanderer_app/map/operations/systems.ex

@@ -0,0 +1,195 @@
+defmodule WandererApp.Map.Operations.Systems do
+  @moduledoc """
+  CRUD and batch upsert for map systems.
+  """
+
+  alias WandererApp.MapSystemRepo
+  alias WandererApp.Map.Server
+  alias WandererApp.Map.Operations.Connections
+  require Logger
+
+  @spec list_systems(String.t()) :: [map()]
+  def list_systems(map_id) do
+    with {:ok, systems} <- MapSystemRepo.get_visible_by_map(map_id) do
+      systems
+    else
+      _ -> []
+    end
+  end
+
+  @spec get_system(String.t(), integer()) :: {:ok, map()} | {:error, :not_found}
+  def get_system(map_id, system_id) do
+    MapSystemRepo.get_by_map_and_solar_system_id(map_id, system_id)
+  end
+
+  @spec create_system(Plug.Conn.t(), map()) :: {:ok, map()} | {:error, atom()}
+  def create_system(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, params) do
+    do_create_system(map_id, user_id, char_id, params)
+  end
+  def create_system(_conn, _params), do: {:error, :missing_params}
+
+  # Private helper for batch upsert
+  defp create_system_batch(%{map_id: map_id, user_id: user_id, char_id: char_id}, params) do
+    do_create_system(map_id, user_id, char_id, params)
+  end
+
+  defp do_create_system(map_id, user_id, char_id, params) do
+    with {:ok, system_id} <- fetch_system_id(params),
+         coords <- normalize_coordinates(params),
+         :ok <- Server.add_system(map_id, %{solar_system_id: system_id, coordinates: coords}, user_id, char_id),
+         {:ok, system} <- MapSystemRepo.get_by_map_and_solar_system_id(map_id, system_id) do
+      {:ok, system}
+    else
+      {:error, reason} when is_binary(reason) ->
+        Logger.warning("[do_create_system] Expected error: #{inspect(reason)}")
+        {:error, :expected_error}
+      _ ->
+        Logger.error("[do_create_system] Unexpected error")
+        {:error, :unexpected_error}
+    end
+  end
+
+  @spec update_system(Plug.Conn.t(), integer(), map()) :: {:ok, map()} | {:error, atom()}
+  def update_system(%{assigns: %{map_id: map_id}} = _conn, system_id, attrs) do
+    with {:ok, current} <- MapSystemRepo.get_by_map_and_solar_system_id(map_id, system_id),
+         x_raw <- Map.get(attrs, "position_x", Map.get(attrs, :position_x, current.position_x)),
+         y_raw <- Map.get(attrs, "position_y", Map.get(attrs, :position_y, current.position_y)),
+         {:ok, x} <- parse_int(x_raw, "position_x"),
+         {:ok, y} <- parse_int(y_raw, "position_y"),
+         coords = %{x: x, y: y},
+         :ok <- apply_system_updates(map_id, system_id, attrs, coords),
+         {:ok, system} <- MapSystemRepo.get_by_map_and_solar_system_id(map_id, system_id) do
+      {:ok, system}
+    else
+      {:error, reason} when is_binary(reason) ->
+        Logger.warning("[update_system] Expected error: #{inspect(reason)}")
+        {:error, :expected_error}
+      _ ->
+        Logger.error("[update_system] Unexpected error")
+        {:error, :unexpected_error}
+    end
+  end
+  def update_system(_conn, _system_id, _attrs), do: {:error, :missing_params}
+
+  @spec delete_system(Plug.Conn.t(), integer()) :: {:ok, integer()} | {:error, atom()}
+  def delete_system(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = _conn, system_id) do
+    with {:ok, _} <- MapSystemRepo.get_by_map_and_solar_system_id(map_id, system_id),
+         :ok <- Server.delete_systems(map_id, [system_id], user_id, char_id) do
+      {:ok, 1}
+    else
+      {:error, :not_found} ->
+        Logger.warning("[delete_system] System not found: #{inspect(system_id)}")
+        {:error, :not_found}
+      _ ->
+        Logger.error("[delete_system] Unexpected error")
+        {:error, :unexpected_error}
+    end
+  end
+  def delete_system(_conn, _system_id), do: {:error, :missing_params}
+
+  @spec upsert_systems_and_connections(Plug.Conn.t(), [map()], [map()]) :: {:ok, map()} | {:error, atom()}
+  def upsert_systems_and_connections(%{assigns: %{map_id: map_id, owner_character_id: char_id, owner_user_id: user_id}} = conn, systems, connections) do
+    assigns = %{map_id: map_id, user_id: user_id, char_id: char_id}
+    {created_s, updated_s, _skipped_s} = upsert_each(systems, fn sys -> create_system_batch(assigns, sys) end, 0, 0, 0)
+    conn_results =
+      connections
+      |> Enum.reduce(%{created: 0, updated: 0, skipped: 0}, fn conn_data, acc ->
+        case Connections.upsert_single(conn, conn_data) do
+          {:ok, :created} -> %{acc | created: acc.created + 1}
+          {:ok, :updated} -> %{acc | updated: acc.updated + 1}
+          _ -> %{acc | skipped: acc.skipped + 1}
+        end
+      end)
+    {:ok, %{
+      systems: %{created: created_s, updated: updated_s},
+      connections: %{created: conn_results.created, updated: conn_results.updated}
+    }}
+  end
+  def upsert_systems_and_connections(_conn, _systems, _connections), do: {:error, :missing_params}
+
+  # -- Internal Helpers -------------------------------------------------------
+
+  defp fetch_system_id(%{"solar_system_id" => id}), do: parse_int(id, "solar_system_id")
+  defp fetch_system_id(%{solar_system_id: id}) when not is_nil(id), do: parse_int(id, "solar_system_id")
+  defp fetch_system_id(_), do: {:error, "Missing system identifier (id)"}
+
+  defp parse_int(val, _field) when is_integer(val), do: {:ok, val}
+  defp parse_int(val, field) when is_binary(val) do
+    case Integer.parse(val) do
+      {i, _} -> {:ok, i}
+      _ -> {:error, "Invalid #{field}: #{val}"}
+    end
+  end
+  defp parse_int(nil, field), do: {:error, "Missing #{field}"}
+  defp parse_int(val, field), do: {:error, "Invalid #{field} type: #{inspect(val)}"}
+
+  defp normalize_coordinates(%{"coordinates" => %{"x" => x, "y" => y}}) when is_number(x) and is_number(y),
+    do: %{x: x, y: y}
+  defp normalize_coordinates(%{coordinates: %{x: x, y: y}}) when is_number(x) and is_number(y),
+    do: %{x: x, y: y}
+  defp normalize_coordinates(params) do
+    %{
+      x: params |> Map.get("position_x", Map.get(params, :position_x, 0)),
+      y: params |> Map.get("position_y", Map.get(params, :position_y, 0))
+    }
+  end
+
+  defp apply_system_updates(map_id, system_id, attrs, %{x: x, y: y}) do
+    with :ok <- Server.update_system_position(map_id, %{solar_system_id: system_id, position_x: round(x), position_y: round(y)}) do
+      attrs
+      |> Map.drop([:coordinates, :position_x, :position_y, :solar_system_id,
+                   "coordinates", "position_x", "position_y", "solar_system_id"])
+      |> Enum.reduce_while(:ok, fn {key, val}, _ ->
+        case update_system_field(map_id, system_id, to_string(key), val) do
+          :ok -> {:cont, :ok}
+          err -> {:halt, err}
+        end
+      end)
+    end
+  end
+
+  defp update_system_field(map_id, system_id, field, val) do
+    case field do
+      "status" -> Server.update_system_status(map_id, %{solar_system_id: system_id, status: convert_status(val)})
+      "description" -> Server.update_system_description(map_id, %{solar_system_id: system_id, description: val})
+      "tag" -> Server.update_system_tag(map_id, %{solar_system_id: system_id, tag: val})
+      "locked" ->
+        bool = val in [true, "true", 1, "1"]
+        Server.update_system_locked(map_id, %{solar_system_id: system_id, locked: bool})
+      f when f in ["label", "labels"] ->
+        labels = cond do
+          is_list(val) -> val
+          is_binary(val) -> String.split(val, ",", trim: true)
+          true -> []
+        end
+        Server.update_system_labels(map_id, %{solar_system_id: system_id, labels: Enum.join(labels, ",")})
+      "temporary_name" -> Server.update_system_temporary_name(map_id, %{solar_system_id: system_id, temporary_name: val})
+      _ -> :ok
+    end
+  end
+
+  defp convert_status("CLEAR"), do: 0
+  defp convert_status("DANGEROUS"), do: 1
+  defp convert_status("OCCUPIED"), do: 2
+  defp convert_status("MASS_CRITICAL"), do: 3
+  defp convert_status("TIME_CRITICAL"), do: 4
+  defp convert_status("REINFORCED"), do: 5
+  defp convert_status(i) when is_integer(i), do: i
+  defp convert_status(s) when is_binary(s) do
+    case Integer.parse(s) do
+      {i, _} -> i
+      _ -> 0
+    end
+  end
+  defp convert_status(_), do: 0
+
+  defp upsert_each([], _fun, c, u, d), do: {c, u, d}
+  defp upsert_each([item | rest], fun, c, u, d) do
+    case fun.(item) do
+      {:ok, _} -> upsert_each(rest, fun, c + 1, u, d)
+      :ok -> upsert_each(rest, fun, c + 1, u, d)
+      {:skip, _} -> upsert_each(rest, fun, c, u + 1, d)
+      _ -> upsert_each(rest, fun, c, u, d + 1)
+    end
+  end
+end

lib/wanderer_app/map/server/map_server_connections_impl.ex

@@ -87,14 +87,11 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
         :timer.minutes(get_eol_expire_timeout_mins())
 
   def init_eol_cache(map_id, connections_eol_time) do
-    eol_expire_timeout = get_eol_expire_timeout()
-
     connections_eol_time
     |> Enum.each(fn {connection_id, connection_eol_time} ->
       WandererApp.Cache.put(
         "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
-        connection_eol_time,
-        ttl: eol_expire_timeout
+        connection_eol_time
       )
     end)
   end
@@ -178,8 +175,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
               true ->
                 WandererApp.Cache.put(
                   "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
-                  DateTime.utc_now(),
-                  ttl: get_eol_expire_timeout()
+                  DateTime.utc_now()
                 )
 
               _ ->

lib/wanderer_app/map/server/map_server_signatures_impl.ex

@@ -119,6 +119,12 @@ defmodule WandererApp.Map.Server.SignaturesImpl do
     end
   end
 
+  def update_signatures(
+        state,
+        _signatures_update
+      ),
+      do: state
+
   defp parse_signatures(signatures, character_eve_id, system_id),
     do:
       signatures

lib/wanderer_app/map/server/map_server_systems_impl.ex

@@ -266,31 +266,32 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       |> Enum.filter(fn system -> not is_nil(system) && not system.locked end)
       |> Enum.map(&{&1.solar_system_id, &1.id})
 
-    solar_system_ids_to_remove =
-      filtered_ids
-      |> Enum.map(fn {solar_system_id, _} -> solar_system_id end)
-
-    system_ids_to_remove =
-      filtered_ids
-      |> Enum.map(fn {_, system_id} -> system_id end)
-
-    connections_to_remove =
-      solar_system_ids_to_remove
-      |> Enum.map(fn solar_system_id ->
-        WandererApp.Map.find_connections(map_id, solar_system_id)
-      end)
-      |> List.flatten()
-      |> Enum.uniq_by(& &1.id)
-
-    :ok = WandererApp.Map.remove_connections(map_id, connections_to_remove)
-    :ok = WandererApp.Map.remove_systems(map_id, solar_system_ids_to_remove)
-
-    solar_system_ids_to_remove
-    |> Enum.each(fn solar_system_id ->
+    filtered_ids
+    |> Enum.each(fn {solar_system_id, system_id} ->
       map_id
       |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id)
       |> case do
         {:ok, _} ->
+          :ok = WandererApp.Map.remove_system(map_id, solar_system_id)
+          @ddrt.delete([solar_system_id], rtree_name)
+          Impl.broadcast!(map_id, :systems_removed, [solar_system_id])
+          track_systems_removed(map_id, user_id, character_id, [solar_system_id])
+          remove_system_connections(map_id, [solar_system_id])
+
+          try do
+            cleanup_linked_signatures(map_id, [solar_system_id])
+          rescue
+            e ->
+              Logger.error("Failed to cleanup linked signature: #{inspect(e)}")
+          end
+
+          try do
+            cleanup_linked_system_sig_eve_ids(state, [system_id])
+          rescue
+            e ->
+              Logger.error("Failed to cleanup system linked sig eve ids: #{inspect(e)}")
+          end
+
           :ok
 
         {:error, error} ->
@@ -299,25 +300,68 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       end
     end)
 
+    state
+  end
+
+  defp track_systems_removed(map_id, user_id, character_id, removed_solar_system_ids)
+       when not is_nil(user_id) and not is_nil(character_id) do
+    WandererApp.User.ActivityTracker.track_map_event(:systems_removed, %{
+      character_id: character_id,
+      user_id: user_id,
+      map_id: map_id,
+      solar_system_ids: removed_solar_system_ids
+    })
+    |> case do
+      {:ok, _} -> :ok
+      error -> Logger.error("Failed to track systems removed: #{inspect(error)}")
+    end
+  end
+
+  defp track_systems_removed(_map_id, _user_id, _character_id, _removed_solar_system_ids), do: :ok
+
+  defp remove_system_connections(map_id, solar_system_ids_to_remove) do
+    connections_to_remove =
+      solar_system_ids_to_remove
+      |> Enum.map(fn solar_system_id ->
+        WandererApp.Map.find_connections(map_id, solar_system_id)
+      end)
+      |> List.flatten()
+      |> Enum.uniq_by(& &1.id)
+
     connections_to_remove
     |> Enum.each(fn connection ->
-      Logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
-      WandererApp.MapConnectionRepo.destroy(map_id, connection)
+      try do
+        Logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
+        :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
+        :ok = WandererApp.Map.remove_connection(map_id, connection)
+        Impl.broadcast!(map_id, :remove_connections, [connection])
+      rescue
+        e ->
+          Logger.error("Failed to remove connection: #{inspect(e)}")
+      end
     end)
+  end
 
-    solar_system_ids_to_remove
+  defp cleanup_linked_signatures(map_id, removed_solar_system_ids) do
+    removed_solar_system_ids
     |> Enum.map(fn solar_system_id ->
       WandererApp.Api.MapSystemSignature.by_linked_system_id!(solar_system_id)
     end)
     |> List.flatten()
     |> Enum.uniq_by(& &1.system_id)
     |> Enum.each(fn s ->
-      {:ok, %{system: system}} = s |> Ash.load([:system])
-      Ash.destroy!(s)
-
-      Impl.broadcast!(map_id, :signatures_updated, system.solar_system_id)
+      try do
+        {:ok, %{system: system}} = s |> Ash.load([:system])
+        :ok = Ash.destroy!(s)
+        Impl.broadcast!(map_id, :signatures_updated, system.solar_system_id)
+      rescue
+        e ->
+          Logger.error("Failed to cleanup linked signature: #{inspect(e)}")
+      end
     end)
+  end
 
+  defp cleanup_linked_system_sig_eve_ids(state, system_ids_to_remove) do
     linked_system_ids =
       system_ids_to_remove
       |> Enum.map(fn system_id ->
@@ -335,34 +379,6 @@ defmodule WandererApp.Map.Server.SystemsImpl do
         linked_sig_eve_id: nil
       })
     end)
-
-    @ddrt.delete(solar_system_ids_to_remove, rtree_name)
-
-    Impl.broadcast!(map_id, :remove_connections, connections_to_remove)
-    Impl.broadcast!(map_id, :systems_removed, solar_system_ids_to_remove)
-
-    case not is_nil(user_id) do
-      true ->
-        {:ok, _} =
-          WandererApp.User.ActivityTracker.track_map_event(:systems_removed, %{
-            character_id: character_id,
-            user_id: user_id,
-            map_id: map_id,
-            solar_system_ids: solar_system_ids_to_remove
-          })
-
-        :telemetry.execute(
-          [:wanderer_app, :map, :systems, :remove],
-          %{count: solar_system_ids_to_remove |> Enum.count()}
-        )
-
-        :ok
-
-      _ ->
-        :ok
-    end
-
-    state
   end
 
   def maybe_add_system(map_id, location, old_location, rtree_name, map_opts)

lib/wanderer_app/repositories/map_connection_repo.ex

@@ -95,4 +95,12 @@ defmodule WandererApp.MapConnectionRepo do
     do:
       connection
       |> WandererApp.Api.MapConnection.update_custom_info(update)
+
+  def get_by_id(map_id, id) do
+    case WandererApp.Api.MapConnection.by_id(id) do
+      {:ok, conn} when conn.map_id == map_id -> {:ok, conn}
+      {:ok, _} -> {:error, :not_found}
+      {:error, _} -> {:error, :not_found}
+    end
+  end
 end

lib/wanderer_app/repositories/map_user_settings_repo.ex

@@ -48,6 +48,33 @@ defmodule WandererApp.MapUserSettingsRepo do
     end
   end
 
+  def get_hubs(map_id, user_id) do
+    case WandererApp.MapUserSettingsRepo.get(map_id, user_id) do
+      {:ok, user_settings} when not is_nil(user_settings) ->
+        {:ok, Map.get(user_settings, :hubs, [])}
+
+      _ ->
+        {:ok, []}
+    end
+  end
+
+  def update_hubs(map_id, user_id, hubs) do
+    get!(map_id, user_id)
+    |> case do
+      user_settings when not is_nil(user_settings) ->
+        user_settings
+        |> WandererApp.Api.MapUserSettings.update_hubs(%{hubs: hubs})
+
+      _ ->
+        WandererApp.Api.MapUserSettings.create!(%{
+          map_id: map_id,
+          user_id: user_id,
+          settings: @default_form_data |> Jason.encode!()
+        })
+        |> WandererApp.Api.MapUserSettings.update_hubs(%{hubs: hubs})
+    end
+  end
+
   def to_form_data(nil), do: {:ok, @default_form_data}
   def to_form_data(%{settings: settings} = _user_settings), do: {:ok, Jason.decode!(settings)}
 

lib/wanderer_app/structures.ex

@@ -7,7 +7,8 @@ defmodule WandererApp.Structure do
   alias WandererApp.Api.MapSystemStructure
   alias WandererApp.Character
 
-  def update_structures(system, added, updated, removed, main_character_eve_id) do
+  def update_structures(system, added, updated, removed, main_character_eve_id, user_id \\ nil) do
+    Logger.info("[Structure] update_structures called by user_id=#{inspect(user_id)}")
     added_structs =
       parse_structures(added, main_character_eve_id, system)
       |> Enum.map(&Map.delete(&1, :id))
@@ -105,7 +106,28 @@ defmodule WandererApp.Structure do
           # remove PK so Ash doesn't treat it as a new record
           updated_data = Map.delete(updated_data, :id)
 
-          new_record = MapSystemStructure.update(existing, updated_data)
+          # Merge update data with existing record to avoid nil required fields
+          merged_data = Map.merge(Map.from_struct(existing), updated_data, fn _k, v1, v2 -> if is_nil(v2), do: v1, else: v2 end)
+          # Only keep fields accepted by Ash update action
+          allowed_keys = [
+            :system_id,
+            :solar_system_name,
+            :solar_system_id,
+            :structure_type_id,
+            :structure_type,
+            :character_eve_id,
+            :name,
+            :notes,
+            :owner_name,
+            :owner_ticker,
+            :owner_id,
+            :status,
+            :end_time
+          ]
+          filtered_data = Map.take(merged_data, allowed_keys)
+          Logger.info("[Structure] update_structures_in_db: calling update for id=#{existing.id} with: #{inspect(filtered_data)}")
+          new_record = MapSystemStructure.update(existing, filtered_data)
+          Logger.info("[Structure] update_structures_in_db: update result for id=#{existing.id}: #{inspect(new_record)}")
 
           Logger.debug(fn ->
             "[Structure] updated record =>\n" <> inspect(new_record, pretty: true)

lib/wanderer_app/zkb/zkb_kills_preloader.ex

@@ -162,7 +162,7 @@ defmodule WandererApp.Zkb.KillsPreloader do
       "[KillsPreloader] Starting #{pass_type} pass => #{length(unique_systems)} systems"
     )
 
-    {final_state, kills_map} =
+    {final_state, _kills_map} =
       unique_systems
       |> Task.async_stream(
         fn {_map_id, system_id} ->