From e5f9764c92dac25de28d35ffab7e5abe01d52c82 Mon Sep 17 00:00:00 2001
From: Brandon Palonis <bmp59@pitt.edu>
Date: Fri, 27 Jan 2017 14:49:05 -0500
Subject: [PATCH 1/4] Changed open to opium

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 830c241..9711ea7 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
   <div id="ui">
     <div id="header">
       <div id="title">
-        <h3>Pitt Open Data Project</h3>
+        <h3>Pitt Opium Data Project</h3>
       </div>
       <div id="navigation">
         <ul>

From 7baa636b420e0137bc69335eb2f8007dab1bc506 Mon Sep 17 00:00:00 2001
From: Brandon Palonis <bmp59@pitt.edu>
Date: Fri, 27 Jan 2017 14:50:17 -0500
Subject: [PATCH 2/4] Fixed a small change

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 9711ea7..830c241 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
   <div id="ui">
     <div id="header">
       <div id="title">
-        <h3>Pitt Opium Data Project</h3>
+        <h3>Pitt Open Data Project</h3>
       </div>
       <div id="navigation">
         <ul>

From 6e67955d81e5ea5946d384dc0d56322f15498d97 Mon Sep 17 00:00:00 2001
From: Brandon Palonis <bmp59@pitt.edu>
Date: Fri, 27 Jan 2017 15:40:47 -0500
Subject: [PATCH 3/4] Added arrest data

---
 main.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/main.js b/main.js
index f1f98f0..e27a438 100644
--- a/main.js
+++ b/main.js
@@ -107,6 +107,12 @@
             html: '<i class="fa fa-balance-scale"></i>',
             iconSize: [32, 32],
             iconAnchor: [16, 32]
+        }),
+		CITY_ARREST: L.divIcon({
+            className: 'map-pin red',
+            html: '<i class="fa fa-gavel"></i>',
+            iconSize: [32, 32],
+            iconAnchor: [16, 32]
         }),
         CITY_311_ICON: L.divIcon({
             className: 'map-pin yellow',
@@ -140,6 +146,24 @@
                 record.incidentDay = parseInt(record.INCIDENTTIME.substring(8,10));
             }
         },
+		
+		"Arrest": {
+		    id: 'e03a89dd-134a-4ee8-a2bd-62c40aeebc6f',
+            primaryFiltering: 'WHERE "INCIDENTNEIGHBORHOOD" LIKE \'%Oakland\'',
+            latLong: ['Y', 'X'],
+            icon: iconTypes.CITY_ARREST,
+
+            // TODO: Better title and popup messages?
+            title: (record) => record['OFFENSES'],
+            popup: (record) => record['OFFENSES'],
+
+            processRecord: (record) => {
+                // Collect time of incident from the record
+                record.incidentYear = parseInt(record.ARRESTTIME.substring(0,4));
+                record.incidentMonth = parseInt(record.ARRESTTIME.substring(5,8));
+                record.incidentDay = parseInt(record.ARRESTTIME.substring(8,10));
+            }
+		},
 
         // City of Pittsburgh 311 data
         // TODO: would be great to prune 311 data to the last 30 days, like the police data
@@ -203,6 +227,7 @@
             // TODO: should have some generic error handling for data
             .catch((err) => displayNotification(err))
             .then((data) => {
+				console.log(dataSource.id, data);
                 const records = data.result.records;
 
                 records.forEach((record, i) => {
@@ -231,6 +256,7 @@
     Promise.all([
         fetchWPRDCData('Police', { limit: 250 }),
         fetchWPRDCData('311', { limit: 250 }),
+		fetchWPRDCData('Arrest', { limit: 250 }),
         fetchWPRDCData('Library')
     ]).then(() => {
         console.log('All data loaded');

From 79768fc3f6d5b22b86ac024c7b17878466de2b02 Mon Sep 17 00:00:00 2001
From: Brandon Palonis <bmp59@pitt.edu>
Date: Fri, 27 Jan 2017 16:15:34 -0500
Subject: [PATCH 4/4] Fixed indentation issues

---
 main.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.js b/main.js
index e27a438..50432fa 100644
--- a/main.js
+++ b/main.js
@@ -108,7 +108,7 @@
             iconSize: [32, 32],
             iconAnchor: [16, 32]
         }),
-		CITY_ARREST: L.divIcon({
+		    CITY_ARREST: L.divIcon({
             className: 'map-pin red',
             html: '<i class="fa fa-gavel"></i>',
             iconSize: [32, 32],
@@ -146,9 +146,9 @@
                 record.incidentDay = parseInt(record.INCIDENTTIME.substring(8,10));
             }
         },
-		
-		"Arrest": {
-		    id: 'e03a89dd-134a-4ee8-a2bd-62c40aeebc6f',
+
+		    "Arrest": {
+		        id: 'e03a89dd-134a-4ee8-a2bd-62c40aeebc6f',
             primaryFiltering: 'WHERE "INCIDENTNEIGHBORHOOD" LIKE \'%Oakland\'',
             latLong: ['Y', 'X'],
             icon: iconTypes.CITY_ARREST,
@@ -163,7 +163,7 @@
                 record.incidentMonth = parseInt(record.ARRESTTIME.substring(5,8));
                 record.incidentDay = parseInt(record.ARRESTTIME.substring(8,10));
             }
-		},
+		    },
 
         // City of Pittsburgh 311 data
         // TODO: would be great to prune 311 data to the last 30 days, like the police data
@@ -256,7 +256,7 @@
     Promise.all([
         fetchWPRDCData('Police', { limit: 250 }),
         fetchWPRDCData('311', { limit: 250 }),
-		fetchWPRDCData('Arrest', { limit: 250 }),
+		    fetchWPRDCData('Arrest', { limit: 250 }),
         fetchWPRDCData('Library')
     ]).then(() => {
         console.log('All data loaded');