make go gettable

master
Oliver Tonnhofer 2014-08-04 15:19:35 +02:00
parent 8ad4c8f1d2
commit 3b73f91a0d
58 changed files with 156 additions and 156 deletions

View File

@ -36,8 +36,8 @@ clean:
test: test-unit test-system
test-unit: imposm3
go test imposm3/... -i
go test imposm3/...
go test ./... -i
go test ./...
test-system: imposm3
(cd test && make test)

View File

@ -3,7 +3,7 @@ package binary
import (
"encoding/binary"
"errors"
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func MarshalDeltaNodes(nodes []element.Node, buf []byte) []byte {

View File

@ -2,7 +2,7 @@ package binary
import (
"code.google.com/p/goprotobuf/proto"
"imposm3/element"
"github.com/omniscale/imposm3/element"
"math"
"math/rand"
"runtime"

View File

@ -3,7 +3,7 @@ package binary
import (
"encoding/binary"
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func MarshalIdRefsBunch(idRefs []element.IdRefs) []byte {

View File

@ -3,7 +3,7 @@ package binary
import (
"testing"
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func TestmarshalBunch(t *testing.T) {

View File

@ -2,7 +2,7 @@ package binary
import (
"code.google.com/p/goprotobuf/proto"
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
const COORD_FACTOR float64 = 11930464.7083 // ((2<<31)-1)/360.0

View File

@ -1,7 +1,7 @@
package binary
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"testing"
)

View File

@ -15,7 +15,7 @@ package binary
// etc.) are converted to a single ASCII control char (0x01-0x1f)
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"unicode/utf8"
)

View File

@ -1,7 +1,7 @@
package binary
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"sort"
"testing"
)

4
cache/delta.go vendored
View File

@ -2,8 +2,8 @@ package cache
import (
"container/list"
"imposm3/cache/binary"
"imposm3/element"
"github.com/omniscale/imposm3/cache/binary"
"github.com/omniscale/imposm3/element"
"sort"
"sync"
)

2
cache/delta_test.go vendored
View File

@ -1,7 +1,7 @@
package cache
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"io/ioutil"
"math/rand"
"os"

4
cache/diff.go vendored
View File

@ -9,8 +9,8 @@ import (
"sort"
"sync"
"imposm3/cache/binary"
"imposm3/element"
"github.com/omniscale/imposm3/cache/binary"
"github.com/omniscale/imposm3/element"
)
type byInt64 []int64

2
cache/diff_test.go vendored
View File

@ -5,7 +5,7 @@ import (
"os"
"testing"
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func TestDiffCache(t *testing.T) {

4
cache/nodes.go vendored
View File

@ -2,8 +2,8 @@ package cache
import (
"github.com/jmhodges/levigo"
"imposm3/cache/binary"
"imposm3/element"
"github.com/omniscale/imposm3/cache/binary"
"github.com/omniscale/imposm3/element"
)
type NodesCache struct {

2
cache/osm_test.go vendored
View File

@ -1,7 +1,7 @@
package cache
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"io/ioutil"
"math/rand"
"os"

View File

@ -9,8 +9,8 @@ import (
"strconv"
"strings"
"imposm3/cache"
"imposm3/element"
"github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/element"
)
var flags = flag.NewFlagSet("query-cache", flag.ExitOnError)

4
cache/relations.go vendored
View File

@ -2,8 +2,8 @@ package cache
import (
"github.com/jmhodges/levigo"
"imposm3/cache/binary"
"imposm3/element"
"github.com/omniscale/imposm3/cache/binary"
"github.com/omniscale/imposm3/element"
)
type RelationsCache struct {

4
cache/ways.go vendored
View File

@ -2,8 +2,8 @@ package cache
import (
"github.com/jmhodges/levigo"
"imposm3/cache/binary"
"imposm3/element"
"github.com/omniscale/imposm3/cache/binary"
"github.com/omniscale/imposm3/element"
)
type WaysCache struct {

View File

@ -2,18 +2,18 @@ package cmd
import (
"fmt"
"imposm3/cache"
"github.com/omniscale/imposm3/cache"
golog "log"
"os"
"runtime"
"imposm3/cache/query"
"imposm3/config"
"imposm3/diff"
"imposm3/geom/limit"
"imposm3/import_"
"imposm3/logging"
"imposm3/stats"
"github.com/omniscale/imposm3/cache/query"
"github.com/omniscale/imposm3/config"
"github.com/omniscale/imposm3/diff"
"github.com/omniscale/imposm3/geom/limit"
"github.com/omniscale/imposm3/import_"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/stats"
)
var log = logging.NewLogger("")

View File

@ -2,8 +2,8 @@ package database
import (
"errors"
"imposm3/element"
"imposm3/mapping"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/mapping"
"strings"
)

View File

@ -4,10 +4,10 @@ import (
"database/sql"
"fmt"
pq "github.com/lib/pq"
"imposm3/database"
"imposm3/element"
"imposm3/logging"
"imposm3/mapping"
"github.com/omniscale/imposm3/database"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/mapping"
"runtime"
"strings"
"sync/atomic"

View File

@ -2,7 +2,7 @@ package postgis
import (
"fmt"
"imposm3/mapping"
"github.com/omniscale/imposm3/mapping"
"strings"
)

View File

@ -1,13 +1,13 @@
package diff
import (
"imposm3/cache"
"imposm3/database"
"imposm3/diff/parser"
"imposm3/element"
"imposm3/expire"
"imposm3/mapping"
"imposm3/proj"
"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/proj"
)
type Deleter struct {

View File

@ -3,8 +3,8 @@ package parser
import (
"compress/gzip"
"encoding/xml"
"imposm3/element"
"imposm3/logging"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/logging"
"os"
"strconv"
)

View File

@ -5,21 +5,21 @@ import (
"fmt"
"io"
"imposm3/cache"
"imposm3/config"
"imposm3/database"
_ "imposm3/database/postgis"
"imposm3/diff/parser"
diffstate "imposm3/diff/state"
"imposm3/element"
"imposm3/expire"
"imposm3/geom/geos"
"imposm3/geom/limit"
"imposm3/logging"
"imposm3/mapping"
"imposm3/proj"
"imposm3/stats"
"imposm3/writer"
"github.com/omniscale/imposm3/cache"
"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"
"github.com/omniscale/imposm3/geom/limit"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/mapping"
"github.com/omniscale/imposm3/proj"
"github.com/omniscale/imposm3/stats"
"github.com/omniscale/imposm3/writer"
)
var log = logging.NewLogger("diff")

View File

@ -4,8 +4,8 @@ import (
"bufio"
"errors"
"fmt"
"imposm3/logging"
"imposm3/parser/pbf"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/parser/pbf"
"io"
"net/http"
"os"

View File

@ -3,7 +3,7 @@ package element
import (
"sort"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/geom/geos"
)
type Tags map[string]string

View File

@ -1,7 +1,7 @@
package expire
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
type Expireor interface {

View File

@ -4,8 +4,8 @@ import (
"encoding/json"
"errors"
"fmt"
"imposm3/geom/geos"
"imposm3/proj"
"github.com/omniscale/imposm3/geom/geos"
"github.com/omniscale/imposm3/proj"
"io"
)

View File

@ -2,8 +2,8 @@ package geom
import (
"errors"
"imposm3/element"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
"math"
)

View File

@ -1,8 +1,8 @@
package geom
import (
"imposm3/element"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
"testing"
)

View File

@ -13,7 +13,7 @@ extern void initGEOS_debug();
import "C"
import (
"imposm3/logging"
"github.com/omniscale/imposm3/logging"
"runtime"
"unsafe"
)

View File

@ -2,9 +2,9 @@ package limit
import (
"errors"
"imposm3/geom/geojson"
"imposm3/geom/geos"
"imposm3/logging"
"github.com/omniscale/imposm3/geom/geojson"
"github.com/omniscale/imposm3/geom/geos"
"github.com/omniscale/imposm3/logging"
"math"
"os"
"strings"

View File

@ -1,7 +1,7 @@
package limit
import (
"imposm3/geom/geos"
"github.com/omniscale/imposm3/geom/geos"
"testing"
)

View File

@ -2,8 +2,8 @@ package geom
import (
"errors"
"imposm3/element"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
"sort"
)

View File

@ -1,8 +1,8 @@
package geom
import (
"imposm3/element"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
"math"
"testing"
)

View File

@ -1,8 +1,8 @@
package geom
import (
"imposm3/element"
"imposm3/geom/geos"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
)
type Ring struct {

View File

@ -1,7 +1,7 @@
package geom
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"sort"
"testing"
)

View File

@ -7,18 +7,18 @@ import (
"os"
"path"
"imposm3/cache"
"imposm3/config"
"imposm3/database"
_ "imposm3/database/postgis"
state "imposm3/diff/state"
"imposm3/geom/limit"
"imposm3/logging"
"imposm3/mapping"
"imposm3/parser/pbf"
"imposm3/reader"
"imposm3/stats"
"imposm3/writer"
"github.com/omniscale/imposm3/cache"
"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/writer"
)
var log = logging.NewLogger("")

View File

@ -1,7 +1,7 @@
package main
import (
"imposm3/cmd"
"github.com/omniscale/imposm3/cmd"
)
func main() {

View File

@ -3,7 +3,7 @@ package mapping
import (
"encoding/json"
"errors"
"imposm3/element"
"github.com/omniscale/imposm3/element"
"os"
)

View File

@ -2,8 +2,8 @@ package mapping
import (
"errors"
"imposm3/element"
"imposm3/logging"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/logging"
"regexp"
"strconv"
"strings"

View File

@ -1,7 +1,7 @@
package mapping
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"testing"
)

View File

@ -1,7 +1,7 @@
package mapping
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func (m *Mapping) NodeTagFilter() TagFilterer {

View File

@ -1,7 +1,7 @@
package mapping
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"testing"
)

View File

@ -1,7 +1,7 @@
package mapping
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
)
func (m *Mapping) PointMatcher() NodeMatcher {

View File

@ -1,7 +1,7 @@
package mapping
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"testing"
)

View File

@ -7,7 +7,7 @@ import (
structs "encoding/binary"
"errors"
"fmt"
"imposm3/parser/pbf/osmpbf"
"github.com/omniscale/imposm3/parser/pbf/osmpbf"
"io"
"log"
"os"

View File

@ -1,8 +1,8 @@
package pbf
import (
"imposm3/element"
"imposm3/parser/pbf/osmpbf"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/parser/pbf/osmpbf"
"log"
)

View File

@ -5,7 +5,7 @@ import (
"code.google.com/p/goprotobuf/proto"
"compress/zlib"
"fmt"
"imposm3/parser/pbf/osmpbf"
"github.com/omniscale/imposm3/parser/pbf/osmpbf"
"io"
"log"
"os"

View File

@ -1,8 +1,8 @@
package pbf
import (
"imposm3/element"
"imposm3/util"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/util"
"runtime"
"sync"
)

View File

@ -1,7 +1,7 @@
package proj
import (
"imposm3/element"
"github.com/omniscale/imposm3/element"
"math"
)

View File

@ -8,16 +8,16 @@ import (
"strings"
"sync"
osmcache "imposm3/cache"
"imposm3/element"
"imposm3/geom/geos"
"imposm3/geom/limit"
"imposm3/logging"
"imposm3/mapping"
"imposm3/parser/pbf"
"imposm3/proj"
"imposm3/stats"
"imposm3/util"
osmcache "github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom/geos"
"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/proj"
"github.com/omniscale/imposm3/stats"
"github.com/omniscale/imposm3/util"
)
var log = logging.NewLogger("reader")

View File

@ -2,7 +2,7 @@ package stats
import (
"fmt"
"imposm3/logging"
"github.com/omniscale/imposm3/logging"
"time"
)

View File

@ -1,13 +1,13 @@
package writer
import (
"imposm3/cache"
"imposm3/database"
"imposm3/element"
"imposm3/geom"
"imposm3/geom/geos"
"imposm3/mapping"
"imposm3/stats"
"github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/database"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/geom"
"github.com/omniscale/imposm3/geom/geos"
"github.com/omniscale/imposm3/mapping"
"github.com/omniscale/imposm3/stats"
"sync"
)

View File

@ -1,14 +1,14 @@
package writer
import (
"imposm3/cache"
"imposm3/database"
"imposm3/element"
"imposm3/expire"
"imposm3/geom"
"imposm3/geom/geos"
"imposm3/mapping"
"imposm3/stats"
"github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/database"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/expire"
"github.com/omniscale/imposm3/geom"
"github.com/omniscale/imposm3/geom/geos"
"github.com/omniscale/imposm3/mapping"
"github.com/omniscale/imposm3/stats"
"sync"
"time"
)

View File

@ -1,14 +1,14 @@
package writer
import (
"imposm3/cache"
"imposm3/database"
"imposm3/element"
"imposm3/expire"
"imposm3/geom"
"imposm3/geom/geos"
"imposm3/mapping"
"imposm3/stats"
"github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/database"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/expire"
"github.com/omniscale/imposm3/geom"
"github.com/omniscale/imposm3/geom/geos"
"github.com/omniscale/imposm3/mapping"
"github.com/omniscale/imposm3/stats"
"sync"
)

View File

@ -4,14 +4,14 @@ import (
"runtime"
"sync"
"imposm3/cache"
"imposm3/database"
"imposm3/element"
"imposm3/expire"
"imposm3/geom/limit"
"imposm3/logging"
"imposm3/proj"
"imposm3/stats"
"github.com/omniscale/imposm3/cache"
"github.com/omniscale/imposm3/database"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/expire"
"github.com/omniscale/imposm3/geom/limit"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/proj"
"github.com/omniscale/imposm3/stats"
)
var log = logging.NewLogger("writer")