summaryrefslogtreecommitdiffstats
path: root/parsers
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2023-10-12 00:58:20 +0300
committerPhilip Sargent <philip.sargent@gmail.com>2023-10-12 00:58:20 +0300
commitd3a7a9823a025f84921561882b3049765105d7fa (patch)
treebdb946fda56bcaba13ace17a35dd8bcbc5cd8020 /parsers
parent3b1fd56fe4b09ffc9203c3109fcd05ff440732ef (diff)
downloadtroggle-d3a7a9823a025f84921561882b3049765105d7fa.tar.gz
troggle-d3a7a9823a025f84921561882b3049765105d7fa.tar.bz2
troggle-d3a7a9823a025f84921561882b3049765105d7fa.zip
remove exact station
Diffstat (limited to 'parsers')
-rw-r--r--parsers/caves.py6
-rw-r--r--parsers/locations.py4
2 files changed, 3 insertions, 7 deletions
diff --git a/parsers/caves.py b/parsers/caves.py
index 91985d1..c3d2567 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -498,7 +498,6 @@ def read_entrance(filename, ent=None):
bearings = getXMLmax1("bearings")
easting = getXMLmax1("easting")
entrance_description = getXMLmax1("entrance_description")
- exact_station = getXMLmax1("exact_station")
explorers = getXMLmax1("explorers")
findability = getXMLmax1("findability")
findability_description = getXMLmax1("findability_description")
@@ -524,11 +523,9 @@ def read_entrance(filename, ent=None):
ent.alt=alt[0]
ent.approach=approach[0]
ent.bearings=bearings[0]
- ent.easting=easting[0]
ent.lat_wgs84=lat_wgs84[0]
ent.long_wgs84=long_wgs84[0]
ent.entrance_description=entrance_description[0]
- ent.exact_station=exact_station[0]
ent.explorers=explorers[0]
ent.filename=filename
ent.findability=findability[0]
@@ -538,7 +535,6 @@ def read_entrance(filename, ent=None):
ent.map_description=map_description[0]
ent.marking=marking[0]
ent.marking_comment=marking_comment[0]
- ent.northing=northing[0]
ent.other_description=other_description[0]
ent.other_station=other_station[0]
ent.photo=photo[0]
@@ -547,7 +543,7 @@ def read_entrance(filename, ent=None):
ent.underground_description=underground_description[0]
ent.url=url[0]
- for st in [ent.exact_station, ent.other_station, ent.tag_station]:
+ for st in [ent.other_station, ent.tag_station]:
#validate_station(st)
try:
validate_station(st)
diff --git a/parsers/locations.py b/parsers/locations.py
index acf41b9..568e79b 100644
--- a/parsers/locations.py
+++ b/parsers/locations.py
@@ -54,7 +54,7 @@ class MapLocations(object):
def points(self):
prior = len(self.p)
for ent in Entrance.objects.all():
- for st, ent_type in {ent.exact_station: "exact", ent.other_station: "other", ent.tag_station: "tag"}.items():
+ for st, ent_type in {ent.other_station: "other", ent.tag_station: "tag"}.items():
if st != "":
self.p.append((st, str(ent), ent.needs_surface_work(), ent))
store_data_issues()
@@ -102,7 +102,7 @@ def validate_entrance_stations(ent=None):
else:
print(f"BUGGER {ent} {ent.cavelist()}")
url="/caves"
- for st, ent_type in {ent.exact_station: "exact", ent.other_station: "other", ent.tag_station: "tag"}.items():
+ for st, ent_type in {ent.other_station: "other", ent.tag_station: "tag"}.items():
if st == "":
continue
try: