citysdk 0.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTM1MmNmNjc0NzJmZmVjMzNkYWMxNTVkZDcxN2Y1ZDlmMGJjM2ZlMg==
+  data.tar.gz: !binary |-
+    NDgyMWU4YTFlZTExMmZiOGJkMDc5M2FkODI1N2JlZGYwYjYzOGM5Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGVjOGVkYTY3YzQ4OTJlMjczNjg3ZTliZGQxMTI4MzIwYmI5OTg1OTk5NDdi
+    OGVkN2NhYzQ1ZTMyMWE1M2UxYTU0MTA1MjkzNDhiZWNlZTgwYWEzOGE5MTZm
+    NmRhNWRlMDRhYzFlOTM5ODhmN2ZkYzcwZmNjN2M3MGI3YjliY2I=
+  data.tar.gz: !binary |-
+    YzhmYmJjYjA1MzIyMjQ0MmYyNjFlZTBhZTFkOGNjYzNjM2Q2YTU2MmIxOWY0
+    ZmNiYjYzYmZiMWY4MjBiNjU5OTBkYzg3YWNiMThiYTIzZjZjODNiOTA0Yjg4
+    OGI3ZDUzM2YxNTU4ZWYwZTczOTEzZThmYjQ4MGZhYjM0MjBhZmE=

data/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in citysdk.gemspec
+gemspec
+
+gem 'georuby'
+gem 'faraday'
+gem 'charlock_holmes'
+

