From 6bd61914843912133f797ab34955b6423d8f082a Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 4 May 2019 13:42:33 +0200
Subject: [PATCH] Minor fixes
---
go.mod | 2 +-
go.sum | 7 ++++++-
main.go | 7 ++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index cdd9b02..9a2fd67 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@ module git.kuschku.de/justjanne/bahn-proxy
go 1.12
require (
- git.kuschku.de/justjanne/bahn-api v0.0.0-20190504113537-452e8eed7129
+ git.kuschku.de/justjanne/bahn-api v0.0.0-20190504114009-71c830fe0812
github.com/patrickmn/go-cache v2.1.0+incompatible
)
diff --git a/go.sum b/go.sum
index 9d84ba5..a0b776f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,12 @@
-git.kuschku.de/justjanne/bahn-api v0.0.0-20190504113537-452e8eed7129/go.mod h1:WQsAQzBR+0dlaVVuwwkx8j5uMoWDIdc8xtX4vlRrp5E=
+git.kuschku.de/justjanne/bahn-api v0.0.0-20190504114009-71c830fe0812 h1:dhL0LHGoud1so9Be3namg7g+/PtGVGhldtw+agNActg=
+git.kuschku.de/justjanne/bahn-api v0.0.0-20190504114009-71c830fe0812/go.mod h1:WQsAQzBR+0dlaVVuwwkx8j5uMoWDIdc8xtX4vlRrp5E=
+github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/main.go b/main.go
index daaf489..e0180a5 100644
--- a/main.go
+++ b/main.go
@@ -219,7 +219,12 @@ func main() {
data[key] = combined
}
- if err = returnJson(w, data); err != nil {
+ var result []InternalModel
+ for _, element := range data {
+ result = append(result, element)
+ }
+
+ if err = returnJson(w, result); err != nil {
log.Fatal(err)
return
}
--
GitLab