From 43d28bac272b03a5fbbefd47e90dc5a9ac5d31c3 Mon Sep 17 00:00:00 2001 From: Jeremy Kidwell Date: Mon, 25 Mar 2019 11:27:49 +0000 Subject: [PATCH] testing hpc version --- mapping_draft.Rmd | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mapping_draft.Rmd b/mapping_draft.Rmd index 7a6a8ff..af0d6bf 100644 --- a/mapping_draft.Rmd +++ b/mapping_draft.Rmd @@ -55,6 +55,7 @@ local({r <- getOption("repos") options(repos=r) }) # TODO: remove sp etc. once sf is fully implemented +# TODO: automatically test for packages below on given execution environment and run install.packages() as needed. require(RCurl) # used for fetching reproducible datasets require(sf) # new simplefeature data class, supercedes sp in many ways require(sp) # needed for proj4string, deprecated by sf() @@ -255,18 +256,13 @@ permaculture_sf_centralbelt <- st_intersection(permaculture_sf, centralbelt_regi ``` ```{r process_admin_data} -# TODO: Code below augments existing dataframes to run calculations and add columns with point counts per polygon, -# percentages, and normalising data. I'm pretty sure this can all be done inline under create_admin_ecs_choropleth -# code chunk without adding new columns to dataframes here, but how?! +# Augment existing dataframes to run calculations and add columns with point counts per polygon, +# percentages, and normalising data. # This code will generate a table of frequencies for each spatialpointsdataframe in admin # calculate count of ECS for fields in admin and provide percentages # JK Note: need to convert from poly.counts, which uses sp() to st_covers() which uses sf() - cf. https://stackoverflow.com/questions/45314094/equivalent-of-poly-counts-to-count-lat-long-pairs-falling-inside-of-polygons-w#45337050 -# Commenting out 27 Feb 2019 in light of revisions to CRS handling above -# ecs <- spTransform(ecs, proj4string(admin_lev1)) -# transition <- spTransform(transition, proj4string(admin_lev1)) - admin_lev1$ecs_count <- poly.counts(ecs,admin_lev1) admin_lev1$ecs_percent<- prop.table(admin_lev1$ecs_count) # calculate count of places of worship in PointX db for fields in admin and provide percentages