motiejus/stud
1
Fork 0
Code Releases Activity

Add Merkys

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-04-18 09:55:28 +03:00
parent 8b38ad409a
commit e91294fbaa
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IV/Makefile
View File

@ -1,5 +1,5 @@
OSM ?= lithuania-latest.osm.pbf OSM ?= lithuania-latest.osm.pbf
WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' WHERE ?= name='Visinčia' OR name='Šalčia' OR name='Nemunas' OR name='Merkys'
#WHERE ?= name like '%' #WHERE ?= name like '%'
SLIDES = slides-2021-03-29.pdf SLIDES = slides-2021-03-29.pdf

4
IV/init.sql
View File

@ -11,3 +11,7 @@ create table wm_debug(stage text, name text, gen bigint, nbend bigint, way geome
-- is used for geometric assertions later in the file. -- is used for geometric assertions later in the file.
drop table if exists wm_demo; drop table if exists wm_demo;
create table wm_demo (name text, i bigint, way geometry); create table wm_demo (name text, i bigint, way geometry);
-- wm_visuals holds visual aids for the paper.
drop table if exists wm_visuals;
create table wm_visuals (name text, way geometry);

7
IV/rivers.sql
View File

File diff suppressed because one or more lines are too long

5
IV/tests.sql
View File

@ -55,9 +55,6 @@ delete from wm_debug where name in (select distinct name from wm_figures);
delete from wm_demo where name in (select distinct name from wm_figures); delete from wm_demo where name in (select distinct name from wm_figures);
insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures; insert into wm_demo (name, way) select name, ST_SimplifyWM(way, name) from wm_figures;
-- wm_visuals holds visual aids for the paper.
drop table if exists wm_visuals;
create table wm_visuals (name text, way geometry);
do $$ do $$
declare fig6b1 geometry; declare fig6b1 geometry;
declare fig6b2 geometry; declare fig6b2 geometry;
@ -65,6 +62,8 @@ do $$
declare sclong geometry; declare sclong geometry;
declare scshort geometry; declare scshort geometry;
begin begin
delete from wm_visuals where name like 'fig6-%' or name like 'selfcrossing-1%';
select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b1 limit 1 offset 0; select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b1 limit 1 offset 0;
select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b2 limit 1 offset 2; select way from wm_debug where name='fig6' and stage='bbends' and gen=1 into fig6b2 limit 1 offset 2;
insert into wm_visuals (name, way) values('fig6-baseline', st_makeline(st_startpoint(fig6b2), st_endpoint(fig6b2))); insert into wm_visuals (name, way) values('fig6-baseline', st_makeline(st_startpoint(fig6b2), st_endpoint(fig6b2)));