X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=r3-webstatus-spaceapi%2Fspaceapi%2Fspaceapi.go;fp=r3-webstatus-spaceapi%2Fspaceapi%2Fspaceapi.go;h=3a0f828098a3c2b1e4cc71ba8a9590e2f9d423ac;hb=b30fa8619ab41857c9c15aa939e05f2e406b8192;hp=7e088198d16de5969215f3516508cc1d87dd72c2;hpb=2e5efa2d148232cec660312c25d404512a9063a8;p=svn42.git

diff --git a/r3-webstatus-spaceapi/spaceapi/spaceapi.go b/r3-webstatus-spaceapi/spaceapi/spaceapi.go
index 7e08819..3a0f828 100644
--- a/r3-webstatus-spaceapi/spaceapi/spaceapi.go
+++ b/r3-webstatus-spaceapi/spaceapi/spaceapi.go
@@ -64,7 +64,7 @@ func (nsi SpaceInfo) AddSpaceFeed(name, mimetype, url string) SpaceInfo {
 }
 
 func (nsi SpaceInfo) AddSpaceEvent(name, eventtype, extra string) SpaceInfo {
-	newevent := SpaceInfo{"name": name, "type": eventtype, "t": time.Now().Unix(), "extra": extra}
+	newevent := SpaceInfo{"name": name, "type": eventtype, "timestamp": time.Now().Unix(), "extra": extra}
 	if nsi["events"] == nil {
 		eventlist := make([]SpaceInfo, 1)
 		eventlist[0] = newevent
@@ -85,12 +85,12 @@ func (nsi SpaceInfo) AddSpaceEvent(name, eventtype, extra string) SpaceInfo {
 
 func (nsi SpaceInfo) AddSpaceAddress(address string) SpaceInfo {
 	nsi["address"] = address
-	return nsi
-}
-
-func (nsi SpaceInfo) AddSpaceLatLon(lat float64, lon float64) SpaceInfo {
-	nsi["lat"] = lat
-	nsi["lon"] = lon
+    if nsi["location"] != nil {
+        location, ok := nsi["location"].(SpaceInfo)
+        if ok {
+            location["address"] = address
+        }
+    }
 	return nsi
 }
 
@@ -100,7 +100,7 @@ func (nsi SpaceInfo) SetStatus(open bool, status string) {
 	nsi["lastchange"] = time.Now().Unix()
 }
 
-func NewSpaceInfo(space string, url string, logo string, open_icon string, closed_icon string) SpaceInfo {
+func NewSpaceInfo(space string, url string, logo string, open_icon string, closed_icon string, lat float64, lon float64) SpaceInfo {
 	nsi := map[string]interface{}{
 		"api":        "0.13",
 		"space":      space,
@@ -108,9 +108,13 @@ func NewSpaceInfo(space string, url string, logo string, open_icon string, close
 		"logo":       logo,
 		"open":       false,
 		"lastchange": time.Now().Unix(),
-		"icon": map[string]interface{}{
+		"icon": SpaceInfo{
 			"open":   open_icon,
-			"closed": closed_icon}}
+			"closed": closed_icon},
+        "location": SpaceInfo{
+            "lat": lat,
+            "lon": lon},
+        "contact" : SpaceInfo {}           }
 	return nsi
 }