From 08a0fc90e371c20b3f78d25dc81440d7eb505a19 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 Nov 2014 22:41:01 +0000
Subject: [PATCH] Track users in piwik

---
 app/assets/javascripts/piwik.js  | 4 ++++
 app/views/layouts/_head.html.erb | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js
index a48e903ad..d327296f6 100644
--- a/app/assets/javascripts/piwik.js
+++ b/app/assets/javascripts/piwik.js
@@ -10,6 +10,10 @@ if (OSM.PIWIK) {
       success: function () {
         piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
       
+        if (OSM.user) {
+          piwikTracker.setUserId(OSM.user);
+        }
+
         piwikTracker.trackPageView();
         piwikTracker.enableLinkTracking();
       
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 1c91e68ec..b879d90bd 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -32,9 +32,12 @@
     I18n.defaultLocale = "<%= I18n.default_locale %>";
     I18n.locale = "<%= I18n.locale %>";
     I18n.fallbacks = true;
-    <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? -%>
+    <% if @user -%>
+    OSM.user = <%= @user.id.to_json.html_safe %>;
+    <% unless @user.home_lon.nil? or @user.home_lat.nil? -%>
     OSM.home = <%= { :lat => @user.home_lat, :lon => @user.home_lon }.to_json.html_safe %>;
     <% end -%>
+    <% end -%>
     <% if session[:location] -%>
     OSM.location = <%= session[:location].to_json.html_safe %>;
     <% end -%>
-- 
2.43.2