Don't expose lat/lon of private traces

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index e8de1aa8e1aeafc5ff5750ef0542936913c0ee7f..919eb0122986fe5ac923e519c6a9aeb3934af713 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -1,3 +1,5 @@
+require 'stringio'
+

 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch
 
 # The Potlatch module provides helper functions for potlatch and its communication with the server
 module Potlatch
 


@@ -6,18 +8,20 @@ module Potlatch
     
     # Return two-byte integer
     def self.getint(s) 
     
     # Return two-byte integer
     def self.getint(s) 

-      s.getc*256+s.getc
+      s.getbyte*256+s.getbyte

     end
 
     # Return four-byte long
     def self.getlong(s) 
     end
 
     # Return four-byte long
     def self.getlong(s) 

-      ((s.getc*256+s.getc)*256+s.getc)*256+s.getc
+      ((s.getbyte*256+s.getbyte)*256+s.getbyte)*256+s.getbyte

     end
 
     # Return string with two-byte length 
     def self.getstring(s) 
     end
 
     # Return string with two-byte length 
     def self.getstring(s) 

-      len=s.getc*256+s.getc
-      s.read(len)
+      len=s.getbyte*256+s.getbyte
+      str=s.read(len)
+      str.force_encoding("UTF-8") if str.respond_to?("force_encoding")
+      str

     end
 
     # Return eight-byte double-precision float 
     end
 
     # Return eight-byte double-precision float 


@@ -43,23 +47,23 @@ module Potlatch
         if (key=='') then break end
         arr[key]=getvalue(s)
       end
         if (key=='') then break end
         arr[key]=getvalue(s)
       end

-      s.getc           # skip the 9 'end of object' value
+      s.getbyte                # skip the 9 'end of object' value

       arr
     end
 
     # Parse and get value
     def self.getvalue(s) 
       arr
     end
 
     # Parse and get value
     def self.getvalue(s) 

-      case s.getc
+      case s.getbyte

       when 0;  return getdouble(s)                     # number
       when 0;  return getdouble(s)                     # number

-      when 1;  return s.getc                           # boolean
+      when 1;  return s.getbyte                        # boolean

       when 2;  return getstring(s)                     # string
       when 3;  return getobject(s)                     # object/hash
       when 2;  return getstring(s)                     # string
       when 3;  return getobject(s)                     # object/hash

-      when 5;  return nil                                      # null
-      when 6;  return nil                                      # undefined
-      when 8;  s.read(4)                                       # mixedArray
-        return getobject(s)                    #  |
-      when 10;return getarray(s)                       # array
-      else;    return nil                                      # error
+      when 5;  return nil                              # null
+      when 6;  return nil                              # undefined
+      when 8;  s.read(4)                               # mixedArray
+                return getobject(s)                    #  |
+      when 10;  return getarray(s)                     # array
+      else;    return nil                              # error

       end
     end
 
       end
     end
 


@@ -97,7 +101,7 @@ module Potlatch
          when 'FalseClass'
         0.chr+encodedouble(0)
       else
          when 'FalseClass'
         0.chr+encodedouble(0)
       else

-        RAILS_DEFAULT_LOGGER.error("Unexpected Ruby type for AMF conversion: "+n.class.to_s)
+        Rails.logger.error("Unexpected Ruby type for AMF conversion: "+n.class.to_s)

       end
     end
 
       end
     end
 


@@ -119,6 +123,48 @@ module Potlatch
 
   end
 
 
   end
 

+  # The Dispatcher class handles decoding a series of RPC calls
+  # from the request, dispatching them, and encoding the response
+  class Dispatcher
+    def initialize(request, &block)
+      # Get stream for request data
+      @request = StringIO.new(request + 0.chr)
+
+      # Skip version indicator and client ID
+      @request.read(2)
+
+      # Skip headers
+      AMF.getint(@request).times do     # Read number of headers and loop
+        AMF.getstring(@request)         #  | skip name
+        req.getbyte                     #  | skip boolean
+        AMF.getvalue(@request)          #  | skip value
+      end
+
+      # Capture the dispatch routine
+      @dispatch = Proc.new
+    end
+
+    def each(&block)
+      # Read number of message bodies
+      bodies = AMF.getint(@request)
+
+      # Output response header
+      a,b = bodies.divmod(256)
+      yield 0.chr + 0.chr + 0.chr + 0.chr + a.chr + b.chr
+
+      # Process the bodies
+      bodies.times do                     # Read each body
+        name = AMF.getstring(@request)    #  | get message name
+        index = AMF.getstring(@request)   #  | get index in response sequence
+        bytes = AMF.getlong(@request)     #  | get total size in bytes
+        args = AMF.getvalue(@request)     #  | get response (probably an array)
+
+        result = @dispatch.call(name, *args)
+
+        yield AMF.putdata(index, result)
+      end
+    end
+  end

 
   # The Potlatch class is a helper for Potlatch
   class Potlatch
 
   # The Potlatch class is a helper for Potlatch
   class Potlatch


