From 3c7381b603e709c688cc88d6c951483dc71da98b Mon Sep 17 00:00:00 2001 From: mfbehrens99 <58851724+mfbehrens99@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:23:15 +0200 Subject: [PATCH 1/8] Added name Feature --- www/bigmap.php | 1 + www/index.html | 4 +++- www/panel.php | 64 +++++++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/www/bigmap.php b/www/bigmap.php index 22713f3..dec1424 100644 --- a/www/bigmap.php +++ b/www/bigmap.php @@ -21,6 +21,7 @@ $lon_max = $llmax[3]; $scale = req_num('scale', 256); $tiles = isset($_REQUEST['tiles']) && preg_match('/^[a-z0-9|-]+$/', $_REQUEST['tiles']) ? $_REQUEST['tiles'] : 'mapnik'; +$name = isset($_REQUEST['name']) ? $_REQUEST['name'] : 'New Map'; $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"; diff --git a/www/index.html b/www/index.html index c34155e..c1ba0ab 100644 --- a/www/index.html +++ b/www/index.html @@ -40,7 +40,9 @@

BigMap 2

- +
+

Map Name:
+

Download queue

diff --git a/www/panel.php b/www/panel.php index 25d01fb..26be784 100644 --- a/www/panel.php +++ b/www/panel.php @@ -16,94 +16,94 @@ $asp = sprintf("1:%.2f", $heipix/$widpix); } - printf("Map is %dx%d tiles (%dx%d px) at zoom %d, aspect %s
", - $widtiles,$heitiles,$widpix,$heipix,$zoom,$asp); + printf("Map \"%s\" is %dx%d tiles (%dx%d px) at zoom %d, aspect %s
", + $name,$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 str_replace('?', '?action=python3&', td("Py3", "left", $xmin,$xmax,$ymin,$ymax,$zoom)); + echo str_replace('?', '?action=python3&', td("Py3", "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 ""; # 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') { From eb05605bc68b31d62ecbb2df7b3a4a61710ec360 Mon Sep 17 00:00:00 2001 From: mfbehrens99 <58851724+mfbehrens99@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:38:02 +0200 Subject: [PATCH 2/8] Name used in all file types --- www/bigmap.php | 3 +-- www/kml.php | 2 +- www/ozimap.php | 2 +- www/perl.php | 5 +++-- www/python.php | 5 +++-- www/wld.php | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www/bigmap.php b/www/bigmap.php index e9355f7..8a1e053 100644 --- a/www/bigmap.php +++ b/www/bigmap.php @@ -21,11 +21,10 @@ $lon_max = $llmax[3]; $scale = req_num('scale', 256); $tiles = isset($_REQUEST['tiles']) && preg_match('/^[a-z0-9|-]+$/', $_REQUEST['tiles']) ? $_REQUEST['tiles'] : 'mapnik'; -$name = isset($_REQUEST['name']) ? $_REQUEST['name'] : 'New Map'; $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/kml.php b/www/kml.php index d5102ed..98609a9 100644 --- a/www/kml.php +++ b/www/kml.php @@ -1,6 +1,6 @@ '."\n"; ?> diff --git a/www/ozimap.php b/www/ozimap.php index 6cd4763..272e4f2 100644 --- a/www/ozimap.php +++ b/www/ozimap.php @@ -1,6 +1,6 @@ #!/usr/bin/perl +# # 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('>BigmapExport%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..35a24b1 100644 --- a/www/python.php +++ b/www/python.php @@ -1,6 +1,6 @@ #!/usr/bin/env python +# # 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 = "BigmapExport%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..667504b 100644 --- a/www/wld.php +++ b/www/wld.php @@ -1,6 +1,6 @@ Date: Thu, 30 Apr 2020 11:54:07 +0200 Subject: [PATCH 3/8] Minor Changes + Added Button for KML + Changed final name + fixed some wrong variables --- www/index.html | 3 ++- www/kml.php | 4 ++-- www/ozimap.php | 4 ++-- www/panel.php | 4 +++- www/perl.php | 4 ++-- www/python.php | 4 ++-- www/wld.php | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/www/index.html b/www/index.html index c1ba0ab..a09210d 100644 --- a/www/index.html +++ b/www/index.html @@ -40,7 +40,8 @@

BigMap 2

-
+ +

Map Name:

diff --git a/www/kml.php b/www/kml.php index 98609a9..fc701ee 100644 --- a/www/kml.php +++ b/www/kml.php @@ -1,12 +1,12 @@ '."\n"; ?> - .png + .png diff --git a/www/ozimap.php b/www/ozimap.php index 272e4f2..e3c258b 100644 --- a/www/ozimap.php +++ b/www/ozimap.php @@ -1,6 +1,6 @@ OziExplorer Map Data File Version 2.2 BigMap -.png +map.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 9ceca7a..64bda9c 100644 --- a/www/panel.php +++ b/www/panel.php @@ -68,12 +68,14 @@ 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,$name)); + echo " "; + echo str_replace('?', '?action=kml&', td("KML", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo " "; 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,$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,$name,256); echo "/"; diff --git a/www/perl.php b/www/perl.php index 3c720cf..611b510 100644 --- a/www/perl.php +++ b/www/perl.php @@ -1,6 +1,6 @@ string(gdSmallFont, 5, $ysize*256 - 15, $attribution, $black); my @t = localtime(); -open PIC, sprintf('>BigmapExport%02d-%02d%02d%02d-%02d%02d.png', $zoom, $t[5]%100, $t[4]+1, $t[3], $t[2], $t[1]); +open PIC, sprintf('>map%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 35a24b1..1c8555b 100644 --- a/www/python.php +++ b/www/python.php @@ -1,6 +1,6 @@ %02d-%02d%02d%02d-%02d%02d.png" % (zoom, now.year % 100, now.month, now.day, now.hour, now.minute) +outputFileName = "map%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 667504b..d66129e 100644 --- a/www/wld.php +++ b/www/wld.php @@ -1,6 +1,6 @@ Date: Thu, 30 Apr 2020 12:00:03 +0200 Subject: [PATCH 4/8] Removed KML Button --- www/panel.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/www/panel.php b/www/panel.php index 64bda9c..1376772 100644 --- a/www/panel.php +++ b/www/panel.php @@ -68,8 +68,6 @@ 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,$name)); - echo " "; - echo str_replace('?', '?action=kml&', td("KML", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo " "; echo str_replace('?', '?action=perl&', td("Perl", "left", $xmin,$xmax,$ymin,$ymax,$zoom,$name)); echo " "; From 822f80c21dead6f127c8bba835bede6b05ef1610 Mon Sep 17 00:00:00 2001 From: mfbehrens99 <58851724+mfbehrens99@users.noreply.github.com> Date: Thu, 30 Apr 2020 16:05:37 +0200 Subject: [PATCH 5/8] Added Renaming Renaming is possible by clicking on the name --- www/panel.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/www/panel.php b/www/panel.php index 1376772..587b4d6 100644 --- a/www/panel.php +++ b/www/panel.php @@ -8,8 +8,8 @@ $heipix = $heitiles*256; $asp=asp($widtiles,$heitiles); - printf("Map \"%s\" is %dx%d tiles (%dx%d px) at zoom %d, aspect %s
", - $name,$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, $name); @@ -85,6 +85,13 @@ echo "
"; 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; From 1961408c062574e9d6ed00d2680d2c273123fc35 Mon Sep 17 00:00:00 2001 From: mfbehrens99 <58851724+mfbehrens99@users.noreply.github.com> Date: Thu, 30 Apr 2020 16:10:04 +0200 Subject: [PATCH 6/8] Changed names back --- www/kml.php | 4 ++-- www/ozimap.php | 2 +- www/perl.php | 4 ++-- www/python.php | 4 ++-- www/wld.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/www/kml.php b/www/kml.php index fc701ee..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 e3c258b..f137dba 100644 --- a/www/ozimap.php +++ b/www/ozimap.php @@ -1,6 +1,6 @@ #!/usr/bin/perl -# +# bigmap_.pl # Generated by BigMap 2. Permalink: diff --git a/www/python.php b/www/python.php index 1c8555b..3c6e23b 100644 --- a/www/python.php +++ b/www/python.php @@ -1,6 +1,6 @@ #!/usr/bin/env python -# +# bigmap_.py # Generated by BigMap 2. Permalink: diff --git a/www/wld.php b/www/wld.php index d66129e..b9d291d 100644 --- a/www/wld.php +++ b/www/wld.php @@ -1,6 +1,6 @@ Date: Thu, 30 Apr 2020 16:13:36 +0200 Subject: [PATCH 7/8] changed Output file name --- www/ozimap.php | 2 +- www/perl.php | 2 +- www/python.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/ozimap.php b/www/ozimap.php index f137dba..9a37440 100644 --- a/www/ozimap.php +++ b/www/ozimap.php @@ -16,7 +16,7 @@ function deg( $value, $is_lon ) { ?> OziExplorer Map Data File Version 2.2 BigMap -map.png +bigmap_.png 1 ,Map Code, WGS 84,WGS 84, 0.0000, 0.0000,WGS 84 Reserved 1 diff --git a/www/perl.php b/www/perl.php index 2976b63..dabe002 100644 --- a/www/perl.php +++ b/www/perl.php @@ -64,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 3c6e23b..1e802d5 100644 --- a/www/python.php +++ b/www/python.php @@ -53,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) From ac064a39de1baddfa48b8111a3e72557b1e8065e Mon Sep 17 00:00:00 2001 From: mfbehrens99 <58851724+mfbehrens99@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:31:02 +0200 Subject: [PATCH 8/8] Fixed renaming issue --- www/panel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/panel.php b/www/panel.php index 587b4d6..e451004 100644 --- a/www/panel.php +++ b/www/panel.php @@ -86,7 +86,7 @@ echo ""; function generateMapTitle($xmin,$xmax,$ymin,$ymax,$zoom,$scale,$tiles,$name) { - return sprintf("%s", + return sprintf("%s", $name, $xmin,$xmax,$ymin,$ymax,$zoom,$scale,$tiles, $name,$name);