diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/tower.html | 2 | ||||
| -rw-r--r-- | httemplate/search/elements/gmap.html | 5 | ||||
| -rw-r--r-- | httemplate/search/sector.html | 27 | ||||
| -rwxr-xr-x | httemplate/search/svc_broadband-map.html | 14 |
4 files changed, 35 insertions, 13 deletions
diff --git a/httemplate/browse/tower.html b/httemplate/browse/tower.html index c8812e57b..16e44c6c0 100644 --- a/httemplate/browse/tower.html +++ b/httemplate/browse/tower.html @@ -3,6 +3,8 @@ 'name' => 'towers', 'menubar' => [ 'Add a new tower' => $p.'edit/tower.html', + 'Sector coverage maps' => + $p.'search/sector.html', 'Download CSV for towercoverage.com' => $p.'misc/tower-export.html?format=tc' ], diff --git a/httemplate/search/elements/gmap.html b/httemplate/search/elements/gmap.html index 632a32338..b7d135dd6 100644 --- a/httemplate/search/elements/gmap.html +++ b/httemplate/search/elements/gmap.html @@ -26,7 +26,7 @@ Generic Google Maps front end. }, # end of feature ], overlays => [ - { url => 'https://localhost/freeside/view/sector_overlay-png.html?102', + { url => 'https://localhost/freeside/view/sector_map-png.html?102', west => -130.0, east => -128.0, south => 10.0, @@ -85,7 +85,7 @@ var featureStyle = function(feature) { }; var map; -var overlays; +var overlays = []; function initMap() { var canvas = $('#map_canvas'); map = new google.maps.Map(canvas[0], { zoom: 6 }); @@ -133,6 +133,7 @@ function initMap() { delete x.url; var overlay = new google.maps.GroundOverlay( url, x ); overlay.setMap(map); + overlay.setOpacity(0.4); overlays.push(overlay); }); } diff --git a/httemplate/search/sector.html b/httemplate/search/sector.html index d03963237..037df10ea 100644 --- a/httemplate/search/sector.html +++ b/httemplate/search/sector.html @@ -11,8 +11,24 @@ font-weight: bold; color: green; } + .grid th { + padding-left: 3px; + padding-right: 3px; + padding-bottom: 2px; + border: none; + empty-cells: show; + font-size:90%; + border-bottom: 1px solid #999999; + } + .grid td { + padding-left: 3px; + padding-right: 3px; + padding-bottom: 2px; + border: none; + empty-cells: show; + } </style> -<table class="grid"> +<table class="grid" style="border-spacing: 0px"> <thead> <tr> <th>Tower / sector</th> @@ -20,9 +36,10 @@ </tr> </thead> <tbody> +% my $row = 0; % foreach my $sector (@sectors) { % my $sectornum = $sector->sectornum; - <tr> + <tr class="row<% $row % 2 %>"> <td> <a href="<% $fsurl %>edit/tower.html?<% $sector->towernum |h %>"> <% $sector->description |h %> @@ -47,7 +64,8 @@ 'create_'.$sectornum, [ 'sectornum' ], $fsurl.'misc/sector-create_map.html', - { 'message' => 'Map generated' }, + { 'message' => 'Map generated', + 'url' => $cgi->self_url }, "sector$sectornum" &> <a class="createmap" href="#" onclick="sector<% $sectornum %>process()"> @@ -58,11 +76,12 @@ <td> % if ( length($sector->image) > 0 ) { <a class="viewmap" href="<% $fsurl %>search/svc_broadband-map.html?sectornum=<% $sectornum %>"> - View map + View map—<% $sector->margin %>dB margin </a> % } </td> </tr> +% $row++; % } # foreach $sector </tbody> </table> diff --git a/httemplate/search/svc_broadband-map.html b/httemplate/search/svc_broadband-map.html index 64a7f98de..fe3c0950b 100755 --- a/httemplate/search/svc_broadband-map.html +++ b/httemplate/search/svc_broadband-map.html @@ -148,13 +148,13 @@ foreach my $tower (values(%towers)) { my @overlays; foreach my $sector (values %sectors) { if ( length($sector->image) > 0 ) { - push @overlays, - { url => $fsurl.'view/sector_map-png.cgi?' . $sector->sectornum, - west => $sector->west, - east => $sector->east, - south => $sector->south, - north => $sector->north, - }; + my $o = { + url => $fsurl.'view/sector_map-png.cgi?' . $sector->sectornum + }; + foreach (qw(south north west east)) { + $o->{$_} = $sector->get($_) + 0; + } + push @overlays, $o; }; }; |