[hamradio-commits] [dump1090] 237/389: Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor
Matthew Ernisse
mernisse-guest at moszumanska.debian.org
Wed Nov 5 00:19:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
mernisse-guest pushed a commit to branch master
in repository dump1090.
commit 5c3f6dac5018071ff4d53e421ad83617bed818e0
Merge: 4752578 fd0c116
Author: Brian Davenport <the.lost.minded at gmail.com>
Date: Thu May 30 17:35:57 2013 +0000
Merge branch 'mapRefactor' of https://github.com/bdavenport/dump1090 into mapRefactor
Conflicts:
public_html/script.js
dump1090.c | 9 +---
public_html/config.js | 8 ++++
public_html/gmap.html | 2 +-
public_html/script.js | 125 +++++++++++++++++++++++++++++++++-----------------
4 files changed, 94 insertions(+), 50 deletions(-)
diff --cc public_html/script.js
index 1d14d0c,07cda07..3bd9888
--- a/public_html/script.js
+++ b/public_html/script.js
@@@ -526,14 -542,28 +542,39 @@@ function selectPlaneByHex(hex)
refreshTableInfo();
}
+function resetMap() {
+ GoogleMap.setZoom(parseInt(localStorage['ZoomLvl']));
+ GoogleMap.setCenter(new google.maps.LatLng(parseFloat(localStorage['CenterLat']), parseFloat(localStorage['CenterLon'])));
+ Selected = null;
+ refreshSelected();
+}
+
+function settingToggle() {
+ console.log("Settings Click");
+ $("#options").toggleClass("notvisable");
+}
++
+ function drawCircle(marker, distance) {
+ if (typeof distance === 'undefined') {
+ return false;
+
+ if (!(!isNaN(parseFloat(distance)) && isFinite(distance)) || distance < 0) {
+ return false;
+ }
+ }
+
+ distance *= 1000.0;
+ if (!Metric) {
+ distance *= 1.852;
+ }
+
+ // Add circle overlay and bind to marker
+ var circle = new google.maps.Circle({
+ map: GoogleMap,
+ radius: distance, // In meters
+ fillOpacity: 0.0,
+ strokeWeight: 1,
+ strokeOpacity: 0.3
+ });
+ circle.bindTo('center', marker, 'position');
+ }
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git
More information about the pkg-hamradio-commits
mailing list