diff options
| -rw-r--r-- | parsers/locations.py | 65 |
1 files changed, 24 insertions, 41 deletions
diff --git a/parsers/locations.py b/parsers/locations.py index d3d65ab..a8ad980 100644 --- a/parsers/locations.py +++ b/parsers/locations.py @@ -49,16 +49,18 @@ class MapLocations(object): ("225-96", "BAlm", "Reference", "Bräuning Alm trig point"), ] # 12 fixed points - # Where we have a lot of survey stations which have not been assigned to proper Entrances and Caves yet, but we - # want to see them in the /stations report page: - - - p = [] def points(self): - nullent = Entrance.objects.all()[0] # hope this doesn't barf + # Where we have a lot of survey stations which have not been assigned to proper Entrances and Caves yet, but we + # want to see them in the /stations report page: + + # they already appear in any survex-generated stuff, e.g. + # $ survexport --gpx --fixes --survey=1623 --survey=1626 troggle_import_root.3d trogfix.gpx + # but not in troggle reports unless we include them here + + nullent = Entrance.objects.all()[0] pending = [ ("1623.p2013-cucc-pit", "no ent", False, nullent), @@ -71,41 +73,22 @@ class MapLocations(object): ("1626.p2013-cucc-12mpit", "no ent", False, nullent), ("1626.p2013-cucc-20mpit", "no ent", False, nullent), ("1626.p2013-cucc-2s-drop", "no ent", False, nullent), - # to add in the rest of the entrances from the 2013 prospecting trip - - # fix p2013-cucc-01 reference 486512 284436 1825 ; 11:02 - # *fix p2013-cucc-01-DUP reference 486519 284448 1823 - - # *fix p2013-cucc-01B reference 486492 284508 1828 ; 11:37 - - # *fix p2013-cucc-01cp reference 486507 284580 1843 ; 11:44 - - # *fix p2013-cucc-rift reference 486410 284622 1835 ; 12:00 - - # *fix p2013-cucc-slope reference 486485 284591 1844 ; 11:51 - - # *fix p2013-cucc-snowplug2 reference 486042 284531 1813 ; 13:03 - - # *fix p2013-cucc-draft4pit reference 486374 284438 1786 ; 13:58 ; * GOOD - # *fix p2013-cucc-draft4pit-DUP reference 486375 284447 1774 - - # *fix p2013-cucc-DraftHole reference 486277 284716 1856 ; 12:28 - - # *fix p2013-cucc-setofsnowholes reference 486060 284584 1848 ; 12:51 - - # *fix p2013-cucc-stotp20 reference 486176 284738 1864 ; 12:37 - - # *fix p2013-cucc-snowplug reference 486349 284666 1833 ; 12:13 - - # *fix p2013-cucc-draft3pit reference 486332 284428 1769 - - # *fix p2013-cucc-shelter1 reference 486533 284546 1831 - - # *fix p2013-cucc-draft2pit reference 486333 284485 1779 - - # ;*fix p2013-cucc-01-DUP ; marked as duplicate - # ;*fix p2013-cucc-draft4pit-DUP ; marked as duplicate - + ("1626.p2013-cucc-01", "no ent", False, nullent), + ("1626.p2013-cucc-01-DUP", "no ent", False, nullent), + ("1626.p2013-cucc-01B", "no ent", False, nullent), + ("1626.p2013-cucc-01cp", "no ent", False, nullent), + ("1626.p2013-cucc-rift", "no ent", False, nullent), + ("1626.p2013-cucc-slope", "no ent", False, nullent), + ("1626.p2013-cucc-snowplug2", "no ent", False, nullent), + ("1626.p2013-cucc-draft4pit ", "no ent", False, nullent), + ("1626.p2013-cucc-draft4pit-DUP ", "no ent", False, nullent), + ("1626.p2013-cucc-DraftHole", "no ent", False, nullent), + ("1626.p2013-cucc-setofsnowholes", "no ent", False, nullent), + ("1626.p2013-cucc-stotp20", "no ent", False, nullent), + ("1626.p2013-cucc-snowplug", "no ent", False, nullent), + ("1626.p2013-cucc-draft3pit", "no ent", False, nullent), + ("1626.p2013-cucc-shelter1", "no ent", False, nullent), + ("1626.p2013-cucc-draft2pit", "no ent", False, nullent), ("1626.p2014-ms-01", "no ent", False, nullent), ("1626.p2014-ms-02", "no ent", False, nullent), ("1626.p2014-ms-03", "no ent", False, nullent), |