diff --git a/www/bigmap.php b/www/bigmap.php index b414ca0..8a1e053 100644 --- a/www/bigmap.php +++ b/www/bigmap.php @@ -24,7 +24,7 @@ $layers = get_layers($tiles, $zoom); $redirect = 'http://'.$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['PHP_SELF']), '/\\').'/'; $permalink = $redirect."bigmap.php?xmin=$xmin&xmax=$xmax&ymin=$ymin&ymax=$ymax&zoom=$zoom&scale=$scale&tiles=$tiles"; -$basename = isset($_REQUEST['basename']) ? $_REQUEST['basename'] : 'bigmap'; +$name = isset($_REQUEST['name']) ? $_REQUEST['name'] : 'Bigmap'; $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; if( $action == 'ozimap' ) { diff --git a/www/index.html b/www/index.html index c34155e..a09210d 100644 --- a/www/index.html +++ b/www/index.html @@ -41,6 +41,9 @@

BigMap 2

+
+

Map Name:
+

Download queue

diff --git a/www/kml.php b/www/kml.php index d5102ed..757f0ca 100644 --- a/www/kml.php +++ b/www/kml.php @@ -1,12 +1,12 @@ '."\n"; ?> - .png + bigmap_.png diff --git a/www/ozimap.php b/www/ozimap.php index 6cd4763..9a37440 100644 --- a/www/ozimap.php +++ b/www/ozimap.php @@ -1,6 +1,6 @@ OziExplorer Map Data File Version 2.2 BigMap -.png +bigmap_.png 1 ,Map Code, WGS 84,WGS 84, 0.0000, 0.0000,WGS 84 Reserved 1 diff --git a/www/panel.php b/www/panel.php index a4f298b..e451004 100644 --- a/www/panel.php +++ b/www/panel.php @@ -8,83 +8,90 @@ $heipix = $heitiles*256; $asp=asp($widtiles,$heitiles); - printf("Map is %dx%d tiles (%dx%d px) at zoom %d, aspect %s
", - $widtiles,$heitiles,$widpix,$heipix,$zoom,$asp); + echo "Map " . generateMapTitle($xmin,$xmax,$ymin,$ymax,$zoom,$scale,$tiles,$name); + printf(" is %dx%d tiles (%dx%d px) at zoom %d, aspect %s
", $widtiles,$heitiles,$widpix,$heipix,$zoom,$asp); echo ''; echo tde(); // td("tl", "right", $xmin-1, $xmax, $ymin-1, $ymax, $zoom); - echo $ymin <= 0 ? tde('top') : td("top", "center", $xmin, $xmax, $ymin-1, $ymax, $zoom); + echo $ymin <= 0 ? tde('top') : td("top", "center", $xmin, $xmax, $ymin-1, $ymax, $zoom, $name); echo tde(); // td("tr", "left", $xmin, $xmax+1, $ymin-1, $ymax, $zoom); echo ""; echo tde(); // td("ul", "right", $xmin-1, $xmax-1, $ymin-1, $ymax-1, $zoom); - echo $ymin <= 0 ? tde('up') : td("up", "center", $xmin, $xmax, $ymin-1, $ymax-1, $zoom); + echo $ymin <= 0 ? tde('up') : td("up", "center", $xmin, $xmax, $ymin-1, $ymax-1, $zoom, $name); echo tde(); // td("ur", "left", $xmin+1, $xmax+1, $ymin-1, $ymax-1, $zoom); echo ""; echo tde(); // td("tl", "right", $xmin+1, $xmax, $ymin+1, $ymax, $zoom); - echo $ymin == $ymax ? tde('top') : td("top", "center", $xmin, $xmax, $ymin+1, $ymax, $zoom); + echo $ymin == $ymax ? tde('top') : td("top", "center", $xmin, $xmax, $ymin+1, $ymax, $zoom, $name); echo tde(); // td("tr", "left", $xmin, $xmax-1, $ymin+1, $ymax, $zoom); echo ""; - echo $xmin <= 0 ? tde('left', 'right') : td("left", "right", $xmin-1, $xmax, $ymin, $ymax, $zoom); + echo $xmin <= 0 ? tde('left', 'right') : td("left", "right", $xmin-1, $xmax, $ymin, $ymax, $zoom, $name); echo ""; - echo $xmax >= $zoom2-1 ? tde('right', 'left') : td("right", "left", $xmin, $xmax+1, $ymin, $ymax, $zoom); + echo $xmax >= $zoom2-1 ? tde('right', 'left') : td("right", "left", $xmin, $xmax+1, $ymin, $ymax, $zoom, $name); echo ""; - echo $xmin <= 0 ? tde('left', 'right') : td("left", "right", $xmin-1, $xmax-1, $ymin, $ymax, $zoom); + echo $xmin <= 0 ? tde('left', 'right') : td("left", "right", $xmin-1, $xmax-1, $ymin, $ymax, $zoom, $name); echo ""; - echo $xmax >= $zoom2-1 ? tde('right', 'left') : td("right", "left", $xmin+1, $xmax+1, $ymin, $ymax, $zoom); + echo $xmax >= $zoom2-1 ? tde('right', 'left') : td("right", "left", $xmin+1, $xmax+1, $ymin, $ymax, $zoom, $name); echo ""; - echo $xmin == $xmax ? tde('left', 'right') : td("left", "right", $xmin+1, $xmax, $ymin, $ymax, $zoom); + echo $xmin == $xmax ? tde('left', 'right') : td("left", "right", $xmin+1, $xmax, $ymin, $ymax, $zoom, $name); echo ""; - echo $xmin == $xmax ? tde('right', 'left') : td("right", "left", $xmin, $xmax-1, $ymin, $ymax, $zoom); + echo $xmin == $xmax ? tde('right', 'left') : td("right", "left", $xmin, $xmax-1, $ymin, $ymax, $zoom, $name); echo ""; echo tde(); // td("bl", "right", $xmin-1, $xmax, $ymin, $ymax+1, $zoom); - echo $ymax >= $zoom2-1 ? tde('bottom') : td("bottom", "center", $xmin, $xmax, $ymin, $ymax+1, $zoom); + echo $ymax >= $zoom2-1 ? tde('bottom') : td("bottom", "center", $xmin, $xmax, $ymin, $ymax+1, $zoom, $name); echo tde(); // td("br", "left", $xmin, $xmax+1, $ymin, $ymax+1, $zoom); echo ""; echo tde(); // td("dl", "right", $xmin-1, $xmax-1, $ymin+1, $ymax+1, $zoom); - echo $ymax >= $zoom2-1 ? tde('down') : td("down", "center", $xmin, $xmax, $ymin+1, $ymax+1, $zoom); + echo $ymax >= $zoom2-1 ? tde('down') : td("down", "center", $xmin, $xmax, $ymin+1, $ymax+1, $zoom, $name); echo tde(); // td("dr", "left", $xmin+1, $xmax+1, $ymin+1, $ymax+1, $zoom); echo ""; echo tde(); // td("bl", "right", $xmin+1, $xmax, $ymin, $ymax-1, $zoom); - echo $ymin == $ymax ? tde('bottom') : td("bottom", "center", $xmin, $xmax, $ymin, $ymax-1, $zoom); + echo $ymin == $ymax ? tde('bottom') : td("bottom", "center", $xmin, $xmax, $ymin, $ymax-1, $zoom, $name); echo tde(); // td("br", "left", $xmin, $xmax-1, $ymin, $ymax-1, $zoom); echo ""; echo ""; echo "
  
EXPAND SHIFT SHRINK
  
"; echo ""; - echo td("in/double size", "left", $xmin*2,$xmax*2+1,$ymin*2,$ymax*2+1,$zoom+1); + echo td("in/double size", "left", $xmin*2,$xmax*2+1,$ymin*2,$ymax*2+1,$zoom+1, $name); echo ""; - echo td("in/keep size", "left", $xmin*2+($xmax-$xmin)/2,$xmax*2-($xmax-$xmin)/2,$ymin*2+($ymax-$ymin)/2,$ymax*2-($ymax-$ymin)/2,$zoom+1); + echo td("in/keep size", "left", $xmin*2+($xmax-$xmin)/2,$xmax*2-($xmax-$xmin)/2,$ymin*2+($ymax-$ymin)/2,$ymax*2-($ymax-$ymin)/2,$zoom+1, $name); echo ""; echo ""; echo ""; - echo td("out/keep size", "left", $xmin/2-($xmax-$xmin)/4,$xmax/2+($xmax-$xmin)/4,$ymin/2-($ymax-$ymin)/4,$ymax/2+($ymax-$ymin)/4,$zoom-1); + echo td("out/keep size", "left", $xmin/2-($xmax-$xmin)/4,$xmax/2+($xmax-$xmin)/4,$ymin/2-($ymax-$ymin)/4,$ymax/2+($ymax-$ymin)/4,$zoom-1, $name); echo ""; - echo td("out/halve size", "left", $xmin/2,$xmax/2,$ymin/2,$ymax/2,$zoom-1); + echo td("out/halve size", "left", $xmin/2,$xmax/2,$ymin/2,$ymax/2,$zoom-1, $name); echo "
   ZOOM  
"; echo ""; - echo preg_replace('/\?[^"]+/', sprintf('index.html#map=%d/%f/%f',$zoom,($lat_min+$lat_max)/2,($lon_min+$lon_max)/2), td("BigMap", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo preg_replace('/\?[^"]+/', sprintf('index.html#map=%d/%f/%f',$zoom,($lat_min+$lat_max)/2,($lon_min+$lon_max)/2), td("BigMap", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo td("Permalink", "left", $xmin,$xmax,$ymin,$ymax,$zoom); + echo td("Permalink", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name); echo ""; - echo str_replace('?', '?action=ozimap&', td("OZI", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo str_replace('?', '?action=ozimap&', td("OZI", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo str_replace('?', '?action=wld&', td("WLD", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo str_replace('?', '?action=wld&', td("WLD", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo str_replace('?', '?action=perl&', td("Perl", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo str_replace('?', '?action=perl&', td("Perl", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo str_replace('?', '?action=python&', td("Py", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo str_replace('?', '?action=python&', td("Py", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo ($xmax-$xmin+1) * ($ymax-$ymin+1) > $max_tiles ? tde("Enqueue", "left") : str_replace('?', '?action=enqueue&', td("Enqueue", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo ($xmax-$xmin+1) * ($ymax-$ymin+1) > $max_tiles ? tde("Enqueue", "left") : str_replace('?', '?action=enqueue&', td("Enqueue", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo ""; - echo td("100", "left", $xmin,$xmax,$ymin,$ymax,$zoom,256); + echo td("100", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name,256); echo ""; - echo td("50", "left", $xmin,$xmax,$ymin,$ymax,$zoom,128); + echo td("50", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name,128); echo ""; - echo td("25%", "left", $xmin,$xmax,$ymin,$ymax,$zoom,64); + echo td("25%", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name,64); echo ""; echo ""; echo "
        // hide this
