Changed json object:

- Created json format for later on
- Removed nested loop
Merge pull request #117 from nealfennimore/fix/trip-controller-json-show-marker

Changed json object: