Skip to content

Commit

Permalink
Merge branch 'main' into v0.5.0
Browse files Browse the repository at this point in the history 
* main:
  missed adjustments (#537)
  QUES/BOWR updates (#536)
  upgrade bcdata
  remove temp pscis fixes where data is now available in source
  • Loading branch information
@smnorris
smnorris committed Jul 8, 2024
2 parents 3983167 + eaa2b7e commit 0bd4a40
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && apt-get --assume-yes upgrade \
&& apt-get -qq install -y --no-install-recommends python3-pip \
&& apt-get -qq install -y --no-install-recommends python3-psycopg2 \
&& pip3 install --upgrade numpy \
&& pip3 install bcdata==0.10.2 \
&& pip3 install bcdata==0.10.4 \
&& pip3 install scikit-image \
&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \
&& unzip awscliv2.zip \
Expand Down
6 changes: 4 additions & 2 deletions data/user_habitat_classification.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15294,10 +15294,12 @@
360873822,168869,170329.9685,BULK,SK,spawning,t,LB,2024-06-06,Pacific Salmon Foundation,River sockeye
360881038,0,280.2148356,BULK,SK,spawning,t,LB,2024-06-06,Pacific Salmon Foundation,Lake sockeye
360804115,652.18,852.93,BULK,CO,spawning,t,LB,2024-06-17,Pacific Salmon Foundation,
356209928,25.6202005,486.7184822,SHUL,CO,Rearing,t,MC,2024-06-27,Local Knowledge,Local Knowledge -CO rearing habitati
356209928,25.6202005,486.7184822,SHUL,CO,Rearing,t,MC,2024-06-27,Local Knowledge,Local Knowledge - CO rearing habitat
356209928,486.719176,822,SHUL,CO,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - CO Spawning
356343800,0,838,SHUL,SK,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - CO and SK Spawning
356348431,1481,1681,SHUL,SK,Rearing,t,MC,2024-06-27,Local Knowledge,Local Knowledge - Some SK seen 300m upstream
356348431,1481,1781,SHUL,SK,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - Some SK seen 300m upstream
356137288,265.6052138,408,SHUL,SK,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - Adult SK observed up to rail line
356347377,0,558,BONP,CH,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - major spawning for CH
356347377,0,558,BONP,CH,Spawning,t,MC,2024-06-27,Local Knowledge,Local Knowledge - major spawning for CH
356311064,6630,8353.604837,QUES,CO,rearing,f,MC,2024-07-04,Field assessments,No channel or water
356287539,1403.205103,1444.490069,QUES,CO,rearing,f,MC,2024-07-04,Field assessments,No wetland/water
15 changes: 14 additions & 1 deletion data/user_modelled_crossing_fixes.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21717,4 +21717,17 @@ modelled_crossing_id,structure,watershed_group_code,reviewer_name,review_date,so
18300892,NONE,SHUL,LS,2024-06-26,Bing/Google/ESRI imagery,redundant mulit-lane highway crossing - removed in favour of most d/s location
23800103,NONE,USHU,LS,2024-06-26,Bing/Google/ESRI imagery,duplicate crossing - removed in favour of d/s location
18300160,NONE,SHUL,LS,2024-06-26,Bing/Google/ESRI imagery,redundant mulit-lane highway crossing - removed in favour of most d/s location
23800079,OBS,USHU,LS,2025-06-28,Bing/Google/ESRI imagery,bridge visible
23800079,OBS,USHU,LS,2025-06-28,Bing/Google/ESRI imagery,bridge visible
17104186,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,No channel or water. Culvert on side road connecting manmade ditch line along road.
1501277,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"No culvert, Low marshy ground on either side of road. No Channel. Small lake to south, wetland to north. Depression in road possibly from culvert removal."
1501283,NONE,BOWR,MC,2024-07-08,WCRP partner field assessments,"No sign of a crossing, but old grown in road nearby. Wetland downstream."
1501281,NONE,BOWR,MC,2024-07-08,WCRP partner field assessments,"No culvert. Old road crossing pulled 10+ years ago. Alder, large cobbles."
1501282,NONE,BOWR,MC,2024-07-08,WCRP partner field assessments,"No crossing, no passage issues. Fish in stream."
17103908,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,No Barrier or culvert. No water/wetland.
17100487,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"In bush off Horsefly/Likely FSR. Very old road, overgrown. No water or channel seen, slightly wet corridor."
17100488,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"In bush off Horsefly/Likely FSR. Very old road, overgrown. No water or channel seen, slightly wet corridor."
17103896,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"Old clear area, may be part of mine. Cleared in the last 1-3 years. Small (2x2m) wetland with cattails seen, but no water or streams. No culverts."
17102208,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"Very old road, overgrown. No crossing found. Slightly wet area but no water seen."
17102191,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,"No water or wetland. Possible culvert removed at old road, shallow overgrown ditch. No culvert seen."
17100098,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,No wetland/water. No culvert seen on road. Private property on either side of road.
17102374,NONE,QUES,MC,2024-07-08,WCRP partner field assessments,Cannot find inlet. Bottom of culvert disintegrated where it touches ground. No water.
3 changes: 0 additions & 3 deletions data/user_pscis_barrier_status.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ stream_crossing_id,user_barrier_status,watershed_group_code,reviewer_name,review
195285,PASSABLE,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
195286,PASSABLE,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
195287,PASSABLE,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
195289,PASSABLE,BULK,SN,2021-01-01,reassessment (Irvine 2020)
195293,PASSABLE,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
195294,BARRIER,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
195295,PASSABLE,BULK,CWF,2021-01-01,based on assessment comments (and imagery review where required)
Expand Down Expand Up @@ -812,8 +811,6 @@ stream_crossing_id,user_barrier_status,watershed_group_code,reviewer_name,review
62412,PASSABLE,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
62417,BARRIER,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
62419,PASSABLE,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
62421,PASSABLE,ELKR,SN,2021-01-01,crossing has been remediated but PSCIS has not been updated (Irvine Elk report 2021)
62422,PASSABLE,ELKR,SN,2021-01-01,crossing has been remediated but PSCIS has not been updated (Irvine Elk report 2021)
62424,PASSABLE,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
62431,PASSABLE,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
62433,PASSABLE,ELKR,CWF,2021-01-01,based on assessment comments (and imagery review where required)
Expand Down

0 comments on commit 0bd4a40

Please sign in to comment.