From dc6a8b4ad5e29f8aea2de73646aeca6e819db0b0 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 4 Mar 2019 16:18:54 +0100 Subject: rebuild --- client/map/index.js | 20 ++++++++------- megapixels/app/settings/app_cfg.py | 1 + megapixels/app/site/parser.py | 2 +- site/public/about/index.html | 2 +- site/public/about/terms/index.html | 2 +- site/public/datasets/lfw/index.html | 51 +++++++++++++++---------------------- 6 files changed, 36 insertions(+), 42 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 6c5aa8af..bfcf5322 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/index.html b/site/public/about/index.html index e2ce409d..16277fce 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -36,7 +36,7 @@
  • Terms and Conditions
  • Privacy Policy
  • -