refactor & cleanup

Author: Kjablonska

app/app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request, jsonify, send_file
+from flask import Flask, request
 from flask_cors import CORS
 
 from astroquery.jplhorizons import Horizons
@@ -9,14 +9,11 @@
 from astropy.coordinates import SkyCoord
 
 from astropy.table import Table
-import pymongo
-import urllib.parse
 import json
 import numpy as np
 
 from satellites import get_satellites
 from planets import get_info, get_planets_data
-from cache import get_cache_data, get_cache_satellites, search_satellites_cache_db, search_planets_cache_db
 
 app = Flask(__name__)
 

app/cache.py

@@ -1,5 +1,4 @@
 from flask import abort
-import pymongo
 from datetime import datetime
 from database import connect_to_db, close_db_connection
 

frontend/README.md

@@ -40,7 +40,6 @@ const ParamsPicker: React.FC<ParamsPickerProps> = ({ visualisationMode }) => {
             openError(true);
             return false;
         }
-        console.log(startValue, endValue);
         if (startValue === null) return;
         const newUserOptions: UserOptions = {
             mode: mode === undefined ? 'RealTime' : mode,

frontend/public/assets/satellites/Dione.jpeg renamed to frontend/public/assets/satellites/Dione.jpg

@@ -19,7 +19,7 @@ export class Clock {
             time === undefined
                 ? `${visualisationOptions.start} 00:00:00`
                 : `${visualisationOptions.start} ${time!.hours}:${time!.minutes}:00`;
-        console.log('TIME', constructInitValue);
+
         this.startDate = new Date(constructInitValue);
         this.endDate = visualisationOptions.end !== undefined ? new Date(visualisationOptions.end) : undefined;
         this.findUpdateParameters(speedMode);
@@ -62,7 +62,6 @@ export class Clock {
     };
 
     public stopClock = () => {
-        console.log('stop clock');
         this.stop = true;
     };
 
@@ -86,26 +85,23 @@ export class Clock {
     public findNextValue = () => {
         if (this.stop) return;
 
-        // const update = this.startDate.getHours() + this.upadeValue;
         this.startDate.setTime(this.startDate.getTime() + (this.upadeValue*60*60*1000));
-        // this.startDate.setUTCHours(update);
-
-        if (this.checkIfEndDateReached()) {
-            console.log('end clock');
-            return;
-        }
 
         this.clock.text = `${this.startDate.getDate()} - ${
             this.startDate.getMonth() + 1
         } - ${this.startDate.getFullYear()}`;
 
+        if (this.checkIfEndDateReached()) {
+            return;
+        }
     };
 
     private checkIfEndDateReached = () => {
         if (this.endDate === undefined) return false;
 
         if (this.startDate.getTime() > this.endDate.getTime()) {
             this.onEndDateReached();
+            this.stop = true;
             new MessageHandler('End date reached.', '220px');
             return true;
         }

frontend/src/components/DataSelection/paramsPicker/ParamsPicker.tsx

@@ -3,7 +3,7 @@ import { Scene, Mesh } from '@babylonjs/core';
 import { VisualisationData } from '../../types/planetInterfaces';
 import { FetchData, VisualisationOptions } from '../../types/period';
 import Info from './InfoPanel';
-import { Timer } from '../SolarSystem/Timer';
+import { Timer } from '../../utils/movement/Timer';
 import { Clock } from './Clock';
 import Label from './Label';
 import { TimeSelection } from '../../types/userOptions';

frontend/src/components/GUI/Clock.ts

@@ -47,18 +47,18 @@ const ParamsTable = styled.table`
     border: 0.5px solid #171738;
     border-collapse: collapse;
     width: 60%;
-    margin-top: 30px;
+    margin-top: 20px;
     margin-bottom: 30px;
 `;
 
 const TableHeader = styled.th`
     border: 0.5px solid #171738;
-    height: 25px;
+    height: 20px;
 `;
 
 const TableContent = styled.td`
     border: 0.5px solid #171738;
-    height: 30px;
+    height: 25px;
 `;
 
 const Info: React.FC<InfoProps> = ({ onClose }) => {
@@ -165,7 +165,7 @@ const Info: React.FC<InfoProps> = ({ onClose }) => {
                 <div>
                     When all parameters are correctly set, the start button apprears. On click, the visualisation
                     starts.
-                    <br></br><br></br>
+                    <br></br>
                     The visualisation contains of the rendered model and user interface containing:
                         <li style={{marginBottom: '5px', marginTop: '10px'}}><b>Clock</b> - displays the current visusalisation date and time.</li>
                         <li style={{marginBottom: '5px'}}><b>"More info" button</b> - displays more info about the visible celestial bodies.</li>

frontend/src/components/GUI/UserPanel.ts

@@ -26,7 +26,6 @@ export const PlanetSystemScene = () => {
     const [planetsData, setPlanetsData] = useState<PlanetData[]>([]);
     const fetchData = findFetchParameters('Satellite');
     const options: UserOptions = useSelector((state: RootStateOrAny) => state.userOptions);
-    console.log('STATE', options);
     const { start, end } = defineStartingPeriod(fetchData.period, options.startDate);
 
     const satellitesNumber = satellitesMap.get(options.planet!);
@@ -49,7 +48,6 @@ export const PlanetSystemScene = () => {
                 `http://localhost:5000/getSatellitesJPLData?planet=${options.planet}&start=${start}&end=${end}&step=${fetchData.step}`,
             );
             resCode = response.status;
-            console.log(resCode)
             const data = await response.json();
             const readyData = [];
             for (const key in data) {

frontend/src/components/LandingPage/Info.tsx

@@ -21,7 +21,6 @@ const SceneComponent = (props: any) => {
         if (reactCanvas.current) {
             const engine = new Engine(reactCanvas.current, antialias, engineOptions, adaptToDeviceRatio);
             const initScene = new Scene(engine, sceneOptions);
-            console.log(planetsData)
             if (initScene !== undefined && initScene.isReady()) {
                 const initData = new SceneData(planetsData, initScene, fetchData.refill);
                 const info = new Info('SolarSystem');

frontend/src/components/PlanetSystem/index.tsx

@@ -40,7 +40,6 @@ export const InitSceneData = () => {
                 `http://localhost:5000/getPlanetsJPLData?name=${planets}&start=${start}&end=${end}&step=${fetchData.step}`,
             );
             const data = await response.json();
-            console.log('fetch', data);
             const readyData = [];
             for (const key in data) {
                 const newPlanetData: PlanetData = { planet: key, position: rescaleData(data[key], key, false) };
@@ -49,7 +48,6 @@ export const InitSceneData = () => {
 
             setPlanetsData([...readyData]);
         } catch (e: any) {
-            console.log(e);
             openError(true);
         } finally {
             openSpinner(false);

frontend/src/components/SolarSystem/SceneComponent.tsx

@@ -1,11 +1,11 @@
 import { Scene, LinesMesh, Vector3, Curve3, MeshBuilder, Mesh } from '@babylonjs/core';
 import { DatesPeriod, FetchData, VisualisationOptions } from '../../types/period';
 import { VisualisationData } from '../../types/planetInterfaces';
-import { findNewPeriod } from '../../utils/findFetchPeriod';
-import getPlanetOrbitData from '../../utils/getOrbiteData';
-import ErrorHandler from '../../utils/handlers/ErrorHandler';
+import { findNewPeriod } from '../findFetchPeriod';
+import getPlanetOrbitData from '../getOrbiteData';
+import ErrorHandler from '../handlers/ErrorHandler';
 
-interface OribteDrawer {
+interface OribtDrawer {
     linesMesh: LinesMesh;
     initPosition: Vector3;
     buffer: Vector3[];
@@ -21,8 +21,8 @@ export class MovePlanets {
     stopFetch: boolean = false;
     errorHandler: ErrorHandler;
     scene: Scene;
-    linesMeshes: Map<string, OribteDrawer>;
-    oribteDrawerCounter: number = 0;
+    linesMeshes: Map<string, OribtDrawer>;
+    oribtDrawerCounter: number = 0;
     draw: boolean = true;
     stopClock: () => void;
     planet?: Mesh;
@@ -41,10 +41,9 @@ export class MovePlanets {
         this.fetchData = fetchData;
         this.errorHandler = new ErrorHandler(this.onDataEnd);
         this.scene = scene;
-        this.linesMeshes = new Map<string, OribteDrawer>();
+        this.linesMeshes = new Map<string, OribtDrawer>();
         this.stopClock = stopClock;
         for (let el of visualisationData) {
-            // if (planets.includes(el.planet.name)) {
             const initPoints = [];
 
             for (let i = 0; i < 10; i++) {
@@ -55,22 +54,22 @@ export class MovePlanets {
                 points: initPoints,
                 updatable: true,
             });
+
             this.linesMeshes.set(el.planet.name, {
                 linesMesh: lineMesh,
                 initPosition: el.orbit[10],
                 buffer: initPoints,
             });
-            // }
         }
 
         this.planet = planet;
     }
 
     movePlanet = async () => {
-        this.oribteDrawerCounter++;
-        if ((this.oribteDrawerCounter = 10)) {
+        this.oribtDrawerCounter++;
+        if ((this.oribtDrawerCounter = 10)) {
             this.draw = true;
-            this.oribteDrawerCounter = 0;
+            this.oribtDrawerCounter = 0;
         }
         if (this.visualisationData !== undefined && !this.stop && !this.checkIfEndDateReached()) {
             for (let data of this.visualisationData) {
@@ -149,7 +148,6 @@ export class MovePlanets {
                 const toModify = data.get(el.planet.name);
 
                 if (toModify !== undefined) {
-                    console.log(toModify);
                     el.length = el.orbit.length + toModify!.length;
                     el.orbit.push(...toModify!);
                     el.iter = 0;

frontend/src/components/SolarSystem/index.tsx

@@ -1,7 +1,7 @@
 import { Scene, AdvancedTimer, Mesh } from '@babylonjs/core';
 import { FetchData, VisualisationOptions } from '../../types/period';
 import { VisualisationData } from '../../types/planetInterfaces';
-import setMovementTimer from '../../utils/setMovementTimer';
+import setMovementTimer from './setMovementTimer';
 import { MovePlanets } from './MovePlanets';
 
 export class Timer {

frontend/src/components/SolarSystem/MovePlanets.ts renamed to frontend/src/utils/movement/MovePlanets.ts

@@ -1,5 +1,5 @@
 import { Scene, AdvancedTimer } from '@babylonjs/core';
-import { MovePlanets } from '../components/SolarSystem/MovePlanets';
+import { MovePlanets } from './MovePlanets';
 
 interface MovementTimer {
     scene: Scene;