Skip to content

Commit

Permalink
Navigation Panel now updates data after scans
Browse files Browse the repository at this point in the history 
Adding a timestamp to the server response controls when the panel redraws, so that now it updates anytime there is new metadata for a system or any body in it
  • Loading branch information
@iaincollins
iaincollins committed Jan 29, 2023
1 parent ff1337c commit fba352c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
22 changes: 6 additions & 16 deletions src/client/components/panels/nav/navigation-inspector-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { SPACE_STATIONS, SURFACE_PORTS, PLANETARY_BASES, MEGASHIPS, SOL_RADIUS_I
import { kelvinToCelius, kelvinToFahrenheit } from 'lib/convert'
import CopyOnClick from 'components/copy-on-click'

export default function NavigationInspectorPanel ({ systemObject, setSystemObjectByName }) {
export default function NavigationInspectorPanel ({ cacheTimestamp, systemObject, setSystemObjectByName }) {
if (!systemObject) return <div className='navigation-panel__inspector navigation-panel__inspector--hidden' />

const isLandable = systemObject.isLandable || SPACE_STATIONS.concat(MEGASHIPS).includes(systemObject.type) || PLANETARY_BASES.includes(systemObject.type)
Expand Down Expand Up @@ -80,14 +80,12 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{(systemObject.distanceToArrival && systemObject.distanceToArrival > 0) === true &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Distance from arrival</h4>

<p className='text-info'>{systemObject.distanceToArrival.toLocaleString(undefined, { maximumFractionDigits: 0 })} Ls</p>
</div>}

{systemObject.type === 'Star' &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Stellar Properties</h4>

{systemObject.isScoopable ? <p className='text-info'>Main Sequence (Fuel Star)</p> : <p className='text-info text-muted'>Not Scoopable</p>}
{systemObject.spectralClass && <p className='text-info'>Class {systemObject.spectralClass} Star </p>}
<p className='text-info'>Luminosity {systemObject.luminosity}</p>
Expand All @@ -99,16 +97,15 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.type === 'Planet' &&
<>
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Environment</h4>

<h4 className='text-prmary'>Environment</h4>
{isLandable ? <p className='text-info'>Landable</p> : <p className='text-muted'>Not Landable</p>}
{systemObject.gravity ? <p className='text-info'>Gravity {systemObject.gravity.toFixed(1)}g</p> : null}
{systemObject.radius && <p className='text-info'>Radius {systemObject.radius.toLocaleString(undefined, { maximumFractionDigits: 0 })} Km</p>}
{systemObject.surfaceTemperature &&
<p className='text-info'>
Temperature {systemObject.surfaceTemperature}K
({kelvinToCelius(systemObject.surfaceTemperature)}C/{kelvinToFahrenheit(systemObject.surfaceTemperature)}F)
</p>}
{systemObject.radius && <p className='text-info'>Radius {systemObject.radius.toLocaleString(undefined, { maximumFractionDigits: 0 })} Km</p>}
{systemObject.terraformingState && systemObject.terraformingState !== 'Not terraformable' && <p className='text-info'>{systemObject.terraformingState}</p>}
{systemObject.volcanismType !== 'No volcanism' ? <p className='text-info'>{systemObject.volcanismType}</p> : null}
{systemObject?.signals?.biological === 1 &&
Expand All @@ -120,12 +117,14 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.biologicalGenuses && <ul className='text-info'>
{systemObject.biologicalGenuses.map(genus => <li key={`navigation-inspector_${systemObject.id}_bio-signal_${genus}`}>{genus}</li>)}
</ul>}
{systemObject?.signals?.biological > 0 && !systemObject?.biologicalGenuses && <ul className='text-info'>
<li className='text-muted'>Unknown Species</li>
</ul>}
</div>

{surfacePorts.length > 0 &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Ports</h4>

<div className='text-info'>
{surfacePorts.map(base => (
<p key={`navigation-inspector_${systemObject.id}_${base.id}`} className='text-link text-no-wrap' onClick={() => setSystemObjectByName(base.name)}>
Expand All @@ -139,7 +138,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{settlements.length > 0 &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Settlements</h4>

<div className='text-info'>
{settlements.map(base => (
<p key={`navigation-inspector_${systemObject.id}_${base.id}`} className='text-link text-no-wrap' onClick={() => setSystemObjectByName(base.name)}>
Expand All @@ -153,7 +151,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.atmosphereComposition &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Atmosphere</h4>

{systemObject.atmosphereType && systemObject.atmosphereType !== 'No atmosphere' ? <p className='text-info'>{systemObject.atmosphereType}</p> : null}
{systemObject.surfacePressure ? <p className='text-info'>Pressure {parseFloat(systemObject.surfacePressure.toFixed(3))} atm</p> : null}
<ul className='text-info'>
Expand All @@ -167,7 +164,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec

<p className='text-muted'>No Atmosphere</p>
</div>}

{systemObject.solidComposition &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Material Composition</h4>
Expand All @@ -181,7 +177,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.materials &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Chemicals &amp; Minerals</h4>

<ul className='text-info'>
{Object.entries(systemObject.materials).map(e => <li key={`navigation-inspector_${systemObject.id}_material_${e[0]}}`}>{e[0]} ({e[1]}%)</li>)}
</ul>
Expand All @@ -190,7 +185,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.rings &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Rings</h4>

{systemObject.reserveLevel && <p className='text-info'>{systemObject.reserveLevel} Reserves</p>}
<ul className='text-info'>
{systemObject.rings.map((ring, i) => <li key={`navigation-inspector_${systemObject.id}_rings_${i}}`}>{ring.name} ({ring.type})</li>)}
Expand All @@ -200,7 +194,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{(systemObjectSubType === 'Settlement' || systemObjectSubType === 'Planetary Port') && systemObject.body &&
<div className='navigation-panel__inspector-section navigation-panel__inspector-section--location'>
<h4 className='text-primary'>Location</h4>

<p className='text-info text-link text-no-wrap' onClick={() => setSystemObjectByName(systemObject.body.name)}>
<i className='icon icarus-terminal-planet' /> <span className='text-link-text text-no-wrap'>{systemObject.body.name}</span>
</p>
Expand All @@ -222,7 +215,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject.economy &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Economy</h4>

<p className='text-info'>
{systemObject.economy}
</p>
Expand All @@ -235,7 +227,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject._shipServices && systemObject._shipServices.length > 0 &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Ship Services</h4>

<ul className='text-info'>
{systemObject._shipServices.map((service, i) => <li key={`navigation-inspector_${systemObject.id}_service_${service}_${i}`}>{service}</li>)}
</ul>
Expand All @@ -244,7 +235,6 @@ export default function NavigationInspectorPanel ({ systemObject, setSystemObjec
{systemObject._otherServices && systemObject._otherServices.length > 0 &&
<div className='navigation-panel__inspector-section'>
<h4 className='text-primary'>Other Services</h4>

<ul className='text-info'>
{systemObject._otherServices.map((service, i) => <li key={`navigation-inspector_${systemObject.id}_other-service_${service}_${i}`}>{service}</li>)}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/client/pages/nav/list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ export default function NavListPage () {
</div>
<Layout connected={connected} active={active} ready={ready} loader={!componentReady}>
<Panel layout='full-width' navigation={NavPanelNavItems('List', query)} search={search} exit={system?.isCurrentLocation === false ? () => getSystem() : null}>
<NavigationListPanel system={system} systemObject={systemObject} setSystemObject={setSystemObject} showHelp={() => setHelpVisible(true)} />
<NavigationInspectorPanel systemObject={systemObject} setSystemObjectByName={setSystemObjectByName} />
<NavigationListPanel cacheTimestamp={system?._cacheTimestamp} system={system} systemObject={systemObject} setSystemObject={setSystemObject} showHelp={() => setHelpVisible(true)} />
<NavigationInspectorPanel cacheTimestamp={system?._cacheTimestamp} systemObject={systemObject} setSystemObjectByName={setSystemObjectByName} />
</Panel>
</Layout>
</>
Expand Down
4 changes: 2 additions & 2 deletions src/client/pages/nav/map.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ export default function NavMapPage () {
return (
<Layout connected={connected} active={active} ready={ready} loader={!componentReady}>
<Panel layout='full-width' navigation={NavPanelNavItems('Map', query)} search={search} exit={system?.isCurrentLocation === false ? () => getSystem() : null}>
<NavigationSystemMapPanel system={system} systemObject={systemObject} setSystemObject={setSystemObject} getSystem={getSystem} cmdrStatus={cmdrStatus} />
<NavigationInspectorPanel systemObject={systemObject} setSystemObjectByName={setSystemObjectByName} />
<NavigationSystemMapPanel cacheTimestamp={system?._cacheTimestamp} system={system} systemObject={systemObject} setSystemObject={setSystemObject} getSystem={getSystem} cmdrStatus={cmdrStatus} />
<NavigationInspectorPanel cacheTimestamp={system?._cacheTimestamp} systemObject={systemObject} setSystemObjectByName={setSystemObjectByName} />
</Panel>
</Layout>
)
Expand Down
9 changes: 6 additions & 3 deletions src/service/lib/event-handlers/system.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ class System {
name: systemName,
unknownSystem: true,
isCurrentLocation,
scanPercentComplete
scanPercentComplete,
_cacheTimestamp: new Date().toISOString()
}

if (isCurrentLocation && currentLocation?.position && currentLocation?.address) {
Expand All @@ -203,7 +204,8 @@ class System {
...currentLocation,
distance: 0,
isCurrentLocation: true,
scanPercentComplete
scanPercentComplete,
_cacheTimestamp: new Date().toISOString()
}

} else {
Expand All @@ -212,7 +214,8 @@ class System {
...cacheResponse,
distance: distance(cacheResponse?.position, currentLocation?.position),
isCurrentLocation: false,
scanPercentComplete
scanPercentComplete,
_cacheTimestamp: new Date().toISOString()
}
}
}
Expand Down

0 comments on commit fba352c

Please sign in to comment.