Merge branch 'master' of github.com:geo-data/cesium-terrain-server

fnicollet · Apr 12, 2016 · d83a577 · d83a577
2 parents 327c06d + 6dbbf45
commit d83a577
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -152,7 +152,7 @@ that Go does.  Assuming that you have set the
 installation is a matter of running `go install`:
 
 ```sh
-go install github.com/geo-data/cesium-terrain-server
+go get github.com/geo-data/cesium-terrain-server/cmd/cesium-terrain-server
 ```
 
 A program called `cesium-terrain-server` should then be available under your

diff --git a/stores/fs/fs.go b/stores/fs/fs.go
@@ -53,7 +53,7 @@ func (this *Store) Tile(tileset string, tile *stores.Terrain) (err error) {
 }
 
 func (this *Store) Layer(tileset string) ([]byte, error) {
-	filename := filepath.Join(tileset, "layer.json")
+	filename := filepath.Join(this.root, tileset, "layer.json")
 	return this.readFile(filename)
 }