Renewable energy report to 4326

seasketch · Oct 24, 2024 · 8734c04 · 8734c04
1 parent 1d4322b
commit 8734c04
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/data/bin/genCog4326.ts b/data/bin/genCog4326.ts
@@ -18,7 +18,7 @@ import project from "../../project/projectClient.js";
 // await $`rm ${warpDst}`;
 // console.log(`Finished reimporting ${datasource.datasourceId}`);
 
-project.getMetricGroup("ousGear").classes.forEach(async (curClass) => {
+project.getMetricGroup("renewableEnergy").classes.forEach(async (curClass) => {
   const datasource = datasources.find(
     (d) => d.datasourceId === curClass.datasourceId!,
   );

diff --git a/examples/output/MPAcollection/renewableEnergy.json b/examples/output/MPAcollection/renewableEnergy.json
@@ -6,7 +6,7 @@
       "classId": "float_solar",
       "sketchId": "47698",
       "groupId": "band-0",
-      "value": 2878.466614,
+      "value": 2656.060994,
       "extra": {
         "sketchName": "MPAcollection",
         "isCollection": true
@@ -18,7 +18,7 @@
       "classId": "float_solar",
       "sketchId": "47699",
       "groupId": "band-0",
-      "value": 2878.466614,
+      "value": 2656.060994,
       "extra": {
         "sketchName": "mpa-test"
       }
@@ -74,7 +74,7 @@
       "classId": "wind_fixed",
       "sketchId": "47698",
       "groupId": "band-0",
-      "value": 454.638902,
+      "value": 402.530621,
       "extra": {
         "sketchName": "MPAcollection",
         "isCollection": true
@@ -86,7 +86,7 @@
       "classId": "wind_fixed",
       "sketchId": "47699",
       "groupId": "band-0",
-      "value": 454.638902,
+      "value": 402.530621,
       "extra": {
         "sketchName": "mpa-test"
       }

diff --git a/examples/output/mpa-test/renewableEnergy.json b/examples/output/mpa-test/renewableEnergy.json
@@ -6,7 +6,7 @@
       "classId": "float_solar",
       "sketchId": "30576",
       "groupId": "band-0",
-      "value": 2878.466614,
+      "value": 2656.060994,
       "extra": {
         "sketchName": "mpa-test"
       }
@@ -28,7 +28,7 @@
       "classId": "wind_fixed",
       "sketchId": "30576",
       "groupId": "band-0",
-      "value": 454.638902,
+      "value": 402.530621,
       "extra": {
         "sketchName": "mpa-test"
       }

diff --git a/project/precalc.json b/project/precalc.json
@@ -133,7 +133,7 @@
     "classId": "float_solar-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 602474442.465831
+    "value": 0.057738
   },
   {
     "geographyId": "world",
@@ -605,23 +605,23 @@
     "classId": "wave-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 210153140.963591
+    "value": 0.020153
   },
   {
     "geographyId": "world",
     "metricId": "area",
     "classId": "wind_fixed-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 448872286.793854
+    "value": 0.043025
   },
   {
     "geographyId": "world",
     "metricId": "area",
     "classId": "wind_float-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 90305002.726665
+    "value": 0.008648
   },
   {
     "geographyId": "world",
@@ -757,7 +757,7 @@
     "classId": "float_solar-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 4328484
+    "value": 3899891
   },
   {
     "geographyId": "world",
@@ -1229,31 +1229,31 @@
     "classId": "wave-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 4328484
+    "value": 3899891
   },
   {
     "geographyId": "world",
     "metricId": "count",
     "classId": "wind_fixed-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 4328484
+    "value": 3899891
   },
   {
     "geographyId": "world",
     "metricId": "count",
     "classId": "wind_float-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 4328484
+    "value": 3899891
   },
   {
     "geographyId": "world",
     "metricId": "sum",
     "classId": "float_solar-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 5709765.261128
+    "value": 5143254.350547
   },
   {
     "geographyId": "world",
@@ -1645,31 +1645,31 @@
     "classId": "wave-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 1877486.355927
+    "value": 1692259.602808
   },
   {
     "geographyId": "world",
     "metricId": "sum",
     "classId": "wind_fixed-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 4138952.849847
+    "value": 3728809.845475
   },
   {
     "geographyId": "world",
     "metricId": "sum",
     "classId": "wind_float-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 919801.118146
+    "value": 827941.928586
   },
   {
     "geographyId": "world",
     "metricId": "valid",
     "classId": "float_solar-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 1169643
+    "value": 1053683
   },
   {
     "geographyId": "world",
@@ -2165,22 +2165,22 @@
     "classId": "wave-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 407991
+    "value": 367784
   },
   {
     "geographyId": "world",
     "metricId": "valid",
     "classId": "wind_fixed-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 871440
+    "value": 785190
   },
   {
     "geographyId": "world",
     "metricId": "valid",
     "classId": "wind_float-total",
     "sketchId": null,
     "groupId": "band-0",
-    "value": 175318
+    "value": 157817
   }
 ]