Commit df32a5e9 authored by Jacob Kaufman's avatar Jacob Kaufman
Browse files

Fixed get radius functions for jupyter and javascript

parent aa91e657

.DS_Store

(8 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Jupyter Notebook/.DS_Store

(6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Jupyter Notebook/src/CartoCosmos.py

+11 −11
Original line number Diff line number Diff line
@@ -35,17 +35,17 @@ class planetary_maps: 
        }



    def find_radius(self):

        if self.target_name == "mars":

            self.dmajor_radius = 3396190.0

            self.dminor_radius = 3376200.0

        elif self.target_name == "moon":

            self.dmajor_radius = 1737400.0

            self.dminor_radius = 1737400.0

        elif self.target_name == "mercury":

            self.dmajor_radius = 2439400.0

            self.dminor_radius = 2439400.0

        else:

            print("Target Planet Not Supported")



        with open(self.json_file, 'r') as fp:

            json_dict = json.load(fp)



        targets = json_dict['targets']

        for i, target in enumerate(targets):

            current_target = targets[i]

            if current_target['name'].lower() == self.target_name:

                self.dmajor_radius = float(current_target['aaxisradius']) * 1000.0

                self.dminor_radius = float(current_target['caxisradius']) * 1000.0

                break;



    def create_widgets(self):

        self.longitude_range = widgets.ToggleButtons(

Leaflet - JavaScript/.DS_Store

(6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

Leaflet - JavaScript/src/js/AstroMath.js

+14 −19
Original line number Diff line number Diff line 
import { MY_JSON_MAPS } from "./layers";



/** 

 * 

 * @class AstroMap
@@ -23,23 +25,16 @@ class AstroMath { 
    constructor(targetName) {

      this.targetName = targetName;



    switch (this.targetName) {

      case "mars":

        this.dMajorRadius = 3396190.0;

        this.dMinorRadius = 3376200.0;

        break;

      case "moon":

        this.dMajorRadius = 1737400.0;

        this.dMinorRadius = 1737400.0;

        break;

      case "mercury":

        this.dMajorRadius = 2439400.0;

        this.dMinorRadius = 2439400.0;

      var targets = MY_JSON_MAPS['targets'];

      for(var i = 0; i < targets.length; i++) {

        var currentTarget = targets[i];



        if (currentTarget['name'].toLowerCase() == targetName ) {

          this.dMajorRadius = parseFloat(currentTarget['aaxisradius'] * 1000);

          this.dMinorRadius = parseFloat(currentTarget['caxisradius'] * 1000);

          break;

      default:

        this.dMajorRadius = 0;

        this.dMinorRadius = 0;

        console.log("target not supported");

        }

      } 

    }

  }

  /**