Skip to content

Commit

Permalink
Merge pull request #133 from afsc-gap-products/fix_lls
Browse files Browse the repository at this point in the history
Fix shapefiles
  • Loading branch information
sean-rohan-NOAA authored Dec 18, 2024
2 parents eb41fbf + ebb6a6b commit 45f219f
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 11 deletions.
13 changes: 12 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
akgfmaps 3.6.0
akgfmaps 3.6.1 (In development)
----------------------------------------------------------------

BUG FIX

- Correct coordinates for longline survey station 20 by replacing
inst/extdata/LL_Survey_Stations_Active2023.shp with
inst/extdata/LonglineStationsActive.shp
- Revert EBS shelf stratum shapefile to 2022 version.


akgfmaps 3.6.0 (December 12, 2024)
----------------------------------------------------------------

FUNCTIONALITY CHANGES
Expand Down
10 changes: 5 additions & 5 deletions R/get_base_layers.R
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ get_base_layers <- function(select.region,
survey.strata <- survey.strata[survey.strata$REGION == "EBS" & survey.strata$TYPE == "Slope", ]

survey.grid <- sf::st_read(
system.file("extdata", "longline_survey", "LL_Survey_Stations_Active2023.shp",
system.file("extdata", "longline_survey", "LonglineStationsActive.shp",
package = "akgfmaps"),
quiet = TRUE)

Expand Down Expand Up @@ -452,7 +452,7 @@ get_base_layers <- function(select.region,
survey.strata <- survey.strata[survey.strata$REGION == "AI" & survey.strata$TYPE == "Slope", ]

survey.grid <- sf::st_read(
system.file("extdata", "longline_survey", "LL_Survey_Stations_Active2023.shp",
system.file("extdata", "longline_survey", "LonglineStationsActive.shp",
package = "akgfmaps"),
quiet = TRUE)

Expand All @@ -478,7 +478,7 @@ get_base_layers <- function(select.region,
stratum.extent <- survey.strata[survey.strata$AREA_DESC %in% area.desc, ]

survey.grid <- sf::st_read(
system.file("extdata", "longline_survey", "LL_Survey_Stations_Active2023.shp",
system.file("extdata", "longline_survey", "LonglineStationsActive.shp",
package = "akgfmaps"),
quiet = TRUE)

Expand All @@ -500,7 +500,7 @@ get_base_layers <- function(select.region,
survey.strata <- survey.strata[survey.strata$REGION == "GOA" & survey.strata$TYPE == "Slope", ]

survey.grid <- sf::st_read(
system.file("extdata", "longline_survey", "LL_Survey_Stations_Active2023.shp",
system.file("extdata", "longline_survey", "LonglineStationsActive.shp",
package = "akgfmaps"),
quiet = TRUE)

Expand All @@ -527,7 +527,7 @@ get_base_layers <- function(select.region,
stratum.extent <- survey.strata[survey.strata$AREA_DESC %in% area.desc, ]

survey.grid <- sf::st_read(
system.file("extdata", "longline_survey", "LL_Survey_Stations_Active2023.shp",
system.file("extdata", "longline_survey", "LonglineStationsActive.shp",
package = "akgfmaps"),
quiet = TRUE)

Expand Down
Binary file modified inst/extdata/ebs_strata.dbf
Binary file not shown.
2 changes: 1 addition & 1 deletion inst/extdata/ebs_strata.prj
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PROJCS["Albers_Conic_Equal_Area",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Albers"],PARAMETER["false_easting",0.0],PARAMETER["false_northing",0.0],PARAMETER["central_meridian",-154.0],PARAMETER["standard_parallel_1",55.0],PARAMETER["standard_parallel_2",65.0],PARAMETER["latitude_of_origin",50.0],UNIT["Meter",1.0]]
PROJCS["NAD_1983_Alaska_Albers",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Albers"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",-154.0],PARAMETER["Standard_Parallel_1",55.0],PARAMETER["Standard_Parallel_2",65.0],PARAMETER["Latitude_Of_Origin",50.0],UNIT["Meter",1.0]]
Binary file modified inst/extdata/ebs_strata.sbn
Binary file not shown.
Binary file modified inst/extdata/ebs_strata.sbx
Binary file not shown.
Binary file modified inst/extdata/ebs_strata.shp
Binary file not shown.
3 changes: 1 addition & 2 deletions inst/extdata/ebs_strata.shp.xml

Large diffs are not rendered by default.

Binary file modified inst/extdata/ebs_strata.shx
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions inst/extdata/longline_survey/LonglineStationsActive.shp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata xml:lang="en"><Esri><CreaDate>20241217</CreaDate><CreaTime>10043500</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>FALSE</SyncOnce><DataProperties><itemProps><itemName Sync="TRUE">LonglineStationsActive</itemName><imsContentType Sync="TRUE">002</imsContentType><nativeExtBox><westBL Sync="TRUE">-178.963330</westBL><eastBL Sync="TRUE">-132.838330</eastBL><southBL Sync="TRUE">51.405000</southBL><northBL Sync="TRUE">59.746670</northBL><exTypeCode Sync="TRUE">1</exTypeCode></nativeExtBox><itemSize Sync="TRUE">0.003</itemSize><itemLocation><linkage Sync="TRUE">file://\\nmfs\akc-abl\GIS\MESA\KATY\Area Shapefiles\LL Survey Stations\LonglineStationsActive.shp</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><coordRef><type Sync="TRUE">Geographic</type><geogcsn Sync="TRUE">GCS_WGS_1984</geogcsn><csUnits Sync="TRUE">Angular Unit: Degree (0.017453)</csUnits><peXml Sync="TRUE">&lt;GeographicCoordinateSystem xsi:type='typens:GeographicCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.8'&gt;&lt;WKT&gt;GEOGCS[&amp;quot;GCS_WGS_1984&amp;quot;,DATUM[&amp;quot;D_WGS_1984&amp;quot;,SPHEROID[&amp;quot;WGS_1984&amp;quot;,6378137.0,298.257223563]],PRIMEM[&amp;quot;Greenwich&amp;quot;,0.0],UNIT[&amp;quot;Degree&amp;quot;,0.0174532925199433],AUTHORITY[&amp;quot;EPSG&amp;quot;,4326]]&lt;/WKT&gt;&lt;XOrigin&gt;-400&lt;/XOrigin&gt;&lt;YOrigin&gt;-400&lt;/YOrigin&gt;&lt;XYScale&gt;11258999068426.238&lt;/XYScale&gt;&lt;ZOrigin&gt;-100000&lt;/ZOrigin&gt;&lt;ZScale&gt;10000&lt;/ZScale&gt;&lt;MOrigin&gt;-100000&lt;/MOrigin&gt;&lt;MScale&gt;10000&lt;/MScale&gt;&lt;XYTolerance&gt;8.983152841195215e-09&lt;/XYTolerance&gt;&lt;ZTolerance&gt;0.001&lt;/ZTolerance&gt;&lt;MTolerance&gt;0.001&lt;/MTolerance&gt;&lt;HighPrecision&gt;true&lt;/HighPrecision&gt;&lt;LeftLongitude&gt;-180&lt;/LeftLongitude&gt;&lt;WKID&gt;4326&lt;/WKID&gt;&lt;LatestWKID&gt;4326&lt;/LatestWKID&gt;&lt;/GeographicCoordinateSystem&gt;</peXml></coordRef><copyHistory><copy source="C:\Users\katy.echave\Desktop\Katy GIS\Shapefiles\LonglineStationsActive" dest="\\nmfs\akc-abl\GIS\MESA\KATY\Area Shapefiles\LL Survey Stations\LonglineStationsActive" date="20241217" time="10043500"></copy></copyHistory></DataProperties><SyncDate>20241217</SyncDate><SyncTime>10044500</SyncTime><ModDate>20241217</ModDate><ModTime>10044500</ModTime></Esri><dataIdInfo><envirDesc Sync="TRUE"> Version 6.2 (Build 9200) ; Esri ArcGIS 10.8.0.12790</envirDesc><dataLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></dataLang><idCitation><resTitle Sync="TRUE">LonglineStationsActive</resTitle><presForm><PresFormCd value="005" Sync="TRUE"></PresFormCd></presForm></idCitation><spatRpType><SpatRepTypCd value="001" Sync="TRUE"></SpatRepTypCd></spatRpType><dataExt><geoEle><GeoBndBox esriExtentType="search"><exTypeCode Sync="TRUE">1</exTypeCode><westBL Sync="TRUE">-178.963330</westBL><eastBL Sync="TRUE">-132.838330</eastBL><northBL Sync="TRUE">59.746670</northBL><southBL Sync="TRUE">51.405000</southBL></GeoBndBox></geoEle></dataExt></dataIdInfo><mdLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></mdLang><mdChar><CharSetCd value="004" Sync="TRUE"></CharSetCd></mdChar><distInfo><distFormat><formatName Sync="TRUE">Shapefile</formatName></distFormat><distTranOps><transSize Sync="TRUE">0.003</transSize></distTranOps></distInfo><mdHrLv><ScopeCd value="005" Sync="TRUE"></ScopeCd></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><refSysInfo><RefSystem><refSysID><identCode code="4326" Sync="TRUE"></identCode><idCodeSpace Sync="TRUE">EPSG</idCodeSpace><idVersion Sync="TRUE">6.14(3.0.1)</idVersion></refSysID></RefSystem></refSysInfo><spatRepInfo><VectSpatRep><geometObjs Name="LonglineStationsActive"><geoObjTyp><GeoObjTypCd value="004" Sync="TRUE"></GeoObjTypCd></geoObjTyp><geoObjCnt Sync="TRUE">103</geoObjCnt></geometObjs><topLvl><TopoLevCd value="001" Sync="TRUE"></TopoLevCd></topLvl></VectSpatRep></spatRepInfo><spdoinfo><ptvctinf><esriterm Name="LonglineStationsActive"><efeatyp Sync="TRUE">Simple</efeatyp><efeageom code="1" Sync="TRUE"></efeageom><esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">103</efeacnt><spindex Sync="TRUE">TRUE</spindex><linrefer Sync="TRUE">FALSE</linrefer></esriterm></ptvctinf></spdoinfo><eainfo><detailed Name="LonglineStationsActive"><enttyp><enttypl Sync="TRUE">LonglineStationsActive</enttypl><enttypt Sync="TRUE">Feature Class</enttypt><enttypc Sync="TRUE">103</enttypc></enttyp><attr><attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias><attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Coordinates defining the features.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Station_Nu</attrlabl><attalias Sync="TRUE">Station_Nu</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Station_De</attrlabl><attalias Sync="TRUE">Station_De</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Station_Ty</attrlabl><attalias Sync="TRUE">Station_Ty</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Region</attrlabl><attalias Sync="TRUE">Region</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Geographic</attrlabl><attalias Sync="TRUE">Geographic</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Geograph_1</attrlabl><attalias Sync="TRUE">Geograph_1</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">NPFMC_Mana</attrlabl><attalias Sync="TRUE">NPFMC_Mana</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">NPFMC_Sabl</attrlabl><attalias Sync="TRUE">NPFMC_Sabl</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">NMFS_Manag</attrlabl><attalias Sync="TRUE">NMFS_Manag</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">FMP_Manage</attrlabl><attalias Sync="TRUE">FMP_Manage</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">INPFC_Mana</attrlabl><attalias Sync="TRUE">INPFC_Mana</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Habitat_Ty</attrlabl><attalias Sync="TRUE">Habitat_Ty</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">254</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">LAT</attrlabl><attalias Sync="TRUE">LAT</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">LONG</attrlabl><attalias Sync="TRUE">LONG</attalias><attrtype Sync="TRUE">Double</attrtype><attwidth Sync="TRUE">19</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Exploitabl</attrlabl><attalias Sync="TRUE">Exploitabl</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">Active</attrlabl><attalias Sync="TRUE">Active</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">10</attwidth><atprecis Sync="TRUE">10</atprecis><attscale Sync="TRUE">0</attscale></attr></detailed></eainfo><mdDateSt Sync="TRUE">20241217</mdDateSt></metadata>

0 comments on commit 45f219f

Please sign in to comment.