changed nb_pump to no_pumps for explicity sake
added marked status for hydrants