Permalink
Browse files

added map link

  • Loading branch information...
1 parent 85457db commit 10ef0f73f0f728b0ed0c55c419a553f8bf34e4f0 @wanderer committed May 12, 2012
@@ -25,9 +25,17 @@ function init_map(args){
var hotel = new L.Marker(new L.LatLng(41.889253,-87.616695), {icon:new altIcon()}).bindPopup("President Obama's Headquaters");
map.addLayer(hotel);
-
+ //Trinity Church
+ var altIcon = L.Icon.extend({
+ iconUrl: data_location+'Icons/marker-alt.png',
+ });
+ var trinity = new L.Marker(new L.LatLng(41.845463,-87.622563), {icon:new altIcon()}).bindPopup("<h2>Camping</h2>The pastor of Trinity Episcopal Anglican Church at 26th and Michigan will allow protesters to set up camp during the summit");
+ map.addLayer(trinity);
+
+
+
//security zone
var p1 = new L.LatLng(41.854262,-87.622311),
p2 = new L.LatLng(41.847389,-87.622225),
@@ -44,6 +52,42 @@ function init_map(args){
}).bindPopup("The Security Perimeter");
// add the rectangle to the map
map.addLayer(rectangle);
+
+ //add cermak
+ p1 = new L.LatLng(41.853611,-87.640976),
+ p2 = new L.LatLng(41.853455,-87.640404),
+ p3 = new L.LatLng(41.852825,-87.640884),
+ p4 = new L.LatLng(41.852837,-87.641434),
+ p5 = new L.LatLng(41.853611,-87.640976),
+ polylinePoints = [p1, p2, p3, p4,p5];
+
+ var cermak = new L.Polygon(polylinePoints, {
+ fillColor: "#ff7800",
+ color: "#000000",
+ opacity: 1,
+ weight: 2
+ }).bindPopup("500 W Cermak");
+
+ // add the rectangle to the map
+ map.addLayer(cermak);
+
+ //add the red zone
+ p1 = new L.LatLng(41.879372,-87.635254),
+ p2 = new L.LatLng(41.879482,-87.627686),
+ p3 = new L.LatLng(41.874561,-87.627617),
+ p4 = new L.LatLng(41.874466,-87.635040),
+ p5 = new L.LatLng(41.879372,-87.635254),
+ polylinePoints = [p1, p2, p3, p4,p5];
+
+ // create the rectangle
+ var redzone = new L.Polygon(polylinePoints, {
+ fillColor: "#FF0000",
+ color: "#000000",
+ opacity: 1,
+ weight: 2
+ }).bindPopup("<b>The Red Zone</b><br><a href=\"http://natoprotest.org/article/operation-red-zone/\">A \"red zone\" will surround federal buildings</a><br>manned by \"traveling swarms\" of armed federal agents. The zone will only be restricted in the event of \"civil disobedience.\"");
+ // add the rectangle to the map
+ map.addLayer(redzone);
//add events
var eventJSON = new L.GeoJSON(null,{
@@ -80,7 +124,23 @@ function init_map(args){
polyline.bindPopup("<h2>CANG8 March</h2> Petrillo Band Shell |<a href=\"http://natoprotest.org/article/cang8-march/\">View More</a>");
map.addLayer(polyline);
-
+
+ //add nurses march
+
+ var p1 = new L.LatLng(41.889515,-87.620277),
+ p2 = new L.LatLng(41.889595,-87.621590),
+ p3 = new L.LatLng(41.890984,-87.621696),
+ p4 = new L.LatLng(41.890923,-87.624184),
+ p5 = new L.LatLng(41.888222,-87.624420),
+ p6 = new L.LatLng(41.880856,-87.624313),
+ p7 = new L.LatLng(41.880440,-87.620728),
+ p8 = new L.LatLng(41.878429,-87.620644),
+ polylinePoints = [p1, p2, p3, p4, p5, p6,p7,p8],
+ polyline2 = new L.Polyline(polylinePoints);
+
+ polyline2.bindPopup("<h2>National Nurses United March</h2>Sheraton Chicago Hotel & Towers |<a href=\"http://natoprotest.org/article/robin-hood-will-search-city-world-leaders/\">View More</a>");
+ map.addLayer(polyline2);
+
//setup Icons
var ImageIcon = L.Icon.extend({
iconUrl: data_location+'Icons/police.png',
@@ -334,7 +334,7 @@ class Article(models.Model):
"""
author = models.ForeignKey(User, null=True, blank=True, help_text="""
The user who wrote this article.""")
- title = models.CharField(max_length=255, help_text="""
+ title = models.CharField(max_length=500, help_text="""
A one-line title to describe article.""")
slug = models.SlugField(unique=True, help_text="""
A label for this article to appear in the url. DO NOT change
@@ -18,7 +18,7 @@
SHP_PATH = join(project_root, 'data')
WHOOSH_ROOT = join(project_root, 'whoosh')
-DEBUG = True
+DEBUG = False
PAYPAL_DEBUG = True
AUTHNET_DEBUG = DEBUG
TEMPLATE_DEBUG = DEBUG
@@ -51,7 +51,7 @@
</section>
</div>
<div style="float:right;">
- <div id="map" style="width:425px; height:425px"></div>
+ <div id="map" style="width:425px; height:425px"></div><a href="../map/">View More</a>
<form method="POST" action=".">{% csrf_token %}
<table>
<th colspan="2">Filter Events</th>
@@ -55,7 +55,7 @@
padding: 4px;
border-color: black;
border-width: 1px;
- border-style: solid;"><a style="color: white; font-weight: bold;" href="\">Go Back</a></div>
+ border-style: solid;"><a style="color: white; font-weight: bold;" href="\">Go Back</a>&nbsp;|&nbsp;<a href="../diagram">Read More</a></div>
</body>
</html>

0 comments on commit 10ef0f7

Please sign in to comment.