"; echo ""; +function generateMapTitle($xmin,$xmax,$ymin,$ymax,$zoom,$scale,$tiles,$name) { + return sprintf("%s", + $name, + $xmin,$xmax,$ymin,$ymax,$zoom,$scale,$tiles, + $name,$name); +} + # functions to create aspect ratio function gcd($a,$b) { return ($a % $b) ? gcd($b,$a % $b) : $b; @@ -96,14 +103,14 @@ function asp($w, $h) { } # helper to display a table cell with a parametrized link inside -function td($what, $align, $xmi, $xma, $ymi, $yma, $zm, $scl = 0) { +function td($what, $align, $xmi, $xma, $ymi, $yma, $zm, $nm, $scl = 0) { global $scale, $tiles; if( !$scl ) $scl = $scale; - return sprintf('%s', + return sprintf('%s', $align, $xmi, $xma, $ymi, $yma, - $zm, $scl, $tiles, $what); + $zm, $nm, $scl, $tiles, $what); } function tde($text = '', $align = 'center') { diff --git a/www/perl.php b/www/perl.php index 025b7d1..dabe002 100644 --- a/www/perl.php +++ b/www/perl.php @@ -1,6 +1,6 @@ #!/usr/bin/perl +# bigmap_.pl # Generated by BigMap 2. Permalink: @@ -63,7 +64,7 @@ $img->string(gdSmallFont, 5, $ysize*256 - 15, $attribution, $black); my @t = localtime(); -open PIC, sprintf('>map%02d-%02d%02d%02d-%02d%02d.png', $zoom, $t[5]%100, $t[4]+1, $t[3], $t[2], $t[1]); +open PIC, sprintf('>bigmap_%02d-%02d%02d%02d-%02d%02d.png', $zoom, $t[5]%100, $t[4]+1, $t[3], $t[2], $t[1]); binmode PIC; print PIC $img->png(); close PIC; diff --git a/www/python.php b/www/python.php index 4104720..1e802d5 100644 --- a/www/python.php +++ b/www/python.php @@ -1,6 +1,6 @@ #!/usr/bin/env python +# bigmap_.py # Generated by BigMap 2. Permalink: @@ -52,5 +53,5 @@ del draw now = datetime.datetime.now() -outputFileName = "map%02d-%02d%02d%02d-%02d%02d.png" % (zoom, now.year % 100, now.month, now.day, now.hour, now.minute) +outputFileName = "bigmap_%02d-%02d%02d%02d-%02d%02d.png" % (zoom, now.year % 100, now.month, now.day, now.hour, now.minute) resultImage.save(outputFileName) diff --git a/www/wld.php b/www/wld.php index cfd4108..b9d291d 100644 --- a/www/wld.php +++ b/www/wld.php @@ -1,6 +1,6 @@