@@ -130,7 +176,7 @@ module Potlatch
     #                          [3] colours, [4] casing, [5] areas, [6] autotags
     #                          (all hashes)
     def self.get_presets
     #                          [3] colours, [4] casing, [5] areas, [6] autotags
     #                          (all hashes)
     def self.get_presets

-      RAILS_DEFAULT_LOGGER.info("  Message: getpresets")
+      Rails.logger.info("  Message: getpresets")

 
       # Read preset menus
       presets={}
 
       # Read preset menus
       presets={}


@@ -139,7 +185,7 @@ module Potlatch
       presettype=''
       presetcategory=''
       #        StringIO.open(txt) do |file|
       presettype=''
       presetcategory=''
       #        StringIO.open(txt) do |file|

-      File.open("#{RAILS_ROOT}/config/potlatch/presets.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/presets.txt") do |file|

         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\/(\w+)/) then
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\/(\w+)/) then


@@ -160,7 +206,7 @@ module Potlatch
 
       # Read colours/styling
       colours={}; casing={}; areas={}
 
       # Read colours/styling
       colours={}; casing={}; areas={}

-      File.open("#{RAILS_ROOT}/config/potlatch/colours.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/colours.txt") do |file|

         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then


@@ -174,7 +220,7 @@ module Potlatch
 
       # Read relations colours/styling
       relcolours={}; relalphas={}; relwidths={}
 
       # Read relations colours/styling
       relcolours={}; relalphas={}; relwidths={}

-      File.open("#{RAILS_ROOT}/config/potlatch/relation_colours.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/relation_colours.txt") do |file|

         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then
         file.each_line {|line|
           t=line.chomp
           if (t=~/(\w+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/) then


@@ -187,12 +233,11 @@ module Potlatch
       end
 
       # Read POI presets
       end
 
       # Read POI presets

-      icon_list=[]; icon_names={}; icon_tags={};
-      File.open("#{RAILS_ROOT}/config/potlatch/icon_presets.txt") do |file|
+      icon_list=[]; icon_tags={};
+      File.open("#{Rails.root}/config/potlatch/icon_presets.txt") do |file|

         file.each_line {|line|
         file.each_line {|line|

-          (icon,name,tags)=line.chomp.split("\t")
+          (icon,tags)=line.chomp.split("\t")

           icon_list.push(icon)
           icon_list.push(icon)

-          icon_names[icon]=name

           icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
         }
       end
           icon_tags[icon]=Hash[*tags.scan(/([^;=]+)=([^;=]+)/).flatten]
         }
       end


@@ -200,7 +245,7 @@ module Potlatch
       
       # Read auto-complete
       autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};
       
       # Read auto-complete
       autotags={}; autotags['point']={}; autotags['way']={}; autotags['POI']={};

-      File.open("#{RAILS_ROOT}/config/potlatch/autocomplete.txt") do |file|
+      File.open("#{Rails.root}/config/potlatch/autocomplete.txt") do |file|

         file.each_line {|line|
           t=line.chomp
           if (t=~/^([\w:]+)\/(\w+)\s+(.+)$/) then
         file.each_line {|line|
           t=line.chomp
           if (t=~/^([\w:]+)\/(\w+)\s+(.+)$/) then


@@ -211,10 +256,7 @@ module Potlatch
         }
       end
 
         }
       end
 

-#        # Read internationalisation
-#        localised = YAML::load(File.open("#{RAILS_ROOT}/config/potlatch/localised.yaml"))
-
-      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,icon_names,icon_tags]
+      [presets,presetmenus,presetnames,colours,casing,areas,autotags,relcolours,relalphas,relwidths,icon_list,{},icon_tags]

     end
   end
 
     end
   end