From 72b4212b19b32b3afa399ba087497ca9096b7061 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 3 Nov 2015 00:19:28 -0800
Subject: [PATCH] Demo uses device tracker demo platform

---
 homeassistant/components/demo.py | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index 388a869ae0c..7c873e834bd 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -10,14 +10,15 @@ import homeassistant.core as ha
 import homeassistant.bootstrap as bootstrap
 import homeassistant.loader as loader
 from homeassistant.const import (
-    CONF_PLATFORM, ATTR_ENTITY_PICTURE, ATTR_ENTITY_ID, ATTR_FRIENDLY_NAME)
+    CONF_PLATFORM, ATTR_ENTITY_ID)
 
 DOMAIN = "demo"
 
-DEPENDENCIES = ['introduction', 'conversation']
+DEPENDENCIES = ['conversation', 'introduction', 'zone']
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
-    'switch', 'light', 'sensor', 'thermostat', 'media_player', 'notify']
+    'device_tracker', 'light', 'media_player', 'notify', 'switch', 'sensor',
+    'thermostat']
 
 
 def setup(hass, config):
@@ -110,25 +111,6 @@ def setup(hass, config):
              }},
             ]})
 
-    # Setup fake device tracker
-    hass.states.set("device_tracker.paulus", "home",
-                    {ATTR_ENTITY_PICTURE:
-                     "http://graph.facebook.com/297400035/picture",
-                     ATTR_FRIENDLY_NAME: 'Paulus'})
-    hass.states.set("device_tracker.anne_therese", "not_home",
-                    {ATTR_FRIENDLY_NAME: 'Anne Therese',
-                     'latitude': hass.config.latitude + 0.002,
-                     'longitude': hass.config.longitude + 0.002})
-
-    hass.states.set("group.all_devices", "home",
-                    {
-                        "auto": True,
-                        ATTR_ENTITY_ID: [
-                            "device_tracker.paulus",
-                            "device_tracker.anne_therese"
-                        ]
-                    })
-
     # Setup configurator
     configurator_ids = []