msc in progress

14 files changed, 159 insertions, 58 deletions

diff --git a/site/content/pages/research/munich_security_conference/assets/4606260362.jpg b/site/content/pages/research/munich_security_conference/assets/4606260362.jpg
new file mode 100755
index 00000000..67fe31f4
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/4606260362.jpg
diff --git a/site/content/pages/research/munich_security_conference/assets/4730007024.jpg b/site/content/pages/research/munich_security_conference/assets/4730007024.jpg
new file mode 100755
index 00000000..b3fff0bf
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/4730007024.jpg
diff --git a/site/content/pages/research/munich_security_conference/assets/4749096858.jpg b/site/content/pages/research/munich_security_conference/assets/4749096858.jpg
new file mode 100755
index 00000000..2c7fc9fa
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/4749096858.jpg
diff --git a/site/content/pages/research/munich_security_conference/assets/background.jpg b/site/content/pages/research/munich_security_conference/assets/background.jpg
index 83499088..2bfa6abc 100755
--- a/site/content/pages/research/munich_security_conference/assets/background.jpg
+++ b/site/content/pages/research/munich_security_conference/assets/background.jpg
diff --git a/site/content/pages/research/munich_security_conference/assets/bar_placeholder.png b/site/content/pages/research/munich_security_conference/assets/bar_placeholder.png
deleted file mode 100644
index 6eeeaabf..00000000
--- a/site/content/pages/research/munich_security_conference/assets/bar_placeholder.png
+++ /dev/null
diff --git a/site/content/pages/research/munich_security_conference/assets/embassy_counts_summary_dataset.csv b/site/content/pages/research/munich_security_conference/assets/embassy_counts_summary_dataset.csv
new file mode 100755
index 00000000..89f3c226
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/embassy_counts_summary_dataset.csv
@@ -0,0 +1,5 @@
+dataset,images
+ibm_dif,389
+megaface,5679
+vgg_face,1
+who_goes_there,2372
diff --git a/site/content/pages/research/munich_security_conference/assets/megapixels_origins_top.csv b/site/content/pages/research/munich_security_conference/assets/megapixels_origins_top.csv
new file mode 100755
index 00000000..081b4636
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/megapixels_origins_top.csv
@@ -0,0 +1,9 @@
+source,images
+Search Engines,30127200
+Flickr.com,11783888
+IMDb.com,5251410
+CCTV,959312
+Wikimedia.org,183500
+Mugshots,113268
+YouTube.com,31888
+Other Sources Combined,37044
diff --git a/site/content/pages/research/munich_security_conference/assets/montage_placeholder.jpg b/site/content/pages/research/munich_security_conference/assets/montage_placeholder.jpg
deleted file mode 100644
index b64348f4..00000000
--- a/site/content/pages/research/munich_security_conference/assets/montage_placeholder.jpg
+++ /dev/null
diff --git a/site/content/pages/research/munich_security_conference/assets/msc_embassy_flickr_montage.jpg b/site/content/pages/research/munich_security_conference/assets/msc_embassy_flickr_montage.jpg
new file mode 100644
index 00000000..751a9f93
--- /dev/null
+++ b/site/content/pages/research/munich_security_conference/assets/msc_embassy_flickr_montage.jpg
diff --git a/site/content/pages/research/munich_security_conference/assets/pie_placeholder.png b/site/content/pages/research/munich_security_conference/assets/pie_placeholder.png
deleted file mode 100644
index e3f3648c..00000000
--- a/site/content/pages/research/munich_security_conference/assets/pie_placeholder.png
+++ /dev/null
diff --git a/site/content/pages/research/munich_security_conference/assets/summary_countries.csv b/site/content/pages/research/munich_security_conference/assets/summary_countries.csv
index 15021c0f..1e319fd9 100755
--- a/site/content/pages/research/munich_security_conference/assets/summary_countries.csv
+++ b/site/content/pages/research/munich_security_conference/assets/summary_countries.csv
@@ -1,43 +1,43 @@
-citations,country
-327,China
-302,United States
-187,United Kingdom
-38,Australia
-35,Germany
-27,Singapore
-25,Canada
-25,Netherlands
-22,Italy
-17,France
-14,India
-12,South Korea
-10,Spain
-9,Switzerland
-7,Poland
-7,Israel
-7,Finland
-6,Sweden
-6,Japan
-6,Turkey
-5,Taiwan
-4,Brazil
-3,Egypt
-3,Romania
-3,Bangladesh
-3,Ireland
-3,Czech Republic
-3,Thailand
-3,South Africa
-2,Russia
-1,Tunisia
-1,Korea
-1,Saudi Arabia
-1,Portugal
-1,Malaysia
-1,Iran
-1,Denmark
-1,Cyprus
-1,Croatia
-1,Chile
-1,Belgium
-1,Vietnam
+country,citations
+China,327
+United States,302
+United Kingdom,187
+Australia,38
+Germany,35
+Singapore,27
+Canada,25
+Netherlands,25
+Italy,22
+France,17
+India,14
+South Korea,12
+Spain,10
+Switzerland,9
+Poland,7
+Israel,7
+Finland,7
+Sweden,6
+Japan,6
+Turkey,6
+Taiwan,5
+Brazil,4
+Egypt,3
+Romania,3
+Bangladesh,3
+Ireland,3
+Czech Republic,3
+Thailand,3
+South Africa,3
+Russia,2
+Tunisia,1
+Korea,1
+Saudi Arabia,1
+Portugal,1
+Malaysia,1
+Iran,1
+Denmark,1
+Cyprus,1
+Croatia,1
+Chile,1
+Belgium,1
+Vietnam,1
diff --git a/site/content/pages/research/munich_security_conference/assets/summary_countries.png b/site/content/pages/research/munich_security_conference/assets/summary_countries.png
deleted file mode 100755
index 1389e35c..00000000
--- a/site/content/pages/research/munich_security_conference/assets/summary_countries.png
+++ /dev/null
diff --git a/site/content/pages/research/munich_security_conference/assets/summary_sources.png b/site/content/pages/research/munich_security_conference/assets/summary_sources.png
deleted file mode 100755
index 09c96d51..00000000
--- a/site/content/pages/research/munich_security_conference/assets/summary_sources.png
+++ /dev/null
diff --git a/site/content/pages/research/munich_security_conference/index.md b/site/content/pages/research/munich_security_conference/index.md
index 79bed8ec..aba39b1c 100644
--- a/site/content/pages/research/munich_security_conference/index.md
+++ b/site/content/pages/research/munich_security_conference/index.md
@@ -3,7 +3,7 @@
 status: published
 title: MSC
 slug: munich-security-conference
