diff --git a/noinfo/prospecting_guide_scripts/fakedpositions.dat b/noinfo/prospecting_guide_scripts/fakedpositions.dat index 8d4d5cab2..f106a7f09 100644 --- a/noinfo/prospecting_guide_scripts/fakedpositions.dat +++ b/noinfo/prospecting_guide_scripts/fakedpositions.dat @@ -1,9 +1,9 @@ -(35975.37, 83018.21, 100) 177 1d# Calculated from bearings -(35350.00, 81630.00, 50) 71 4# From Auer map -(36025.00, 82475.00, 50) 146 2c# From mystery map -(35600.00, 82050.00, 50) 35 4# From Auer map -(35650.00, 82025.00, 50) 44 4# From Auer map -(35700.00, 82150.00, 50) 75 4# From Auer map -(36200.00, 82925.00, 50) 178 1d# Calculated from bearings -(35232.64, 82910.37, 25) 181 1b# Calculated from bearings -(35750.00, 83368.00, 50) 98 1d# "up from 176" +(35975.37, 83018.21, 100) 177 # Calculated from bearings +(35350.00, 81630.00, 50) 71 # From Auer map +(36025.00, 82475.00, 50) 146 # From mystery map +(35600.00, 82050.00, 50) 35 # From Auer map +(35650.00, 82025.00, 50) 44 # From Auer map +(35700.00, 82150.00, 50) 75 # From Auer map +(36200.00, 82925.00, 50) 178 # Calculated from bearings +(35232.64, 82910.37, 25) 181 # Calculated from bearings +(35800.00, 83418.00, 100) 98 # "up from 176" diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py index 4c8ea6efd..775a0a873 100644 --- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py +++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py @@ -267,7 +267,7 @@ for cave in cavetab: plot(positions["laser.0_7"], "BNase", "6", "Bräuning Näse laser point") plot(positions["226-96"], "BZkn", "6", "Bräuning Zinken trig point") -plot(positions["vd1"],"VD1","6", "VD1 laser point") +plot(positions["vd1"],"VD1","6", "VD1 survey point") plot(positions["laser.kt114_96"],"HSK","6", "Hinterer Schwarzmooskogel trig point") plot(positions["2000"],"Nipple","6", "Nipple (Weiße Warze)") plot(positions["3000"],"VSK","6", "Vorderer Schwarzmooskogel summit") @@ -299,10 +299,21 @@ for area in areas: fakedpositions = file("fakedpositions.dat") for p in fakedpositions: try: - (x,y,d,name, area) = re.match(r'\(([0-9.]*?),\t([0-9.]*?),\t([0-9.]*?)\)\t(.*)\t(.*)#', chomp(p)).groups() + (x,y,d,name) = re.match(r'\(([0-9.]*?),\t([0-9.]*?),\t([0-9.]*?)\)\t(.*?)[\t ]*#', chomp(p)).groups() except: print "Couldn't understand" + repr(chomp(p)) continue + # Find the area with this cave in + area = '' + for tryarea in areas: + for (number, cave, locn) in cavelists[tryarea]: + if name == number: + area = tryarea + break + # FIXME really want to break from both loops at once + # but I don't know how to in Python + if area != '': + break x,y,d = map(float, (x,y,d)) x,y,d = map(round, (x,y,d)) lo = mungecoord(x-d,y+d)