Integrated points and lines JSON

Both points and lines are now loaded from a single source, data.php