From c2a5c009ac173d4af400581e6a285b2d16bf877b Mon Sep 17 00:00:00 2001
From: osesina <osesina@yahoo.com>
Date: Sun, 23 Oct 2016 16:00:22 -0400
Subject: [PATCH 1/3] clean up of unused background-image

---
 app/scripts/templates/early_voting_sidebar.ejs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/scripts/templates/early_voting_sidebar.ejs b/app/scripts/templates/early_voting_sidebar.ejs
index 1152e48..7b65a3c 100644
--- a/app/scripts/templates/early_voting_sidebar.ejs
+++ b/app/scripts/templates/early_voting_sidebar.ejs
@@ -1,5 +1,17 @@
 <% locations.forEach(function(location, i) { %>    
     <div class="early-voting-location" id="location<%= i %>">
+
+      <div 
+      id="marker_<%= i %>"
+      style="
+        background-image: url(https://maps.gstatic.com/mapfiles/api-3/images/spotlight-poi-dotless.png);
+        background-repeat: no-repeat;
+        height:40px;
+      "
+      > 
+        &nbsp;
+        <%= ""+earlyPollingMarkers[i].getLabel() %>
+      </div>
       <div id="heading<%= i %>" role="tab">
         <h4>
           <a role="button" data-toggle="collapse" data-parent="#early-voting-sidebar" href="#collapse<%= i %>" aria-expanded="false" aria-controls="collapse<%= i %>">

From afbb6accc9086a0ea816356e6cc6d3f31ca205f9 Mon Sep 17 00:00:00 2001
From: osesina <osesina@yahoo.com>
Date: Sun, 23 Oct 2016 15:56:56 -0400
Subject: [PATCH 2/3] Added label to early voting locations Added label and
 markers to sidebar items

---
 app/scripts/early_voting_mgr.js               |  3 ++-
 app/scripts/map_service.js                    | 26 +++++++++++++++++++
 .../templates/early_voting_sidebar.ejs        |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/scripts/early_voting_mgr.js b/app/scripts/early_voting_mgr.js
index eb13365..6622e80 100644
--- a/app/scripts/early_voting_mgr.js
+++ b/app/scripts/early_voting_mgr.js
@@ -52,7 +52,8 @@ define(
         $el.find('#early-voting-sidebar').html(ejs.render(earlyVotingSidebarTmpl, {
           moment: moment,
           locations: earlyVotingLocations,
-          getDirections: getDirections
+          getDirections: getDirections,
+          earlyPollingMarkers: mapService.getEarlyPollingMarkers()
         }));
 
         listenToSidebarEvents();
diff --git a/app/scripts/map_service.js b/app/scripts/map_service.js
index b6c14f5..1a02f97 100644
--- a/app/scripts/map_service.js
+++ b/app/scripts/map_service.js
@@ -56,8 +56,26 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
       var earlyVotingMarker = new google.maps.Marker({
         position: poll.getGeometry().get()
       });
+<<<<<<< HEAD
       earlyVotingMarker.addListener('click', function() {
         fireMarkerEvent('click', earlyVotingMarker);
+=======
+    }
+
+    function createEarlyPollingMarkers() {
+      var labels = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+      var labelIndex = 0;
+      earlyPollingLocations.forEach(function(location) {
+        var earlyVotingMarker = new google.maps.Marker({
+          position: location.position,
+          label: labels[labelIndex++ % labels.length]
+        });
+        earlyVotingMarker.addListener('click', function() {
+          fireMarkerEvent('click', earlyVotingMarker);
+        });
+
+        earlyPollingMarkers.push(earlyVotingMarker);
+>>>>>>> 553901e... Added label to early voting locations
       });
       earlyPollingMarkers.push(earlyVotingMarker);
     });
@@ -162,9 +180,17 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
         
     },
 
+<<<<<<< HEAD
     subscribeToMarkerEvents: function(cb) {
       markerEventListeners.push(cb);
     },
+=======
+        getEarlyPollingMarkers: function() {
+            return earlyPollingMarkers;
+        },
+
+        displayNewPollingPlace: function(latLng, destination, precinct, successCallback, errorCallback) {
+>>>>>>> 553901e... Added label to early voting locations
 
     displayNewPollingPlace: function(latLng, destination, precinct, successCallback, errorCallback) {
 
diff --git a/app/scripts/templates/early_voting_sidebar.ejs b/app/scripts/templates/early_voting_sidebar.ejs
index 7b65a3c..fee3f51 100644
--- a/app/scripts/templates/early_voting_sidebar.ejs
+++ b/app/scripts/templates/early_voting_sidebar.ejs
@@ -1,9 +1,9 @@
 <% locations.forEach(function(location, i) { %>    
     <div class="early-voting-location" id="location<%= i %>">
-
       <div 
       id="marker_<%= i %>"
       style="
+        background-images: url(/images/number-bubble.png);
         background-image: url(https://maps.gstatic.com/mapfiles/api-3/images/spotlight-poi-dotless.png);
         background-repeat: no-repeat;
         height:40px;

From 1db14860ca458ef1ea5927ad943e093fdea21ae2 Mon Sep 17 00:00:00 2001
From: osesina <osesina@yahoo.com>
Date: Tue, 25 Oct 2016 22:07:55 -0400
Subject: [PATCH 3/3] created new branh for early voting side bar marker labels
 and cherry -picked from last commits

---
 app/scripts/map_service.js                    | 52 ++++++++-----------
 .../templates/early_voting_sidebar.ejs        |  6 +--
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/app/scripts/map_service.js b/app/scripts/map_service.js
index 1a02f97..5755bd6 100644
--- a/app/scripts/map_service.js
+++ b/app/scripts/map_service.js
@@ -1,8 +1,8 @@
 define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
         function(earlyPollingJSON) {
 
-  var hoverIcon = "https://mts.googleapis.com/maps/vt/icon/name=icons/spotlight/spotlight-waypoint-a.png&text=•&psize=30&font=fonts/Roboto-Regular.ttf&color=ff333333&ax=44&ay=48&scale=1"
-  var defaultIcon = "https://mts.googleapis.com/maps/vt/icon/name=icons/spotlight/spotlight-waypoint-b.png&text=•&psize=30&font=fonts/Roboto-Regular.ttf&color=ff333333&ax=44&ay=48&scale=1"
+  var hoverIcon = "https://mts.googleapis.com/maps/vt/icon/name=icons/spotlight/spotlight-waypoint-a.png&text=&psize=30&font=fonts/Roboto-Regular.ttf&color=ff333333&ax=44&ay=48&scale=1"
+  var defaultIcon = "https://mts.googleapis.com/maps/vt/icon/name=icons/spotlight/spotlight-waypoint-b.png&text=&psize=30&font=fonts/Roboto-Regular.ttf&color=ff333333&ax=44&ay=48&scale=1"
 
 
   var DEFAULT_ZOOM_LEVEL = 13;
@@ -34,6 +34,7 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
   }
 
 
+  var labels = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
   var earlyPollingMarkers = [];
 
 
@@ -52,30 +53,16 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
   }
 
   function createEarlyPollingMarkers() {
+      
+      var labelIndex = 0;
       earlyPollingLocations.forEach(function(poll, index) {
       var earlyVotingMarker = new google.maps.Marker({
-        position: poll.getGeometry().get()
+        position: poll.getGeometry().get(),
+        label: labels[labelIndex++ % labels.length],
+        animation: google.maps.Animation.DROP
       });
-<<<<<<< HEAD
       earlyVotingMarker.addListener('click', function() {
         fireMarkerEvent('click', earlyVotingMarker);
-=======
-    }
-
-    function createEarlyPollingMarkers() {
-      var labels = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-      var labelIndex = 0;
-      earlyPollingLocations.forEach(function(location) {
-        var earlyVotingMarker = new google.maps.Marker({
-          position: location.position,
-          label: labels[labelIndex++ % labels.length]
-        });
-        earlyVotingMarker.addListener('click', function() {
-          fireMarkerEvent('click', earlyVotingMarker);
-        });
-
-        earlyPollingMarkers.push(earlyVotingMarker);
->>>>>>> 553901e... Added label to early voting locations
       });
       earlyPollingMarkers.push(earlyVotingMarker);
     });
@@ -158,10 +145,17 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
 
 
     changeMarkerColor:function(index, color) {
+    var defaultState = "background: url("+defaultIcon+") no-repeat;height:40px;";
+    var hoverState = "background: url("+hoverIcon+") no-repeat;height:40px;";
+
       if (color === "hover") {
-        earlyPollingMarkers[index].setIcon(hoverIcon);
+        earlyPollingMarkers[index].setIcon( hoverIcon );
+        earlyPollingMarkers[index].setLabel("");
+        document.getElementById('marker_'+index).setAttribute('style', hoverState);
       } else if (color === "default") {
-        earlyPollingMarkers[index].setIcon(defaultIcon);
+        earlyPollingMarkers[index].setIcon();
+        earlyPollingMarkers[index].setLabel(labels[index]);
+        document.getElementById('marker_'+index).setAttribute('style', defaultState);
       }
     },
 
@@ -180,17 +174,13 @@ define(['json!vendor/EARLY_VOTING_AddressPoints.geojson'],
         
     },
 
-<<<<<<< HEAD
     subscribeToMarkerEvents: function(cb) {
       markerEventListeners.push(cb);
     },
-=======
-        getEarlyPollingMarkers: function() {
-            return earlyPollingMarkers;
-        },
-
-        displayNewPollingPlace: function(latLng, destination, precinct, successCallback, errorCallback) {
->>>>>>> 553901e... Added label to early voting locations
+    
+    getEarlyPollingMarkers: function() {
+        return earlyPollingMarkers;
+    },
 
     displayNewPollingPlace: function(latLng, destination, precinct, successCallback, errorCallback) {
 
diff --git a/app/scripts/templates/early_voting_sidebar.ejs b/app/scripts/templates/early_voting_sidebar.ejs
index fee3f51..587749f 100644
--- a/app/scripts/templates/early_voting_sidebar.ejs
+++ b/app/scripts/templates/early_voting_sidebar.ejs
@@ -3,14 +3,12 @@
       <div 
       id="marker_<%= i %>"
       style="
-        background-images: url(/images/number-bubble.png);
-        background-image: url(https://maps.gstatic.com/mapfiles/api-3/images/spotlight-poi-dotless.png);
-        background-repeat: no-repeat;
+        background: url(https://maps.gstatic.com/mapfiles/api-3/images/spotlight-poi-dotless.png) no-repeat;
         height:40px;
       "
       > 
         &nbsp;
-        <%= ""+earlyPollingMarkers[i].getLabel() %>
+        <%= ""+earlyPollingMarkers[i].label %>
       </div>
       <div id="heading<%= i %>" role="tab">
         <h4>