vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

record updated IDs for updating generalized tables later

master
Oliver Tonnhofer 2013-10-28 14:55:01 +01:00
parent f4d0435102
commit 5e42ef6b98
5 changed files with 105 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/database.go
View File

@ -43,6 +43,8 @@ type Deployer interface {
type Generalizer interface {
Generalize() error
EnableGeneralizeUpdates()
GeneralizeUpdates() error
}
type Finisher interface {

95
database/postgis/postgis.go
View File

@ -241,6 +241,15 @@ func createIndex(pg *PostGIS, tableName string, columns []ColumnSpec) error {
return nil
}
func (pg *PostGIS) GeneralizeUpdates() error {
for _, table := range pg.sortedGeneralizedTables() {
if ids, ok := pg.updatedIds[table]; ok {
fmt.Println(ids)
}
}
return nil
}
func (pg *PostGIS) Generalize() error {
defer log.StopStep(log.StartStep(fmt.Sprintf("Creating generalized tables")))
@ -404,18 +413,20 @@ func clusterTable(pg *PostGIS, tableName string, srid int, columns []ColumnSpec)
}
type PostGIS struct {
Db *sql.DB
Params string
Schema string
BackupSchema string
Config database.Config
Tables map[string]*TableSpec
GeneralizedTables map[string]*GeneralizedTableSpec
Prefix string
txRouter *TxRouter
pointTagMatcher *mapping.TagMatcher
lineStringTagMatcher *mapping.TagMatcher
polygonTagMatcher *mapping.TagMatcher
Db *sql.DB
Params string
Schema string
BackupSchema string
Config database.Config
Tables map[string]*TableSpec
GeneralizedTables map[string]*GeneralizedTableSpec
Prefix string
txRouter *TxRouter
pointTagMatcher *mapping.TagMatcher
lineStringTagMatcher *mapping.TagMatcher
polygonTagMatcher *mapping.TagMatcher
updateGeneralizedTables bool
updatedIds map[string][]int64
}
func (pg *PostGIS) Open() error {
@ -448,6 +459,12 @@ func (pg *PostGIS) InsertLineString(elem element.OSMElem, matches interface{}) {
row := match.Row(&elem)
pg.txRouter.Insert(match.Table.Name, row)
}
if pg.updateGeneralizedTables {
for _, generalizedTable := range pg.generalizedFromMatches(matches) {
pg.updatedIds[generalizedTable.Name] = append(pg.updatedIds[generalizedTable.Name], elem.Id)
}
}
}
}
@ -457,6 +474,14 @@ func (pg *PostGIS) InsertPolygon(elem element.OSMElem, matches interface{}) {
row := match.Row(&elem)
pg.txRouter.Insert(match.Table.Name, row)
}
if pg.updateGeneralizedTables {
for _, generalizedTable := range pg.generalizedFromMatches(matches) {
fmt.Println("INSERT! GEN", generalizedTable)
pg.updatedIds[generalizedTable.Name] = append(pg.updatedIds[generalizedTable.Name], elem.Id)
}
}
}
}
@ -486,10 +511,46 @@ func (pg *PostGIS) Delete(id int64, matches interface{}) error {
for _, match := range matches {
pg.txRouter.Delete(match.Table.Name, id)
}
if pg.updateGeneralizedTables {
for _, generalizedTable := range pg.generalizedFromMatches(matches) {
pg.txRouter.Delete(generalizedTable.Name, id)
}
}
}
return nil
}
func (pg *PostGIS) generalizedFromMatches(matches []mapping.Match) []*GeneralizedTableSpec {
generalizedTables := []*GeneralizedTableSpec{}
for _, match := range matches {
tbl := pg.Tables[match.Table.Name]
generalizedTables = append(generalizedTables, tbl.Generalizations...)
}
return generalizedTables
}
func (pg *PostGIS) sortedGeneralizedTables() []string {
added := map[string]bool{}
sorted := []string{}
for len(pg.GeneralizedTables) > len(sorted) {
for _, tbl := range pg.GeneralizedTables {
if _, ok := added[tbl.Name]; !ok {
if tbl.Source != nil || added[tbl.SourceGeneralized.Name] {
added[tbl.Name] = true
sorted = append(sorted, tbl.Name)
}
}
}
}
return sorted
}
func (pg *PostGIS) EnableGeneralizeUpdates() {
pg.updateGeneralizedTables = true
pg.updatedIds = make(map[string][]int64)
}
func (pg *PostGIS) Begin() error {
pg.txRouter = newTxRouter(pg, false)
return nil
@ -658,6 +719,7 @@ func New(conf database.Config, m *mapping.Mapping) (database.DB, error) {
db.GeneralizedTables[name] = NewGeneralizedTableSpec(db, table)
}
db.prepareGeneralizedTableSources()
db.prepareGeneralizations()
db.pointTagMatcher = m.PointMatcher()
db.lineStringTagMatcher = m.LineStringMatcher()
@ -700,6 +762,15 @@ func (pg *PostGIS) prepareGeneralizedTableSources() {
}
}
func (pg *PostGIS) prepareGeneralizations() {
for _, table := range pg.GeneralizedTables {
table.Source.Generalizations = append(table.Source.Generalizations, table)
if source, ok := pg.GeneralizedTables[table.SourceName]; ok {
source.Generalizations = append(source.Generalizations, table)
}
}
}
func init() {
database.Register("postgres", New)
database.Register("postgis", New)

6
database/postgis/router.go
View File

@ -46,8 +46,8 @@ func (ib *TxRouter) Insert(table string, row []interface{}) {
func (ib *TxRouter) Delete(table string, id int64) {
tt, ok := ib.Tables[table]
if !ok {
panic("unknown table " + table)
if ok {
// panic("unknown table " + table)
tt.Delete(id)
}
tt.Delete(id)
}

12
database/postgis/spec.go
View File

@ -12,11 +12,12 @@ type ColumnSpec struct {
Type ColumnType
}
type TableSpec struct {
Name string
Schema string
Columns []ColumnSpec
GeometryType string
Srid int
Name string
Schema string
Columns []ColumnSpec
GeometryType string
Srid int
Generalizations []*GeneralizedTableSpec
}
type GeneralizedTableSpec struct {
@ -27,6 +28,7 @@ type GeneralizedTableSpec struct {
Tolerance float64
Where string
created bool
Generalizations []*GeneralizedTableSpec
}
func (col *ColumnSpec) AsSQL() string {

10
diff/process.go
View File

@ -79,6 +79,12 @@ func Update(oscFile string, geometryLimiter *limit.Limiter, force bool) {
if !ok {
log.Fatal("database not deletable")
}
genDb, ok := db.(database.Generalizer)
if ok {
genDb.EnableGeneralizeUpdates()
}
deleter := NewDeleter(
delDb,
osmCache,
@ -256,6 +262,10 @@ For:
relWriter.Close()
wayWriter.Close()
if genDb != nil {
genDb.GeneralizeUpdates()
}
err = db.End()
if err != nil {
log.Fatal(err)