Skip to content

Commit 0295045

Browse files
committed
修复文件输出格式可能错误,file->文件夹存储模式输出文件格式跟随format类型
1 parent c768296 commit 0295045

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

task.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func (task *Task) savePipe() {
224224
//SaveTile 保存瓦片
225225
func (task *Task) saveTile(tile Tile) error {
226226
// defer task.wg.Done()
227-
err := saveToFiles(tile, filepath.Base(task.File))
227+
err := saveToFiles(tile, task)
228228
if err != nil {
229229
log.Errorf("create %v tile file error ~ %s", tile.T, err)
230230
}

utils.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ func saveToMBTile(tile Tile, db *sql.DB) error {
2525
return nil
2626
}
2727

28-
func saveToFiles(tile Tile, rootdir string) error {
28+
func saveToFiles(tile Tile, task *Task) error {
29+
rootdir := filepath.Base(task.File)
2930
dir := filepath.Join(rootdir, fmt.Sprintf(`%d`, tile.T.Z), fmt.Sprintf(`%d`, tile.T.X))
3031
os.MkdirAll(dir, os.ModePerm)
31-
fileName := filepath.Join(dir, fmt.Sprintf(`%d.png`, tile.T.Y))
32+
fileName := filepath.Join(dir, fmt.Sprintf(`%d.%s`, tile.T.Y, task.TileMap.Format))
3233
err := ioutil.WriteFile(fileName, tile.C, os.ModePerm)
3334
if err != nil {
3435
return err

0 commit comments

Comments
 (0)