BUG: fixed renamed environment attributes

Author: Gui-FernandesBR

rocketpy/Environment.py

@@ -492,15 +492,15 @@ def setElevation(self, elevation="Open-Elevation"):
         """
         if elevation != "Open-Elevation" and elevation != "SRTM":
             self.elevation = elevation
-        # elif elevation == "SRTM" and self.latitude != None and self.lon != None:
+        # elif elevation == "SRTM" and self.latitude != None and self.longitude != None:
         #     # Trigger the authentication flow.
         #     #ee.Authenticate()
         #     # Initialize the library.
         #     ee.Initialize()
 
         #     # Calculate elevation
         #     dem  = ee.Image('USGS/SRTMGL1_003')
-        #     xy   = ee.Geometry.Point([self.lon, self.latitude])
+        #     xy   = ee.Geometry.Point([selfgitude, self.latitude])
         #     elev = dem.sample(xy, 30).first().get('elevation').getInfo()
 
         #     self.elevation = elev
@@ -3354,10 +3354,10 @@ def exportEnvironment(self, filename="environment"):
         # TODO: find a way to documennt the workaround I've used on ma.getdata(self...
         self.exportEnvDictionary = {
             "railLength": self.rL,
-            "gravity": self.g,
+            "gravity": self.gravity,
             "date": [self.date.year, self.date.month, self.date.day, self.date.hour],
-            "latitude": self.lat,
-            "longitude": self.lon,
+            "latitude": self.latitude,
+            "longitude": self.longitude,
             "elevation": self.elevation,
             "datum": self.datum,
             "timeZone": self.timeZone,

rocketpy/Flight.py

@@ -2576,7 +2576,7 @@ def potentialEnergy(self):
         totalMass = self.rocket.totalMass
         grid = self.vx[:, 0]
         totalMass = Function(np.column_stack([grid, totalMass(grid)]), "Time (s)")
-        potentialEnergy = totalMass * self.env.g * self.z
+        potentialEnergy = totalMass * self.env.gravity * self.z
         potentialEnergy.setInputs("Time (s)")
         return potentialEnergy
 
@@ -2994,7 +2994,7 @@ def latitude(self):
         latitude: Function
             Rocket latitude coordinate, in degrees, at each time step.
         """
-        lat1 = np.deg2rad(self.env.lat)  # Launch lat point converted to radians
+        lat1 = np.deg2rad(self.env.latitude)  # Launch lat point converted to radians
 
         # Applies the haversine equation to find final lat/lon coordinates
         latitude = np.rad2deg(
@@ -3019,8 +3019,8 @@ def longitude(self):
         longitude: Function
             Rocket longitude coordinate, in degrees, at each time step.
         """
-        lat1 = np.deg2rad(self.env.lat)  # Launch lat point converted to radians
-        lon1 = np.deg2rad(self.env.lon)  # Launch lon point converted to radians
+        lat1 = np.deg2rad(self.env.latitude)  # Launch lat point converted to radians
+        lon1 = np.deg2rad(self.env.longitude)  # Launch lon point converted to radians
 
         # Applies the haversine equation to find final lat/lon coordinates
         longitude = np.rad2deg(

rocketpy/Rocket.py

@@ -955,7 +955,7 @@ def allInfo(self):
         self.thrustToWeight.plot(lower=0, upper=self.motor.burnOutTime)
 
         # ax = plt.subplot(415)
-        # ax.plot(  , self.rocket.motor.thrust()/(self.env.g() * self.rocket.totalMass()))
+        # ax.plot(  , self.rocket.motor.thrust()/(self.env.gravity * self.rocket.totalMass()))
         # ax.set_xlim(0, self.rocket.motor.burnOutTime)
         # ax.set_xlabel("Time (s)")
         # ax.set_ylabel("Thrust/Weight")