Fixed stop position parsing
Added route way point service and parsing