fixing read from cloud, update google analytics

28raining · 28raining · commit a3d1ba0be5a6 · 2022-12-06T22:50:35.000-08:00
diff --git a/smith_chart/index.html b/smith_chart/index.html
@@ -3,15 +3,15 @@
 
 <head>
 
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-118860421-1"></script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
-    gtag('js', new Date());
-
-    gtag('config', 'UA-118860421-1');
-  </script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-JHF1DVMYL7"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-JHF1DVMYL7');
+</script>
 
   <meta charset="utf-8">
   <meta name="author" content="Will Kelsey">
diff --git a/smith_chart/js/smith_tool.js b/smith_chart/js/smith_tool.js
@@ -33,7 +33,7 @@ function readFromJsonBin(id) {
       const objBin = JSON.parse(req.responseText);
       console.log(req.responseText, objBin);
       schematic = objBin.record;
-      update_smith_chart();
+      updateFromOldState();
     }
   };
   req.open("GET", `https://api.jsonbin.io/v3/b/${id}/latest`, true);
@@ -183,42 +183,46 @@ function readFile() {
   reader.onload = function (event) {
 
     schematic = JSON.parse(event.target.result);
-    //check for old version of file
-    for (i = 1; i < schematic.length; i++) {
-      if (!(Array.isArray(schematic[i].abs))) {
-        schematic[i].abs = [schematic[i].abs];
-      }
-      if ('abs_bb_i' in schematic[i]) schematic[i].abs.push(schematic[i].abs_bb_i);
-      if (!(Array.isArray(schematic[i].unit))) {
-        schematic[i].unit = [schematic[i].unit];
-      }
-    }
+    console.log("READING", schematic);
+    updateFromOldState()
+  }
+  reader.readAsText(file);
+}
 
-    //update freq units
-    var opts = domFreqSel.options;
-    for (var opt, j = 0; opt = opts[j]; j++) {
-      if (opt.value == freqUnitToText(schematic[0].freq_unit.multiplier)) {
-        domFreqSel.selectedIndex = j;
-        break;
-      }
+function updateFromOldState() {
+  //check for old version of file
+  for (i = 1; i < schematic.length; i++) {
+    if (!(Array.isArray(schematic[i].abs))) {
+      schematic[i].abs = [schematic[i].abs];
     }
-    opts = domSpanSel.options;
-    for (opt, j = 0; opt = opts[j]; j++) {
-      if (opt.value == freqUnitToText(schematic[0].span_unit.multiplier)) {
-        domSpanSel.selectedIndex = j;
-        break;
-      }
+    if ('abs_bb_i' in schematic[i]) schematic[i].abs.push(schematic[i].abs_bb_i);
+    if (!(Array.isArray(schematic[i].unit))) {
+      schematic[i].unit = [schematic[i].unit];
     }
+  }
 
-    domFreq.value = Number(schematic[0].freq);
-    domSpan.value = Number(schematic[0].span);
-    domEr.value = Number(schematic[0].er);
-    zo = Number(schematic[0].zo);
-    domZo.value = zo;
-    console.log("READING", schematic);
-    updateFromDom();
+  //update freq units
+  var opts = domFreqSel.options;
+  for (var opt, j = 0; opt = opts[j]; j++) {
+    if (opt.value == freqUnitToText(schematic[0].freq_unit.multiplier)) {
+      domFreqSel.selectedIndex = j;
+      break;
+    }
   }
-  reader.readAsText(file);
+  opts = domSpanSel.options;
+  for (opt, j = 0; opt = opts[j]; j++) {
+    if (opt.value == freqUnitToText(schematic[0].span_unit.multiplier)) {
+      domSpanSel.selectedIndex = j;
+      break;
+    }
+  }
+
+  domFreq.value = Number(schematic[0].freq);
+  domSpan.value = Number(schematic[0].span);
+  domEr.value = Number(schematic[0].er);
+  zo = Number(schematic[0].zo);
+  domZo.value = zo;
+  updateFromDom();
 }
 
 
