' +
+ 'African schools, and students in particular, have historically played a progressive role in anti-colonial, anti-imperial, and pro-democracy movements. Today, Africa is witnessing a resurgence of educational activism and youth-led popular struggles. The' + ' '+' School Protests in Africa'+' '+'digital project documents the incidence and causes of school-based protests in Africa since 2000, demonstrating the continued importance of schools and school actors in political participation and processes of social change in Africa.' + '
" + "Use filters to display protests based on category." +
+ "
" + " ")
+
+
+ search_button = Button(label="Filter protests",
+ button_type="success",
+ visible=True,
+ css_classes = ["mobile-button"])
# Create two copies of the protest data. One will be the data to be
# displayed, and will be mutable. The other will be an unchanging
@@ -478,8 +679,100 @@ def point_plot(self, title, tile_url, tile_attribution='MapTiler'):
protests_json = self.protests.to_json()
full_source = GeoJSONDataSource(geojson=protests_json)
point_source = GeoJSONDataSource(geojson=protests_json)
+
+
+ # Here, point_source, which contains just the selected points,
+ # gets "attached" to the map and the hover div.
+
points(plot, div, point_source)
+ search_button.js_on_event(events.ButtonClick, CustomJS(
+ args=dict(div=mobile_div, point_source=point_source, button=search_button),
+ code="""
+
+ div.text = "
" +
+ "
" +
+ "
" + " ";
+ let features = point_source['data'];
+ let length;
+
+ console.log(features['School Name'].length);
+ if(features['School Name'].length > 10 | features['School Name'].length == 10){
+ length = 10;
+ }else if(features['School Name'].length < 10){
+ length = features['School Name'].length
+ }
+
+ for (let i = 0; i < length; i++) {
+ var desc = features['Description of Protest'][i];
+ var uni = features['School Name'][i]
+ .toString()
+ .toUpperCase();
+ var type = features['Event Type (F3)'][i];
+ var date = features['Date'][i];
+ var locationName = features['Locality Name'][i];
+
+ // `baseurlPrefix` will need to match whatever
+ // baseurl Jekyll's _config.yml file specifies...
+ // pretty awkward, but I see no obvious alternative.
+ //zoop
+ //var baseurlPrefix = '/';
+
+ var protestName = "/" + features['perma'][i];
+
+ // In the following I tried to make the underlying HTML
+ // structure a little more visible. It's not perfect,
+ // but I hope it helps a bit.
+ //doop da doo
+
+ div.text +=
+ '' +
+ '' +
+ '
' + ' ' +
+ '' +
+ ''+ ' ';
+
+ }
+ if (features['School Name'].length > 10){
+ div.text += "Additional protests for this search may not be shown; please see the desktop version of the site for full results";
+ }
+
+ """))
+
+
+ hash_callback = CustomJS(
+ name="callback-load-hash-coordinates-protests",
+ args=dict(x=plot.x_range, y=plot.y_range),
+ code="""
+ console.log([x.start, x.end, y.start, y.end].join(','))
+ let data = window.location.hash.slice(1)
+ .split(',').map(x => +x);
+ if (data.length == 4 && data.every(x => !isNaN(x))) {
+ [x.start, x.end, y.start, y.end] = data;
+ }
+ """
+ )
+ hidden_button = Button(label="Reset Zoom",
+ button_type="success",
+ visible=False)
+ hidden_button.js_on_event(events.ButtonClick, hash_callback)
+
# The number of items is different for different filters, but
# they are stored in a table that must have the same number of
# items in each column, so we pad the columns with empty strings.
@@ -573,27 +866,46 @@ def point_plot(self, title, tile_url, tile_attribution='MapTiler'):
duo_stack = []
for filter_name, filter_vals in self.filters.items():
filter = one_filter(plot, filter_name, filter_vals,
- filters_state, max_items)
+ filters_state, hidden_button, max_items)
tog = toggle(filter_name, filter)
duo_stack.append(tog)
duo_stack.append(filter)
-
duo_col = column(*duo_stack)
+ duo_col.css_classes = ["spa-filters-column"]
+
+ results_col = column(search_button,mobile_div)
map_select = row(duo_col, plot, div)
- layout = column(map_select)
- return Panel(child=layout, title=title)
-
- # Plan for protest incorporation: pick six random protests associated
- # with the country (using some stable method that always picks the
- # same protests). Add them to the nation table and write it out to
- # the jekyll/_data folder. Should be possible to represent them as
- # protest indices, and then access them via `site.data.protests[ix]`.
- # Should be possible to use just one column, joining indices together
- # with some reasonable separator.
- def nation_pages(self, path):
- for i, name in enumerate(self.nations.index.values):
+ layout = column(hidden_button, map_select, results_col)
+ return layout
+
+ def individual_point_plots(
+ self, tile_url, tile_attribution='MapTiler'
+ ):
+
+ protests_json = self.protests.to_json()
+ point_source = GeoJSONDataSource(geojson=protests_json)
+
+ for selected_ix in range(len(self.protests)):
+ geo = self.protests.iloc[selected_ix].geometry.coords[0]
+ point_x, point_y = geo
+
+ width = 5000
+ x_range = (point_x - width, point_x + width)
+ y_range = (point_y - width, point_y + width)
+
+ plot = individual_point_map(
+ point_source, selected_ix,
+ x_range, y_range,
+ tile_url, tile_attribution
+ )
+ path = 'docs/assets/img/protest-points'
+ export_png(plot, filename=f'{path}/protest_{selected_ix}.png')
+
+ def country_pages(self, path):
+ for i, name in enumerate(sorted(self.countries.index.values)):
+ urlsafe = country_name_urlsafe(name)
perma = country_name_perma(name)
- filename = (Path(path) / Path(perma)).with_suffix('.md')
+ filename = (Path(path) / Path(urlsafe)).with_suffix('.md')
title = name
with open(filename, 'w', encoding='utf-8') as op:
op.write(f'---\n'
@@ -605,13 +917,23 @@ def nation_pages(self, path):
f'---\n')
def protest_pages(self, path):
- for i, name in enumerate(self.protests.index.values):
- perma = name.lower().replace(' ', '-').replace('\'', '-')
- filename = (Path(path) / Path(perma)).with_suffix('.md')
- title = name
+ for i, row_ix in enumerate(self.protests.index.values):
+ if i > 7000:
+ break
+ row = self.protests.loc[row_ix]
+
+ perma = row['perma']
+
+ filename = protest_name_urlsafe(row_ix)
+ filename = (Path(path) / Path(filename)).with_suffix('.md')
+
+ title = row['Protest Name']
+ title = title.split('-')
+ title = f'{title[0]}, {title[1]} {title[2]}'
+
with open(filename, 'w', encoding='utf-8') as op:
op.write(f'---\n'
- f'layout: country\n'
+ f'layout: protest\n'
f'row_index: {i}\n'
f'permalink: {perma}\n'
f'title: {title}\n'
@@ -619,27 +941,82 @@ def protest_pages(self, path):
f'---\n')
-def save_embed(plot):
- with open("jekyll/_includes/map.html", 'w', encoding='utf-8') as op:
- save_components(plot, op)
- save_onload_callback(op)
+def save_embeds(include_path, tab_plot, patch_plot, point_plot, filters):
+ country_cb = ['callback-load-hash-coordinates-country']
+ protest_cb = ['callback-load-hash-coordinates-protests']
+
+ filter_cb = ['callback-load-hash-filter-' + filter_name_camel(f)
+ for f in filters]
+
+ include_path = Path(include_path)
+
+ with open(include_path / "map.html", 'w', encoding='utf-8') as op:
+ save_onload_callback(op, country_cb + protest_cb + filter_cb)
+ save_components(tab_plot, op)
+
+ with open(include_path / "country-map.html", 'w', encoding='utf-8') as op:
+ save_onload_callback(op, country_cb + filter_cb)
+ save_components(patch_plot, op)
+
+ with open(include_path / "protest-map.html", 'w', encoding='utf-8') as op:
+ save_onload_callback(op, protest_cb + filter_cb)
+ save_components(point_plot, op)
# This ensures that the right version of BokehJS is always in use
# on the jekyll site.
- with open('jekyll/_includes/bokeh_heading.html',
+ with open(include_path / 'bokeh_heading.html',
'w', encoding='utf-8') as op:
save_script_tags(op)
-def save_html(plot):
- with open("map-standalone.html", 'w', encoding='utf-8') as op:
+def save_html(tab_plot, patch_plot, point_plot, filters):
+ country_cb = ['callback-load-hash-coordinates-country']
+ protest_cb = ['callback-load-hash-coordinates-protests']
+
+ filter_cb = ['callback-load-hash-filter-' + filter_name_camel(f)
+ for f in filters]
+
+ with open("map-tab-standalone.html", 'w', encoding='utf-8') as op:
+ op.write("""
+
+
+ """)
+
+ save_script_tags(op)
+ save_components(tab_plot, op)
+ save_onload_callback(op, country_cb + protest_cb + filter_cb)
+
+ op.write("""
+
@@ -672,37 +1049,132 @@ def save_components(plot, open_file):
open_file.write('\n')
-# ' window.addEventListener(\'load\', function(event) { \n'
-def save_onload_callback(open_file):
- open_file.write("""
+def save_onload_callback(open_file, callback_names):
+ """
+ Create a callback that sets an interval to call a function
+ after some delay. The function causes the Bokeh map to zoom
+ to a particular set of coordinates. The delay starts at 16
+ milliseconds, so that if the Boekh document loads quicky,
+ we snappily zoom to the correct location. Otherwise, the
+ interval is reset. But we don't want to bog the browser down
+ with busy-waiting for the document to load, especially if
+ it is broken and will never load! So we double the delay each
+ time -- this is called exponential backoff, and it's closely
+ related to exponential search. I think if anyone learns any
+ computer-science-related thing, it should be this! It's a
+ useful stratgey in all kinds of situations, big and small.
+
+ It has the very nice property that the total time spent waiting
+ is never more than twice what it absolutely must be, while
+ guaranteeing that the amount of time we spend uselessly
+ checking for an update is proportional to the logarithm
+ of the total time spent waiting -- which is, relatively
+ speaking, a very, very small number.
+
+ For example, if we wind up waiting 2 ** 14 milliseconds,
+ or about sixteen seconds, we only check to see what's with
+ the Bokeh document fourteen times! (Actually, it winds up
+ being ten times, since we start at 2 ** 4 = 16 milliseconds.)
+ If we just kept on checking every 16 milliseconds, we'd wind
+ up checking more than a thousand times! So we really cut down
+ on the amount of spammy work we make the browser do without
+ sacrificing all that much usability.
+
+ We could adjust that balance by using a floating point number
+ less than 2 and greater than 1. 1.25 would lead us to check
+ about thirty times in 16 seconds. In 16 minutes, it would
+ lead us to check only about fifty times.
+ """
+
+ # NOTE: Indented code will be formatted by the markdown engine
+ # into a preformatted code block for display, instead of
+ # being inserted as HTML/JavaScript. So don't indent!
+ #
+ # See the comments above, around line 350, for more
+ # explanation.
+
+ # ALSO: I (Scott) have realized that this might be a ridiculous way of
+ # doing this. This should probably just be in a standalone JS file?
+ # Or, if not, I should do some work to understand why. Perhaps
+ # this script needs information that only map.py has when it
+ # is being run? Even then, though, we could save this to a
+ # separate js file and load that file via a script tag
+ # in layouts? But still not 100% sure -- more thought needed.
+
+ open_file.write("""
+
""")
-def main(embed=True):
+def main(embed=True, export_point_pngs=False):
patch_key = ('https://api.maptiler.com/maps/voyager/{z}/{x}/{y}.png?'
'key=k3o6yW6gLuLZpwLM3ecn')
- point_key = ('https://api.maptiler.com/maps/streets/{z}/{x}/{y}.png?'
- 'key=xEyWbUmfIFzRcu729a2M')
+ point_key = ('https://api.maptiler.com/maps/outdoor/{z}/{x}/{y}.png?'
+ 'key=k3o6yW6gLuLZpwLM3ecn')
map = Map()
- map.nation_pages('jekyll/_nations')
- vis = Tabs(tabs=[map.patch_plot("Country View", patch_key),
- map.point_plot("Protest View", point_key)])
- if embed:
- save_embed(vis)
+
+ if export_point_pngs:
+ map.individual_point_plots(point_key)
else:
- save_html(vis)
+ patch_vis = map.patch_plot(patch_key)
+ point_vis = map.point_plot(point_key)
+ tab_vis = Tabs(tabs=[Panel(child=patch_vis, title="Country View"),
+ Panel(child=point_vis, title="Protest View")])
+
+ if embed:
+ # The top-level directory for our jekyll site is "docs" so that
+ # github pages can build (most of) the site.
+ map.country_pages('docs/_countries')
+ map.protest_pages('docs/_protests')
+ save_embeds('docs/_includes',
+ tab_vis, patch_vis, point_vis,
+ list(map.filters.keys()))
+
+ # Force index and protest map to re-render.
+ # Not sure this actually works.
+ Path('docs/index.markdown').touch()
+ Path('docs/full-protest-map.markdown').touch()
+ Path('docs/_includes/bokeh_heading.html').touch()
+ Path('docs/_includes/country-map.html').touch()
+ Path('docs/_includes/protest-map.html').touch()
+ else:
+ save_html(tab_vis, patch_vis, point_vis, list(map.filters.keys()))
if __name__ == "__main__":
@@ -710,22 +1182,32 @@ def main(embed=True):
if '--standalone' in sys.argv[1:]:
print("Generating standalone map...")
main(embed=False)
+ elif '--export-point-pngs' in sys.argv[1:]:
+ print("Generating point pngs")
+ main(export_point_pngs=True)
else:
# Get the default signal handler for SIGTERM (see below)
default_sigterm = signal.getsignal(signal.SIGTERM)
# We set these variables to keep track of changes
- temp_time = 0
- recent_time = 0
+ last_mod_time = 0
+ new_mod_time = 0
+ init = True
print("Watching input directory for changes every ten seconds.")
while True:
- for data_file in os.listdir("data_to_map/data"):
- mod_time = os.path.getmtime(os.path.join("data_to_map/data",
- data_file))
- if mod_time > recent_time:
- recent_time = mod_time
- if recent_time > temp_time:
- temp_time = recent_time
+ data_files = list(Path("data_to_map/data").iterdir())
+ data_files.append(Path(__file__).resolve())
+ for data_file in data_files:
+ mod_time = os.path.getmtime(data_file)
+ if mod_time > new_mod_time:
+ new_mod_time = mod_time
+
+ if init:
+ init = False
+ last_mod_time = new_mod_time
+
+ if new_mod_time > last_mod_time:
+ last_mod_time = new_mod_time
print("Change detected, generating new map...")
main()
print("Map generation complete.")
@@ -736,3 +1218,4 @@ def main(embed=True):
time.sleep(10)
# Ignore SIGTERM while working.
signal.signal(signal.SIGTERM, default_sigterm)
+ # foo
diff --git a/docker-compose.yml b/docker-compose.yml
index f53f7c7..5b026e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,15 +4,15 @@ services:
jekyll:
image: jekyll/jekyll:latest
volumes:
- - ./jekyll:/srv/jekyll
- - ./docs:/srv/jekyll/_site
+ - ./docs:/srv/jekyll
command: >
- bash -c "jekyll build
- && jekyll serve --watch --force_polling"
+ bash -c "jekyll serve --force_polling
+ && touch /srv/jekyll/index.markdown"
ports:
- "4000:4000"
depends_on:
- data_to_map
+ restart: "always"
data_to_map:
build:
context: .
@@ -20,5 +20,6 @@ services:
image: data_to_map_image
volumes:
- ./data_to_map:/srv/data_to_map
- - ./jekyll:/srv/jekyll
+ - ./docs:/srv/docs
command: python -u data_to_map/map.py
+ restart: "always"
diff --git a/docs/.DS_Store b/docs/.DS_Store
new file mode 100644
index 0000000..08ab855
Binary files /dev/null and b/docs/.DS_Store differ
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 0000000..4dee98e
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,9 @@
+_site
+
+.sass-cache
+
+.jekyll-cache
+
+.jekyll-metadata
+
+vendor
diff --git a/docs/404.html b/docs/404.html
index 0d0cba2..086a5c9 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -1,41 +1,9 @@
-
-
-
-
-
-Student Protests in Africa | A map showing patterns of student protest in Africa.
-
-
-
-
-
-
-
-
-
-
-
-
-
+---
+permalink: /404.html
+layout: default
+---
-