AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge mapRefactor -> master

Browse source
This commit is contained in:
terribl 2013-06-03 11:27:17 +03:00
parent f53632b00d b161004d8b
commit 82b61f267d
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
public_html/script.js
View file

@ -596,23 +596,8 @@ function resetMap() {
selectPlaneByHex(SelectedPlane);
}
<<<<<<< HEAD
function resetMap() {
localStorage['CenterLat'] = CONST_CENTERLAT;
localStorage['CenterLon'] = CONST_CENTERLON;
localStorage['ZoomLvl'] = CONST_ZOOMLVL;
CenterLat = CONST_CENTERLAT;
CenterLon = CONST_CENTERLON;
ZoomLvl = CONST_ZOOMLVL;
Map.setZoom(parseInt(localStorage['ZoomLvl']));
Map.setCenter(new google.maps.LatLng(parseFloat(localStorage['CenterLat']),
parseFloat(localStorage['CenterLon'])));
Selected = null;
refreshSelectedInfo();
=======
refreshSelected();
refreshTableInfo();
>>>>>>> mapRefactor
}
function drawCircle(marker, distance) {