search

NEFSC / READ-SSB-CHAJI-Effort-Displacement---Scallop

Other
0 stars 0 forks source link

Central Atlantic & NY Bight Shapefiles #183

Closed mchaji closed 1 year ago

mchaji commented 1 year ago

Central Atlantic Planning/Call Area Shapefiles along with NY Bight Wind Energy Area & Lease Area shapefiles need to be added to the repo

mle2718 commented 1 year ago

put them into this branch :https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/tree/moar_shapefiles

mchaji commented 1 year ago

Finished uploading the following to the moar_shapefiles branch: I. Central Atlantic shapefiles (2) a. Planning Areas b. Call Areas II. NY Bight shapefiles (2) a. Wind Energy Area b. Lease Areas All shapefiles were obtained from BOEM websites and pulled November 2022

mchaji commented 1 year ago

I was able to dig up the NY Bight call areas, but the shapefiles may need a little work; standing by to talk to Min-Yang about this further

mle2718 commented 1 year ago

when you finish tidying up the NY Bight call area shapefile, please edit this file: https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/blob/moar_shapefiles/data_wrangle/combine_cable_routes.Rmd

In these spots: https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/blob/cb320257c3f8a7a44a8de14d7a7da14809c885b2/data_wrangle/combine_cable_routes.Rmd#L216-L221

https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/blob/cb320257c3f8a7a44a8de14d7a7da14809c885b2/data_wrangle/combine_cable_routes.Rmd#L235-L237

https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/blob/cb320257c3f8a7a44a8de14d7a7da14809c885b2/data_wrangle/combine_cable_routes.Rmd#L283-L286

https://github.com/NEFSC/READ-SSB-CHAJI-Effort-Displacement---Scallop/blob/cb320257c3f8a7a44a8de14d7a7da14809c885b2/data_wrangle/combine_cable_routes.Rmd#L298-L300

to add the processing step for the Wind_NY1 file.

mchaji commented 1 year ago

I accidentally pushed the combine cable route changes into the loop on the scallop analysis branch. Can I revert the changes and redo it in the moar_shapefiles branch, or would that cause issues? @mle2718

mle2718 commented 1 year ago

I can take care of it. I forget exactly how, but I've done it a few times.

mle2718 commented 1 year ago

i did it by

  1. switch to moar_shapefiles.
  2. git cherry-pick -n 0a51d932daecb1a0a32e3727ddc7e377d2d46e82 I always do the -n option. Review changes and commit. This applies the changes from that commit to the moar_shapefiles branch.
  3. switch to loop_on_scallop_analysis
  4. git revert 0a51d932daecb1a0a32e3727ddc7e377d2d46e82 The rstudio interface uses joe for a text editor, so to save the commit message you do :wq . This is the undo for the loop_on_scallop_analysis branch.

Also, this was probably overkill, since you were going to put in a pull request to merge moar_shapefiles into "loop_on_scallop_analysis" anyway, right? Regardless, it's good practice.

mchaji commented 1 year ago

i did it by

  1. switch to moar_shapefiles.
  2. git cherry-pick -n 0a51d932daecb1a0a32e3727ddc7e377d2d46e82 I always do the -n option. Review changes and commit. This applies the changes from that commit to the moar_shapefiles branch.
  3. switch to loop_on_scallop_analysis
  4. git revert 0a51d932daecb1a0a32e3727ddc7e377d2d46e82 The rstudio interface uses joe for a text editor, so to save the commit message you do :wq . This is the undo for the loop_on_scallop_analysis branch.

Also, this was probably overkill, since you were going to put in a pull request to merge moar_shapefiles into "loop_on_scallop_analysis" anyway, right? Regardless, it's good practice.

That's good to know; thank you!