From ca626447b49c55f40ef58d97ee7ff1784f3481b0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Fri, 9 Nov 2018 02:52:17 +0100
Subject: arcs on dark maps

---
 s2-citation-report.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 's2-citation-report.py')

diff --git a/s2-citation-report.py b/s2-citation-report.py
index 54d267eb..19b018f8 100644
--- a/s2-citation-report.py
+++ b/s2-citation-report.py
@@ -80,6 +80,18 @@ def process_paper(fn, addresses):
           institution,
         ])
 
+  paper_institutions = load_institutions(paper.paper_id)
+  paper_address = None
+  for inst in sorted(institutions, key=operator.itemgetter(1)):
+    # print(inst[1])
+    address_count += 1
+    institution = inst[1]
+    if institution in addresses:
+      paper_address = addresses[institution]
+
+  if paper_address:
+    print(paper_address)
+
   total_citations = len(geocoded_citations) + len(unknown_citations)
   os.makedirs('reports/papers/', exist_ok=True)
   with open('reports/papers/{}.html'.format(paper.paper_id), 'w') as f:
@@ -96,17 +108,26 @@ def process_paper(fn, addresses):
     f.write("<h2>{}</h2>".format(paper.title))
     f.write('<ul>')
     if paper.journal:
-      f.write('<li>{}</li>'.format(paper.journal))
+      f.write('<li>Journal: {}</li>'.format(paper.journal))
+    if paper_address:
+      f.write('<li>Research institution: {}</li>'.format(paper_address[0]))
+      f.write('<li>Address: {}</li>'.format(paper_address[3]))
     f.write('<li>{}</li>'.format(paper.year))
-    f.write('<li>{} / {} citations ({} %)</li>'.format(len(geocoded_citations), total_citations, math.floor(len(geocoded_citations) / total_citations * 100)))
+    f.write('<li>{} / {} citations were located ({} %).</li>'.format(len(geocoded_citations), total_citations, math.floor(len(geocoded_citations) / total_citations * 100)))
     f.write('</ul>')
     f.write('<h3>{}</h3>'.format('Geocoded Citations'))
     write_table(f, keys=None, rows=sorted(display_geocoded_citations, key=operator.itemgetter(0)))
     f.write('<h3>{}</h3>'.format('Other Citations'))
     write_table(f, keys=None, rows=sorted(unknown_citations, key=operator.itemgetter(0)))
     f.write("</body>")
+    f.write('<script src="../snap.svg-min.js"></script>')
     f.write('<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js" integrity="sha512-nMMmRyTVoLYqjP9hrbed9S+FzjZHW5gY1TWCHA5ckwXZBadntCNs8kEqAWdrb9O7rxbCaA4lKTIWjDXZxflOcA==" crossorigin=""></script>')
-    f.write('<script type="text/json">')
+    f.write('<script src="../leaflet.arc.js"></script>')
+    f.write('<script src="../leaflet.bezier.js"></script>')
+    f.write('<script type="text/json" id="address">')
+    json.dump(paper_address, f)
+    f.write('</script>')
+    f.write('<script type="text/json" id="citations">')
     json.dump(geocoded_citations, f)
     f.write('</script>')
     f.write('<script src="../map.js"></script>')
-- 
cgit v1.2.3-70-g09d2