mapobj db impl

server/mapobjectdb/accessor.go

@@ -19,14 +19,16 @@ type Tile struct {
 
 type MapObject struct {
 	//mapblock position
-	MBPos *coords.MapBlockCoords
+	MBPos *coords.MapBlockCoords	`json:"mapblock"`
 
 	//block position
-	X, Y, Z int
+	X int `json:"x"`
+	Y int `json:"y"`
+	Z int `json:"z"`
 
-	Type       string
+	Type       string `json:"type"`
-	Mtime      int64
+	Mtime      int64 `json:"mtime"`
-	Attributes map[string]string
+	Attributes map[string]string `json:"attributes"`
 }
 
 func NewMapObject(MBPos *coords.MapBlockCoords, x int, y int, z int, _type string) *MapObject {

server/mapobjectdb/sqlite_mapobjects.go

@@ -33,6 +33,7 @@ func (db *Sqlite3Accessor) GetMapData(q SearchQuery) ([]*MapObject, error) {
 
 	result := make([]*MapObject, 0)
 	var currentObj *MapObject
+	var currentId *int64
 
 	for rows.Next() {
 		var id int64
@@ -52,12 +53,22 @@ func (db *Sqlite3Accessor) GetMapData(q SearchQuery) ([]*MapObject, error) {
 			return nil, err
 		}
 
-		if currentObj == nil {
+		if currentId == nil || *currentId != id {
-			//TODO
+			pos := coords.NewMapBlockCoords(posx, posy, posz)
-		} else {
+			mo := NewMapObject(
-			//TODO
+				&pos,
+				x, y, z,
+				Type,
+			)
+
+			currentObj = mo
+			currentId = &id
+
+			result = append(result, currentObj)
+
 		}
 
+		currentObj.Attributes[key] = value
 	}
 
 	return result, nil

server/mapobjectdb/sqlite_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"mapserver/coords"
 	"os"
+	"fmt"
 	"testing"
 )
 
@@ -107,12 +108,14 @@ func TestMapObjects(t *testing.T) {
 		Type: "xy",
 	}
 
-	_, err = db.GetMapData(q)
+	objs, err := db.GetMapData(q)
 
 	if err != nil {
 		panic(err)
 	}
 
-
+	for _, mo := range objs {
+		fmt.Println(mo)
+	}
 
 }