Merge pull request #402 from SchmidtDSE/main

Fast forward deploy.
SchmidtDSE · Sep 2, 2024 · 5058aa0 · 5058aa0
2 parents 88249d9 + 99310fb
commit 5058aa0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/js/version.txt b/js/version.txt
@@ -1 +1 @@
-20240830
+20240902
diff --git a/regions.json b/regions.json
@@ -31,7 +31,7 @@
                 "landfillEmissions": 89,
                 "incinerationEmissions": 1324,
                 "recyclingEmissions": 906,
-                "mismanagedEmissions": 503,
+                "mismanagedEmissions": 1,
                 "percentTransportationAdditives": 1.93,
                 "percentPackagingAdditives": 0.31,
                 "percentConstructionAdditives": 1.68,
@@ -86,7 +86,7 @@
                 "landfillEmissions": 89,
                 "incinerationEmissions": 1324,
                 "recyclingEmissions": 906,
-                "mismanagedEmissions": 503,
+                "mismanagedEmissions": 1,
                 "percentTransportationAdditives": 1.93,
                 "percentPackagingAdditives": 0.31,
                 "percentConstructionAdditives": 1.68,
@@ -141,7 +141,7 @@
                 "landfillEmissions": 89,
                 "incinerationEmissions": 1324,
                 "recyclingEmissions": 906,
-                "mismanagedEmissions": 503,
+                "mismanagedEmissions": 1,
                 "percentTransportationAdditives": 1.93,
                 "percentPackagingAdditives": 0.31,
                 "percentConstructionAdditives": 1.68,
@@ -196,7 +196,7 @@
                 "landfillEmissions": 89,
                 "incinerationEmissions": 1324,
                 "recyclingEmissions": 906,
-                "mismanagedEmissions": 503,
+                "mismanagedEmissions": 1,
                 "percentTransportationAdditives": 1.93,
                 "percentPackagingAdditives": 0.31,
                 "percentConstructionAdditives": 1.68,

diff --git a/service_worker_v2.js b/service_worker_v2.js
@@ -44,9 +44,10 @@ const OLD_CACHES = [
     "GlobalPlasticsTool_20240524",
     "GlobalPlasticsTool_20240621",
     "GlobalPlasticsTool_20240622",
-    "GlobalPlasticsTool_20240623"
+    "GlobalPlasticsTool_20240623",
+    "GlobalPlasticsTool_20240830"
 ];
-const CACHE_NAME = "GlobalPlasticsTool_20240830";
+const CACHE_NAME = "GlobalPlasticsTool_20240902";
 const ESSENTIAL_FILES = [
     "/css/README.md",
     "/css/base.css",

diff --git a/template/base.html b/template/base.html
@@ -652,7 +652,7 @@ <h2>About</h2>
                             </div>
                             <div id="about-model">
                                 <h2>Model Information</h2>
-                                Note that the current model should be treated as "in pre-print" and, in addition to expanded documentation / discussion, predictions may evolve as this project goes into publication. That said, this effort uses a mixture of techniques to accomplish both projection of business as usual as well as simulate different policy interventions.
+                                Note that the current model should be treated as "in pre-print" and, in addition to expanded documentation / discussion, predictions may evolve as this project goes into publication. That said, this effort uses a mixture of techniques to accomplish both projection of business as usual as well as simulate different policy interventions. For more details, see the <a href="https://global-plastics-tool.org/pdf/ml.pdf">technical model write up</a>.
 
                                 <ul>
                                     <li>Consumption is modeled through random forest and uses historic data as well as GDP per-capita (USD 2010 PPP) and population projections.</li>
@@ -705,9 +705,10 @@ <h2>Model Information</h2>
                                     <li>The <a href="/~https://github.com/SchmidtDSE/plastics-prototype/tree/main/pt" target="_blank">pt subdirectory</a> for technical information and code for interventions.</li>
                                 </ul>
 
-                                Model outputs are converted to polymers and GHG with some numerical smoothing as documented in <a href="/~https://github.com/SchmidtDSE/plastics-prototype">our tool repository</a> in which up to 1 Mt of imprecision is allowed. Model version 2024.15 (pre-release). Tool last updated 2024-06-21. Major edits after initial release include:
+                                Model outputs are converted to polymers and GHG with some numerical smoothing as documented in <a href="/~https://github.com/SchmidtDSE/plastics-prototype">our tool repository</a> in which up to 1 Mt of imprecision is allowed. For additional details, see the <a href="https://global-plastics-tool.org/pdf/polymers_and_ghg.pdf">technical GHG and polymers write up</a>. Model version 2024.15 (pre-release). Tool last updated 2024-06-21. Major edits after initial release include:
 
                                 <ul>
+                                    <li>Additional update to GHG assumptions for mismanaged waste on 2024-09-02.</li>
                                     <li>Update to GHG assumptions including adding a small mismanaged intensity on 2024-08-30.</li>
                                     <li>Minor labeling touch up and non-substantial update to single use packaging percentages 2024-08-27.</li>
                                     <li>Standardize million metric tons notation as "Mt" on 2024-06-23.</li>
@@ -918,7 +919,7 @@ <h2>Table of Contents</h2>
             <a class="tab-trigger" href="#about-privacy">Privacy</a> / <a class="tab-trigger" href="#about-license">Terms</a> / <a class="tab-trigger" href="/~https://github.com/SchmidtDSE/plastics-prototype">Open Source</a> / <a class="tab-trigger" href="#about-contact">Contact</a> / <a class="tab-trigger" href="#toc">Table of Contents</a> / <a class="tab-trigger" href="#settings">Accessibility</a> / <a class="tab-trigger" href="#about-publication">Cite Us</a>
         </footer>
 
-        <input type="hidden" id="version-number" value="20240830">
+        <input type="hidden" id="version-number" value="20240902">
 
         <dialog id="add-dialog">
             <form>