No sp 2022 (#481)

* Increment version number to 1.0.0 * Remove calc_catchment * Purge rgdal for #332 * Remove sp from quadrants.R * Update quadrant code for #332 * Refactor n_vertices * Remove sp deps in bb functions for #332 * Try to fix bbox_scale() issue * sf version of line_segment(), close #482 * Remove line_length() 1 * Remove line_length() 2 * More for #332 * Remove sp versions of overline * Remove SpatialLinesNetwork funs * Remove src directory * Remove sln funs * Fix typo in vignette code * Remove more sp support from linefuns.R * Remove more rgeos functions - toptail * Update docs * Complete purge of rgeos * Purge maptools * More removals for #332 * Fix documentation issues * More docs * Completely remove raster #332 * Remove geosphere, close #332 * Remove temp version of line_segment * Turn off windows tests * Update startup message * Document * Update od2odf, depend on od pkg * Remove unnused stringr import * Comment out failing osrm examples * Update onload message * Fix typo in examples causing errors * Remove failing examples * Remove more failing examples * Remove unused sp-related functions * Remove all sp calls from package, close #332 * Purge sp * Purge unused data objects * Purge another package, openxlsx +deprecate fun * Update urls for cran * Remove annoying message * Revert "Update urls for cran" This reverts commit f300bbc. * Revert "Revert "Update urls for cran"" This reverts commit 8267343. * Revert "Remove annoying message" This reverts commit 10f9a57.
ropensci · Jun 9, 2022 · b1765fd · b1765fd
1 parent 9d4b416
commit b1765fd
Show file tree

Hide file tree

Showing 153 changed files with 448 additions and 7,251 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: stplanr
 Type: Package
 Title: Sustainable Transport Planning
-Version: 0.9.0
+Version: 1.0.0
 Authors@R: c(
     person("Robin", "Lovelace", email = "rob00x@gmail.com", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0001-5679-6536")),
@@ -37,17 +37,11 @@ LazyData: yes
 Depends:
     R (>= 3.5.0)
 Imports:
-    sp (>= 1.3.1),
     curl (>= 3.2),
     dplyr (>= 0.7.6),
     httr (>= 1.3.1),
     jsonlite (>= 1.5),
-    stringr (>= 1.3.1),
-    maptools (>= 0.9.3),
-    raster (>= 2.6.7),
-    rgeos (>= 0.3.28),
     methods,
-    geosphere (>= 1.5.7),
     Rcpp (>= 0.12.1),
     nabor (>= 0.5.0),
     rlang (>= 0.2.2),
@@ -56,10 +50,8 @@ Imports:
     magrittr,
     sfheaders,
     data.table,
-    pbapply
-LinkingTo: 
-    RcppArmadillo (>= 0.9.100.5.0),
-    Rcpp (>= 0.12.18)
+    pbapply,
+    od
 Suggests:
     testthat (>= 2.0.0),
     knitr (>= 1.20),
@@ -68,17 +60,15 @@ Suggests:
     dodgr (>= 0.0.3),
     cyclestreets,
     leaflet,
-    rgdal,
     pct,
     tmap,
-    openxlsx (>= 4.1.0),
     osrm,
     geodist,
     mapsapi,
     opentripplanner
 VignetteBuilder: knitr
 URL: https://github.com/ropensci/stplanr, https://docs.ropensci.org/stplanr/
 SystemRequirements: GNU make
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.0
 Roxygen: list(markdown = TRUE)
 Encoding: UTF-8
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,84 +1,41 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(SpatialLinesNetwork,Spatial)
-S3method(SpatialLinesNetwork,sf)
-S3method(angle_diff,Spatial)
-S3method(angle_diff,sf)
-S3method(calc_catchment,Spatial)
-S3method(calc_catchment,sf)
-S3method(calc_catchment_sum,Spatial)
-S3method(calc_catchment_sum,sf)
 S3method(geo_bb,bbox)
 S3method(geo_bb,matrix)
 S3method(geo_bb,sf)
-S3method(geo_bb_matrix,Spatial)
 S3method(geo_bb_matrix,matrix)
 S3method(geo_bb_matrix,numeric)
 S3method(geo_bb_matrix,sf)
-S3method(geo_buffer,Spatial)
 S3method(geo_buffer,sf)
 S3method(geo_buffer,sfc)
-S3method(geo_length,Spatial)
 S3method(geo_length,sf)
-S3method(geo_projected,Spatial)
 S3method(geo_projected,sf)
-S3method(geo_select_aeq,Spatial)
 S3method(geo_select_aeq,sf)
 S3method(geo_select_aeq,sfc)
-S3method(geo_toptail,Spatial)
-S3method(geo_toptail,sf)
-S3method(gsection,Spatial)
 S3method(gsection,sf)
-S3method(line2df,Spatial)
 S3method(line2df,sf)
-S3method(line2points,Spatial)
 S3method(line2points,sf)
 S3method(line2points,sfc)
 S3method(line2points,sfg)
-S3method(line2pointsn,Spatial)
 S3method(line2pointsn,sf)
 S3method(line2vertices,sf)
-S3method(line_bearing,Spatial)
-S3method(line_bearing,sf)
-S3method(line_midpoint,Spatial)
-S3method(line_midpoint,sf)
-S3method(n_vertices,Spatial)
 S3method(n_vertices,sf)
-S3method(nearest_cyclestreets,"NULL")
-S3method(nearest_cyclestreets,Spatial)
-S3method(nearest_cyclestreets,sf)
-S3method(od2line,Spatial)
 S3method(od2line,sf)
-S3method(onewaygeo,Spatial)
 S3method(onewaygeo,sf)
-S3method(overline,Spatial)
 S3method(overline,sf)
-S3method(points2line,Spatial)
-S3method(points2line,matrix)
 S3method(points2line,sf)
 S3method(points2odf,Spatial)
 S3method(points2odf,sf)
 S3method(rnet_group,default)
 S3method(rnet_group,sf)
-S3method(rnet_group,sfNetwork)
 S3method(rnet_group,sfc)
-S3method(route,Spatial)
 S3method(route,character)
 S3method(route,numeric)
 S3method(route,sf)
 export("%>%")
-export("weightfield<-")
-export(SpatialLinesNetwork)
 export(angle_diff)
-export(api_pat)
 export(bb2poly)
 export(bbox_scale)
-export(calc_catchment)
-export(calc_catchment_sum)
-export(calc_moving_catchment)
-export(calc_network_catchment)
-export(dist_google)
-export(find_network_nodes)
 export(geo_bb)
 export(geo_bb_matrix)
 export(geo_buffer)
@@ -87,38 +44,26 @@ export(geo_length)
 export(geo_projected)
 export(geo_select_aeq)
 export(geo_toptail)
-export(gprojected)
 export(gsection)
 export(is_linepoint)
 export(islines)
 export(line2df)
 export(line2points)
 export(line2pointsn)
-export(line2route)
-export(line2routeRetry)
 export(line2vertices)
-export(lineLabels)
 export(line_bearing)
 export(line_breakup)
-export(line_length)
 export(line_midpoint)
-export(line_sample)
 export(line_segment)
-export(line_segment_sf)
 export(line_via)
 export(mats2line)
-export(n_sample_length)
 export(n_vertices)
-export(nearest_cyclestreets)
-export(nearest_google)
 export(od2line)
-export(od2line2)
 export(od2odf)
 export(od_aggregate_from)
 export(od_aggregate_to)
 export(od_coords)
 export(od_coords2line)
-export(od_dist)
 export(od_id_character)
 export(od_id_max_min)
 export(od_id_order)
@@ -130,13 +75,11 @@ export(onewaygeo)
 export(overline)
 export(overline2)
 export(overline_intersection)
-export(overline_spatial)
 export(points2flow)
 export(points2line)
 export(points2odf)
 export(quadrant)
 export(read_table_builder)
-export(reproject)
 export(rnet_add_node)
 export(rnet_boundary_df)
 export(rnet_boundary_points)
@@ -148,10 +91,8 @@ export(rnet_get_nodes)
 export(rnet_group)
 export(route)
 export(route_average_gradient)
-export(route_cyclestreets)
 export(route_dodgr)
 export(route_google)
-export(route_local)
 export(route_nearest_point)
 export(route_osrm)
 export(route_rolling_average)
@@ -162,53 +103,21 @@ export(route_slope_matrix)
 export(route_slope_vector)
 export(route_split)
 export(route_split_id)
-export(route_transportapi_public)
-export(sln2points)
-export(sln_add_node)
-export(sln_clean_graph)
-export(sum_network_links)
-export(sum_network_routes)
 export(toptail_buff)
-export(toptailgs)
-export(update_line_geometry)
-export(weightfield)
-exportMethods(plot)
-exportMethods(summary)
 import(curl)
 importFrom(Rcpp,evalCpp)
 importFrom(dplyr,first)
 importFrom(dplyr,last)
 importFrom(dplyr,n)
-importFrom(geosphere,distHaversine)
 importFrom(graphics,text)
 importFrom(magrittr,"%>%")
-importFrom(maptools,SpatialLinesMidPoints)
 importFrom(methods,as)
 importFrom(methods,is)
 importFrom(methods,new)
 importFrom(methods,slot)
-importFrom(raster,crop)
-importFrom(raster,extent)
-importFrom(rgeos,gArea)
-importFrom(rgeos,gBuffer)
-importFrom(rgeos,gIntersection)
-importFrom(rgeos,gIntersects)
-importFrom(rgeos,gLength)
-importFrom(rgeos,gSimplify)
 importFrom(rlang,.data)
-importFrom(sp,"proj4string<-")
-importFrom(sp,CRS)
-importFrom(sp,Lines)
-importFrom(sp,SpatialLines)
-importFrom(sp,bbox)
-importFrom(sp,coordinates)
-importFrom(sp,plot)
-importFrom(sp,proj4string)
-importFrom(sp,spChFIDs)
-importFrom(sp,spTransform)
 importFrom(stats,setNames)
 importFrom(utils,download.file)
 importFrom(utils,read.csv)
 importFrom(utils,tail)
 importFrom(utils,unzip)
-useDynLib(stplanr)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+# stplanr 1.0.0
+
+- Remove dependency on `sp`, `rgeos` and `rgdal` (#332)
+- That involved removal of the following functions:
+  - [catchmentArea.R](https://github.com/ropensci/stplanr/blob/v0.8.5/R/catchmentArea.R)
+  - Some of the functionality from [linefuns.R](https://github.com/ropensci/stplanr/blob/v0.8.5/R/linefuns.R)
+
+  - Browse the code base as of stplanr 0.8.5 here: https://github.com/ropensci/stplanr/blob/v0.8.5
+
 # stplanr 0.9.0 (May 2022)
 
 - Message added on loading the package announcing planned changes: support for `sp` objects and associated packages will be dropped (#332)