rename diff package to update

cmd/imposm3/main.go

@@ -9,10 +9,10 @@ import (
 	"github.com/omniscale/imposm3"
 	"github.com/omniscale/imposm3/cache/query"
 	"github.com/omniscale/imposm3/config"
-	"github.com/omniscale/imposm3/diff"
 	"github.com/omniscale/imposm3/import_"
 	"github.com/omniscale/imposm3/logging"
 	"github.com/omniscale/imposm3/stats"
+	"github.com/omniscale/imposm3/update"
 )
 
 var log = logging.NewLogger("")
@@ -52,14 +52,14 @@ func Main(usage func()) {
 		if config.BaseOptions.Httpprofile != "" {
 			stats.StartHttpPProf(config.BaseOptions.Httpprofile)
 		}
-		diff.Diff()
+		update.Diff()
 	case "run":
 		config.ParseRunImport(os.Args[2:])
 
 		if config.BaseOptions.Httpprofile != "" {
 			stats.StartHttpPProf(config.BaseOptions.Httpprofile)
 		}
-		diff.Run()
+		update.Run()
 	case "query-cache":
 		query.Query(os.Args[2:])
 	case "version":

import_/import.go

@@ -11,13 +11,13 @@ import (
 	"github.com/omniscale/imposm3/config"
 	"github.com/omniscale/imposm3/database"
 	_ "github.com/omniscale/imposm3/database/postgis"
-	state "github.com/omniscale/imposm3/diff/state"
 	"github.com/omniscale/imposm3/geom/limit"
 	"github.com/omniscale/imposm3/logging"
 	"github.com/omniscale/imposm3/mapping"
 	"github.com/omniscale/imposm3/parser/pbf"
 	"github.com/omniscale/imposm3/reader"
 	"github.com/omniscale/imposm3/stats"
+	"github.com/omniscale/imposm3/update/state"
 	"github.com/omniscale/imposm3/writer"
 )
 

test/helper_test.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/lib/pq/hstore"
 
-	"github.com/omniscale/imposm3/diff"
 	"github.com/omniscale/imposm3/geom/geos"
+	"github.com/omniscale/imposm3/update"
 
 	"github.com/omniscale/imposm3/config"
 	"github.com/omniscale/imposm3/import_"
@@ -159,7 +159,7 @@ func (s *importTestSuite) updateOsm(t *testing.T, diffFile string) {
 	}
 	args = append(args, diffFile)
 	config.ParseDiffImport(args)
-	diff.Diff()
+	update.Diff()
 }
 
 func (s *importTestSuite) dropSchemas() {

update/deleter.go

@@ -1,12 +1,12 @@
-package diff
+package update
 
 import (
 	"github.com/omniscale/imposm3/cache"
 	"github.com/omniscale/imposm3/database"
-	"github.com/omniscale/imposm3/diff/parser"
 	"github.com/omniscale/imposm3/element"
 	"github.com/omniscale/imposm3/expire"
 	"github.com/omniscale/imposm3/mapping"
+	"github.com/omniscale/imposm3/update/parser"
 )
 
 type Deleter struct {

update/doc.go

@@ -1,4 +1,4 @@
 /*
 Package diff provides the diff sub command for updating with diff files.
 */
-package diff
+package update

update/download/download.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/omniscale/imposm3"
-	"github.com/omniscale/imposm3/diff/state"
 	"github.com/omniscale/imposm3/logging"
+	"github.com/omniscale/imposm3/update/state"
 )
 
 var log = logging.NewLogger("downloader")

update/process.go

@@ -1,4 +1,4 @@
-package diff
+package update
 
 import (
 	"errors"
@@ -10,8 +10,6 @@ import (
 	"github.com/omniscale/imposm3/config"
 	"github.com/omniscale/imposm3/database"
 	_ "github.com/omniscale/imposm3/database/postgis"
-	"github.com/omniscale/imposm3/diff/parser"
-	diffstate "github.com/omniscale/imposm3/diff/state"
 	"github.com/omniscale/imposm3/element"
 	"github.com/omniscale/imposm3/expire"
 	"github.com/omniscale/imposm3/geom/geos"
@@ -19,6 +17,8 @@ import (
 	"github.com/omniscale/imposm3/logging"
 	"github.com/omniscale/imposm3/mapping"
 	"github.com/omniscale/imposm3/stats"
+	"github.com/omniscale/imposm3/update/parser"
+	diffstate "github.com/omniscale/imposm3/update/state"
 	"github.com/omniscale/imposm3/writer"
 )
 

update/run.go

@@ -1,4 +1,4 @@
-package diff
+package update
 
 import (
 	"fmt"
@@ -9,10 +9,10 @@ import (
 
 	"github.com/omniscale/imposm3/cache"
 	"github.com/omniscale/imposm3/config"
-	"github.com/omniscale/imposm3/diff/download"
 	"github.com/omniscale/imposm3/expire"
 	"github.com/omniscale/imposm3/geom/limit"
 	"github.com/omniscale/imposm3/logging"
+	"github.com/omniscale/imposm3/update/download"
 )
 
 var logger = logging.NewLogger("")