osm-import 0.0.0 → 0.0.1

data/lib/osm_import.rb

@@ -29,7 +29,7 @@ module OsmImport
     require 'osm_import/target'
 
     schema = Schema.load mapping_file
-    target = Target.new :pg, options
+    target = Target.new(options[:target] || :pg_tables, options)
 
     target.import(schema)
   end

data/lib/osm_import/mapper/type.rb

@@ -13,7 +13,7 @@ class OsmImport::Mapper::Type < OsmImport::Mapper::Base
 
   def assigns
     if @multi
-      { :type => expression, :type_array => expression_multi }
+      { :type => expression, :types => expression_multi }
     else
       { :type => expression }
     end
@@ -21,7 +21,7 @@ class OsmImport::Mapper::Type < OsmImport::Mapper::Base
 
   def fields
     if @multi
-      { :type => 'VARCHAR(100) NOT NULL', :type_array => 'VARCHAR(100)[]' }
+      { :type => 'VARCHAR(100) NOT NULL', :types => 'VARCHAR(100)[]' }
     else
       { :type => 'VARCHAR(100) NOT NULL' }
     end
@@ -29,7 +29,7 @@ class OsmImport::Mapper::Type < OsmImport::Mapper::Base
 
    def indexes
     if @multi
-      { :type => "BTREE(type)", :type_array => "GIN(type_array)" }
+      { :type => "BTREE(type)", :types => "GIN(types)" }
     else
       { :type => "BTREE(type)" }
     end

data/lib/osm_import/target/pg_base.rb

@@ -0,0 +1,91 @@
+require 'osm_import'
+require 'pg'
+
+class OsmImport::Target::PgBase < Struct.new(:options)
+
+  def prefix
+    options[:prefix] or 'osm_'
+  end
+
+  def raw_prefix
+    options[:raw_prefix] or 'raw_osm_'
+  end
+
+  def new_prefix
+    options[:new_prefix] or 'new_osm_'
+  end
+
+  def projection
+    options[:projection]
+  end
+
+  GEOTYPES = { 'point' => 'POINT', 'line' => 'LINESTRING', 'polygon' => 'POLYGON', 'multiline' => 'MULTILINESTRING', 'multipolygon' => 'MULTIPOLYGON' }
+
+  def geometry_type(type)
+    GEOTYPES[type.to_s] or raise StandardError.new("Unknown geometry type #{type.inspect}")
+  end
+
+  class Connection < Struct.new(:options)
+
+    def initialize(*args)
+      super
+      @conn = PG.connect options[:pg]
+    end
+
+    def exec(q)
+      puts "  #{q}"
+      @conn.exec q
+    end
+
+    def close
+      @conn.close
+    end
+
+  end
+
+  class TargetEntry
+
+    attr_reader :target, :conn, :table, :type_mapping, :types_mapping, :name_mapping, :fields, :conditions, :assigns
+
+    def initialize(target, conn, table)
+      @target = target
+      @conn = conn
+      @table = table
+
+      @type_mapping = table.type_mapper.expression
+      @types_mapping = table.type_mapper.expression_multi
+      @name_mapping = "NULLIF(COALESCE(src.tags->'name:ru', src.tags->'name', src.tags->'int_name'), '')"
+
+      @fields = table.type_mapper.fields.merge :id => 'INT8 PRIMARY KEY',  :name => 'VARCHAR(255)', :tags => 'HSTORE', :osm_type => 'VARCHAR(10)'
+      @assigns = table.type_mapper.assigns.merge :id => osm_id_expr, :name => name_mapping, :tags => 'src.tags', :osm_type => osm_type_expr
+      @conditions = table.type_mapper.conditions
+
+      table.mappers.each do |key, mapper|
+        @fields.merge! mapper.fields
+        @assigns.merge! mapper.assigns
+      end
+    end
+
+    def osm_id_expr
+      "ABS(src.osm_id)"
+    end
+
+    def osm_type_expr(t = table.type)
+      "CASE WHEN src.osm_id < 0 THEN 'relation' ELSE '#{if t.to_s == 'point' then 'node' else 'way' end}' END"
+    end
+
+    def geometry_expr
+      if table.type =~ /^multi/
+        'ST_Multi(way)'
+      else
+        'way'
+      end
+    end
+
+    def name
+      "#{target.new_prefix}#{table.name}"
+    end
+
+  end
+
+end

data/lib/osm_import/target/{pg.rb → pg_tables.rb}

@@ -1,23 +1,9 @@
 require 'osm_import'
-require 'pg'
 
-class OsmImport::Target::Pg < Struct.new(:options)
-
-  def projection
-    options[:projection]
-  end
-
-  def prefix
-    'osm_'
-  end
-
-  def new_prefix
-    'new_osm_'
-  end
+class OsmImport::Target::PgTables < OsmImport::Target::PgBase
 
   def import(schema)
     conn = Connection.new options
-
     conn.exec "BEGIN TRANSACTION"
 
     puts "Dropping old tables:"
@@ -51,60 +37,7 @@ class OsmImport::Target::Pg < Struct.new(:options)
     conn.close
   end
 
