Refactored API

external_coachsequence.go

@@ -2,15 +2,16 @@ package bahn
 
 import (
 	"encoding/json"
+	"io"
 	"strconv"
 	"strings"
 	"time"
 	"unicode"
 )
 
-func CoachSequenceFromDecoder(source json.Decoder) (CoachSequence, error) {
+func CoachSequenceFromReader(source io.Reader) (CoachSequence, error) {
 	var raw rawCoachSequence
-	if err := source.Decode(&raw); err != nil {
+	if err := json.NewDecoder(source).Decode(&raw); err != nil {
 		return CoachSequence{}, err
 	}
 	return parseCoachSequence(raw), nil

external_station.go

 package bahn
 
-import "encoding/xml"
+import (
+	"encoding/xml"
+	"io"
+)
 
-func StationsFromDecoder(source xml.Decoder) ([]Station, error) {
+func StationsFromReader(source io.Reader) ([]Station, error) {
 	var raw rawStations
-	if err := source.Decode(&raw); err != nil {
+	if err := xml.NewDecoder(source).Decode(&raw); err != nil {
 		return make([]Station, 0), err
 	}
 	return parseStations(raw), nil

external_timetable.go

@@ -3,11 +3,12 @@ package bahn
 import (
 	"encoding/xml"
 	"fmt"
+	"io"
 )
 
-func TimetableFromDecoder(source xml.Decoder) (Timetable, error) {
+func TimetableFromReader(source io.Reader) (Timetable, error) {
 	var raw rawTimetable
-	if err := source.Decode(&raw); err != nil {
+	if err := xml.NewDecoder(source).Decode(&raw); err != nil {
 		return Timetable{}, err
 	}
 	return parseTimetable(raw), nil

external_wings.go

 package bahn
 
-import "encoding/xml"
+import (
+	"encoding/xml"
+	"io"
+)
 
-func WingDefinitionFromDecoder(source xml.Decoder) (WingDefinition, error) {
+func WingDefinitionFromReader(source io.Reader) (WingDefinition, error) {
 	var raw rawWingDefinition
-	if err := source.Decode(&raw); err != nil {
+	if err := xml.NewDecoder(source).Decode(&raw); err != nil {
 		return WingDefinition{}, err
 	}
 	return parseWingDefinition(raw), nil