Skip to content

Commit

Permalink
WCS and related URLs now point to soilweb load-balancer
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanbeaudette committed Oct 3, 2023
1 parent 130f793 commit fd42e57
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion R/ISSR800.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ISSR800.wcs <- function(aoi, var, res = 800, quiet = FALSE) {
}

# base URL + parameters
base.url <- 'http://soilmap2-1.lawr.ucdavis.edu/cgi-bin/mapserv?'
base.url <- 'http://casoilresource.lawr.ucdavis.edu/cgi-bin/mapserv?'
service.url <- 'map=/soilmap2/website/wcs/issr800.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=GetCoverage'

# unpack BBOX for WCS 2.0
Expand Down
58 changes: 29 additions & 29 deletions R/WCS-utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -174,63 +174,63 @@ WCS_details <- function(wcs = c('mukey', 'ISSR800', 'soilColor')) {
type = 'GEOTIFF_16',
desc = 'Moist soil color, 5cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc010cm' = list(
dsn = 'sc010cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 10cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc015cm' = list(
dsn = 'sc015cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 15cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc025cm' = list(
dsn = 'sc025cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 25cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc050cm' = list(
dsn = 'sc050cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 50cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc075cm' = list(
dsn = 'sc075cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 75cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc100cm' = list(
dsn = 'sc100cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 100cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc125cm' = list(
dsn = 'sc125cm',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 125cm (270m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),


Expand All @@ -239,63 +239,63 @@ WCS_details <- function(wcs = c('mukey', 'ISSR800', 'soilColor')) {
type = 'GEOTIFF_16',
desc = 'Moist soil color, 5cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc010cm_hr' = list(
dsn = 'sc010cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 10cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc015cm_hr' = list(
dsn = 'sc015cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 15cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc025cm_hr' = list(
dsn = 'sc025cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 25cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc050cm_hr' = list(
dsn = 'sc050cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 50cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc075cm_hr' = list(
dsn = 'sc075cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 75cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc100cm_hr' = list(
dsn = 'sc100cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 100cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
),

'sc125cm_hr' = list(
dsn = 'sc125cm_hr',
type = 'GEOTIFF_16',
desc = 'Moist soil color, 125cm (30m)',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/wcs/soilcolor/unique-moist-color-LUT.csv'
)
)

Expand Down Expand Up @@ -542,15 +542,15 @@ WCS_details <- function(wcs = c('mukey', 'ISSR800', 'soilColor')) {
type = 'GEOTIFF_16',
desc = 'Soil Series Name',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/series_name.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/series_name.csv'
),

'hydgrp' = list(
dsn = 'hydgrp',
type = 'GEOTIFF_BYTE',
desc = 'Hydrologic Soil Group',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/hydgrp.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/hydgrp.csv'
),


Expand All @@ -559,15 +559,15 @@ WCS_details <- function(wcs = c('mukey', 'ISSR800', 'soilColor')) {
type = 'GEOTIFF_BYTE',
desc = 'Soil Drainage Class',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/drainage_class.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/drainage_class.csv'
),

'weg' = list(
dsn = 'weg',
type = 'GEOTIFF_BYTE',
desc = 'Wind Erodibility Group',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/weg.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/weg.csv'
),

'wei' = list(
Expand All @@ -583,71 +583,71 @@ WCS_details <- function(wcs = c('mukey', 'ISSR800', 'soilColor')) {
type = 'GEOTIFF_BYTE',
desc = 'Soil Temperature Regime',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/str.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/str.csv'
),

'soilorder' = list(
dsn = 'soilorder',
type = 'GEOTIFF_BYTE',
desc = 'Soil Taxonomy: Soil Order',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/soilorder.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/soilorder.csv'
),

'suborder' = list(
dsn = 'suborder',
type = 'GEOTIFF_BYTE',
desc = 'Soil Taxonomy: Suborder',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/suborder.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/suborder.csv'
),

'greatgroup' = list(
dsn = 'greatgroup',
type = 'GEOTIFF_BYTE',
desc = 'Soil Taxonomy: Greatgroup',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/greatgroup.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/greatgroup.csv'
),

'texture_05cm' = list(
dsn = 'texture_05cm',
type = 'GEOTIFF_BYTE',
desc = 'Soil Texture Class, 0-5cm',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/texture_05.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/texture_05.csv'
),

'texture_025cm' = list(
dsn = 'texture_025cm',
type = 'GEOTIFF_BYTE',
desc = 'Soil Texture Class, 0-25cm',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/texture_025.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/texture_025.csv'
),

'texture_2550cm' = list(
dsn = 'texture_2550cm',
type = 'GEOTIFF_BYTE',
desc = 'Soil Texture Class, 25-50cm',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/texture_2550.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/texture_2550.csv'
),

'lcc_irrigated' = list(
dsn = 'lcc_irrigated',
type = 'GEOTIFF_BYTE',
desc = 'Land Capability Class, irrigated',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/lcc.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/lcc.csv'
),

'lcc_nonirrigated' = list(
dsn = 'lcc_nonirrigated',
type = 'GEOTIFF_BYTE',
desc = 'Land Capability Class, non-irrigated',
na = 0,
rat = 'http://soilmap2-1.lawr.ucdavis.edu/800m_grids/RAT/lcc.csv'
rat = 'http://casoilresource.lawr.ucdavis.edu/800m_grids/RAT/lcc.csv'
)


Expand Down
2 changes: 1 addition & 1 deletion R/mukey-WCS.R
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ mukey.wcs <- function(aoi, db = c('gNATSGO', 'gSSURGO', 'RSS', 'STATSGO', 'PR_SS
}

# base URL + parameters
base.url <- 'http://soilmap2-1.lawr.ucdavis.edu/cgi-bin/mapserv?'
base.url <- 'http://casoilresource.lawr.ucdavis.edu/cgi-bin/mapserv?'
service.url <- 'map=/soilmap2/website/wcs/mukey.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=GetCoverage'

# unpack BBOX for WCS 2.0
Expand Down
2 changes: 1 addition & 1 deletion R/soilColorWCS.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ soilColor.wcs <- function(aoi, var, res = 270, quiet = FALSE) {
}

# base URL + parameters
base.url <- 'http://soilmap2-1.lawr.ucdavis.edu/cgi-bin/mapserv?'
base.url <- 'http://casoilresource.lawr.ucdavis.edu/cgi-bin/mapserv?'
service.url <- 'map=/soilmap2/website/wcs/color.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=GetCoverage'

# unpack BBOX for WCS 2.0
Expand Down

0 comments on commit fd42e57

Please sign in to comment.