Skip to content

Commit 70e19cb

Browse files
authored
0.7.0 (#181)
* load with shell script instead of makefile, convert cache to parquet instead of replicating .gdb * fix out file name and specify geometry column name * also cache and load non-spatial tables * remove redundant queries * fix #180, load extras directly and wrap inserts in transactions * simplify db folder and scripts, do not order by random, fids get lost * missed folder * remove temp file * remove docker folder * update readme, ignore .gdb * remove primary makefile * wsg.txt no longer required * remove docker guide * update changes * cut a v0.7.0 release and leave transboundary wsds for v0.8.0 * update tag
1 parent 6037205 commit 70e19cb

File tree

83 files changed

+1235
-1959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1235
-1959
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
data/
1111
*.zip
1212
*.gz
13+
*.gdb
1314
extras/channel_width/*csv
1415
extras/discharge/*csv
1516
extras/lookups/*csv

CHANGES.txt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@ Changes
33

44
All issue numbers are relative to https://github.com/smnorris/fwapg/issues
55

6-
0.7.0 (2025-)
7-
------------------
8-
- add new function FWA_SegmentAlongInterval, returning regularly spaced stream segments
9-
- add new function FWA_SlopeAlongInterval, returning regularly spaced slope measurements
10-
- add new function FWA_DownstreamTrace, returning streams_vw records downstream of a point location
11-
- update dependencies in dockerfile
12-
- cache data on BC object storage for faster repeated downloads
6+
0.7.0 (2025-11-06)
7+
------------------
8+
- postgres >=17 compatibility
9+
- new functions:
10+
+ FWA_SegmentAlongInterval, returns regularly spaced stream segments
11+
+ FWA_SlopeAlongInterval, returns regularly spaced slope measurements
12+
+ FWA_DownstreamTrace, returns stream records downstream of a point location
13+
+ FWA_NetworkTrace, returns stream records between two point locations
14+
+ FWA_NetworkTraceAgg, returns aggregated stream paths between two point locations
15+
- new data:
16+
+ add a lookup relating streams to PSE conservation units
17+
+ include value added data (discharge/channel width etc) directly in new table whse_basemapping.fwa_streams
18+
- cache source data on BC object storage as parquet/gzipped csv
19+
(for faster downloads and to enable direct remote access via tools like duckdb)
20+
- simplify maintenance by building/loading with bash scripts instead of Makefile
1321
- misc bug fixes
14-
- note that PG17 is not yet supported
1522

1623
0.6.1 (2024-04-08)
1724
------------------

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.10.0
1+
FROM ghcr.io/osgeo/gdal:ubuntu-full-3.10.3
22

33
RUN apt-get update && apt-get --assume-yes upgrade \
44
&& apt-get -qq install -y --no-install-recommends postgresql-common \

Makefile

Lines changed: 0 additions & 250 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ See [documentation](https://smnorris.github.io/fwapg/) for setup and usage detai
1818
## Quickstart
1919

2020
1. Ensure all requirements/dependencies are met/installed:
21-
- access to a PostgreSQL (13-16, 17 is not yet supported) database with the PostGIS extension (>=3.1) installed
22-
- GDAL >=3.4
21+
- access to a PostgreSQL (>13) database with the PostGIS extension
22+
- GDAL >=3.6
2323
- Python 3
2424
- [`bcdata`](https://github.com/smnorris/bcdata)
2525
- [`make`](https://www.gnu.org/software/make/)/`unzip`/`curl`/`awscli`/ etc (see Dockerfile)
@@ -32,7 +32,8 @@ See [documentation](https://smnorris.github.io/fwapg/) for setup and usage detai
3232

3333
git clone https://github.com/smnorris/fwapg.git
3434
cd fwapg
35-
make
35+
cd data && ./create.sh && cd .. # load extensions, create schemas/tables
36+
./load.sh # load the data
3637

3738
The full load takes some time - but once complete, you can run `fwapg` enabled queries with your favorite sql client. For example:
3839

0 commit comments

Comments
 (0)