jlengrand/ShowMeYourBigSatellite
1
0
Fork 0
mirror of https://github.com/jlengrand/ShowMeYourBigSatellite.git synced 2026-03-10 08:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from jlengrand/isue_16

Browse Source 
Issue 16
This commit is contained in:
julien Lengrand-Lambert
2014-08-05 23:55:59 +02:00
parent 69d5166bd7 3a5d78fef8
commit 83f3a76780
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ShowMeYourBigSatellite.sublime-workspace
View File

@@ -537,6 +537,8 @@
}, },
"file_history": "file_history":
[ [
"/home/jll/Documents/01_perso/10_whereShouldILive/index.html",
"/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/whereismysat.py",
"/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/.git/COMMIT_EDITMSG", "/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/.git/COMMIT_EDITMSG",
"/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/templates/dropdown_test.html", "/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/templates/dropdown_test.html",
"/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/main.py", "/home/jll/Documents/01_perso/14_ShowMeYourBigSatellite/main.py",
@@ -662,9 +664,7 @@
"/home/jll/dev/source_git/main_zwolle/majiic/db/build.properties", "/home/jll/dev/source_git/main_zwolle/majiic/db/build.properties",
"/home/jll/dev/source_git/main_zwolle/csd/db/build.xml", "/home/jll/dev/source_git/main_zwolle/csd/db/build.xml",
"/home/jll/dev/source_git/main_zwolle/csd/build.properties", "/home/jll/dev/source_git/main_zwolle/csd/build.properties",
"/home/jll/dev/source_git/main_zwolle/csd/db/build.properties", "/home/jll/dev/source_git/main_zwolle/csd/db/build.properties"
"/opt/spacemetric/keystone/config/keystone.postgres",
"/home/jll/Desktop/WEB-INF/web.xml"
], ],
"find": "find":
{ {

4
static/js/mapsFun.js
View File

@@ -33,10 +33,10 @@ var satelliteIcon = L.icon({
// Gets the latest satellite position from the server // Gets the latest satellite position from the server
function getPosition(){ function getPosition(){
var urlBase = "http://localhost:5000/get_coordinates/" var urlBase = $("#server").val() + "/get_coordinates/";
var satellite = $("#satellite").val(); var satellite = $("#satellite").val();
var url = urlBase + satellite; var url = urlBase + satellite;
console.log(url);
$.getJSON(url,function(result){ $.getJSON(url,function(result){
var pos = new L.latLng(result.latitude, result.longitude); var pos = new L.latLng(result.latitude, result.longitude);
satMarker.setLatLng(pos); satMarker.setLatLng(pos);

7
templates/simplemap.html
View File

@@ -13,6 +13,7 @@
<div id="map"></div> <div id="map"></div>
<div id="menu"> <div id="menu">
<h1>Menu<h1> <h1>Menu<h1>
<div id="satellites">
<h2>Select your satellite : <h2> <h2>Select your satellite : <h2>
<select id="satellite"> <select id="satellite">
{% for sat in satellites %} {% for sat in satellites %}
@@ -20,6 +21,12 @@
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
<div id="servers">
<h2>Server address : <h2>
<input type="text" id="server" value="http://localhost:5000">
</div>
</div>
</body> </body>
<script src='js/lib/leaflet.js'></script> <script src='js/lib/leaflet.js'></script>