Skip to content

Commit

Permalink
fix: ⚡ fix long loop through markers looking for satellites
Browse files Browse the repository at this point in the history
  • Loading branch information
@thkruz
thkruz committed Aug 5, 2024
1 parent f7748f4 commit 53f1f3d
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 45 deletions.
1 change: 1 addition & 0 deletions public/css/responsive-sm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
width: 100%;
}

#timeline-sensor-list,
#multi-site-look-angles-sensor-list {
display: grid;
justify-content: space-evenly;
Expand Down
45 changes: 23 additions & 22 deletions src/plugins/select-sat-manager/sat-info-box.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ export class SatInfoBox extends KeepTrackPlugin {
const posZmax = pos.z + distance;

(<HTMLInputElement>getEl('search')).value = '';
for (let i = 0; i < catalogManagerInstance.numSats; i++) {
for (let i = 0; i < catalogManagerInstance.numSatellites; i++) {
pos = catalogManagerInstance.getObject(i, GetSatType.POSITION_ONLY).position;
if (pos.x < posXmax && pos.x > posXmin && pos.y < posYmax && pos.y > posYmin && pos.z < posZmax && pos.z > posZmin) {
SCCs.push(catalogManagerInstance.getSat(i, GetSatType.EXTRA_ONLY).sccNum);
Expand Down Expand Up @@ -1173,41 +1173,42 @@ export class SatInfoBox extends KeepTrackPlugin {
}

const similarVmag = [];

keepTrackApi.getCatalogManager().objectCache.forEach((posObj) => {
if (!posObj.isSatellite()) {
return;
} // Only look at satellites
const posSat = posObj as DetailedSatellite;

if (obj.type !== posSat.type) {
const catalogManager = keepTrackApi.getCatalogManager();
const curSatType = obj.type;
const curSatId = obj.id;
const curSatCountry = obj.country;
const curSatName = obj.name.toLowerCase();

catalogManager.getSats().forEach((posSat) => {
if (!posSat.vmag) {
return;
} // Only look at same type of curSat
if (obj.id === posSat.id) {
}
if (curSatCountry !== posSat.country) {
// Only look at same country
return;
} // Don't look at the same curSat
if (obj.country !== posSat.country) {
}
if (curSatType !== posSat.type) {
// Only look at same type of curSat
return;
} // Only look at same country

if (posSat.vmag) {
similarVmag.push(posSat.vmag);
} else {
}
if (curSatId === posSat.id) {
// Don't look at the same curSat
return;
}

similarVmag.push(posSat.vmag);

// Only use the first word of the name
const name = obj.name.toLowerCase();
const posName = posSat.name.toLowerCase();

if (name.length < 4 || posName.length < 4) {
if (curSatName.length < 4 || posName.length < 4) {
return;
}

// Determine how many characters match
const matchingChars = name.split('').filter((char, index) => char === posName[index]);
const matchingChars = curSatName.split('').filter((char, index) => char === posName[index]);

if (matchingChars.length / name.length > 0.85) {
if (matchingChars.length / curSatName.length > 0.85) {
similarVmag.push(posSat.vmag);
similarVmag.push(posSat.vmag);
similarVmag.push(posSat.vmag);
Expand Down
88 changes: 73 additions & 15 deletions src/plugins/timeline/timeline.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { getEl } from '@app/lib/get-el';
import { errorManagerInstance } from '@app/singletons/errorManager';
import viewTimelinePng from '@public/img/icons/view_timeline.png';

import { sensors } from '@app/catalogs/sensors';
import { SatMath } from '@app/static/sat-math';
import { BaseObject, Degrees, DetailedSatellite, DetailedSensor, Hours, Kilometers, MILLISECONDS_PER_SECOND, SatelliteRecord, Seconds } from 'ootk';
import { KeepTrackPlugin } from '../KeepTrackPlugin';
import { SelectSatManager } from '../select-sat-manager/select-sat-manager';
import { SensorManager } from '../sensor/sensorManager';
import { SoundNames } from '../sounds/SoundNames';

interface Pass {
start: Date;
Expand Down Expand Up @@ -38,8 +38,8 @@ export class Timeline extends KeepTrackPlugin {
keepTrackApi.getSensorManager().sensorListPrc,
keepTrackApi.getSensorManager().sensorListOther,
);
disabledSensors_: DetailedSensor[] = this.allSensorLists_.filter((s) =>
!keepTrackApi.getSensorManager().sensorListMw.includes(s),
private enabledSensors_: DetailedSensor[] = this.allSensorLists_.filter((s) =>
keepTrackApi.getSensorManager().sensorListMw.includes(s),
);
private lengthOfLookAngles_ = 6 as Hours;
private lengthOfBadPass_ = 120 as Seconds;
Expand Down Expand Up @@ -83,13 +83,13 @@ export class Timeline extends KeepTrackPlugin {
<canvas id="timeline-canvas-static" style="display: none;"></canvas>
</div>`;
sideMenuSettingsHtml: string = keepTrackApi.html`
<div class="switch row">
<!-- <div class="switch row">
<label>
<input id="settings-riseset" type="checkbox" checked="true" />
<span class="lever"></span>
Show Only Rise and Set Times
</label>
</div>
</div> -->
<div class="row">
<div class="input-field col s12">
<input id="timeline-setting-total-length" value="${this.lengthOfLookAngles_.toString()}" type="text"
Expand All @@ -98,6 +98,14 @@ export class Timeline extends KeepTrackPlugin {
<label for="timeline-setting-total-length" class="active">Calculation Length (Hours)</label>
</div>
</div>
<div class="row">
<div class="input-field col s12">
<input id="timeline-setting-interval" value="${this.angleCalculationInterval_.toString()}" type="text"
style="text-align: center;"
/>
<label for="timeline-setting-interval" class="active">Calculation Interval (Seconds)</label>
</div>
</div>
<div class="row">
<div class="input-field col s12">
<input id="timeline-setting-bad-length" value="${this.lengthOfBadPass_.toString()}" type="text"
Expand All @@ -115,7 +123,7 @@ export class Timeline extends KeepTrackPlugin {
</div>
</div>
<div class="row" style="margin: 0 10px;">
<div id="multi-site-look-angles-sensor-list">
<div id="timeline-sensor-list">
</div>
</div>`;
sideMenuSettingsOptions = {
Expand Down Expand Up @@ -152,6 +160,12 @@ export class Timeline extends KeepTrackPlugin {
this.updateTimeline();
});

getEl('timeline-setting-interval').addEventListener('change', () => {
this.angleCalculationInterval_ = parseFloat((<HTMLInputElement>getEl('timeline-setting-interval')).value) as Seconds;
this.ctxStatic_.reset();
this.updateTimeline();
});

getEl('timeline-setting-bad-length').addEventListener('change', () => {
this.lengthOfBadPass_ = parseFloat((<HTMLInputElement>getEl('timeline-setting-bad-length')).value) as Seconds;
this.ctxStatic_.reset();
Expand All @@ -176,6 +190,7 @@ export class Timeline extends KeepTrackPlugin {
cbName: this.PLUGIN_NAME,
cb: (sat: BaseObject) => {
if (sat) {
this.ctxStatic_.reset();
this.updateTimeline();
this.canvas_.style.display = 'block';
}
Expand All @@ -192,20 +207,63 @@ export class Timeline extends KeepTrackPlugin {
return;
}

const satellite = this.selectSatManager_.getSelectedSat() as DetailedSatellite;
const sensors_ = [sensors.BLEAFB, sensors.CODSFS, sensors.MITMIL, sensors.CAVSFS, sensors.CLRSFS, sensors.COBRADANE, sensors.RAFFYL, sensors.PITSB];
const sensorPasses = this.calculatePasses_(satellite, sensors_);
this.calculateSensors_();
const sensorPasses = this.calculatePasses_();

this.drawTimeline(sensorPasses);
this.drawTimeline_(sensorPasses);
} catch (e) {
errorManagerInstance.info(e);
}
}

private calculatePasses_(satellite: DetailedSatellite, sensors: DetailedSensor[]): SensorPasses[] {
private calculateSensors_() {
const sensorListDom = getEl('timeline-sensor-list');

if (!sensorListDom) {
errorManagerInstance.warn('Could not find sensor list dom');

return;
}

sensorListDom.innerHTML = '';

for (const sensor of this.allSensorLists_) {
if (!sensor.objName) {
continue;
}

const sensorButton = document.createElement('button');

sensorButton.classList.add('btn', 'btn-ui', 'waves-effect', 'waves-light');
if (!this.enabledSensors_.includes(sensor)) {
sensorButton.classList.add('btn-red');
}

sensorButton.innerText = sensor.uiName ?? sensor.shortName ?? sensor.objName;
sensorButton.addEventListener('click', () => {
if (sensorButton.classList.contains('btn-red')) {
sensorButton.classList.remove('btn-red');
this.enabledSensors_.push(sensor);
keepTrackApi.getSoundManager().play(SoundNames.TOGGLE_ON);
} else {
sensorButton.classList.add('btn-red');
this.enabledSensors_.splice(this.enabledSensors_.indexOf(sensor), 1);
keepTrackApi.getSoundManager().play(SoundNames.TOGGLE_OFF);
}

this.ctxStatic_.reset();
this.updateTimeline();
});
sensorListDom.appendChild(sensorButton);
sensorListDom.appendChild(document.createTextNode(' '));
}
}

private calculatePasses_(): SensorPasses[] {
const sensorPasses: SensorPasses[] = [];
const satellite = this.selectSatManager_.getSelectedSat() as DetailedSatellite;

for (const sensor of sensors) {
for (const sensor of this.enabledSensors_) {
const sensorPass: SensorPasses = {
sensor,
passes: [],
Expand Down Expand Up @@ -286,7 +344,7 @@ export class Timeline extends KeepTrackPlugin {

}

private drawTimeline(sensorPasses: SensorPasses[]): void {
private drawTimeline_(sensorPasses: SensorPasses[]): void {
// Clone the canvas element to remove all event listeners
const oldCanvas = this.canvas_;
const newCanvas = oldCanvas.cloneNode(true) as HTMLCanvasElement;
Expand Down Expand Up @@ -357,7 +415,7 @@ export class Timeline extends KeepTrackPlugin {
// Draw sensor name
this.ctx_.fillStyle = 'rgb(255, 255, 255)';
this.ctx_.font = '14px Consolas';
this.ctx_.fillText(sensorPass.sensor.shortName, leftOffset - 30, y + 5);
this.ctx_.fillText(sensorPass.sensor.uiName, leftOffset - 150, y + 5);

// Draw passes
sensorPass.passes.forEach((pass) => {
Expand Down Expand Up @@ -385,7 +443,7 @@ export class Timeline extends KeepTrackPlugin {
const endTime = new Date(passEnd).toISOString().slice(11, 19);

// Calculate width of box based on text
const text = `${sensorPass.sensor.shortName}: ${startTime} - ${endTime}`;
const text = `${sensorPass.sensor.uiName}: ${startTime} - ${endTime}`;

this.ctx_.font = '14px Consolas';

Expand Down
12 changes: 7 additions & 5 deletions src/singletons/catalog-manager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ export class CatalogManager {

missileSats: number = 0;
missileSet = [];
numSats: number = 0;
numSatellites: number = 0;
numObjects: number = 0;
orbitDensity: number[][] = [];
orbitDensityMax = 0;
orbitalSats: number;
Expand All @@ -110,7 +111,7 @@ export class CatalogManager {

const highestMarkerNumber = this.sensorMarkerArray?.[this.sensorMarkerArray?.length - 1] || 0;

settingsManager.dotsOnScreen = Math.max(this.numSats - settingsManager.maxFieldOfViewMarkers, highestMarkerNumber);
settingsManager.dotsOnScreen = Math.max(this.numObjects - settingsManager.maxFieldOfViewMarkers, highestMarkerNumber);
};

/**
Expand Down Expand Up @@ -277,7 +278,8 @@ export class CatalogManager {
}

getSats(): DetailedSatellite[] {
return this.objectCache.filter((obj) => obj?.isSatellite()) as DetailedSatellite[];
// sats are the first numSats objects in the objectCache
return this.objectCache.slice(0, this.numSatellites).filter((sat) => sat.isSatellite()) as DetailedSatellite[];
}

getMissile(missileId: number): MissileObject | null {
Expand All @@ -295,7 +297,7 @@ export class CatalogManager {
}

id2satnum(satIdArray: number[]) {
return satIdArray.map((id) => ((<DetailedSatellite> this.getObject(id))?.sccNum || -1).toString()).filter((satnum) => satnum !== '-1');
return satIdArray.map((id) => ((<DetailedSatellite>this.getObject(id))?.sccNum || -1).toString()).filter((satnum) => satnum !== '-1');
}

async init(satCruncherOveride?: any): Promise<void> {
Expand Down Expand Up @@ -608,7 +610,7 @@ export class CatalogManager {
}
}

for (let i = 0; i < this.numSats; i++) {
for (let i = 0; i < this.numObjects; i++) {
// Static objects lack these values and including them increase the JS heap a lot
if (!this.objectCache[i].isSatellite()) {
continue;
Expand Down
4 changes: 2 additions & 2 deletions src/singletons/color-scheme-manager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,8 +835,8 @@ export class ColorSchemeManager {
}

// Generate some buffers
this.colorData = new Float32Array(catalogManagerInstance.numSats * 4);
this.pickableData = new Int8Array(catalogManagerInstance.numSats);
this.colorData = new Float32Array(catalogManagerInstance.numObjects * 4);
this.pickableData = new Int8Array(catalogManagerInstance.numObjects);
this.calculateColorBuffers(true).then(() => {
this.isReady = true;
});
Expand Down
4 changes: 3 additions & 1 deletion src/static/catalog-loader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ export class CatalogLoader {

const catalogManagerInstance = keepTrackApi.getCatalogManager();

catalogManagerInstance.numSats = catalogManagerInstance.objectCache.length;
catalogManagerInstance.numObjects = catalogManagerInstance.objectCache.length;

const satDataString = CatalogLoader.getSatDataString_(catalogManagerInstance.objectCache);

Expand Down Expand Up @@ -341,6 +341,8 @@ export class CatalogLoader {
tempObjData.push(analSat);
}

catalogManagerInstance.numSatellites = tempObjData.length;

for (const missileObj of catalogManagerInstance.missileSet) {
tempObjData.push(missileObj);
}
Expand Down

0 comments on commit 53f1f3d

Please sign in to comment.