diff options
Diffstat (limited to 'tools/mmd/MmdWidgets.py')
| -rw-r--r-- | tools/mmd/MmdWidgets.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/mmd/MmdWidgets.py b/tools/mmd/MmdWidgets.py index cd8a347..c725945 100644 --- a/tools/mmd/MmdWidgets.py +++ b/tools/mmd/MmdWidgets.py @@ -207,15 +207,12 @@ def logWidget (): return html -def osmWidget (satellite, user): - user_location = user.getDefaultLocation () +def osmWidget (session): + user_location = session.user.getDefaultLocation () if not user_location: user_location = Location () - longitude, latitude, java = computeTrajectory (user_location.longitude, user_location.latitude, 300) + timestamp, longitude, latitude = session.satellite.getCurrentSSP () - # - # how can we use { and } in javascript that can be ignored by python format ()? - # html = ''' <div id="osm"></div> <script src="http://www.openlayers.org/api/OpenLayers.js"></script> @@ -267,7 +264,13 @@ def osmWidget (satellite, user): map.zoomTo (1); </script> - '''.format (longitude, latitude, user_location.longitude, user_location.latitude, java) + '''.format ( + longitude, + latitude, + user_location.longitude, + user_location.latitude, + session.satellite.getTrajectoryAsJavaArray (30) + ) return html |