[svn r7102] Work out area code for faked positions automatically.

Also VD1 isn't a laser point, just a very well known, well marked, and often
used survey station.
This commit is contained in:
expo
2005-08-08 19:55:04 +02:00
parent e38fe33caa
commit c6ebb05da9
2 changed files with 22 additions and 11 deletions

View File

@@ -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)