merge

chicago_api/settings.py

@@ -110,7 +110,7 @@
 
 # Parse database configuration from $DATABASE_URL
 import dj_database_url
-# DATABASES['default'] =  dj_database_url.config()p
+# DATABASES['default'] =  dj_database_url.config()
 
 
 

chicago_api/urls.py

@@ -7,7 +7,6 @@
 urlpatterns = patterns('',
     # Examples:
     url(r'^$', 'chicago_api.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
     url(r'^gmap/', include('gmap.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^social_data/',include('social_data.urls')),

gmap/admin.py

@@ -1,7 +1 @@
 from django.contrib import admin
-# from gmap.models import Location
-
-# class LocationAdmin(admin.ModelAdmin):
-#     fields = ['longitude','latitude']
-
-# admin.site.register(Location, LocationAdmin)

gmap/models.py

@@ -1,12 +1 @@
 from django.db import models
-
-# class Location(models.Model):
-
-#     longitude = models.CharField(max_length=200)
-#     latitude = models.CharField(max_length=200)
-#     # summary = models.CharField(max_length=200)
-
-#     def __unicode__(self):
-#         string = "longitude: %s; latitude: %s" % (self.longitude, self.latitude)
-#         return string
-

gmap/templates/gmap/map_sentiment.html

@@ -15,7 +15,6 @@
 
         var myParser;
 
-        // window.onload = function() {
         function initialize() {
             var lat_long = new google.maps.LatLng({{latitude}}, {{longitude}});
             var mapOptions = {
@@ -32,49 +31,6 @@
             myParser.parse(kml);    
 
             heat_data = []
-            {% if data %}
-
-                function createMarker(latitude, longitude, string, icon, image) {
-                    var marker = new google.maps.Marker({
-                        position: new google.maps.LatLng(latitude, longitude),
-                        map: map,
-                        icon: icon,
-                        animation: google.maps.Animation.DROP,
-                    })
-                    var contentString = string;
-
-                    if (image != "") {
-                        contentString = '<IMG BORDER="0" ALIGN="Left" SRC=' + image + '>' + contentString
-                    }
-
-                    var infoWindow = new google.maps.InfoWindow({
-                        content: contentString
-                    });
-
-                    google.maps.event.addListener(marker, 'click', function() {
-                        infoWindow.open(map,marker);
-                    }); 
-                }
-
-
-
-                // myParser.parse(kml);
-
-
-                // {% for p in data %}
-
-                //     createMarker({{p.latitude}},{{p.longitude}}, "{{p.title|escapejs}}", "{{p.icon}}", "{{p.image}}");
-
-                //     var item = new google.maps.LatLng({{p.latitude}}, {{p.longitude}});
-                //     heat_data.push(item);
-
-                // {% endfor %}
-
-                // var pointArray = new google.maps.MVCArray(heat_data);
-
-
-
-            {% endif %}
 
 
         }
@@ -93,9 +49,6 @@
                             if (sentiment == "positive") {
                                 counter = counter + 1
                             }
-                            // polygon.setOptions({fillColor: "blue", fillOpacity: 0.20});
-                            // window.alert("hello world");
-
                         }
 
 
@@ -120,23 +73,6 @@
                             polygon.setOptions({fillColor: "red", fillOpacity: 0.30})
                         }
                     }
-
-                    // {% for p in data %}
-                    //     var latitude = {{p.latitude}}
-                    //     var longitude = {{p.longitude}}
-                    //     var sentiment = "{{p.sentiment}}"
-
-                    //     var position = new google.maps.LatLng(latitude, longitude)
-
-                    //     if (google.maps.geometry.poly.containsLocation(position, polygon)) {
-
-                    //         polygon.setOptions({fillColor: "blue", fillOpacity: 0.30});
-                    //         // window.alert("hello world");
-
-                    //     }
-                    //     // polygon.setMap(map);
-
-                    // {% endfor %}
         }
 
         function sentiment(){
@@ -146,9 +82,6 @@
                 for (var i = 0; i < arrayLength; i++) {
                     var polygon = myParser.docs[0].gpolygons[i];
                     getSentiment(polygon);  
-                    // polygon.setMap(null);
-                    // polygon.setOptions({fillColor: "blue", fillOpacity: 0.20})
-                    // polygon.setMap(map);
                 }
 
 

requirements.txt

@@ -10,5 +10,4 @@ tweepy==2.2
 wsgiref==0.1.2
 nltk==2.0.4
 python-instagram==0.8.0
-facepy==0.9.0
-requests==2.1.0
+facepy==0.9.0