-desc: Analyzing the Transnational Flow of Facial Recognition Data
+desc: Analyzing the Transnational Flow of Facial Recognition Training Data
 subdesc: Where does face data originate and who's using it?
 cssclass: dataset
 image: assets/background.jpg
@@ -13,39 +13,126 @@ authors: Adam Harvey
 
 ------------
 
-## 5,000 Embassy Flickr Photos Were used to Train Face Recognition
+## Analysis for the Munich Security Conference Transnational Security Report
 
 ### sidebar
 
-+ Test: ok
-+ Foo: bar
++ Images Analyzed: 24,302,637
++ Datasets Analyzed: 30
++ Years: 2006 - 2018
++ Status: Ongoing Investigation
++ Last Updated: June 27, 2019
 
 ### end sidebar
 
-[page under devlopment]
 
-Intro paragraph.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-[ add montage of extracted faces here]
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+
+=== columns 2
 
 ```
-single_pie_chart /site/research/munich_security_conference/assets/country_counts.csv
-Caption: Embassy images found in datasets, by country
-Top: 4
-OtherLabel: Other Countries
+single_pie_chart /site/research/munich_security_conference/assets/megapixels_origins_top.csv
+Caption: Sources of Publicly Available Face Training Data 2006 - 2018
+Top: 10
+OtherLabel: Other
 ```
 
-![caption: Placeholder caption](assets/montage_placeholder.jpg)
+===
+
+```
+single_pie_chart /site/research/munich_security_conference/assets/summary_countries.csv
+Caption: Locations Where Face Data Is Used
+Top: 14
+OtherLabel: Other
+```
+
+=== end columns
 
-![caption: Placeholder caption](assets/bar_placeholder.png)
 
 === columns 2
 
-![caption: Placeholder caption](assets/pie_placeholder.png)
+#### Sources of Face Data
+
+Add text
+
+| Source | Images |
+| --- | --- |
+|Search Engines | 30,127,200 |
+|Flickr.com | 11,783,888 |
+|IMDb.com  |  5,251,410 |
+|CCTV  |  959,312 |
+|Wikimedia.org  | 183,500 |
+|Mugshots  |  113,268 |
+|Other Sources Combined  | 37,044 |
+|YouTube.com | 31,888 |
+
+===
+
+#### Locations Where Face Data Is Used
+
+Add text
+
+|country | citations|
+| --- | --- |
+|China | 327|
+|United States | 302|
+|United Kingdom | 187|
+|Australia | 38|
+|Germany | 35|
+|Singapore | 27|
+|Canada | 25|
+|Netherlands | 25|
+|Italy | 22|
+|France | 17|
+|India | 14|
+|South Korea | 12|
+|Spain | 10|
+|Switzerland | 9|
+
+=== end columns
+
+
+
+## Over 6,000 Embassy Images on Flickr Found in Face Recognition Datasets
+
+Including over 2,000 more for racial analysis
+
+
+![caption: MegaFace from U.S. Embassy Canberra](assets/4730007024.jpg)
+
+
+=== columns 2
+
+![caption: An image from the MegaFace dataset obtained from United Kingdom's Embassy in Italy https://flickr.com/photos/ukinitaly](assets/4606260362.jpg)
+
+====
+
+![caption: An imgae from the MegaFace dataset obtained from the Flick account of the United States Embassy in Kabul Afghanistan https://flickr.com/photos/kabulpublicdiplomacy](assets/4749096858.jpg)
+
+
+=== end columns
+
+
+=== columns 2
+
+```
+single_pie_chart /site/research/munich_security_conference/assets/megapixels_origins_top.csv
+Caption: Sources of Face Training Data
+Top: 5
+OtherLabel: Other Countries
+```
 
 ===========
 
-![caption: Placeholder caption](assets/pie_placeholder.png)
+```
+single_pie_chart /site/research/munich_security_conference/assets/embassy_counts_summary_dataset.csv
+Caption: Dataset sources
+Top: 4
+OtherLabel: Other
+```
 
 === end columns