diff options
| -rw-r--r-- | client/map/index.js | 20 | ||||
| -rw-r--r-- | megapixels/app/settings/app_cfg.py | 1 | ||||
| -rw-r--r-- | megapixels/app/site/parser.py | 2 | ||||
| -rw-r--r-- | site/public/about/research/index.html | 59 | ||||
| -rw-r--r-- | site/public/research/02_what_computers_can_see/index.html | 150 |
5 files changed, 222 insertions, 10 deletions
diff --git a/client/map/index.js b/client/map/index.js index 56a5abed..4b922ec5 100644 --- a/client/map/index.js +++ b/client/map/index.js @@ -76,17 +76,19 @@ export default function append(el, payload) { if (address) { source = [address.lat, address.lng].map(n => parseFloat(n)) + } else { + console.error("No address found for root paper") + console.log(data) } - // ....i dont think the sort order does anything?? - citations.sort((a, b) => sortOrder.indexOf(a) - sortOrder.indexOf(b)) - .forEach(citation => { - const citationAddress = citation.addresses[0] - const latlng = [citationAddress.lat, citationAddress.lng].map(n => parseFloat(n)) - if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return - addMarker(map, latlng, citation.title, citationAddress.name) - addArc(map, source, latlng, arcStyles[citationAddress.type]) - }) + citations.forEach(citation => { + // console.log(citation) + const citationAddress = citation.addresses[0] + const latlng = [citationAddress.lat, citationAddress.lng].map(n => parseFloat(n)) + if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return + addMarker(map, latlng, citation.title, citationAddress.name) + addArc(map, source, latlng, arcStyles[citationAddress.type]) + }) console.log(paper) diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index 40625958..d213f584 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -165,6 +165,7 @@ S3_DATASETS_PATH = "v1" # datasets is already in the filename DIR_SITE_PUBLIC = "../site/public" DIR_SITE_CONTENT = "../site/content/pages" DIR_SITE_TEMPLATES = "../site/templates" +DIR_SITE_INCLUDES = "../site/includes" DIR_SITE_USER_CONTENT = "../site/public/user_content" # ----------------------------------------------------------------------------- diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py index 9c7efddd..87539ade 100644 --- a/megapixels/app/site/parser.py +++ b/megapixels/app/site/parser.py @@ -236,7 +236,7 @@ def format_include(section): """ Include html template """ - include_dir = '/work/megapixels_dev/site/includes/' + include_dir = cfg.DIR_SITE_INCLUDES fp_html = section.strip().strip('\n').strip().strip('{%').strip().strip('%}').strip() fp_html = fp_html.strip('include').strip().strip('"').strip().strip("'").strip() try: diff --git a/site/public/about/research/index.html b/site/public/about/research/index.html new file mode 100644 index 00000000..94b4e2ee --- /dev/null +++ b/site/public/about/research/index.html @@ -0,0 +1,59 @@ +<!doctype html> +<html> +<head> + <title>MegaPixels</title> + <meta charset="utf-8" /> + <meta name="author" content="Adam Harvey" /> + <meta name="description" content="About MegaPixels Research Methodologies" /> + <meta name="referrer" content="no-referrer" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel='stylesheet' href='/assets/css/fonts.css' /> + <link rel='stylesheet' href='/assets/css/tabulator.css' /> + <link rel='stylesheet' href='/assets/css/css.css' /> + <link rel='stylesheet' href='/assets/css/leaflet.css' /> + <link rel='stylesheet' href='/assets/css/applets.css' /> +</head> +<body> + <header> + <a class='slogan' href="/"> + <div class='logo'></div> + <div class='site_name'>MegaPixels</div> + </a> + <div class='links'> + <a href="/datasets/">Datasets</a> + <a href="/research/">Research</a> + <a href="/about/">About</a> + </div> + </header> + <div class="content content-about"> + + <section><h1>Research Methodologies</h1> +<ul> +<li><a href="/about/">About</a></li> +<li><a href="/about/press/">Press</a></li> +<li><a href="/about/research/">Research Methodology</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> + + </div> + <footer> + <div> + <a href="/">MegaPixels.cc</a> + <a href="/about/disclaimer/">Disclaimer</a> + <a href="/about/terms/">Terms of Use</a> + <a href="/about/privacy/">Privacy</a> + <a href="/about/">About</a> + <a href="/about/team/">Team</a> + </div> + <div> + MegaPixels ©2017-19 Adam R. Harvey / + <a href="https://ahprojects.com">ahprojects.com</a> + </div> + </footer> +</body> + +<script src="/assets/js/dist/index.js"></script> +</html>
\ No newline at end of file diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html new file mode 100644 index 00000000..6826955f --- /dev/null +++ b/site/public/research/02_what_computers_can_see/index.html @@ -0,0 +1,150 @@ +<!doctype html> +<html> +<head> + <title>MegaPixels</title> + <meta charset="utf-8" /> + <meta name="author" content="Adam Harvey" /> + <meta name="description" content="What Computers Can See" /> + <meta name="referrer" content="no-referrer" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel='stylesheet' href='/assets/css/fonts.css' /> + <link rel='stylesheet' href='/assets/css/tabulator.css' /> + <link rel='stylesheet' href='/assets/css/css.css' /> + <link rel='stylesheet' href='/assets/css/leaflet.css' /> + <link rel='stylesheet' href='/assets/css/applets.css' /> +</head> +<body> + <header> + <a class='slogan' href="/"> + <div class='logo'></div> + <div class='site_name'>MegaPixels</div> + </a> + <div class='links'> + <a href="/datasets/">Datasets</a> + <a href="/research/">Research</a> + <a href="/about/">About</a> + </div> + </header> + <div class="content content-"> + + <section> + <h1>What Computers Can See</h1> + <div class='meta'> + <div> + <div class='gray'>Posted</div> + <div>2018-12-15</div> + </div> + <div> + <div class='gray'>By</div> + <div>Adam Harvey</div> + </div> + + </div> + </section> + + <section><p>A list of 100 things computer vision can see, eg:</p> +<ul> +<li>age, race, gender, ancestral origin, body mass index</li> +<li>eye color, hair color, facial hair, glasses</li> +<li>beauty score, </li> +<li>intelligence</li> +<li>what you're looking at</li> +<li>medical conditions</li> +<li>tired, drowsiness in car</li> +<li>affectiva: interest in product, intent to buy</li> +</ul> +<h2>From PubFig Dataset</h2> +<ul> +<li>Male</li> +<li>Asian</li> +<li>White</li> +<li>Black</li> +<li>Baby</li> +<li>Child</li> +<li>Youth</li> +<li>Middle Aged</li> +<li>Senior</li> +<li>Black Hair</li> +<li>Blond Hair</li> +<li>Brown Hair</li> +<li>Bald</li> +<li>No Eyewear</li> +<li>Eyeglasses</li> +<li>Sunglasses</li> +<li>Mustache</li> +<li>Smiling Frowning</li> +<li>Chubby</li> +<li>Blurry</li> +<li>Harsh Lighting</li> +<li>Flash</li> +<li>Soft Lighting</li> +<li>Outdoor Curly Hair</li> +<li>Wavy Hair</li> +<li>Straight Hair</li> +<li>Receding Hairline</li> +<li>Bangs</li> +<li>Sideburns</li> +<li>Fully Visible Forehead </li> +<li>Partially Visible Forehead </li> +<li>Obstructed Forehead</li> +<li>Bushy Eyebrows </li> +<li>Arched Eyebrows</li> +<li>Narrow Eyes</li> +<li>Eyes Open</li> +<li>Big Nose</li> +<li>Pointy Nose</li> +<li>Big Lips</li> +<li>Mouth Closed</li> +<li>Mouth Slightly Open</li> +<li>Mouth Wide Open</li> +<li>Teeth Not Visible</li> +<li>No Beard</li> +<li>Goatee </li> +<li>Round Jaw</li> +<li>Double Chin</li> +<li>Wearing Hat</li> +<li>Oval Face</li> +<li>Square Face</li> +<li>Round Face </li> +<li>Color Photo</li> +<li>Posed Photo</li> +<li>Attractive Man</li> +<li>Attractive Woman</li> +<li>Indian</li> +<li>Gray Hair</li> +<li>Bags Under Eyes</li> +<li>Heavy Makeup</li> +<li>Rosy Cheeks</li> +<li>Shiny Skin</li> +<li>Pale Skin</li> +<li>5 o' Clock Shadow</li> +<li>Strong Nose-Mouth Lines</li> +<li>Wearing Lipstick</li> +<li>Flushed Face</li> +<li>High Cheekbones</li> +<li>Brown Eyes</li> +<li>Wearing Earrings</li> +<li>Wearing Necktie</li> +<li>Wearing Necklace</li> +</ul> +</section> + + </div> + <footer> + <div> + <a href="/">MegaPixels.cc</a> + <a href="/about/disclaimer/">Disclaimer</a> + <a href="/about/terms/">Terms of Use</a> + <a href="/about/privacy/">Privacy</a> + <a href="/about/">About</a> + <a href="/about/team/">Team</a> + </div> + <div> + MegaPixels ©2017-19 Adam R. Harvey / + <a href="https://ahprojects.com">ahprojects.com</a> + </div> + </footer> +</body> + +<script src="/assets/js/dist/index.js"></script> +</html>
\ No newline at end of file |