mv diff/cmd/process to diff/

diff/deleter.go

@@ -6,13 +6,10 @@ import (
 	"goposm/diff/parser"
 	"goposm/element"
 	"goposm/expire"
-	"goposm/logging"
 	"goposm/mapping"
 	"goposm/proj"
 )
 
-var log = logging.NewLogger("diff")
-
 type Deleter struct {
 	delDb         database.Deleter
 	osmCache      *cache.OSMCache

diff/process.go

@@ -1,4 +1,4 @@
-package cmd
+package diff
 
 import (
 	"fmt"
@@ -6,7 +6,6 @@ import (
 	"goposm/config"
 	"goposm/database"
 	_ "goposm/database/postgis"
-	"goposm/diff"
 	"goposm/diff/parser"
 	diffstate "goposm/diff/state"
 	"goposm/element"
@@ -19,7 +18,7 @@ import (
 	"io"
 )
 
-var log = logging.NewLogger("")
+var log = logging.NewLogger("diff")
 
 func Update(oscFile string, force bool) {
 	state, err := diffstate.ParseFromOsc(oscFile)
@@ -79,7 +78,7 @@ func Update(oscFile string, force bool) {
 	if !ok {
 		log.Fatal("database not deletable")
 	}
-	deleter := diff.NewDeleter(
+	deleter := NewDeleter(
 		delDb,
 		osmCache,
 		diffCache,

goposm.go

@@ -5,7 +5,7 @@ import (
 	"goposm/config"
 	"goposm/database"
 	_ "goposm/database/postgis"
-	"goposm/diff/cmd"
+	"goposm/diff"
 	state "goposm/diff/state"
 	"goposm/geom/clipper"
 	"goposm/logging"
@@ -68,7 +68,7 @@ func main() {
 			break
 		}
 		for _, oscFile := range config.DiffImportFlags.Args() {
-			cmd.Update(oscFile, false)
+			diff.Update(oscFile, false)
 		}
 	default:
 		log.Fatal("invalid command")