location at root of device response

app/models/device.rb

@@ -187,19 +187,22 @@ def soft_state
     end
   end
 
+  def formatted_location
+    {
+      ip: nil,
+      exposure: exposure,
+      elevation: elevation.try(:to_i) ,
+      latitude: latitude,
+      longitude: longitude,
+      geohash: geohash,
+      city: city,
+      country_code: country_code,
+      country: country_name
+    }
+  end
+
   def formatted_data
     s = {
-      location: {
-        ip: nil,
-        exposure: exposure,
-        elevation: elevation.try(:to_i) ,
-        latitude: latitude,
-        longitude: longitude,
-        geohash: geohash,
-        city: city,
-        country_code: country_code,
-        country: country_name
-      },
       sensors: []
     }
 

app/views/v0/devices/_device.jbuilder

@@ -27,6 +27,7 @@ else
   json.merge! device_token: '[FILTERED]'
 end
 
+json.merge!(location: device.formatted_location)
 json.merge!(hardware: device.hardware(authorized))
 
 if with_owner && device.owner

spec/requests/v0/devices_spec.rb

@@ -24,7 +24,7 @@
       expect(json.length).to eq(2)
       # expect(json[0]['name']).to eq(first.name)
       # expect(json[1]['name']).to eq(second.name)
-      expect(json[0].keys).to eq(%w(id uuid name description state postprocessing system_tags user_tags is_private notify_low_battery notify_stopped_publishing last_reading_at created_at updated_at device_token hardware owner data))
+      expect(json[0].keys).to eq(%w(id uuid name description state postprocessing system_tags user_tags is_private notify_low_battery notify_stopped_publishing last_reading_at created_at updated_at device_token location hardware owner data))
     end
 
     describe "when not logged in" do