From 9a2e3ad21b66a6b4a535554f8886419820fbf612 Mon Sep 17 00:00:00 2001 From: Andy Hull Date: Tue, 18 Feb 2014 17:10:04 -0500 Subject: [PATCH 1/3] changing outline color of map markers. --- _posts/2013-01-23-network.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2013-01-23-network.html b/_posts/2013-01-23-network.html index 97976ac6e..43e0f5692 100644 --- a/_posts/2013-01-23-network.html +++ b/_posts/2013-01-23-network.html @@ -53,7 +53,7 @@ - +
From dff33d6d7ebfd47da60a069a4a81baf9e3600e2d Mon Sep 17 00:00:00 2001 From: Andy Hull Date: Thu, 20 Feb 2014 19:27:32 -0500 Subject: [PATCH 2/3] added accordian to the map. --- _posts/2013-01-23-network.html | 59 +++++++++++++++++++++++++--------- css/screen.css | 6 ++++ js/main.js | 45 +++++++++++++------------- 3 files changed, 73 insertions(+), 37 deletions(-) diff --git a/_posts/2013-01-23-network.html b/_posts/2013-01-23-network.html index 43e0f5692..731aedc0e 100644 --- a/_posts/2013-01-23-network.html +++ b/_posts/2013-01-23-network.html @@ -21,22 +21,51 @@
2013
-
- +
+
+
+
+ + Flu Shot Finder + +
+
+
+
+

A Chicago brigade member built an app to find flu shot providers that 3 other cities in the CfA network have re-deployed, using a standard data specification to enable the common app. Read more

+
+
+
+
+
+
+ + Code Across 2013 + +
+
+
+
+

We activated the Code for America network through a national weekend of civic innovation where we built beta apps, liberated datasets and held write-a-thons to foster community and get citizens to engage with their local governments.

+
+
+
+
+
+
+ + Summit + +
+
+
+
+

We brought together civic hackers and city staff, mayors and mentors, designers and developers from around the globe to discuss what happened in the civic tech movement in 2013 -- to share insights and learnings. For three days, 500 passionate citizens from around the world talked, listened, and learned about how to work together and make our communities better.

+
+
+
-
-

We created data standards that put information directly in the hands of citizens by integrating restaurant inspections and residential code enforcements with consumer platforms such as Yelp and Trulia.

-
-
-

A Chicago brigade member built an app to find flu shot providers that 3 other cities in the CfA network have re-deployed, using a standard data specification to enable the common app. Read more

-
-
-

We activated the Code for America network through a national weekend of civic innovation where we built beta apps, liberated datasets and held write-a-thons to foster community and get citizens to engage with their local governments.

-
+
Date: Thu, 20 Feb 2014 20:00:11 -0500 Subject: [PATCH 3/3] working on the map colors --- _posts/2013-01-23-network.html | 9 +++------ js/main.js | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/_posts/2013-01-23-network.html b/_posts/2013-01-23-network.html index 731aedc0e..5a94033c3 100644 --- a/_posts/2013-01-23-network.html +++ b/_posts/2013-01-23-network.html @@ -9,10 +9,7 @@ section: network --- - -
-
@@ -25,7 +22,7 @@
- + Flu Shot Finder
@@ -39,7 +36,7 @@
- + Code Across 2013
@@ -53,7 +50,7 @@
- + Summit
diff --git a/js/main.js b/js/main.js index 566d09b8d..055f1cd3c 100644 --- a/js/main.js +++ b/js/main.js @@ -6,7 +6,7 @@ var cityLocations = [{ "properties": { "city": "philadelphia", "year": "2011", "type": "fellowship", "story": "codeacross"} }, { "geometry": { "type": "Point", "coordinates": [-71.053, 42.352]}, - "properties": { "city": "boston", "year": "2011", "type": "fellowship", "story": "flu" } + "properties": { "city": "boston", "year": "2011", "type": "fellowship", "story": "flu", "marker-color": "#ffffff" } }, { "geometry": { "type": "Point", "coordinates": [-122.326, 47.604]}, "properties": { "city": "seattle", "year": "2011", "type": "fellowship", "story":"codeacross" } @@ -460,10 +460,11 @@ $(function(){ }); markerLayer.addCallback("markeradded", function(l, m){ - if($(m.element).attr("class").indexOf("simplestyle-marker") === -1) - return; displayedMarkers.push(m); - // $(m.element).css("top", "-1000px"); + // console.log(displayedMarkers); + if($(m.element).attr("class").indexOf("marker") === -1) + return; + $(m.element).css("top", "-1000px"); setTimeout(function(){ $(m.element).animate({"top":"0px"}, 400); @@ -474,6 +475,8 @@ $(function(){ var markerFactory = function() { + + var m = document.getElementById('marker').cloneNode(true); m.style.display = 'block'; return m; @@ -594,7 +597,10 @@ $(function(){ // $('#map-story ul li a').removeClass('active'); // $(this).addClass('active'); markerLayer.filter(function(f) { - return f.properties['story'] === 'flu'; + f.properties['story'] === 'flu'; + f.properties['marker-color'] = '#00000' + console.log(f); + return }); return false; }); @@ -606,8 +612,10 @@ $(function(){ // $('#standards').collapse('hide'); // $('#map-story ul li a').removeClass('active'); // $(this).addClass('active'); - markerLayer.filter(function(f) { - return f.properties['story'] === 'codeacross'; + b = markerLayer.filter(function(f) { + f.properties['story'] === 'codeacross'; + f.properties['marker-color'] == '#00000' + return }); return false; });