-  GEOTYPES = { 'point' => 'POINT', 'line' => 'LINESTRING', 'polygon' => 'POLYGON', 'multiline' => 'MULTILINESTRING', 'multipolygon' => 'MULTIPOLYGON' }
-
-  def geometry_type(type)
-    GEOTYPES[type.to_s] or raise StandardError.new("Unknown geometry type #{type.inspect}")
-  end
-
-  class Connection < Struct.new(:options)
-
-    def initialize(*args)
-      super
-      @conn = PG.connect options[:pg]
-    end
-
-    def exec(q)
-      puts "  #{q}"
-      @conn.exec q
-    end
-
-    def close
-      @conn.close
-    end
-
-  end
-
-  class TargetTable
-
-    attr_reader :target, :conn, :table, :type_mapping, :type_array_mapping, :name_mapping, :fields, :conditions, :assigns
-
-    def initialize(target, conn, table)
-      @target = target
-      @conn = conn
-      @table = table
-
-      @type_mapping = table.type_mapper.expression
-      @type_array_mapping = table.type_mapper.expression_multi
-      @name_mapping = "NULLIF(COALESCE(src.tags->'name:ru', src.tags->'name', src.tags->'int_name'), '')"
-
-      @fields = table.type_mapper.fields.merge :id => 'INT8 PRIMARY KEY',  :name => 'VARCHAR(255)', :tags => 'HSTORE', :osm_type => 'VARCHAR(10)'
-      @assigns = table.type_mapper.assigns.merge :id => osm_id_expr, :name => name_mapping, :tags => 'src.tags', :osm_type => osm_type_expr
-      @conditions = table.type_mapper.conditions
-
-      table.mappers.each do |key, mapper|
-        @fields.merge! mapper.fields
-        @assigns.merge! mapper.assigns
-      end
-    end
-
-    def osm_id_expr
-      "ABS(src.osm_id)"
-    end
-
-    def osm_type_expr(t = table.type)
-      "CASE WHEN src.osm_id < 0 THEN 'relation' ELSE '#{if t.to_s == 'point' then 'node' else 'way' end}' END"
-    end
+  class TargetTable < TargetEntry
 
     def add_geometry_column(column, type)
       if target.projection
@@ -114,10 +47,6 @@ class OsmImport::Target::Pg < Struct.new(:options)
       end
     end
 
-    def name
-      "#{target.new_prefix}#{table.name}"
-    end
-
     def create!
       conn.exec "CREATE TABLE #{name}(#{fields.map{|k,v| "#{k} #{v}"}.join(', ')})"
       add_geometry_column :geometry, table.type
@@ -148,12 +77,6 @@ class OsmImport::Target::Pg < Struct.new(:options)
 
     def import!
       unless table.type_mapper.mappings.empty?
-        if table.type =~ /^multi/
-          geometry_expr = 'ST_Multi(way)'
-        else
-          geometry_expr = 'way'
-        end
-
         field_keys = fields.keys.to_a
         conn.exec "INSERT INTO #{name}(geometry, #{field_keys.join(', ')}) SELECT #{geometry_expr} AS geometry, #{field_keys.map{|k| "#{assigns[k]} AS #{k}"}.join(',')} FROM raw_osm_#{table.type.gsub('multi','')} src WHERE #{conditions.join(' AND ')}"
       end

data/lib/osm_import/target/pg_views.rb

@@ -0,0 +1,45 @@
+require 'osm_import'
+
+class OsmImport::Target::PgViews < OsmImport::Target::PgBase
+
+  def new_prefix
+    prefix
+  end
+
+  def import(schema)
+    conn = Connection.new options
+    conn.exec "BEGIN TRANSACTION"
+
+    puts "Preparing target views"
+    tvs = schema.tables.map{|table| TargetView.new self, conn, table }
+
+    puts "Dropping old views"
+    tvs.each(&:drop!)
+
+    puts "Creating views"
+    tvs.each(&:create!)
+
+    puts "Restoring geometry columns"
+    conn.exec "TRUNCATE geometry_columns"
+    conn.exec "SELECT probe_geometry_columns()"
+
+    puts "Commiting"
+    conn.exec "COMMIT"
+    conn.close
+  end
+
+  class TargetView < TargetEntry
+
+    def drop!
+      conn.exec "DROP VIEW IF EXISTS #{name}"
+    end
+
+    def create!
+      return if table.type_mapper.mappings.empty?
+
+      conn.exec "CREATE VIEW #{name} AS SELECT #{geometry_expr} AS geometry, #{fields.keys.map{|k| "#{assigns[k]} AS #{k}"}.join(',')} FROM #{target.raw_prefix}#{table.type.gsub('multi','')} src WHERE #{conditions.join(' AND ')}"
+    end
+
+  end
+
+end

data/lib/osm_import/version.rb

@@ -2,7 +2,7 @@ module OsmImport
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: osm-import
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 1
+  version: 0.0.1
 platform: ruby
 authors: 
 - Alexey Noskov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg
@@ -67,7 +67,9 @@ files:
 - lib/osm_import/mapper/address.rb
 - lib/osm_import/version.rb
 - lib/osm_import/target.rb
-- lib/osm_import/target/pg.rb
+- lib/osm_import/target/pg_tables.rb
+- lib/osm_import/target/pg_base.rb
+- lib/osm_import/target/pg_views.rb
 - lib/osm_import/schema.rb
 - lib/osm_import.rb
 - MIT-LICENSE