citysdk 0.1.1.7 → 0.1.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWRlYTFkMjY1YmY2M2E5MTBhYzZhM2NhZDIyOTc1MTY0ZGRiNjM5Mw==
+    NjNkMzA3MDEzMDI2Y2NkNTQ2MmQyZDFhM2MzNmViY2U0Zjc3NTM3ZA==
   data.tar.gz: !binary |-
-    YWRjOWZiNWFjNzBlNmEzYWRmOTdjMjQxNzZjYjdkNGQ3ZmNmNjU3YQ==
+    ODVkNzg2Y2Q0MTc1ODMxOWJkNDE4ZmI3ZDdiOTk0YjUzNjY0MzM4OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmY0NzZlMGEzYzYzYmQxNmFhM2MwNTU1NjFjY2ExMTAwNzVjMTFhYjZkY2E0
-    NzFlM2RlZDllZDVlZjFlMTYyNDliMDM0YzI1ZWNlYzIxOWQ4NTJjN2IyZWE1
-    MDZkNWYzZTNhYTcxN2Y4OGNmZGRhZTdkMjNiYjZiNzA3NjRmYTg=
+    ZWYxMThiZThiOWM3YTMwYzJkNmE0M2FmZGI2MGU0Yzk2ODE2M2FiMmY3ZGY4
+    YWIzYjYzYzM4ZjRmMDVhZjkzYjdmNDk1ZGE4MTAyOGMyZDEwNDE5ZGM0Mzlj
+    OWYxNzgyNGZhM2RlNTk4ZDU1MDI4MmExNGZiNTYwNWM3YTIzMWY=
   data.tar.gz: !binary |-
-    NWIwZWQyOWIxNTUwZWZjNDMyM2U5ZGU1ZjM1NmNhZjgxNWZmMWU5YWJiMTg5
-    MDQ1MzI3YzI5MjBkZmU2N2QwY2U3OGZmOGZiZDUzZjg2NzdlMzQ1YWNiNGI1
-    M2NiZDQzNzA1ZGUzZDgzNjc3ZmNlNTQ3NTFiNzQxNjc1NmIyMDM=
+    MjRhYmNiNTA5ZmI3OTA5MmM1YjgzYTE0NjA0ZWMwODA4OGU1ODQwMzYyMzgw
+    NmNjZTc5YmQxNjFjYzcxZDM3YjA0YzgzY2E4NTBiODIwNTVmODkzY2QzMGY1
+    OGRiOGIzNDA0MzY2NTVhNTkwZDEyMjUwY2JlYmRkOGI2MWM4MmI=

data/lib/citysdk/file_reader.rb

@@ -72,6 +72,8 @@ module CitySDK
       end
     end
 
+
+
     def findUniqueField
       fields = {}
       unfield = nil
@@ -115,7 +117,7 @@ module CitySDK
     def getFields
       @params[:fields] = []
       @content[0][:properties].each_key do |k|
-        @params[:fields] << k
+        @params[:fields] << (k.to_sym rescue k) || k
       end
     end
     

data/lib/citysdk/importer.rb

@@ -89,10 +89,16 @@ module CitySDK
     end
   
     def filterFields(h)
+      
+      # puts "h: \n#{h}"
+      # puts "@params[:fields]: \n#{@params[:fields]}"
+      
       data = {}
       h.each_key do |k|
+        k = (k.to_sym rescue k) || k
         data[k] = h[k] if @params[:fields].include?(k)
       end
+      # puts "data: \n#{data}"
       data
     end
   
@@ -180,16 +186,14 @@ module CitySDK
 
           begin
             nodes.each do |rec|
-              
+
               node = {
                 :geom => rec[:geometry],
                 :id   => rec[:id]
               }
-              node[:name] = rec[:properties][@params[:name]] if @params[:name]
+              node[:name] = rec[:properties][@params[:name].to_sym] if @params[:name]
               node[:data] = filterFields(rec[:properties])
 
-              # puts JSON.pretty_generate(node)
-            
               yield(node) if block_given?
 
               @api.create_node(node) if not dryrun
@@ -227,6 +231,7 @@ module CitySDK
             if not (pc.empty? or hn.empty?)
               pc = pc.downcase.gsub(/[^a-z0-9]/,'')
               hn.scan(/\d+/).reverse.each { |n|
+                # puts "/nodes?#{@params[:addresslayer]}::#{@params[:addressfield]}=#{pc + n}"
                 qres = @api.get("/nodes?#{@params[:addresslayer]}::#{@params[:addressfield]}=#{pc + n}")
                 break if qres[:status]=='success' and qres[:record_count].to_i >= 1
               }

data/lib/citysdk.rb

@@ -4,6 +4,6 @@ require 'citysdk/file_reader.rb'
 require 'citysdk/importer.rb'
 
 module CitySDK
-  VERSION = "0.1.1.7"
+  VERSION = "0.1.1.8"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1.7
+  version: 0.1.1.8
 platform: ruby
 authors:
 - Tom Demeyer