data/Gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: .
+  specs:
+    citysdk (0.1.0)
+      charlock_holmes (>= 0.6.9.4)
+      dbf
+      faraday (>= 0.8.5)
+      georuby (>= 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    charlock_holmes (0.6.9.4)
+    dbf (2.0.6)
+      fastercsv (~> 1.5.4)
+    diff-lcs (1.2.4)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    fastercsv (1.5.5)
+    georuby (2.0.0)
+    multipart-post (1.2.0)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.0)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  charlock_holmes
+  citysdk!
+  faraday
+  georuby
+  rspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Waag Society
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,52 @@
+# Citysdk
+
+The CitySDK gem encapulates the CItySDK API, and offers high-level file import functionalities.
+The CitySDK API is part of an (open)data distribution platform developed in the EU CitySDK program by [Waag Society](http://waag.org).
+Find the platform itself on [github](https://github.com/waagsociety/citysdk), platform documentation is [here](http://dev.citysdk.waag.org).
+
+
+## Usage
+
+    require 'citysdk'
+    
+    # check the dev site for api usage.
+
+    api = CitySDK::API.new('api.citysdk.waag.org')
+
+    # simple GET
+    # GET requests do not need authentication
+    first10layers = api.get('/layers')
+    puts "Number of layers: #{first10layers[:record_count]}"
+    puts "First layer: #{JSON.pretty_generate(first10layers[:results][0])}"
+    
+
+    # authenticate for write actions.
+    exit if not api.authenticate(<email>,<passw>)
+
+    # make a layer
+    # when you own the 'my' top level layer domain: 
+    @api.put('/layers',{:data => {
+      :name => 'my.layer',
+      :description => 'for testing',
+      :organization => 'me',
+      :category => 'civic.test'
+    }})
+
+    # add data to this layer
+    # attach to the node representing the city of Rotterdam
+    api.put('/admr.nl.rotterdam/my.layer', {:data => {:key1=>'value1', :key2=>10}})
+
+
+    ...
+    
+    # don't forget to release! this will also send 'unfilled' batches to the backend.
+    api.release
+    
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1,3 @@
+require 'bundler'
+require "bundler/gem_tasks"
+Bundler::GemHelper.install_tasks

data/citysdk.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'citysdk'
+
+Gem::Specification.new do |gem|
+  gem.name          = "citysdk"
+  gem.version       = CitySDK::VERSION
+  gem.authors       = ["Tom Demeyer"]
+  gem.email         = ["tom@waag.org"]
+  gem.description   = %q{Encapsulates the CitySDK api.}
+  gem.summary       = %q{Encapsulates the CitySDK api, provides high-level file import functionality.}
+  gem.homepage      = "http://citysdk.waag.org"
+  gem.licenses      = ['MIT']
+  
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  
+  gem.add_dependency('dbf')
+  gem.add_dependency('georuby', '>= 2.0.0')
+  gem.add_dependency('faraday', '>= 0.8.5')
+  gem.add_dependency('charlock_holmes', '>= 0.6.9.4')
+  
+  gem.add_development_dependency "rspec"
+end
+

data/lib/citysdk.rb

@@ -0,0 +1,9 @@
+require './lib/citysdk/util.rb'
+require './lib/citysdk/api.rb'
+require './lib/citysdk/file_reader.rb'
+require './lib/citysdk/importer.rb'
+
+module CitySDK
+  VERSION = "0.1.1"
+end
+

data/lib/citysdk/api.rb

@@ -0,0 +1,216 @@
+require 'json'
+require 'faraday'
+
+module CitySDK
+  
+  class HostException < ::Exception
+  end
+
+  class API
+    attr_reader :error
+    attr_accessor :batch_size
+  
+    @@match_tpl = {
+      :match => {
+        :params => {}
+      },
+      :nodes => []
+    }
+    @@create_tpl =  {
+      :create => {
+        :params => {
+          :create_type => "create"
+        }
+      },
+      :nodes => []
+    }
+
+    def initialize(host, port=80)
+      @error = '';
+      @layer = '';
+      @batch_size = 10;
+      @updated = @created = 0;
+      set_host(host,port)
+    end
+    
+    def authenticate(e,p)
+      @email = e;
+      @passw = p;
+      if !( @host == 'api.dev' or @host == 'localhost' or @host == '127.0.0.1')
+        auth_connection = Faraday.new :url => "https://#{@host}", :ssl => {:verify => false}
+        resp = auth_connection.get '/get_session', { :e => @email, :p => @passw }
+      else 
+        resp = @connection.get '/get_session', { :e => @email, :p => @passw }
+      end
+      if resp.status == 200 
+        resp = CitySDK::parseJson(resp.body)
+        if resp[:status] == 'success'
+          @connection.headers['X-Auth'] = resp[:results][0]
+        else
+          raise Exception.new(resp[:message])
+        end
+      else
+        raise Exception.new(resp.body)
+      end
+      
+      if block_given?
+        yield
+        return self.release
+      end
+      true
+    end
+
+    def set_host(host,port=80)
+      @host  = host
+      @port  = port
+      @connection = Faraday.new :url => "http://#{@host}:#{@port}"
+      @connection.headers = {
+        :user_agent => 'CitySDK_API GEM ' + CitySDK::VERSION,
+        :content_type => 'application/json'
+      }
+      begin 
+        get('/')
+      rescue Exception => e
+        raise CitySDK::Exception.new("Trouble connecting to api @ #{host}")
+      end
+      @create = @@create_tpl
+      @match = @@match_tpl
+    end
+
+    def set_matchTemplate(mtpl) 
+      mtpl[:nodes] = []
+      @match = @@match_tpl = mtpl
+    end
+
+    def set_createTemplate(ctpl) 
+      ctpl[:nodes] = []
+      @create = @@create_tpl = ctpl
+    end
+
+    def set_layer(l)
+      @layer = l
+    end
+  
+    def set_layer_status(status)
+      put("/layer/#{@layer}/status",{:data => status})
+    end
+  
+    def match_node(n)
+      @match[:nodes] << n
+      return match_flush if @match[:nodes].length >= @batch_size
+      return nil
+    end
+
+    def match_create_node(n)
+      @match[:nodes] << n
+      return match_create_flush if @match[:nodes].length >= @batch_size
+    end
+
+    def create_node(n)
+      @create[:nodes] << n
+      create_flush if @create[:nodes].length >= @batch_size
+    end
+  
+    def authorized?
+      @connection.headers['X-Auth']
+    end
+
+    def release
+      match_flush
+      create_flush # send any remaining entries in the create buffer
+      match_create_flush
+      if authorized?
+        resp = @connection.get('/release_session')
+        if resp.status == 200
+          @connection.headers.delete('X-Auth')
+        else
+          @error = CitySDK::parseJson(resp.body)[:message]
+          raise HostException.new(@error)
+        end
+      end
+      return [@updated, @created]
+    end
+  
+    def delete(path)
+      if authorized? 
+        resp = @connection.delete(path)
+        if resp.status == 200
+          return CitySDK::parseJson(resp.body) 
+        end
+        @error = CitySDK::parseJson(resp.body)[:message]
+        raise HostException.new(@error)
+      end
+      raise CitySDK::Exception.new("DEL needs authorization.")
+    end
+  
+    def post(path,data)
+      if authorized? 
+        resp = @connection.post(path,data.to_json)
+        return CitySDK::parseJson(resp.body) if resp.status == 200
+        @error = CitySDK::parseJson(resp.body)[:message]
+        raise HostException.new(@error)
+      end
+      raise CitySDK::Exception.new("POST needs authorization.")
+    end
+
+    def put(path,data)
+      if authorized? 
+        resp = @connection.put(path,data.to_json)
+        return CitySDK::parseJson(resp.body) if resp.status == 200
+        @error = CitySDK::parseJson(resp.body)[:message]
+        raise HostException.new(@error)
+      end
+      raise CitySDK::Exception.new("PUT needs authorization.")
+    end
+
+    def get(path)
+      resp = @connection.get(path)
+      return CitySDK::parseJson(resp.body) if resp.status == 200
+      @error = CitySDK::parseJson(resp.body)[:message]
+      raise HostException.new(@error)
+    end
+
+    def match_create_flush
+      
+      if @match[:nodes].length > 0
+        resp = post('util/match',@match)
+        if resp[:nodes].length > 0 
+          @create[:nodes] = resp[:nodes]
+          res = put("/nodes/#{@layer}",@create)
+          tally(res)
+          @create[:nodes] = []
+        end
+        @match[:nodes] = []
+        res
+      end
+      nil
+    end
+
+    def match_flush
+      if @match[:nodes].length > 0
+        resp = post('util/match',@match)
+        @match[:nodes] = []
+        return resp
+      end
+    end
+  
+  
+    def create_flush
+      if @create[:nodes].length > 0
+        tally put("/nodes/#{@layer}",@create)
+        @create[:nodes] = []
+      end
+    end
+
+    def tally(res)
+      if res[:status] == "success"
+        # TODO: also tally debug data!
+        @updated += res[:create][:results][:totals][:updated]
+        @created += res[:create][:results][:totals][:created]
+      end
+    end
+    
+  end
+
+end
+

data/lib/citysdk/file_reader.rb

@@ -0,0 +1,387 @@
+require 'csv'
+require 'geo_ruby'
+require 'geo_ruby/shp'
+require 'geo_ruby/geojson'
+require 'charlock_holmes'
+require 'tmpdir'
+
+module CitySDK
+
+
+  class FileReader
+    
+    RE_NAME = /(title|titel|naam|name)/i
+    RE_A_NAME = /^(naam|name|title|titel)$/i
+    RE_GEO = /^geom(etry)?|location|locatie$/i
+    RE_Y = /lat|(y.*coord)|(y.*loc(atie|ation)?)/i
+    RE_X = /lon|lng|(x.*coord)|(x.*loc(atie|ation)?)/i
+    
+    attr_reader :file, :content,:params
+
+    def initialize(pars)
+      @params = pars
+      file_path = File.expand_path(@params[:file_path])
+      case File.extname(file_path)
+      when /\.zip/i
+        readZip(file_path)
+      when /\.(geo)?json/i
+        readJSON(file_path)
+      when /\.shape/i
+        readShape(file_path)
+      when /\.csv|tsv/i
+        readCsv(file_path)
+      when /\.csdk/i
+        readCsdk(file_path)
+      end
+
+      @params[:rowcount] = @content.length
+      getFields if not @params[:fields]
+      guessName if not @params[:name]
+      guessSRID if not @params[:srid]
+      findUniqueField  if not @params[:unique_id]
+      getAddress if not @params[:hasaddress]
+      @params[:hasgeometry] = 'unknown' if @params[:hasgeometry].nil?
+    end
+    
+    def getAddress
+      pd = pc = hn = ad = false
+      @params[:fields].reverse.each do |f|
+        pd = f if ( f.to_s =~ /postcode|post/i )
+        pc = f if ( f.to_s =~ /^postcode$/i )
+        hn = f if ( f.to_s =~ /huisnummer|housenumber|(house|huis)(nr|no)|number/i)
+        ad = f if ( f.to_s =~ /address|street|straat|adres/i)
+      end
+      @params[:hasaddress] = 'unknown'
+      if (ad or hn)
+        if pc 
+          @params[:hasaddress] = 'certain'
+          @params[:postcode] = pc
+        elsif pd
+          @params[:hasaddress] = 'maybe'
+          @params[:postcode] = pd
+        end
+        @params[:housenumber] = hn ? hn : ad
+      end
+    end
+
+    def findUniqueField
+      fields = {}
+      unfield = nil
+
+      return if @content[0][:id]
+
+      @content.each do |h|
+        h[:properties].each do |k,v|
+          fields[k] = {} if fields[k].nil?
+          (fields[k][v] == nil) ? fields[k][v] = 1 : fields[k][v] += 1
+        end
+      end
+
+      fields.each_key do |k|
+        if fields[k].length == @params[:rowcount]
+          @params[:unique_id] = unfield = k
+          break
+        end
+      end
+
+      if unfield
+        @content.each do |h|
+          h[:id] = h[:properties][unfield]
+        end
+      end
+
+    end
+
+    def guessName
+      @params[:fields].reverse.each do |k|
+        if(k.to_s =~ RE_A_NAME)
+          @params[:name] = k
+          return
+        end
+        if(k.to_s =~ RE_NAME)
+          @params[:name] = k
+        end
+      end
+    end
+
+    def getFields
+      @params[:fields] = []
+      @content[0][:properties].each_key do |k|
+        @params[:fields] << k
+      end
+    end
+    
+    def guessSRID
+      return if @content[0][:geometry].nil?
+      @params[:srid] = 4326 
+      g = @content[0][:geometry][:coordinates]
+      while g[0].is_a?(Array)
+        g = g[0]
+      end
+      lon = g[0]
+      lat = g[1]
+      # if lon > -180.0 and lon < 180.0 and lat > -90.0 and lat < 90.0 
+      #   @params[:srid] = 4326 
+      # els
+      if lon > -7000.0 and lon < 300000.0 and lat > 289000.0 and lat < 629000.0
+        # Dutch new rd system
+        @params[:srid] = 28992
+      end
+    end
+    
+    def findColSep(f)
+      a = f.gets
+      b = f.gets
+      [";","\t","|"].each do |s|
+        return s if (a.split(s).length == b.split(s).length) and b.split(s).length > 1
+      end
+      ','
+    end
+
+    def isWkbGeometry(s)
+      begin
+        f = GeoRuby::SimpleFeatures::GeometryFactory::new
+        p = GeoRuby::SimpleFeatures::HexEWKBParser.new(f)
+        p.parse(s)
+        g = f.geometry
+        return g.srid,g.as_json[:type],g
+      rescue Exception=>e
+      end
+      nil
+    end
+
+    def isGeoJSON(s)
+      begin
+        if ['Point', 'MultiPoint', 'LineString', 'MultiLineString', 'Polygon', 'MultiPolygon', 'GeometryCollection'].include?(s[:type])
+          srid = 4326
+          if s[:crs] && s[:crs][:type] == 'OGC'
+            urn = s[:crs][:properties][:urn].split(':')
+            srid = urn.last.to_i if (urn[4] == 'EPSG')
+          end
+          return srid,s[:type],s
+        end
+      rescue Exception=>e
+      end
+      nil
+    end
+    
+    
+    def findGeometry
+      xfield = nil; xs = true
+      yfield = nil; ys = true
+      @content[0][:properties].each do |k,v|
+        if k.to_s =~ RE_GEO
+          srid,g_type = isWkbGeometry(v)
+          if(srid)
+            @params[:srid] = srid
+            @params[:geomtry_type] = g_type
+            @content.each do |h|
+              a,b,g = isWkbGeometry(h[:properties][k])
+              h[:geometry] = g
+              h[:properties].delete(k)
+            end
+            @params[:hasgeometry] = 'certain'
+            return true
+          end
+          
+          srid,g_type = isGeoJSON(v)
+          if(srid)
+            @params[:srid] = srid
+            @params[:geomtry_type] = g_type
+            @content.each do |h|
+              h[:geometry] = h[:properties][k]
+              h[:properties].delete(k)
+            end
+            @params[:hasgeometry] = 'certain'
+            return true
+          end
+          
+          @content.each do |h|
+            h[:geometry] = h[:properties][k]
+            h[:properties].delete(k)
+          end
+          @params[:hasgeometry] = 'maybe'
+          return
+        end
+        
+        hdc = k.to_sym.downcase
+        if hdc == 'longitude' or hdc == 'lon'
+          xfield=k; xs=false
+        end
+        if hdc == 'latitude' or hdc == 'lat'
+          yfield=k; ys=false
+        end
+        xfield = k if xs and (hdc =~ RE_X) 
+        yfield = k if ys and (hdc =~ RE_Y)
+      end
+
+      if xfield and yfield and (xfield != yfield)
+        @params[:hasgeometry] = 'certain'
+        @content.each do |h|
+          h[:geometry] = {:type => 'Point', :coordinates => [h[:properties][xfield].gsub(',','.').to_f, h[:properties][yfield].gsub(',','.').to_f]}
+          h[:properties].delete(yfield)
+          h[:properties].delete(xfield)
+        end
+        @params[:geomtry_type] = 'Point'
+        return true
+      end
+      false
+    end
+    
+    
+    def readCsv(path)
+      @file = path
+      c=''
+      File.open(path, "r:bom|utf-8") do |fd|
+        c = fd.read
+      end
+      if true != @params[:utf8_fixed]
+        detect = CharlockHolmes::EncodingDetector.detect(c)
+        c =	CharlockHolmes::Converter.convert(c, detect[:encoding], 'UTF-8') if detect
+      end
+      c = c.force_encoding('utf-8')
+      @content = []
+      @params[:colsep] = findColSep(StringIO.new(c))
+      csv = CSV.new(c, :col_sep => @params[:colsep], :headers => true, :skip_blanks =>true)
+      csv.each do |row|
+        r = row.to_hash
+        h = {}
+        r.each do |k,v|
+          h[(k.to_sym rescue k) || k] = v
+        end
+        @content << {:properties => h }
+      end
+      findGeometry
+    end
+
+
+    def readJSON(path)
+      @content = []
+      @file = path
+      raw = ''
+      File.open(path, "r:bom|utf-8") do |fd|
+        raw = fd.read
+      end
+      hash = CitySDK::parseJson(raw)
+
+      if hash.is_a?(Hash) and hash[:type] and (hash[:type] == 'FeatureCollection')
+        hash[:features].each do |f|
+          f.delete(:type)
+          @content << f
+        end
+        @params[:hasgeometry] = 'certain'
+        findUniqueField if @content[0][:id].nil?
+      else
+        val,length = nil,0
+
+        if hash.is_a?(Array)
+           val,length = hash,hash.length
+        else
+          hash.each do |k,v|
+            if v.is_a?(Array)
+              val,length = v,v.length if v.length > length
+            end
+          end
+        end
+        
+        if val
+          val.each do |h|
+            @content << {:properties => h}
+          end
+        end
+        findGeometry
+      end
+    end
+
+
+    def sridFromPrj(str)
+      begin
+        connection = Faraday.new :url => "http://prj2epsg.org"
+        resp = connection.get('/search.json', {:mode => 'wkt', :terms => str})
+        if resp.status == 200 
+          resp = CitySDK::parseJson resp.body
+          @params[:srid] = resp[:codes][0][:code].to_i
+        end
+      rescue
+      end
+    end
+
+    def readShape(path)
+      @content = []
+      @file = path
+      
+      prj = path.gsub(/.shp$/i,"") + '.prj'
+      prj = File.exists?(prj) ? File.read(prj) : nil
+      sridFromPrj(prj) if (prj and @params[:srid].nil?)
+      
+      @params[:hasgeometry] = 'certain'
+      
+      GeoRuby::Shp4r::ShpFile.open(path) do |shp|
+        shp.each do |shape|
+          h = {}
+          h[:geometry] = CitySDK::parseJson(shape.geometry.to_json) #a GeoRuby SimpleFeature
+          h[:properties] = {}
+          att_data = shape.data #a Hash
+          shp.fields.each do |field|
+            h[:properties][field.name.to_sym] = att_data[field.name]
+          end
+          @content << h
+        end
+      end
+    end
+    
+    def readCsdk(path)
+      h = Marshal.load(File.read(path))
+      @params = h[:config]
+      @content = h[:content]
+    end    
+    
+    def readZip(path)
+      begin 
+        Dir.mktmpdir("cdkfi_#{File.basename(path)}") do |dir| 
+          raise "Error unzipping #{path}." if not system "unzip #{path} -d #{dir} > /dev/null 2>&1"
+          Dir.foreach(dir) do |f|
+            next if f =~ /^\./
+            case File.extname(f)
+              when /\.(geo)?json/i
+                readJSON(dir+'/'+f)
+                return
+              when /\.shp/i
+                readShape(dir+'/'+f)
+                return
+              when /\.csv|tsv/i
+                readCsv(dir+'/'+f)
+                return
+            end
+          end
+        end
+      rescue Exception => e
+        raise CitySDK::Exception(e.message, {:originalfile => path}, __FILE__,__LINE__)
+      end
+    end
+
+    def write(path=nil)
+      begin
+        path = @file_path if path.nil?
+        File.open(path+'.csdk',"w") do |fd|
+          fd.write( Marshal.dump({:config=>@params, :content=>@content}) )
+          # fd.write(JSON.pretty_generate({:config=>@params, :content=>@content}))
+        end
+      rescue
+      end
+    end
+
+  end
+  
+end
+
+
+
+# {
+#   :headers => ['aap','noot','titel', 'gid', 'geometry']
+#   :config => {:geom => 'geometry', :name => 'titel', :id => 'gid', :srid => 28892}
+#   :data => [
+#     ['jpo','pipo','naam1','1092',{:type => 'Point', :coordinates => [5.3, 52.4]}],
+#     ['jpa','popi','naam2','1093',{:type => 'Point', :coordinates => [5.1, 52.1]}]
+#   ]
+# }