cleanup

.github/workflows/R-CMD-check.yaml

@@ -11,6 +11,8 @@ on:
   pull_request:
     branches:
       - main
+  schedule:
+    - cron: "30 12 * * 3"
 
 name: R-CMD-check
 
@@ -52,6 +54,17 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v1
 
+      - name: "[Custom block] [macOS] Install libraries"
+        if: runner.os == 'macOS'
+        run: |
+          # conflicts with gfortran from r-lib/actions when linking gcc
+          # rm '/usr/local/bin/gfortran'
+          # brew install udunits
+          brew install pkg-config gdal proj geos udunits
+      - name: "[Stage] [Linux] Install required system libs"
+        if: runner.os == 'Linux'
+        run: sudo apt install libcurl4-openssl-dev libgit2-dev proj-bin
+
       - name: Query dependencies
         run: |
           install.packages('remotes')

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: tongfen
 Type: Package
 Title: Make Data Based on Different Geographies Comparable
-Version: 0.3.2
+Version: 0.3.3
 Authors@R: c(
     person("Jens", "von Bergmann", email = "jens@mountainmath.ca", role = c("aut", "cre"), comment = "creator and maintainer"))
 Description: Several functions to allow comparisons of data across different geographies, in particular for Canadian census data from different censuses.

R/tongfen.R

@@ -51,6 +51,19 @@ meta_for_additive_variables <- function(dataset,variables){
 #' result <- tongfen_estimate(geo2 %>% rename(Population_2016=Population),geo1,meta)
 #'}
 tongfen_estimate <- function(target,source,meta,na.rm=FALSE) {
+  # make sure we only have polygon type geomtries
+  target_geo_types <- target %>% sf::st_geometry_type() %>% unique
+  source_geo_types <- source %>% sf::st_geometry_type() %>% unique
+  if (length(setdiff(target_geo_types,c("MULTIPOLYGON","POLYGON")))>0) {
+    warning(paste0("Target geometry has to be of type POLYGON or MULTIPOLYGON, but given target has types ",
+                   paste0(target_geo_types,collapse=", "),". Dropping other geometries."))
+    target <- target %>% sf::st_collection_extract("POLYGON")
+  }
+  if (length(setdiff(source_geo_types,c("MULTIPOLYGON","POLYGON")))>0) {
+    warning(paste0("SOURCE geometry has to be of type POLYGON or MULTIPOLYGON, but given SOURCE has types ",
+                   paste0(source_geo_types,collapse=", "),". Dropping other geometries."))
+    source <- source %>% sf::st_collection_extract("POLYGON")
+  }
 
   unique_key="tongfen_row_number"
   target <- target %>% mutate(!!unique_key:=row_number())
@@ -331,7 +344,15 @@ tongfen_aggregate <- function(data,correspondence,meta=NULL, base_geo = NULL){
       if (!is.null(meta)) {
         d <- d %>%  aggregate_data_with_meta(meta)
       } else {
-        d <- d %>% summarize()
+        if ("sf" %in% class(d)) {
+          geo_column=attr(d,"sf_column")
+          d <- d %>% summarize(!!geo_column:=suppressMessages(sf::st_union(!!as.name(geo_column))) %>%
+                      sf::st_cast("MULTIPOLYGON"),
+                      .groups="drop")
+
+        } else {
+          d <- d %>% summarize(.groups="drop")
+        }
       }
     }) %>%
     setNames(nn)

README.md

@@ -85,7 +85,7 @@ Methods to facilitate this are still under active development.
 If you wish to cite tongfen:
 
   von Bergmann, J. (2021). tongfen: R package to
-  Make Data Based on Different Geographies Comparable. v0.3.2.
+  Make Data Based on Different Geographies Comparable. v0.3.3.
 
 
 A BibTeX entry for LaTeX users is
@@ -94,7 +94,7 @@ A BibTeX entry for LaTeX users is
     author = {Jens {von Bergmann}},
     title = {tongfen: R package to Make Data Based on Different Geographies Comparable},
     year = {2021},
-    note = {R package version 0.3.2},
+    note = {R package version 0.3.3},
     url = {https://mountainmath.github.io/tongfen/},
   }
 ```

docs/articles/polling_districts_files/header-attrs-2.8/header-attrs.js

@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+  var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+  var i, h, a;
+  for (i = 0; i < hs.length; i++) {
+    h = hs[i];
+    if (!/^h[1-6]$/i.test(h.tagName)) continue;  // it should be a header h1-h6
+    a = h.attributes;
+    while (a.length > 0) h.removeAttribute(a[0].name);
+  }
+});

docs/articles/tongfen-ca-estimate_files/header-attrs-2.8/header-attrs.js

@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+  var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+  var i, h, a;
+  for (i = 0; i < hs.length; i++) {
+    h = hs[i];
+    if (!/^h[1-6]$/i.test(h.tagName)) continue;  // it should be a header h1-h6
+    a = h.attributes;
+    while (a.length > 0) h.removeAttribute(a[0].name);
+  }
+});

docs/articles/tongfen_ca_files/header-attrs-2.8/header-attrs.js

@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+  var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+  var i, h, a;
+  for (i = 0; i < hs.length; i++) {
+    h = hs[i];
+    if (!/^h[1-6]$/i.test(h.tagName)) continue;  // it should be a header h1-h6
+    a = h.attributes;
+    while (a.length > 0) h.removeAttribute(a[0].name);
+  }
+});

docs/articles/tongfen_files/header-attrs-2.8/header-attrs.js

@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+  var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+  var i, h, a;
+  for (i = 0; i < hs.length; i++) {
+    h = hs[i];
+    if (!/^h[1-6]$/i.test(h.tagName)) continue;  // it should be a header h1-h6
+    a = h.attributes;
+    while (a.length > 0) h.removeAttribute(a[0].name);
+  }
+});

docs/articles/tongfen_us_files/header-attrs-2.8/header-attrs.js

@@ -0,0 +1,12 @@
+// Pandoc 2.9 adds attributes on both header and div. We remove the former (to
+// be compatible with the behavior of Pandoc < 2.8).
+document.addEventListener('DOMContentLoaded', function(e) {
+  var hs = document.querySelectorAll("div.section[class*='level'] > :first-child");
+  var i, h, a;
+  for (i = 0; i < hs.length; i++) {
+    h = hs[i];
+    if (!/^h[1-6]$/i.test(h.tagName)) continue;  // it should be a header h1-h6
+    a = h.attributes;
+    while (a.length > 0) h.removeAttribute(a[0].name);
+  }
+});