Skip to content

Commit

Permalink
add test files and dfo init setup
Browse files Browse the repository at this point in the history
  • Loading branch information
smercier committed Aug 2, 2019
1 parent cd29031 commit c1d530b
Show file tree
Hide file tree
Showing 26 changed files with 1,727 additions and 2 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions data/dfo/init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cat ../../sql/dfo_add_conformance_band.sql ../../sql/dfo_add_shoal_geom.sql ../../sql/dfo_calculate_tile_extents.sql ../../sql/dfo_calculate_tile_geoms.sql ../../sql/dfo_delete_empty_tiles.sql ../../sql/dfo_merge_bands.sql ../../sql/dfo_metadata.sql ../../sql/dfo_most_recent.sql ../../sql/dfoTables/parent.sql ../../sql/dfoTables/25cm.sql ../../sql/dfoTables/50cm.sql ../../sql/dfoTables/1m.sql ../../sql/dfoTables/2m.sql ../../sql/dfoTables/4m.sql ../../sql/dfoTables/8m.sql ../../sql/dfoTables/16m.sql ../../sql/init_exta.sql | psql pgrt -U loader -1 -f -
5 changes: 5 additions & 0 deletions data/dfo/secteur16.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pgrastertime -s ./sql/postprocess.sql -t sound_16c -f -r ../data/CA/16c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16d -f -r ../data/CA/16d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16e -f -r ../data/CA/16e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16f -f -r ../data/CA/16f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16g -f -r ../data/CA/16g/ -p xml
5 changes: 5 additions & 0 deletions data/dfo/secteur17.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#pgrastertime -s ./sql/postprocess.sql -t sound_17c -f -r ../data/CA/17c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17dv2 -f -r ../data/CA/17d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17ev2 -f -r ../data/CA/17e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17fv2 -f -r ../data/CA/17f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17gv2 -f -r ../data/CA/17g/ -p xml
5 changes: 5 additions & 0 deletions data/dfo/secteur18.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pgrastertime -s ./sql/postprocess.sql -t sound_18cv2 -f -r ../data/CA/18c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18dv2 -f -r ../data/CA/18d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18ev2 -f -r ../data/CA/18e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18fv2 -f -r ../data/CA/18f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18gv2 -f -r ../data/CA/18g/ -p xml
15 changes: 15 additions & 0 deletions data/dfo/secteur_16-18.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
pgrastertime -s ./sql/postprocess.sql -t sound_18c -f -r ../data/CA/18c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18d -f -r ../data/CA/18d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18e -f -r ../data/CA/18e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18f -f -r ../data/CA/18f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_18g -f -r ../data/CA/18g/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17c -f -r ../data/CA/17c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17d -f -r ../data/CA/17d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17e -f -r ../data/CA/17e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17f -f -r ../data/CA/17f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_17g -f -r ../data/CA/17g/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16c -f -r ../data/CA/16c/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16d -f -r ../data/CA/16d/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16e -f -r ../data/CA/16e/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16f -f -r ../data/CA/16f/ -p xml
pgrastertime -s ./sql/postprocess.sql -t sound_16g -f -r ../data/CA/16g/ -p xml
294 changes: 294 additions & 0 deletions data/dfo/secteur_sondage.sql

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions pgrastertime/commandline.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ def main():

# 1. Load Processing Class
# TODO: Replace this by a factory

#This option is broken
if args.processing == 'load':

# 2. Load file with reader options
Expand All @@ -155,8 +157,8 @@ def main():

# Finaly, user create some post process SQL to run over loaded table
# User can have multiple SQL file to run
if self.sqlfiles is not None:
print("Post process SQL file: " + self.sqlfiles)
if args.sqlfiles != '':
print("Post process SQL file: " + args.sqlfiles)
PostprocSQL(args.sqlfiles,args.tablename).execute()

elif args.processing == 'xml':
Expand Down
175 changes: 175 additions & 0 deletions sql/dfoTables/16m.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
-- Table: soundings_16m

-- DROP TABLE soundings_16m;

CREATE TABLE soundings_16m
(
id serial NOT NULL,
tile_id bigint,
rast raster,
resolution double precision,
filename text COLLATE pg_catalog."default",
sys_period tstzrange,
tile_extent geometry(Polygon),
tile_geom geometry(MultiPolygon),
metadata_id character varying(100) COLLATE pg_catalog."default",
shoal_geom geometry(MultiPolygon,3979),
CONSTRAINT soundings_16m_pk PRIMARY KEY (id),
CONSTRAINT enforce_out_db_rast CHECK (_raster_constraint_out_db(rast) = '{f,f,f,f,f}'::boolean[]),
CONSTRAINT enforce_nodata_values_rast CHECK (_raster_constraint_nodata_values(rast) = '{340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000}'::numeric[]),
CONSTRAINT enforce_pixel_types_rast CHECK (_raster_constraint_pixel_types(rast) = '{32BF,32BF,32BF,32BF,32BF}'::text[]),
CONSTRAINT enforce_num_bands_rast CHECK (st_numbands(rast) = 5),
CONSTRAINT enforce_scaley_rast CHECK (round(st_scaley(rast)::numeric, 10) = round(- 16::numeric, 10)),
CONSTRAINT enforce_scalex_rast CHECK (round(st_scalex(rast)::numeric, 10) = round(16::numeric, 10)),
CONSTRAINT enforce_srid_rast CHECK (st_srid(rast) = 3979)
)
WITH (
OIDS = FALSE
)
TABLESPACE pg_default;

ALTER TABLE soundings_16m
OWNER to stecyr;

-- Index: soundings_16m_lower_sysperiod

-- DROP INDEX soundings_16m_lower_sysperiod;

