From 4dc8d11538f009941c434a0c7eda26098ccbb792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sun, 10 Mar 2024 23:40:27 +0100 Subject: [PATCH] Be less pedantic, improve logging --- cmd/fetch/fetch.go | 6 +++--- cmd/fetch/types.go | 22 ++++++++++---------- cmd/keyserver/keyserver.go | 34 +++++++++++++++++++++++-------- cmd/keyserver/types.go | 16 +++++++-------- hoods/Adelsdorf.json | 2 +- hoods/Arnstein.json | 2 +- hoods/Aschaffenburg.json | 2 +- hoods/Bad Hersfeld.json | 14 ++++++------- hoods/Bad-Windsheim.json | 2 +- hoods/BadSteben.json | 2 +- hoods/Bamberg.json | 2 +- hoods/Bayreuth.json | 2 +- hoods/Breitendiel.json | 20 +++++++++--------- hoods/Chiemgau.json | 2 +- hoods/Coburg.json | 2 +- hoods/Crailsheim.json | 2 +- hoods/Dinkelsbuehl.json | 2 +- hoods/Ebermannstadt.json | 2 +- hoods/Ebern.json | 2 +- hoods/Eckental.json | 2 +- hoods/Erlangen-Innenstadt.json | 12 +++++------ hoods/Erlangen-Nord.json | 2 +- hoods/Erlangen-Ost.json | 2 +- hoods/Erlangen-West.json | 2 +- hoods/Fichtelberg.json | 2 +- hoods/FichtelgebirgeFleckl.json | 2 +- hoods/FichtelgebirgeNeubau.json | 2 +- hoods/FichtelgebirgeNord.json | 2 +- hoods/FichtelgebirgeOst.json | 2 +- hoods/FichtelgebirgeSued.json | 2 +- hoods/FichtelgebirgeWest.json | 2 +- hoods/Forchheim.json | 2 +- hoods/FraenkischeSchweizNord.json | 2 +- hoods/FraenkischeSchweizOst.json | 2 +- hoods/FraenkischeSchweizSued.json | 2 +- hoods/Frankenwald.json | 2 +- hoods/Fuerth.json | 2 +- hoods/Gerolzhofen.json | 2 +- hoods/Hassfurt.json | 2 +- hoods/HassfurtStadt.json | 10 ++++----- hoods/Helmbrechts.json | 2 +- hoods/Hoechstadt.json | 2 +- hoods/Hof.json | 2 +- hoods/Hofheim.json | 2 +- hoods/HofheimStadt.json | 12 +++++------ hoods/Konradsreuth.json | 2 +- hoods/Lauf.json | 2 +- hoods/Leupoldsgruen.json | 2 +- hoods/Lichtenberg.json | 2 +- hoods/Lichtenfels.json | 2 +- hoods/Marktredwitz.json | 2 +- hoods/Miltenberg.json | 2 +- hoods/Mosbach.json | 2 +- hoods/Muenchberg.json | 2 +- hoods/Naila.json | 2 +- hoods/Nürnberg-Innenstadt.json | 14 ++++++------- hoods/Nürnberg-Umland.json | 2 +- hoods/Nürnberg.json | 24 +++++++++++----------- hoods/Pegnitz.json | 2 +- hoods/Rehau.json | 2 +- hoods/Remscheid.json | 2 +- hoods/Roettenbach.json | 2 +- hoods/Roth.json | 2 +- hoods/Salzach.json | 2 +- hoods/Schauenstein.json | 8 ++++---- hoods/Schnaittach.json | 2 +- hoods/SchwarzenbachSaale.json | 2 +- hoods/Schweinfurt.json | 2 +- hoods/Selb.json | 2 +- hoods/Selbitz.json | 8 ++++---- hoods/Trainstation.json | 10 +++++++-- hoods/Weissdorf.json | 12 +++++------ hoods/Wuerzburg.json | 2 +- hoods/Zell.json | 8 ++++---- 74 files changed, 184 insertions(+), 162 deletions(-) diff --git a/cmd/fetch/fetch.go b/cmd/fetch/fetch.go index 9792f15..98f7d66 100644 --- a/cmd/fetch/fetch.go +++ b/cmd/fetch/fetch.go @@ -60,11 +60,11 @@ func main() { } if len(h.Polygons) == 0 { - hood.Location = []Coordinate{{Lat: h.Lat, Long: h.Long}} + hood.Location = []HoodCoordinate{{Lat: h.Lat, Long: h.Long}} } else { - hood.Location = []Coordinate{} + hood.Location = []HoodCoordinate{} for _, p := range h.Polygons[0] { - hood.Location = append(hood.Location, Coordinate{Lat: p.Lat, Long: p.Long}) + hood.Location = append(hood.Location, HoodCoordinate{Lat: p.Lat, Long: p.Long}) } } diff --git a/cmd/fetch/types.go b/cmd/fetch/types.go index 4b747cd..e8445af 100644 --- a/cmd/fetch/types.go +++ b/cmd/fetch/types.go @@ -15,28 +15,23 @@ type InputCoordinate struct { Long float64 `json:"lon"` } -type Coordinate struct { - Lat float64 `json:"lat"` - Long float64 `json:"long"` -} - type Hood struct { - Version uint64 `json:"version"` - Network HoodNetwork `json:"network"` - Vpn []VpnEndpoint `json:"vpn"` - HoodInfo HoodInfo `json:"hood"` + Version uint64 `json:"version"` + Network HoodNetwork `json:"network"` + Vpn []HoodVpnEndpoint `json:"vpn"` + HoodInfo HoodInfo `json:"hood"` // one coordinate: voronoi // two coordinates: invalid // three or more coordinates: polygon - Location []Coordinate `json:"location,omitempty"` + Location []HoodCoordinate `json:"location,omitempty"` } type HoodNetwork struct { UlaPrefix string `json:"ula_prefix"` } -type VpnEndpoint struct { +type HoodVpnEndpoint struct { Name string `json:"name"` Protocol string `json:"protocol"` Address string `json:"address"` @@ -63,3 +58,8 @@ type HoodInfo struct { NtpIp string `json:"ntp_ip"` Timestamp uint64 `json:"timestamp"` } + +type HoodCoordinate struct { + Lat float64 `json:"lat"` + Long float64 `json:"lon"` +} diff --git a/cmd/keyserver/keyserver.go b/cmd/keyserver/keyserver.go index f8869c5..e0ab727 100644 --- a/cmd/keyserver/keyserver.go +++ b/cmd/keyserver/keyserver.go @@ -53,7 +53,8 @@ func hoodPoly(lat, long float64) *Hood { if !poly.IsClosed() { // TODO: validate when parsing files! - log.Print("polygon is not closed!") + log.Printf("Polygon is not closed for hood: %s", hood.HoodInfo.Name) + continue } if poly.Contains(geo.NewPoint(lat, long)) { @@ -95,16 +96,31 @@ func keyserverV2Time(w http.ResponseWriter, r *http.Request) { log.Printf("Processed request in %s", duration) } +func httpHeader(w http.ResponseWriter, r *http.Request, statusCode int) { + log.Printf("\"%s %s %s\" %d", r.Method, r.RequestURI, r.Proto, statusCode) + w.WriteHeader(statusCode) +} + func keyserverV2(w http.ResponseWriter, r *http.Request) { hoodid := r.URL.Query().Get("hoodid") lat := r.URL.Query().Get("lat") long := r.URL.Query().Get("long") + lon := r.URL.Query().Get("lon") var hood *Hood = hoodId(0) + if lon != "" && long != "" { + httpHeader(w, r, http.StatusBadRequest) + return + } + + if lon != "" { + long = lon + } + if hoodid != "" { id, err := strconv.ParseUint(hoodid, 10, 64) if err != nil { - w.WriteHeader(http.StatusBadRequest) + httpHeader(w, r, http.StatusBadRequest) return } hood = hoodId(id) @@ -112,7 +128,7 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) { if lat != "" { if long == "" { - w.WriteHeader(http.StatusBadRequest) + httpHeader(w, r, http.StatusBadRequest) return } @@ -122,12 +138,12 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) { latF, err := strconv.ParseFloat(lat, 64) if err != nil { - w.WriteHeader(http.StatusBadRequest) + httpHeader(w, r, http.StatusBadRequest) return } longF, err := strconv.ParseFloat(long, 64) if err != nil { - w.WriteHeader(http.StatusBadRequest) + httpHeader(w, r, http.StatusBadRequest) return } @@ -139,24 +155,24 @@ func keyserverV2(w http.ResponseWriter, r *http.Request) { } if hood == nil { - w.WriteHeader(http.StatusInternalServerError) + httpHeader(w, r, http.StatusInternalServerError) return } } else if long != "" { - w.WriteHeader(http.StatusBadRequest) + httpHeader(w, r, http.StatusBadRequest) return } if hood == nil { log.Print("No hood found") - w.WriteHeader(http.StatusNotFound) + httpHeader(w, r, http.StatusNotFound) return } b, err := json.MarshalIndent(hood, "", " ") if err != nil { log.Printf("Marshaling error: %s", err) - w.WriteHeader(http.StatusInternalServerError) + httpHeader(w, r, http.StatusInternalServerError) return } w.Header().Add("Content-Type", "application/json; charset=utf-8") diff --git a/cmd/keyserver/types.go b/cmd/keyserver/types.go index 10be95e..78e3661 100644 --- a/cmd/keyserver/types.go +++ b/cmd/keyserver/types.go @@ -1,22 +1,22 @@ package main type Hood struct { - Version uint64 `json:"version"` - Network HoodNetwork `json:"network"` - Vpn []VpnEndpoint `json:"vpn"` - HoodInfo HoodInfo `json:"hood"` + Version uint64 `json:"version"` + Network HoodNetwork `json:"network"` + Vpn []HoodVpnEndpoint `json:"vpn"` + HoodInfo HoodInfo `json:"hood"` // one coordinate: voronoi // two coordinates: invalid // three or more coordinates: polygon - Location []Coordinate `json:"location,omitempty"` + Location []HoodCoordinate `json:"location,omitempty"` } type HoodNetwork struct { UlaPrefix string `json:"ula_prefix"` } -type VpnEndpoint struct { +type HoodVpnEndpoint struct { Name string `json:"name"` Protocol string `json:"protocol"` Address string `json:"address"` @@ -44,7 +44,7 @@ type HoodInfo struct { Timestamp uint64 `json:"timestamp"` } -type Coordinate struct { +type HoodCoordinate struct { Lat float64 `json:"lat"` - Long float64 `json:"long"` + Long float64 `json:"lon"` } diff --git a/hoods/Adelsdorf.json b/hoods/Adelsdorf.json index d9dcd52..bdebf84 100644 --- a/hoods/Adelsdorf.json +++ b/hoods/Adelsdorf.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.71, - "long": 10.89 + "lon": 10.89 } ] } \ No newline at end of file diff --git a/hoods/Arnstein.json b/hoods/Arnstein.json index 5a01e1c..85827a6 100644 --- a/hoods/Arnstein.json +++ b/hoods/Arnstein.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.981666, - "long": 9.969662 + "lon": 9.969662 } ] } \ No newline at end of file diff --git a/hoods/Aschaffenburg.json b/hoods/Aschaffenburg.json index 1749137..5c6df28 100644 --- a/hoods/Aschaffenburg.json +++ b/hoods/Aschaffenburg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.975661, - "long": 9.146826 + "lon": 9.146826 } ] } \ No newline at end of file diff --git a/hoods/Bad Hersfeld.json b/hoods/Bad Hersfeld.json index 4c22058..6428b83 100644 --- a/hoods/Bad Hersfeld.json +++ b/hoods/Bad Hersfeld.json @@ -34,31 +34,31 @@ "location": [ { "lat": 50.940906, - "long": 9.668312 + "lon": 9.668312 }, { "lat": 50.862527, - "long": 9.598617 + "lon": 9.598617 }, { "lat": 50.760133, - "long": 9.684448 + "lon": 9.684448 }, { "lat": 50.776201, - "long": 9.772338 + "lon": 9.772338 }, { "lat": 50.818083, - "long": 9.888381 + "lon": 9.888381 }, { "lat": 50.907146, - "long": 9.879798 + "lon": 9.879798 }, { "lat": 50.938094, - "long": 9.780235 + "lon": 9.780235 } ] } \ No newline at end of file diff --git a/hoods/Bad-Windsheim.json b/hoods/Bad-Windsheim.json index d77d579..885f4bd 100644 --- a/hoods/Bad-Windsheim.json +++ b/hoods/Bad-Windsheim.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.50198129, - "long": 10.40405273 + "lon": 10.40405273 } ] } \ No newline at end of file diff --git a/hoods/BadSteben.json b/hoods/BadSteben.json index 89f1806..907343e 100644 --- a/hoods/BadSteben.json +++ b/hoods/BadSteben.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.37, - "long": 11.62 + "lon": 11.62 } ] } \ No newline at end of file diff --git a/hoods/Bamberg.json b/hoods/Bamberg.json index 06932f2..be8e916 100644 --- a/hoods/Bamberg.json +++ b/hoods/Bamberg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.89, - "long": 10.898 + "lon": 10.898 } ] } \ No newline at end of file diff --git a/hoods/Bayreuth.json b/hoods/Bayreuth.json index 1f0f1e3..6b64d05 100644 --- a/hoods/Bayreuth.json +++ b/hoods/Bayreuth.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.94814, - "long": 11.580566 + "lon": 11.580566 } ] } \ No newline at end of file diff --git a/hoods/Breitendiel.json b/hoods/Breitendiel.json index 592d409..2ab3a26 100644 --- a/hoods/Breitendiel.json +++ b/hoods/Breitendiel.json @@ -42,43 +42,43 @@ "location": [ { "lat": 49.68773326885868, - "long": 9.200448989868164 + "lon": 9.200448989868164 }, { "lat": 49.68562314289233, - "long": 9.200277328491211 + "lon": 9.200277328491211 }, { "lat": 49.676626315133916, - "long": 9.218602180480957 + "lon": 9.218602180480957 }, { "lat": 49.68342962539177, - "long": 9.218344688415527 + "lon": 9.218344688415527 }, { "lat": 49.686789276459145, - "long": 9.221091270446777 + "lon": 9.221091270446777 }, { "lat": 49.68701139396704, - "long": 9.224524497985838 + "lon": 9.224524497985838 }, { "lat": 49.693008183060336, - "long": 9.228386878967283 + "lon": 9.228386878967283 }, { "lat": 49.69750528937159, - "long": 9.223923683166504 + "lon": 9.223923683166504 }, { "lat": 49.69670028240164, - "long": 9.213409423828125 + "lon": 9.213409423828125 }, { "lat": 49.68773326885868, - "long": 9.200448989868164 + "lon": 9.200448989868164 } ] } \ No newline at end of file diff --git a/hoods/Chiemgau.json b/hoods/Chiemgau.json index f7b9dab..90a9cfa 100644 --- a/hoods/Chiemgau.json +++ b/hoods/Chiemgau.json @@ -42,7 +42,7 @@ "location": [ { "lat": 47.873644, - "long": 12.638943 + "lon": 12.638943 } ] } \ No newline at end of file diff --git a/hoods/Coburg.json b/hoods/Coburg.json index d94c679..17baa44 100644 --- a/hoods/Coburg.json +++ b/hoods/Coburg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.268233, - "long": 10.9608003 + "lon": 10.9608003 } ] } \ No newline at end of file diff --git a/hoods/Crailsheim.json b/hoods/Crailsheim.json index 5a25b55..dd44d2e 100644 --- a/hoods/Crailsheim.json +++ b/hoods/Crailsheim.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.058, - "long": 10.065 + "lon": 10.065 } ] } \ No newline at end of file diff --git a/hoods/Dinkelsbuehl.json b/hoods/Dinkelsbuehl.json index cb0db90..837e2a8 100644 --- a/hoods/Dinkelsbuehl.json +++ b/hoods/Dinkelsbuehl.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.068678, - "long": 10.325771 + "lon": 10.325771 } ] } \ No newline at end of file diff --git a/hoods/Ebermannstadt.json b/hoods/Ebermannstadt.json index 0a0fa1e..43ccf51 100644 --- a/hoods/Ebermannstadt.json +++ b/hoods/Ebermannstadt.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.78, - "long": 11.18 + "lon": 11.18 } ] } \ No newline at end of file diff --git a/hoods/Ebern.json b/hoods/Ebern.json index 4a967ab..d38c582 100644 --- a/hoods/Ebern.json +++ b/hoods/Ebern.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.09652289, - "long": 10.80041885 + "lon": 10.80041885 } ] } \ No newline at end of file diff --git a/hoods/Eckental.json b/hoods/Eckental.json index 6dfc36f..a876d9c 100644 --- a/hoods/Eckental.json +++ b/hoods/Eckental.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.581851, - "long": 11.200677 + "lon": 11.200677 } ] } \ No newline at end of file diff --git a/hoods/Erlangen-Innenstadt.json b/hoods/Erlangen-Innenstadt.json index b464a7c..4894754 100644 --- a/hoods/Erlangen-Innenstadt.json +++ b/hoods/Erlangen-Innenstadt.json @@ -42,27 +42,27 @@ "location": [ { "lat": 49.602992, - "long": 10.99951 + "lon": 10.99951 }, { "lat": 49.601709, - "long": 11.00521 + "lon": 11.00521 }, { "lat": 49.592037, - "long": 11.008728 + "lon": 11.008728 }, { "lat": 49.590035, - "long": 11.009025 + "lon": 11.009025 }, { "lat": 49.589917, - "long": 11.002528 + "lon": 11.002528 }, { "lat": 49.593084, - "long": 11.002599 + "lon": 11.002599 } ] } \ No newline at end of file diff --git a/hoods/Erlangen-Nord.json b/hoods/Erlangen-Nord.json index 7ecd9de..24060fe 100644 --- a/hoods/Erlangen-Nord.json +++ b/hoods/Erlangen-Nord.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.63645351, - "long": 10.97757339 + "lon": 10.97757339 } ] } \ No newline at end of file diff --git a/hoods/Erlangen-Ost.json b/hoods/Erlangen-Ost.json index db7b561..5ba53d1 100644 --- a/hoods/Erlangen-Ost.json +++ b/hoods/Erlangen-Ost.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.58957114, - "long": 11.02100372 + "lon": 11.02100372 } ] } \ No newline at end of file diff --git a/hoods/Erlangen-West.json b/hoods/Erlangen-West.json index e6aa634..ba7509a 100644 --- a/hoods/Erlangen-West.json +++ b/hoods/Erlangen-West.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.58934858, - "long": 10.9388 + "lon": 10.9388 } ] } \ No newline at end of file diff --git a/hoods/Fichtelberg.json b/hoods/Fichtelberg.json index a168e55..070f045 100644 --- a/hoods/Fichtelberg.json +++ b/hoods/Fichtelberg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50, - "long": 11.8524 + "lon": 11.8524 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeFleckl.json b/hoods/FichtelgebirgeFleckl.json index 1fd2e04..163af32 100644 --- a/hoods/FichtelgebirgeFleckl.json +++ b/hoods/FichtelgebirgeFleckl.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.010718, - "long": 11.8079 + "lon": 11.8079 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeNeubau.json b/hoods/FichtelgebirgeNeubau.json index a4e13ba..dafa10b 100644 --- a/hoods/FichtelgebirgeNeubau.json +++ b/hoods/FichtelgebirgeNeubau.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.0132, - "long": 11.84792 + "lon": 11.84792 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeNord.json b/hoods/FichtelgebirgeNord.json index 13d5909..064bb66 100644 --- a/hoods/FichtelgebirgeNord.json +++ b/hoods/FichtelgebirgeNord.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.0522, - "long": 11.7946 + "lon": 11.7946 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeOst.json b/hoods/FichtelgebirgeOst.json index bf61d19..2ed992f 100644 --- a/hoods/FichtelgebirgeOst.json +++ b/hoods/FichtelgebirgeOst.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.0163, - "long": 11.94961 + "lon": 11.94961 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeSued.json b/hoods/FichtelgebirgeSued.json index d7b2ebc..87d2ead 100644 --- a/hoods/FichtelgebirgeSued.json +++ b/hoods/FichtelgebirgeSued.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.9743, - "long": 11.8652 + "lon": 11.8652 } ] } \ No newline at end of file diff --git a/hoods/FichtelgebirgeWest.json b/hoods/FichtelgebirgeWest.json index fa5b009..4135d5d 100644 --- a/hoods/FichtelgebirgeWest.json +++ b/hoods/FichtelgebirgeWest.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.993077, - "long": 11.775884 + "lon": 11.775884 } ] } \ No newline at end of file diff --git a/hoods/Forchheim.json b/hoods/Forchheim.json index 078fee0..442b390 100644 --- a/hoods/Forchheim.json +++ b/hoods/Forchheim.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.72, - "long": 11.06 + "lon": 11.06 } ] } \ No newline at end of file diff --git a/hoods/FraenkischeSchweizNord.json b/hoods/FraenkischeSchweizNord.json index 6c84905..3d9ffd8 100644 --- a/hoods/FraenkischeSchweizNord.json +++ b/hoods/FraenkischeSchweizNord.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.94, - "long": 11.29 + "lon": 11.29 } ] } \ No newline at end of file diff --git a/hoods/FraenkischeSchweizOst.json b/hoods/FraenkischeSchweizOst.json index 37abe72..cb8421d 100644 --- a/hoods/FraenkischeSchweizOst.json +++ b/hoods/FraenkischeSchweizOst.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.7762, - "long": 11.4049 + "lon": 11.4049 } ] } \ No newline at end of file diff --git a/hoods/FraenkischeSchweizSued.json b/hoods/FraenkischeSchweizSued.json index f11dd68..dc9f0d0 100644 --- a/hoods/FraenkischeSchweizSued.json +++ b/hoods/FraenkischeSchweizSued.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.65, - "long": 11.26 + "lon": 11.26 } ] } \ No newline at end of file diff --git a/hoods/Frankenwald.json b/hoods/Frankenwald.json index ec0c36d..7666eb3 100644 --- a/hoods/Frankenwald.json +++ b/hoods/Frankenwald.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.252, - "long": 11.415 + "lon": 11.415 } ] } \ No newline at end of file diff --git a/hoods/Fuerth.json b/hoods/Fuerth.json index 0e6ff84..5185d66 100644 --- a/hoods/Fuerth.json +++ b/hoods/Fuerth.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.4814, - "long": 10.966 + "lon": 10.966 } ] } \ No newline at end of file diff --git a/hoods/Gerolzhofen.json b/hoods/Gerolzhofen.json index 42e926a..c2c7288 100644 --- a/hoods/Gerolzhofen.json +++ b/hoods/Gerolzhofen.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.900258, - "long": 10.347808 + "lon": 10.347808 } ] } \ No newline at end of file diff --git a/hoods/Hassfurt.json b/hoods/Hassfurt.json index 66bea7f..5c914f5 100644 --- a/hoods/Hassfurt.json +++ b/hoods/Hassfurt.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.031638, - "long": 10.506658 + "lon": 10.506658 } ] } \ No newline at end of file diff --git a/hoods/HassfurtStadt.json b/hoods/HassfurtStadt.json index 5969b88..e2d274c 100644 --- a/hoods/HassfurtStadt.json +++ b/hoods/HassfurtStadt.json @@ -34,23 +34,23 @@ "location": [ { "lat": 50.03917119338, - "long": 10.47477705002 + "lon": 10.47477705002 }, { "lat": 50.02417459643, - "long": 10.47700864792 + "lon": 10.47700864792 }, { "lat": 50.0086217092, - "long": 10.53949338913 + "lon": 10.53949338913 }, { "lat": 50.0436912, - "long": 10.55966377 + "lon": 10.55966377 }, { "lat": 50.03928155539, - "long": 10.4782101059 + "lon": 10.4782101059 } ] } \ No newline at end of file diff --git a/hoods/Helmbrechts.json b/hoods/Helmbrechts.json index 9a3d09e..7c0bb2c 100644 --- a/hoods/Helmbrechts.json +++ b/hoods/Helmbrechts.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.235, - "long": 11.716 + "lon": 11.716 } ] } \ No newline at end of file diff --git a/hoods/Hoechstadt.json b/hoods/Hoechstadt.json index ede8e11..2045290 100644 --- a/hoods/Hoechstadt.json +++ b/hoods/Hoechstadt.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.709, - "long": 10.845 + "lon": 10.845 } ] } \ No newline at end of file diff --git a/hoods/Hof.json b/hoods/Hof.json index 743a005..818381c 100644 --- a/hoods/Hof.json +++ b/hoods/Hof.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.31478, - "long": 11.912398 + "lon": 11.912398 } ] } \ No newline at end of file diff --git a/hoods/Hofheim.json b/hoods/Hofheim.json index a6a6682..2746d54 100644 --- a/hoods/Hofheim.json +++ b/hoods/Hofheim.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.136694, - "long": 10.523199 + "lon": 10.523199 } ] } \ No newline at end of file diff --git a/hoods/HofheimStadt.json b/hoods/HofheimStadt.json index 0cda58b..70ff7ff 100644 --- a/hoods/HofheimStadt.json +++ b/hoods/HofheimStadt.json @@ -34,27 +34,27 @@ "location": [ { "lat": 50.1481138, - "long": 10.5282926 + "lon": 10.5282926 }, { "lat": 50.1454187, - "long": 10.5162334 + "lon": 10.5162334 }, { "lat": 50.1349394, - "long": 10.5128002 + "lon": 10.5128002 }, { "lat": 50.1268513, - "long": 10.5178642 + "lon": 10.5178642 }, { "lat": 50.1337565, - "long": 10.5325841 + "lon": 10.5325841 }, { "lat": 50.1395055, - "long": 10.5364894 + "lon": 10.5364894 } ] } \ No newline at end of file diff --git a/hoods/Konradsreuth.json b/hoods/Konradsreuth.json index 532eb08..7c8beef 100644 --- a/hoods/Konradsreuth.json +++ b/hoods/Konradsreuth.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.271, - "long": 11.847 + "lon": 11.847 } ] } \ No newline at end of file diff --git a/hoods/Lauf.json b/hoods/Lauf.json index d16db06..57eaee8 100644 --- a/hoods/Lauf.json +++ b/hoods/Lauf.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.518, - "long": 11.281 + "lon": 11.281 } ] } \ No newline at end of file diff --git a/hoods/Leupoldsgruen.json b/hoods/Leupoldsgruen.json index 2617bd1..5543571 100644 --- a/hoods/Leupoldsgruen.json +++ b/hoods/Leupoldsgruen.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.294, - "long": 11.797 + "lon": 11.797 } ] } \ No newline at end of file diff --git a/hoods/Lichtenberg.json b/hoods/Lichtenberg.json index 6119f23..0465b70 100644 --- a/hoods/Lichtenberg.json +++ b/hoods/Lichtenberg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.395, - "long": 11.687 + "lon": 11.687 } ] } \ No newline at end of file diff --git a/hoods/Lichtenfels.json b/hoods/Lichtenfels.json index 0a5559c..510ff7d 100644 --- a/hoods/Lichtenfels.json +++ b/hoods/Lichtenfels.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.144, - "long": 11.055 + "lon": 11.055 } ] } \ No newline at end of file diff --git a/hoods/Marktredwitz.json b/hoods/Marktredwitz.json index 2fec95b..a9d2b17 100644 --- a/hoods/Marktredwitz.json +++ b/hoods/Marktredwitz.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.0023, - "long": 12.0786 + "lon": 12.0786 } ] } \ No newline at end of file diff --git a/hoods/Miltenberg.json b/hoods/Miltenberg.json index a2ee760..4f82e2c 100644 --- a/hoods/Miltenberg.json +++ b/hoods/Miltenberg.json @@ -34,7 +34,7 @@ "location": [ { "lat": 49.84, - "long": 9.3 + "lon": 9.3 } ] } \ No newline at end of file diff --git a/hoods/Mosbach.json b/hoods/Mosbach.json index b9f555f..036dee8 100644 --- a/hoods/Mosbach.json +++ b/hoods/Mosbach.json @@ -34,7 +34,7 @@ "location": [ { "lat": 49.348265, - "long": 9.113524 + "lon": 9.113524 } ] } \ No newline at end of file diff --git a/hoods/Muenchberg.json b/hoods/Muenchberg.json index c74f337..914967d 100644 --- a/hoods/Muenchberg.json +++ b/hoods/Muenchberg.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.182, - "long": 11.788 + "lon": 11.788 } ] } \ No newline at end of file diff --git a/hoods/Naila.json b/hoods/Naila.json index c808f84..a309ea9 100644 --- a/hoods/Naila.json +++ b/hoods/Naila.json @@ -50,7 +50,7 @@ "location": [ { "lat": 50.328488, - "long": 11.705781 + "lon": 11.705781 } ] } \ No newline at end of file diff --git a/hoods/Nürnberg-Innenstadt.json b/hoods/Nürnberg-Innenstadt.json index 11d6387..c315915 100644 --- a/hoods/Nürnberg-Innenstadt.json +++ b/hoods/Nürnberg-Innenstadt.json @@ -42,31 +42,31 @@ "location": [ { "lat": 49.44896027702345, - "long": 11.065592765808105 + "lon": 11.065592765808105 }, { "lat": 49.45875232014657, - "long": 11.073832511901855 + "lon": 11.073832511901855 }, { "lat": 49.45942179010528, - "long": 11.086664199829102 + "lon": 11.086664199829102 }, { "lat": 49.45766441195774, - "long": 11.088123321533203 + "lon": 11.088123321533203 }, { "lat": 49.45543272983746, - "long": 11.088252067565918 + "lon": 11.088252067565918 }, { "lat": 49.44667239531518, - "long": 11.080656051635742 + "lon": 11.080656051635742 }, { "lat": 49.44748153641486, - "long": 11.067438125610352 + "lon": 11.067438125610352 } ] } \ No newline at end of file diff --git a/hoods/Nürnberg-Umland.json b/hoods/Nürnberg-Umland.json index 58d0f6f..d9e8b47 100644 --- a/hoods/Nürnberg-Umland.json +++ b/hoods/Nürnberg-Umland.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.444, - "long": 11.05 + "lon": 11.05 } ] } \ No newline at end of file diff --git a/hoods/Nürnberg.json b/hoods/Nürnberg.json index 26be666..64dcd79 100644 --- a/hoods/Nürnberg.json +++ b/hoods/Nürnberg.json @@ -42,51 +42,51 @@ "location": [ { "lat": 49.430291392482545, - "long": 11.040229797363281 + "lon": 11.040229797363281 }, { "lat": 49.440896414087646, - "long": 11.035938262939453 + "lon": 11.035938262939453 }, { "lat": 49.45183392837305, - "long": 11.037483215332031 + "lon": 11.037483215332031 }, { "lat": 49.467120037299296, - "long": 11.056537628173828 + "lon": 11.056537628173828 }, { "lat": 49.47035517151213, - "long": 11.094131469726562 + "lon": 11.094131469726562 }, { "lat": 49.46014703890668, - "long": 11.106576919555664 + "lon": 11.106576919555664 }, { "lat": 49.45936600129137, - "long": 11.115074157714842 + "lon": 11.115074157714842 }, { "lat": 49.4560743488551, - "long": 11.118335723876953 + "lon": 11.118335723876953 }, { "lat": 49.44988097977617, - "long": 11.12288475036621 + "lon": 11.12288475036621 }, { "lat": 49.43609653047201, - "long": 11.116962432861328 + "lon": 11.116962432861328 }, { "lat": 49.42884000063522, - "long": 11.085548400878906 + "lon": 11.085548400878906 }, { "lat": 49.428170112992, - "long": 11.065464019775389 + "lon": 11.065464019775389 } ] } \ No newline at end of file diff --git a/hoods/Pegnitz.json b/hoods/Pegnitz.json index bdb633c..6258159 100644 --- a/hoods/Pegnitz.json +++ b/hoods/Pegnitz.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.7581, - "long": 11.5401 + "lon": 11.5401 } ] } \ No newline at end of file diff --git a/hoods/Rehau.json b/hoods/Rehau.json index d433b53..46a26cd 100644 --- a/hoods/Rehau.json +++ b/hoods/Rehau.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.248, - "long": 12.037 + "lon": 12.037 } ] } \ No newline at end of file diff --git a/hoods/Remscheid.json b/hoods/Remscheid.json index 7c6fbce..3145b62 100644 --- a/hoods/Remscheid.json +++ b/hoods/Remscheid.json @@ -34,7 +34,7 @@ "location": [ { "lat": 51.176178, - "long": 7.189986 + "lon": 7.189986 } ] } \ No newline at end of file diff --git a/hoods/Roettenbach.json b/hoods/Roettenbach.json index 174a3b4..8c17190 100644 --- a/hoods/Roettenbach.json +++ b/hoods/Roettenbach.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.68, - "long": 10.96 + "lon": 10.96 } ] } \ No newline at end of file diff --git a/hoods/Roth.json b/hoods/Roth.json index 700bf0a..868b28c 100644 --- a/hoods/Roth.json +++ b/hoods/Roth.json @@ -34,7 +34,7 @@ "location": [ { "lat": 49.252047, - "long": 11.091189 + "lon": 11.091189 } ] } \ No newline at end of file diff --git a/hoods/Salzach.json b/hoods/Salzach.json index bc2e8fd..55aa9d6 100644 --- a/hoods/Salzach.json +++ b/hoods/Salzach.json @@ -42,7 +42,7 @@ "location": [ { "lat": 47.873644, - "long": 12.743185 + "lon": 12.743185 } ] } \ No newline at end of file diff --git a/hoods/Schauenstein.json b/hoods/Schauenstein.json index 05ab82c..275ee17 100644 --- a/hoods/Schauenstein.json +++ b/hoods/Schauenstein.json @@ -42,19 +42,19 @@ "location": [ { "lat": 50.279855, - "long": 11.783019 + "lon": 11.783019 }, { "lat": 50.259117, - "long": 11.740018 + "lon": 11.740018 }, { "lat": 50.28852, - "long": 11.680795 + "lon": 11.680795 }, { "lat": 50.293729, - "long": 11.73813 + "lon": 11.73813 } ] } \ No newline at end of file diff --git a/hoods/Schnaittach.json b/hoods/Schnaittach.json index 6c92d27..c7afc9e 100644 --- a/hoods/Schnaittach.json +++ b/hoods/Schnaittach.json @@ -42,7 +42,7 @@ "location": [ { "lat": 49.575217, - "long": 11.337566 + "lon": 11.337566 } ] } \ No newline at end of file diff --git a/hoods/SchwarzenbachSaale.json b/hoods/SchwarzenbachSaale.json index 811d22a..ae86bbf 100644 --- a/hoods/SchwarzenbachSaale.json +++ b/hoods/SchwarzenbachSaale.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.221, - "long": 11.932 + "lon": 11.932 } ] } \ No newline at end of file diff --git a/hoods/Schweinfurt.json b/hoods/Schweinfurt.json index 491ada8..8f3eefe 100644 --- a/hoods/Schweinfurt.json +++ b/hoods/Schweinfurt.json @@ -42,7 +42,7 @@ "location": [ { "lat": 50.04499, - "long": 10.23419 + "lon": 10.23419 } ] } \ No newline at end of file diff --git a/hoods/Selb.json b/hoods/Selb.json index 35711d3..1b3edc6 100644 --- a/hoods/Selb.json +++ b/hoods/Selb.json @@ -34,7 +34,7 @@ "location": [ { "lat": 50.171, - "long": 12.131 + "lon": 12.131 } ] } \ No newline at end of file diff --git a/hoods/Selbitz.json b/hoods/Selbitz.json index cf3c6fd..bb8e0aa 100644 --- a/hoods/Selbitz.json +++ b/hoods/Selbitz.json @@ -42,19 +42,19 @@ "location": [ { "lat": 50.29925296, - "long": 11.71866989 + "lon": 11.71866989 }, { "lat": 50.2926733, - "long": 11.77840805 + "lon": 11.77840805 }, { "lat": 50.34002657, - "long": 11.81085205 + "lon": 11.81085205 }, { "lat": 50.31975374, - "long": 11.72914123 + "lon": 11.72914123 } ] } \ No newline at end of file diff --git a/hoods/Trainstation.json b/hoods/Trainstation.json index 0e68afb..7cbb395 100644 --- a/hoods/Trainstation.json +++ b/hoods/Trainstation.json @@ -30,5 +30,11 @@ "upgrade_path": "http://[fd43:5602:29bd:ffff::feee]:83", "ntp_ip": "fd43:5602:29bd:ffff::42", "timestamp": 1596227702 - } -} + }, + "location": [ + { + "lat": 0, + "lon": 0 + } + ] +} \ No newline at end of file diff --git a/hoods/Weissdorf.json b/hoods/Weissdorf.json index 979e984..fc3dfc2 100644 --- a/hoods/Weissdorf.json +++ b/hoods/Weissdorf.json @@ -34,27 +34,27 @@ "location": [ { "lat": 50.208164, - "long": 11.836996 + "lon": 11.836996 }, { "lat": 50.185527, - "long": 11.837425 + "lon": 11.837425 }, { "lat": 50.176348, - "long": 11.832361 + "lon": 11.832361 }, { "lat": 50.175799, - "long": 11.855621 + "lon": 11.855621 }, { "lat": 50.184098, - "long": 11.859226 + "lon": 11.859226 }, { "lat": 50.208164, - "long": 11.856909 + "lon": 11.856909 } ] } \ No newline at end of file diff --git a/hoods/Wuerzburg.json b/hoods/Wuerzburg.json index 6b00f1c..b055a7c 100644 --- a/hoods/Wuerzburg.json +++ b/hoods/Wuerzburg.json @@ -34,7 +34,7 @@ "location": [ { "lat": 49.79688, - "long": 9.93489 + "lon": 9.93489 } ] } \ No newline at end of file diff --git a/hoods/Zell.json b/hoods/Zell.json index b59f329..b2f9133 100644 --- a/hoods/Zell.json +++ b/hoods/Zell.json @@ -34,19 +34,19 @@ "location": [ { "lat": 50.145061, - "long": 11.801462 + "lon": 11.801462 }, { "lat": 50.122284, - "long": 11.801462 + "lon": 11.801462 }, { "lat": 50.122284, - "long": 11.832361 + "lon": 11.832361 }, { "lat": 50.145061, - "long": 11.832361 + "lon": 11.832361 } ] } \ No newline at end of file