Acep uaf my branch to my main branch

.github/workflows/quarto-publish.yml

@@ -7,6 +7,9 @@ name: Render and Publish
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
+    concurrency:
+      group: pages-deploy
+      cancel-in-progress: true
     steps:
       - name: Check out repository
         uses: actions/checkout@v4

_citations.qmd

@@ -15,7 +15,7 @@ day_2digit   = date.getDate().toString().padStart(2, "0");
 currentDate = `${month} ${day}, ${year}`
 
 // build a button
-button = (blob, filename = 'test.bib', displayname) => {
+citation_button = (blob, filename = 'test.bib', displayname) => {
   const button = DOM.download(
     blob,
     filename,
@@ -49,7 +49,7 @@ biblatex_blob = new Blob([biblatexContent], { type: 'text/plain' });
 ris_blob = new Blob([risContent], { type: 'text/plain' }); 
 
 // Insert blobs into buttons
-button(biblatex_blob, 'aetr_web_book_2024.bib', 'BibLaTeX');
-button(ris_blob, 'aetr_web_book_2024.ris', 'RIS');
+citation_button(biblatex_blob, 'aetr_web_book_2024.bib', 'BibLaTeX');
+citation_button(ris_blob, 'aetr_web_book_2024.ris', 'RIS');
 
 ```

_quarto-pdf.yml

@@ -6,8 +6,16 @@ book:
 
   chapters:
     - index.qmd
+    - methods.qmd
+    - consumption.qmd
+    - prices.qmd
+    - conclusions.qmd
+    - data.qmd
   appendices:
     - about.qmd
+    - historic_reports.qmd
+    - acronyms.qmd
+    - credits.qmd 
 
 # These change page titles https://quarto.org/docs/books/book-structure.html#parts-appendices 
 # but not in the sidebar navigation or in cross-references

_regions_map.qmd

@@ -12,12 +12,12 @@ css=html`<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2
 ```
 
 ```{ojs}
-aea_regions = FileAttachment("data/working/regions/aea_regions.geojson").json()
-acep_regions = FileAttachment("data/working/regions/acep_regions.geojson").json()
+aea_regions = FileAttachment("data/final_data/aea_regions.geojson").json()
+acep_regions = FileAttachment("data/final_data/acep_regions.geojson").json()
 
-coords_json = FileAttachment("data/working/regions/coordinates.geojson").json()
+coords_json = FileAttachment("data/final_data/coordinates.geojson").json()
 
-// coords_csv = FileAttachment("data/working/regions/coordinates_pce.csv").csv({typed: true})
+// coords_csv = FileAttachment("data/final_data/coordinates_pce.csv").csv({typed: true})
 
 ```
 

capacity.qmd

@@ -19,7 +19,7 @@ library(ggplot2)
 library(ggiraph)
 
 # Import the data
-capacity_data <- read.csv("data/working/capacity/capacity_long.csv")
+capacity_data <- read.csv("data/final_data/capacity.csv")
 
 regional_capacity <- capacity_data %>%
   group_by(year,acep_region,prime_mover) %>%
@@ -540,6 +540,6 @@ print(rural_remote_renewable_pdf)
 ```
 
 ```{ojs}
-original_cap_data = FileAttachment("data/working/capacity/capacity_long.csv").csv({ typed: true })
+original_cap_data = FileAttachment("data/final_data/capacity.csv").csv({ typed: true })
 cap_data = original_cap_data.map((d) => ({...d, "Prime Mover": d.prime_mover}))
 ```