CREATE INDEX soundings_16m_lower_sysperiod
ON soundings_16m USING btree
(lower(sys_period))
TABLESPACE pg_default;

-- Index: soundings_16m_metadata_id

-- DROP INDEX soundings_16m_metadata_id;

CREATE INDEX soundings_16m_metadata_id
ON soundings_16m USING btree
(metadata_id COLLATE pg_catalog."default")
TABLESPACE pg_default;

-- Index: soundings_16m_raster

-- DROP INDEX soundings_16m_raster;

CREATE INDEX soundings_16m_raster
ON soundings_16m USING gist
(st_convexhull(rast))
TABLESPACE pg_default;

-- Index: soundings_16m_sysperiod

-- DROP INDEX soundings_16m_sysperiod;

CREATE INDEX soundings_16m_sysperiod
ON soundings_16m USING gist
(sys_period)
TABLESPACE pg_default;

-- Index: soundings_16m_tile_extent_idx

-- DROP INDEX soundings_16m_tile_extent_idx;

CREATE INDEX soundings_16m_tile_extent_idx
ON soundings_16m USING gist
(tile_extent)
TABLESPACE pg_default;

-- Index: soundings_16m_tile_geom_idx

-- DROP INDEX soundings_16m_tile_geom_idx;

CREATE INDEX soundings_16m_tile_geom_idx
ON soundings_16m USING gist
(tile_geom)
TABLESPACE pg_default;

-- Table: soundings_vnsl_16m

-- DROP TABLE soundings_vnsl_16m;

CREATE TABLE soundings_vnsl_16m
(
-- Inherited from table soundings_16m: id integer NOT NULL DEFAULT nextval('soundings_16m_id_seq'::regclass),
-- Inherited from table soundings_16m: tile_id bigint,
-- Inherited from table soundings_16m: rast raster,
-- Inherited from table soundings_16m: resolution double precision,
-- Inherited from table soundings_16m: filename text COLLATE pg_catalog."default",
-- Inherited from table soundings_16m: sys_period tstzrange,
-- Inherited from table soundings_16m: tile_extent geometry(Polygon),
-- Inherited from table soundings_16m: tile_geom geometry(MultiPolygon),
-- Inherited from table soundings_16m: metadata_id character varying(100) COLLATE pg_catalog."default",
-- Inherited from table soundings_16m: shoal_geom geometry(MultiPolygon,3979),
CONSTRAINT soundings_vnsl_16m_pkey PRIMARY KEY (id),
CONSTRAINT enforce_same_alignment_rast CHECK (st_samealignment(rast, '0100000000000000000000304000000000000030C000000000209C39410000000000A0E9C0000000000000000000000000000000008B0F000001000100'::raster)),
CONSTRAINT enforce_out_db_rast CHECK (_raster_constraint_out_db(rast) = '{f,f,f,f,f}'::boolean[]),
CONSTRAINT enforce_nodata_values_rast CHECK (_raster_constraint_nodata_values(rast) = '{340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000,340282346638529000000000000000000000000.0000000000}'::numeric[]),
CONSTRAINT enforce_pixel_types_rast CHECK (_raster_constraint_pixel_types(rast) = '{32BF,32BF,32BF,32BF,32BF}'::text[]),
CONSTRAINT enforce_num_bands_rast CHECK (st_numbands(rast) = 5),
CONSTRAINT enforce_scaley_rast CHECK (round(st_scaley(rast)::numeric, 10) = round(- 16::numeric, 10)),
CONSTRAINT enforce_scalex_rast CHECK (round(st_scalex(rast)::numeric, 10) = round(16::numeric, 10)),
CONSTRAINT enforce_srid_rast CHECK (st_srid(rast) = 3979)
)
INHERITS (soundings_16m)
WITH (
OIDS = FALSE
)
TABLESPACE pg_default;

ALTER TABLE soundings_vnsl_16m
OWNER to stecyr;

-- Index: soundings_vnsl_16m_lower_sysperiod

-- DROP INDEX soundings_vnsl_16m_lower_sysperiod;

CREATE INDEX soundings_vnsl_16m_lower_sysperiod
ON soundings_vnsl_16m USING btree
(lower(sys_period))
TABLESPACE pg_default;

-- Index: soundings_vnsl_16m_metadata_id

-- DROP INDEX soundings_vnsl_16m_metadata_id;

CREATE INDEX soundings_vnsl_16m_metadata_id
ON soundings_vnsl_16m USING btree
(metadata_id COLLATE pg_catalog."default")
TABLESPACE pg_default;

-- Index: soundings_vnsl_16m_raster

-- DROP INDEX soundings_vnsl_16m_raster;

CREATE INDEX soundings_vnsl_16m_raster
ON soundings_vnsl_16m USING gist
(st_convexhull(rast))
TABLESPACE pg_default;

-- Index: soundings_vnsl_16m_sysperiod

-- DROP INDEX soundings_vnsl_16m_sysperiod;

CREATE INDEX soundings_vnsl_16m_sysperiod
ON soundings_vnsl_16m USING gist
(sys_period)
TABLESPACE pg_default;

-- Index: soundings_vnsl_16m_tile_extent_idx

-- DROP INDEX soundings_vnsl_16m_tile_extent_idx;

CREATE INDEX soundings_vnsl_16m_tile_extent_idx
ON soundings_vnsl_16m USING gist
(tile_extent)
TABLESPACE pg_default;

-- Index: soundings_vnsl_16m_tile_geom_idx

-- DROP INDEX soundings_vnsl_16m_tile_geom_idx;

CREATE INDEX soundings_vnsl_16m_tile_geom_idx
ON soundings_vnsl_16m USING gist
(tile_geom)
TABLESPACE pg_default;
Loading

0 comments on commit c1d530b

Please sign in to comment.