update function importPoints.php

Substitute watertower for rwstation_s2 and read control points for
*both* RoF and BoS.  This is untested as I can't get this far with
BOSEditor, yet, so please test it and report.