Merge pull request #917 from DataUSA/staging

v3.1.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "datausa-site",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "The most comprehensive visualization of U.S. public data",
   "main": "src/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "@datawheel/canon-cms": "^0.16.7",
     "@datawheel/canon-core": "^0.20.1",
     "@datawheel/canon-logiclayer": "^0.4.8",
-    "@datawheel/canon-vizbuilder": "^0.4.5",
+    "@datawheel/canon-vizbuilder": "^0.4.6",
     "@datawheel/olap-client": "^1.3.3",
     "buble": "^0.19.3",
     "countries-list": "^2.5.4",

scripts/wikiCandidates.js

@@ -53,7 +53,8 @@ async function run() {
         .filter(d => d.nodeType !== 3)
         .forEach((column, i) => {
           const header = headers[i + colOffset]
-            .replace(/<br[^>]*>/g, " ");
+            .replace(/<br[^>]*>/g, " ")
+            .replace(/\<.*$/g, "");
           let data = column;
           while (data.querySelector(".cx-segment") || data.querySelector(".cx-link")) {
             data = data.querySelector(".cx-segment") || data.querySelector(".cx-link");
@@ -69,6 +70,11 @@ async function run() {
           else if (header === "Image") {
             obj[header] = `https:${data.querySelector("img").getAttribute("src")}`;
           }
+          else if (header === "Portrait") {
+            if (data.querySelector("img")) {
+              obj.Image = `https:${data.querySelector("img").getAttribute("src")}`;
+            }
+          }
           else if (header === "Term up") {
             obj[header] = data.innerHTML.slice(0, 4);
           }
@@ -82,7 +88,7 @@ async function run() {
             const ref = JSON.parse(column.querySelector(".mw-ref").getAttribute("data-mw"));
             if (ref.parts && ref.parts[0].template.params["1"]) {
               obj.note = ref.parts[0].template.params["1"]
-                .wt.split("<ref>")[0]
+                .wt.replace(/\<.*$/g, "")
                 .replace(/\[\[/g, "")
                 .replace(/\]\]/g, "");
             }