From 02c879e3190f48e4e3581b371b41e55474a082fe Mon Sep 17 00:00:00 2001 From: bwcompton Date: Thu, 27 Jul 2023 13:33:05 -0400 Subject: [PATCH] change stream data target to final name (DEPMEP:streams) everywhere; update to version 1.0.0 --- DESCRIPTION | 2 +- R/get.tile.R | 2 +- R/layer.info.R | 4 ++-- R/read.tile.R | 2 +- vignettes/shiny-example.Rmd | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 04a5178..ddd2b0f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: readMVT Type: Package Title: Read MapBox Vector Tiles From a GeoServer -Version: 0.1.0 +Version: 1.0.0 Author: Bradley W. Compton Maintainer: Bradley W. Compton Description: Read tiled vector data in Mapbox Vector Tiles (MVT) from a diff --git a/R/get.tile.R b/R/get.tile.R index a4cb3fe..ad113c4 100644 --- a/R/get.tile.R +++ b/R/get.tile.R @@ -25,7 +25,7 @@ #' @examples #' require(readMVT) #' xml <- read.XML('https://umassdsl.webgis1.com/geoserver') - #' info <- layer.info(xml, 'testbed:streamlines') + #' info <- layer.info(xml, 'DEPMEP:streams') #' rc <- get.tile(10, 48.0096, -88.7712) #' # B. Compton, 16 Jun 2023 diff --git a/R/layer.info.R b/R/layer.info.R index 1d1c9de..08c5224 100644 --- a/R/layer.info.R +++ b/R/layer.info.R @@ -5,7 +5,7 @@ #' Reads all necessary info for reading Mapbox Vector Tiles from a GeoServer. #' #' @param xml XML from getcapabilities. Use [read.XML()] to get this - #' @param layer name of the layer, e.g., testbed:streamlines + #' @param layer name of the layer, e.g., DEPMEP:streams #' @param crs coordinate reference system. For Mapbox Vector Tiles, you'll want EPSG:900913 (= EPSG:3857) #' #' @return @@ -32,7 +32,7 @@ #' @examples #' require(readMVT) #' xml <- read.XML('https://umassdsl.webgis1.com/geoserver') - #' info <- layer.info(xml, 'testbed:streamlines') + #' info <- layer.info(xml, 'DEPMEP:streams') #' # B. Compton, 12-14 and 29 Jun 2023 diff --git a/R/read.tile.R b/R/read.tile.R index d909f30..595a351 100644 --- a/R/read.tile.R +++ b/R/read.tile.R @@ -33,7 +33,7 @@ #' require(readMVT) #' require(leaflet) #' xml <- read.XML('https://umassdsl.webgis1.com/geoserver') - #' info <- layer.info(xml, 'testbed:streamlines') + #' info <- layer.info(xml, 'DEPMEP:streams') #' rc <- get.tile(12, 42.394, -72.5312) #' x <- read.tile(info, 12, rc[1], rc[2]) #' leaflet(x) |> addTiles() |> addPolylines(data = x) diff --git a/vignettes/shiny-example.Rmd b/vignettes/shiny-example.Rmd index fa36fa8..0239d8f 100644 --- a/vignettes/shiny-example.Rmd +++ b/vignettes/shiny-example.Rmd @@ -69,7 +69,7 @@ Finally, we can use functions from readMVT. `read.XML()` fetches the GeoServer's ```{r xml} xml <- read.XML('https://umassdsl.webgis1.com/geoserver') # get capabilities of our GeoServer -streamlines <- layer.info(xml, 'testbed:streamlines') # get info for stream linework +streamlines <- layer.info(xml, 'DEPMEP:streams') # get info for stream linework culverts <- layer.info(xml, 'testbed:CL_crossings7') # get info for crossing points ``` @@ -101,7 +101,7 @@ $tiles 31 30 394726401 401696265 317408725 328404932 $url -[1] https://umassdsl.webgis1.com/geoserver/gwc/service/wmts/rest/testbed:streamlines/simple_streams/EPSG:900913/EPSG:900913:{zoom}/{TileRow}/{TileCol}?format=application/vnd.mapbox-vector-tile +[1] https://umassdsl.webgis1.com/geoserver/gwc/service/wmts/rest/DEPMEP:streams/simple_streams/EPSG:900913/EPSG:900913:{zoom}/{TileRow}/{TileCol}?format=application/vnd.mapbox-vector-tile ``` ### User interface @@ -212,7 +212,7 @@ trigger <- 14 # show vector data when zoomed in this far or more zoom.levels = 14:22 # show vector data at these zoom levels xml <- read.XML('https://umassdsl.webgis1.com/geoserver') # get capabilities of our GeoServer -streamlines <- layer.info(xml, 'testbed:streamlines') # get info for stream linework +streamlines <- layer.info(xml, 'DEPMEP:streams') # get info for stream linework culverts <- layer.info(xml, 'testbed:CL_crossings7') # get info for crossing points