Merge pull request #2485 from mmd-osm/patch/json2

JSON output nodes, ways, relations, map

diff --combined test/test_helper.rb
index 378d49bb9a02f43097cfe13c9b73c32c702e1aac,5b4d0d28f31b5c453cdc09ef4bb508caba347e66..08f01e8e7d488c21c2b9493ca74434b5a82516ee
--- 1/test/test_helper.rb
--- 2/test/test_helper.rb
+++ b/test/test_helper.rb
@@@ -115,6 -115,12 +115,12 @@@ module ActiveSuppor
        @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))
      end
  
+     ##
+     # set request header for HTTP Accept
+     def http_accept_format(format)
+       @request.env["HTTP_ACCEPT"] = format
+     end
+ 
      ##
      # set request readers to ask for a particular error format
      def error_format(format)
@@@ -159,6 -165,12 +165,6 @@@
        stub_request(:get, url).and_return(:status => status, :body => body)
      end
  
 -    def stub_hostip_requests
 -      # Controller tests and integration tests use different IPs
 -      stub_request(:get, "https://api.hostip.info/country.php?ip=0.0.0.0")
 -      stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1")
 -    end
 -
      def email_text_parts(message)
        message.parts.each_with_object([]) do |part, text_parts|
          if part.content_type.start_with?("text/")
@@@ -170,6 -182,7 +176,6 @@@
      end
  
      def sign_in_as(user)
 -      stub_hostip_requests
        visit login_path
        fill_in "username", :with => user.email
        fill_in "password", :with => "test"