Merge branch 'master' of github.com:adamhrv/megapixels_dev

18 files changed, 117 insertions, 30 deletions

diff --git a/site/content/pages/about/assets/adam-harvey-3d.jpg b/site/content/pages/about/assets/adam-harvey-3d.jpg
new file mode 100644
index 00000000..2d7cbd80
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.jpg
diff --git a/site/content/pages/about/assets/adam-harvey-3d.png b/site/content/pages/about/assets/adam-harvey-3d.png
new file mode 100644
index 00000000..3616e851
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.png
diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
index e0ab893a..38a484d1 100644
--- a/site/content/pages/about/assets/adam-harvey.jpg
+++ b/site/content/pages/about/assets/adam-harvey.jpg
diff --git a/site/content/pages/about/assets/jules-laplace-3d.jpg b/site/content/pages/about/assets/jules-laplace-3d.jpg
new file mode 100644
index 00000000..d51e0933
--- /dev/null
+++ b/site/content/pages/about/assets/jules-laplace-3d.jpg
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
index 310b2783..18fc1170 100644
--- a/site/content/pages/about/assets/jules-laplace.jpg
+++ b/site/content/pages/about/assets/jules-laplace.jpg
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
new file mode 100644
index 00000000..3ad962df
--- /dev/null
+++ b/site/content/pages/about/credits.md
@@ -0,0 +1,43 @@
+------------
+
+status: published
+title: MegaPixels Press and News
+desc: MegaPixels Press and News
+slug: press
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+ 
+------------
+ 
+# Credits
+
+<section class="about-menu">
+<ul>
+    <li><a href="/about/">About</a></li>
+    <li><a href="/about/press/">Press</a></li>
+    <li><a class="current" href="/about/credits/">Credits</a></li>
+    <li><a href="/about/disclaimer/">Disclaimer</a></li>
+    <li><a href="/about/terms/">Terms and Conditions</a></li>
+    <li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
+
+
+#### Team
+
+- Research, concept: Adam Harvey
+- Site development, visualizations: Jules LaPlace
+- Assistant researcher: Berit Gilma
+- Produced in Partnership with Mozilla
+
+#### Code
+
+- This site uses D3 and C2 for visuzations. 
+- Add more here
+
+#### Data
+
+- link to github
+- how it was gathered
\ No newline at end of file
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 97edc461..f82a09a0 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -17,15 +17,14 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a class="current" href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-### Sidebar
-
-## End Sidebar
+(TEMPORARY PAGE)
 
 Last updated: December 04, 2018
 
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index dbf4e1bb..b1b7a80f 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -17,23 +17,34 @@ authors: Adam Harvey
 <ul>
 <li><a class="current" href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-<p><div style="font-size:20px;line-height:36px">Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">videos on YouTube</a>. </div></p>
+(PAGE UNDER DEVELOPMENT)
 
-While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global supply chain of biometric data.
+<p><div style="font-size:20px;line-height:36px">MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about facial recognition datasets that aims to unravel their histories, futures, geographies, and meanings. Throughout 2019 this site, coded by Jules LaPlace, will publish research reports, visualizations, raw data, and interactive tools to explore how publicly available facial recognition datasets contribute to a global supply chain of biometric data that powers the global facial recognition industry.</div></p>
 
-MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish research reports, visualizations, downloadable statisticds, and interactive tools for searching the datasets.
+The MegaPixels website is produced in partnership with [Mozilla](https://mozilla.org).
 
-This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role these datasets have played in creating biometric surveillance technologies. 
-
-
-## Team
-
-![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
-
-![sideimage:Jules LaPlace](assets/jule s-laplace.jpg)**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+<div class="flex-container">
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey-3d.jpg" />
+        <h3>Adam Harvey</h3>
+        <p>is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund grants, and is a researcher in residence at Karlsruhe HfG. 
+        <br>
+        ahprojects.com
+        </p>
+    </div>
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace-3d.jpg" />
+        <h3>Jules LaPlace</h3>
+        <p>is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+        <br>
+        https://asdf.us
+        </p>
+    </div>
+</div>
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 2e6d3423..47e1af52 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -17,12 +17,13 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)
+(TEMPORARY PAGE)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
\ No newline at end of file
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index 0d908559..e36daf2a 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -17,12 +17,15 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a class="current" href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
+(TEMPORARY PAGE)
+
 A summary of our privacy policy is as follows:
 
 The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 3217e366..7ae6dac7 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -18,12 +18,15 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a class="current" href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
+(TEMPORARY PAGE)
+
 (FPO: this is only example text)
 
 Last updated: December 04, 2018
diff --git a/site/content/pages/datasets/50_people_one_question/index.md b/site/content/pages/datasets/50_people_one_question/index.md
index e7dec0aa..2276e386 100644
--- a/site/content/pages/datasets/50_people_one_question/index.md
+++ b/site/content/pages/datasets/50_people_one_question/index.md
@@ -1,6 +1,6 @@
 ------------
 
-status: published
+status: draft
 title: 50 People One Question
 desc: <span style="color:#ffaa00">People One Question</span> is a dataset of people from an online video series on YouTube and Vimeo used for building facial recogntion algorithms
 subdesc: People One Question dataset includes ...
@@ -23,9 +23,11 @@ authors: Adam Harvey
 
 ## 50 People 1 Question
 
- At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. 
+(PAGE UNDER DEVELOPMENT)
 
- Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
+At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. 
+
+Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
 
 {% include 'map.html' %}
 
diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md
index 64f7e57d..a01f5bf4 100644
--- a/site/content/pages/datasets/brainwash/index.md
+++ b/site/content/pages/datasets/brainwash/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: Brainwash
-desc: Brainwash is a dataset of people from webcams the Brainwash Cafe in San Francisco being used to train face detection algorithms
-subdesc: Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe"
+desc: Brainwash is a dataset of webcam images from the Brainwash Cafe in San Francisco
+subdesc: The Brainwash dataset includes 11,918 images of "everyday life of a busy downtown cafe" and is used for training head detection algorithms
 slug: brainwash
 cssclass: dataset
 color: #ffaa00
@@ -33,6 +33,8 @@ authors: Adam Harvey
 
 ## Brainwash Dataset
 
+(PAGE UNDER DEVELOPMENT)
+
 *Brainwash* is a face detection dataset created from the Brainwash Cafe's livecam footage including 11,918 images of "everyday life of a busy downtown cafe[^readme]". The images are used to develop face detection algorithms for the "challenging task of detecting people in crowded scenes" and tracking them.
 
 Before closing in 2017, Brainwash Cafe was a "cafe and laundromat" located in San Francisco's SoMA district. The cafe published a publicy available livestream from the cafe with a view of the cash register, performance stage, and seating area.
diff --git a/site/content/pages/datasets/celeba/index.md b/site/content/pages/datasets/celeba/index.md
index 19b0291d..a2669cf6 100644
--- a/site/content/pages/datasets/celeba/index.md
+++ b/site/content/pages/datasets/celeba/index.md
@@ -1,6 +1,6 @@
 ------------
 
-status: published
+status: draft
 title: CelebA
 desc: <span style="color:#ffaa00">CelebA</span> is a dataset of people...
 subdesc: CelebA includes...
@@ -23,6 +23,8 @@ authors: Adam Harvey
 
 ## CelebA
 
+(PAGE UNDER DEVELOPMENT)
+
 At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. 
 
 Nam libero tempore, cum soluta nobis est eligendi optio, cumque nihil impedit, quo minus id, quod maxime placeat, facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet, ut et voluptates repudiandae sint et molestiae non-recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat
diff --git a/site/content/pages/datasets/cofw/index.md b/site/content/pages/datasets/cofw/index.md
index 3b1cdb2b..d017f405 100644
--- a/site/content/pages/datasets/cofw/index.md
+++ b/site/content/pages/datasets/cofw/index.md
@@ -1,6 +1,6 @@
 ------------
 
-status: published
+status: draft
 title: Caltech Occluded Faces in The Wild
 desc: COFW: Caltech Occluded Faces in The Wild
 slug: cofw
@@ -10,7 +10,8 @@ authors: Adam Harvey
 
 ------------
 
-# Caltech Occluded Faces in The Wild
+
+### sidebar
 
 + Years: 1993-1996
 + Images: 14,126
@@ -19,9 +20,9 @@ authors: Adam Harvey
 + Funded by: ODNI, IARPA, Microsoft
 
 
-<!--header-->
+## Caltech Occluded Faces in the Wild
 
-![](assets/cofw_index.gif)
+(PAGE UNDER DEVELOPMENT)
 
 COFW is "is designed to benchmark face landmark algorithms in realistic conditions, which include heavy occlusions and large shape variations" [Robust face landmark estimation under occlusion].
 
diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md
index cb326f0b..b803efc5 100644
--- a/site/content/pages/datasets/lfw/index.md
+++ b/site/content/pages/datasets/lfw/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: Labeled Faces in The Wild
-desc: Labeled Faces in The Wild (LFW) is a database of face photographs designed for studying the problem of unconstrained face recognition.
-subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004.
+desc: Labeled Faces in The Wild (LFW) is the first facial recognition dataset created entirely from online photos
+subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004 and is the most frequently used dataset in the world for benchmarking face recognition algorithms.
 image: assets/background.jpg
 slug: lfw
 year: 2007
@@ -33,6 +33,8 @@ authors: Adam Harvey
 
 ## Labeled Faces in the Wild
 
+(PAGE UNDER DEVELOPMENT)
+
 *Labeled Faces in The Wild* (LFW) is "a database of face photographs designed for studying the problem of unconstrained face recognition[^lfw_www]. It is used to evaluate and improve the performance of facial recognition algorithms in academic, commercial, and government research. According to BiometricUpdate.com[^lfw_pingan], LFW is "the most widely used evaluation set in the field of facial recognition, LFW attracts a few dozen teams from around the globe including Google, Facebook, Microsoft Research Asia, Baidu, Tencent, SenseTime, Face++ and Chinese University of Hong Kong." 
 
 The LFW dataset includes 13,233 images of 5,749 people that were collected between 2002-2004. LFW is a subset of *Names of Faces* and is part of the first facial recognition training dataset created entirely from images appearing on the Internet. The people appearing in LFW are...
diff --git a/site/content/pages/datasets/mars/index.md b/site/content/pages/datasets/mars/index.md
index 19f9ced4..864dbe5b 100644
--- a/site/content/pages/datasets/mars/index.md
+++ b/site/content/pages/datasets/mars/index.md
@@ -2,8 +2,8 @@
 
 status: published
 title: MARS
-desc: <span style="color:#ffaa00">MARS</span> is a dataset of people...
-subdesc: MARS includes...
+desc: The <span style="color:#99ccee">Motion Analysis and Re-identification Set (MARS)</span> is a dataset is collection of CCTV footage 
+subdesc: The MARS dataset includes 1,191,003 of people used for training person re-identification algorithms
 slug: mars
 cssclass: dataset
 image: assets/background.jpg
@@ -21,7 +21,9 @@ authors: Adam Harvey
 + Faces: TBD
 
 
-## 50 MARS
+## Motion Analysis and Re-identification Set (MARS)
+
+(PAGE UNDER DEVELOPMENT)
 
 At vero eos et accusamus et iusto odio dignissimos ducimus, qui blanditiis praesentium voluptatum deleniti atque corrupti, quos dolores et quas molestias excepturi sint, obcaecati cupiditate non-provident, similique sunt in culpa, qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. 
 
diff --git a/site/content/pages/research/00_introduction/index.md b/site/content/pages/research/00_introduction/index.md
index 9555ca9b..bcb3d57c 100644
--- a/site/content/pages/research/00_introduction/index.md
+++ b/site/content/pages/research/00_introduction/index.md
@@ -16,6 +16,22 @@ authors: Megapixels
 + Author: Adam Harvey
 
 
+
+### Motivation
+
+Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to developing and validating face recognition technologies. Today, these datasets no longer originate in labs, but instead from family photo albums posted on photo sharing sites, surveillance camera footage from college campuses, search engine queries for celebrities, cafe livestreams, or <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">videos on YouTube</a>.
+
+During the last year, hundreds of these facial analysis datasets created "in the wild" have been collected to understand how they contribute to a global supply chain of biometric data that is powering the global facial recognition industry.
+
+While many of these datasets include public figures such as politicians, athletes, and actors; they also include many non-public figures: digital activists, students, pedestrians, and semi-private shared photo albums are all considered "in the wild" and fair game for research projects. Some images are used with creative commons licenses, yet others were taken in unconstrained scenarios without awareness or consent. At first glance it appears many of the datasets were created for seemingly harmless academic research, but when examined further it becomes clear that they're also used by foreign defense agencies.
+
+The MegaPixels site is based on an earlier [installation](https://ahprojects.com/megapixels-glassroom) (also supported by Mozilla) at the [Tactical Tech Glassroom](https://theglassroom.org/) in London in 2017; and a commission from the Elevate arts festival curated by Berit Gilma about pedestrian recognition datasets in 2018, and research during [CV Dazzle](https://cvdazzle.com) from 2010-2015. Through the many prototypes, conversations, pitches, PDFs, and false starts this project has endured during the last 5 years, it eventually evolved into something much different than originally imagined. Now, as datasets become increasingly influential in shaping the computational future, it's clear that they must be critically analyzed to understand the biases, shortcomings, funding sources, and contributions to the surveillance industry. However, it's misguided to only criticize these datasets for their flaws without also praising their contribution to society. Without publicly available facial analysis datasets there would be less public discourse, less open-source software, and less peer-reviewed research. Public datasets can indeed become a vital public good for the information economy but as this projects aims to illustrate, many ethical questions arise about consent, intellectual property, surveillance, and privacy.
+
+<!-- who provided funding to research, development this project understand the role these datasets have played in creating biometric surveillance technologies. -->
+
+
+
+
 Ever since the first computational facial recognition research project by the CIA in the early 1960s, data has always played a vital role in the development of our biometric future. Without facial recognition datasets there would be no facial recognition. Datasets are an indispensable part of any artificial intelligence system because, as Geoffrey Hinton points out: 
 > Our relationship to computers has changed. Instead of programming them, we now show them and they figure it out. - [Geoffrey Hinton](https://www.youtube.com/watch?v=-eyhCTvrEtE)