From faa7b067589caf6e78e93457356efc496b2b25f9 Mon Sep 17 00:00:00 2001 From: olly Date: Sat, 20 Jun 2015 10:30:46 +1200 Subject: [PATCH 1/7] Revert commit 2078 - put the javascript back in --- .../make-prospectingguide-new.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index 7a81e8bab..bf989cd68 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -439,10 +439,10 @@ else: htmlfile = file("../../handbook/prospecting_guide.html", "w") htmlfile.write("Prospecting Guide\n") -#htmlfile.write("\n"); +htmlfile.write("\n"); htmlfile.write(""" """) -htmlfile.write("

Prospecting Guide

"); -htmlfile.write("\n"); +htmlfile.write("

Prospecting Guide

") htmlfile.write("

Generated " + time.strftime("%Y-%m-%d %H:%M:%S %Z") + " by " + sys.argv[0] + "

\n") htmlfile.write("

Notes:

\n") From bf265338a7d9ead1994ef7252b3e77f24c30a94f Mon Sep 17 00:00:00 2001 From: olly Date: Sat, 20 Jun 2015 10:42:05 +1200 Subject: [PATCH 2/7] Fix layout of area table --- .../make-prospectingguide-new.py | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index bf989cd68..ed8dbfb22 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -186,24 +186,17 @@ def get_img_name(maparea): # big map first (zoom factor ignored) maps = { -# id left top right bottom zoom -# G&K G&K G&K G&K factor -"all": [34950.9, 86300.0, 38325.0, 80895.6, 1.0, - "All"], -"40": [36275.6, 82392.5, 36780.3, 81800.0, 3.0, - "Eishöhle"], -"76": [35440.0, 83220.0, 36090.0, 82670.0, 3.0, - "Eislufthöhle"], -"204": [36354.1, 84154.5, 37047.4, 83399.7, 3.0, - "Steinbrückenhöhle"], -"tc": [35230.0, 82690.0, 36110.0, 82100.0, 3.0, - "Near Top Camp"], -"grieß": - [36000.0, 86300.0, 38320.0, 84400.0, 4.0, - "Grießkogel Area"], +# id left top right bottom zoom +# G&K G&K G&K G&K factor +"all": [34950.9, 86300.0, 38325.0, 80895.6, 1.0, "All"], +"40": [36275.6, 82392.5, 36780.3, 81800.0, 3.0, "Eishöhle"], +"76": [35440.0, 83220.0, 36090.0, 82670.0, 3.0, "Eislufthöhle"], +"204": [36354.1, 84154.5, 37047.4, 83399.7, 3.0, "Steinbrückenhöhle"], +"tc": [35230.0, 82690.0, 36110.0, 82100.0, 3.0, "Near Top Camp"], +"gk": [36000.0, 86300.0, 38320.0, 84400.0, 4.0, "Grießkogel Area"], } # Keys in the order in which we want the maps output -mapcodes = ["all", "grieß","40", "76", "204", "tc"] +mapcodes = ["all", "gk", "40", "76", "204", "tc"] # Field codes L = 0 T = 1 From 85d776666e2e88544ba589cd7d9cce33bd7e1795 Mon Sep 17 00:00:00 2001 From: olly Date: Sat, 20 Jun 2015 10:43:51 +1200 Subject: [PATCH 3/7] Fix coordinates of "all" to match map scan --- noinfo/prospecting_guide_scripts/make-prospectingguide-new.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index ed8dbfb22..12ef4de73 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -188,7 +188,8 @@ def get_img_name(maparea): maps = { # id left top right bottom zoom # G&K G&K G&K G&K factor -"all": [34950.9, 86300.0, 38325.0, 80895.6, 1.0, "All"], +# DO NOT just change the coordinates of "all" - they MUST match the borders of the scanned map. +"all": [34394.9, 84508.6, 37399.4, 80895.6, 1.0, "All"], "40": [36275.6, 82392.5, 36780.3, 81800.0, 3.0, "Eishöhle"], "76": [35440.0, 83220.0, 36090.0, 82670.0, 3.0, "Eislufthöhle"], "204": [36354.1, 84154.5, 37047.4, 83399.7, 3.0, "Steinbrückenhöhle"], From 293441a50329d2540f576db58bcf38babdfbfcac Mon Sep 17 00:00:00 2001 From: olly Date: Sat, 20 Jun 2015 10:44:17 +1200 Subject: [PATCH 4/7] Remove bogus trailing ; --- .../prospecting_guide_scripts/make-prospectingguide-new.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index 12ef4de73..0d6e8031d 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -433,10 +433,10 @@ else: htmlfile = file("../../handbook/prospecting_guide.html", "w") htmlfile.write("Prospecting Guide\n") -htmlfile.write("\n"); + htmlfile.write("bg%s = false;\n" % maparea) +htmlfile.write("//-->\n\n") htmlfile.write("""