Skip to content

Commit 1d92942

Browse files
jotojoto
committed
Add multipolygon wkt files
They show what the multipolygons are supposed to look like. They are also added to the grid.db file and the QGIS project.
1 parent 65382f8 commit 1d92942

24 files changed

+279
-47
lines changed

‎grid/.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
tests.qgs~
2-
grid.sql
1+
data-labels.sql
2+
data-multipolygons.sql
33
data-nodes.sql
44
data-ways.sql
5-
labels.sql
5+
grid.sql
6+
tests.qgs~

‎grid/Makefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# You need osmium tool from https://github.com/osmcode/osmium-tool for this
33
OSMIUM := ../../osmium-tool/osmium
44

5+
SQL_FILES := grid.sql data-nodes.sql data-ways.sql data-multipolygons.sql data-labels.sql
6+
57
.PHONY: grid data all clean
68

79
all: grid data
@@ -12,15 +14,18 @@ grid.sql: data/?-* bin/create-grid.sh
1214
bin/create-grid.sh `find data -mindepth 1 -maxdepth 1 -type d | cut -d/ -f2 | cut -d- -f1 | sort` >$@
1315

1416
data-nodes.sql: data/*/*/out.wkt
15-
grep --no-filename POINT $^ | sed -re "s/^([0-9]+) (.*)/INSERT INTO nodes (id, geom) VALUES (\1, PointFromText('\2', 4326));/" >$@
17+
grep --no-filename POINT $^ | sed -re "s/^([0-9][0-9][0-9])([0-9][0-9][0-9]) (.*)/INSERT INTO nodes (test_id, id, geom) VALUES (\1, \1\2, PointFromText('\3', 4326));/" >$@
1618

1719
data-ways.sql: data/*/*/out.wkt
18-
grep --no-filename LINESTRING $^ | sed -re "s/^([0-9]+) (.*)/INSERT INTO ways (id, geom) VALUES (\1, LineFromText('\2', 4326));/" >$@
20+
grep --no-filename LINESTRING $^ | sed -re "s/^([0-9][0-9][0-9])([0-9][0-9][0-9]) (.*)/INSERT INTO ways (test_id, id, geom) VALUES (\1, \1\2, LineFromText('\3', 4326));/" >$@
21+
22+
data-multipolygons.sql: data/*/*/multipolygon.wkt
23+
cat $^ | sed -re "s/^([0-9][0-9][0-9])([0-9][0-9][0-9]) ([wr]) ([^ ]*) (.*)/INSERT INTO multipolygons (test_id, id, from_type, variant, geom) VALUES (\1, \1\2, '\3', '\4', MultiPolygonFromText('\5', 4326));/" >$@
1924

20-
labels.sql: data/*/*/labels.wkt
25+
data-labels.sql: data/*/*/labels.wkt
2126
cat $^ | sed -re "s/^(POINT\([0-9. ]+\)) (.*)/INSERT INTO labels (label, geom) VALUES ('\2', PointFromText('\1', 4326));/" >$@
2227

23-
grid.db: grid.sql data-nodes.sql data-ways.sql labels.sql
28+
grid.db: setup.sql $(SQL_FILES)
2429
rm -f $@
2530
cat $^ | spatialite -batch -bail $@
2631

@@ -33,6 +38,5 @@ show:
3338
bin/show-tests.sh
3439

3540
clean:
36-
rm -f grid.db grid.sql
37-
rm -f data/all.osm
41+
rm -f grid.db $(SQL_FILES) data/all.osm
3842

‎grid/bin/create-grid.sh

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,6 @@
1010
# bin/create-grid.sh 1 7
1111
#
1212

13-
cat << EOF
14-
--
15-
-- Automatically created with create-grid.sh
16-
--
17-
18-
PRAGMA synchronous = OFF;
19-
20-
CREATE TABLE grid (
21-
test_id INTEGER NOT NULL PRIMARY KEY,
22-
available INTEGER,
23-
result VARCHAR,
24-
description VARCHAR
25-
);
26-
SELECT AddGeometryColumn('grid', 'geom', 4326, 'POLYGON', 2);
27-
28-
CREATE TABLE titles (
29-
title VARCHAR
30-
);
31-
SELECT AddGeometryColumn('titles', 'geom', 4326, 'LINESTRING', 2);
32-
33-
CREATE TABLE nodes (
34-
id INTEGER NOT NULL PRIMARY KEY
35-
);
36-
SELECT AddGeometryColumn('nodes', 'geom', 4326, 'POINT', 2);
37-
38-
CREATE TABLE ways (
39-
id INTEGER NOT NULL PRIMARY KEY
40-
);
41-
SELECT AddGeometryColumn('ways', 'geom', 4326, 'LINESTRING', 2);
42-
43-
CREATE TABLE labels (
44-
label VARCHAR
45-
);
46-
SELECT AddGeometryColumn('labels', 'geom', 4326, 'POINT', 2);
47-
48-
EOF
49-
5013
for t in $*; do
5114
title=`echo data/$t-* | cut -d/ -f2`
5215
echo "INSERT INTO titles (title, geom) VALUES ('${title}', LineFromText('LINESTRING(${t}.0 2.1,${t}.9999 2.1)', 4326));\n"

‎grid/data/1-basic-geom/112/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
112800 w default MULTIPOLYGON(((1.21 1.11,1.21 1.17,1.27 1.17,1.27 1.12,1.21 1.11)))

‎grid/data/7-mp-geom/700/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
700800 w default MULTIPOLYGON(((7.01 1.01,7.01 1.04,7.04 1.04,7.04 1.01,7.01 1.01)))

‎grid/data/7-mp-geom/701/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
701900 r default MULTIPOLYGON(((7.14 1.01,7.11 1.01,7.11 1.04,7.14 1.04,7.14 1.01)))

‎grid/data/7-mp-geom/702/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
702900 r default MULTIPOLYGON(((7.24 1.01,7.21 1.01,7.21 1.02,7.23 1.03,7.23 1.04,7.21 1.04,7.21 1.05,7.24 1.05,7.24 1.01)))

‎grid/data/7-mp-geom/703/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
703900 r default MULTIPOLYGON(((7.34 1.01,7.31 1.01,7.31 1.02,7.33 1.03,7.33 1.04,7.32 1.04,7.32 1.05,7.34 1.05,7.34 1.01)))

‎grid/data/7-mp-geom/704/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
704900 r default MULTIPOLYGON(((7.41 1.02,7.41 1.03,7.42 1.03,7.42 1.04,7.43 1.04,7.43 1.03,7.44 1.03,7.44 1.02,7.43 1.02,7.43 1.01,7.42 1.01,7.42 1.02,7.41 1.02)))

‎grid/data/7-mp-geom/705/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
705900 r default MULTIPOLYGON(((7.58 1.02,7.56 1.03,7.56 1.04,7.55 1.04,7.54 1.01,7.52 1.01,7.53 1.03,7.51 1.04,7.52 1.08,7.54 1.07,7.55 1.09,7.56 1.09,7.59 1.06,7.58 1.02)))

‎grid/data/7-mp-geom/707/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
707900 r default MULTIPOLYGON(((7.71 1.04,7.72 1.06,7.75 1.05,7.73 1.02,7.71 1.04)),((7.74 1.03,7.77 1.03,7.77 1.01,7.74 1.01,7.74 1.03)))

‎grid/data/7-mp-geom/708/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
708900 r default MULTIPOLYGON(((7.81 1.03,7.82 1.06,7.85 1.06,7.86 1.03,7.85 1.03,7.84 1.05,7.83 1.05,7.82 1.02,7.81 1.03)),((7.83 1.04,7.84 1.04,7.84 1.02,7.87 1.02,7.87 1.03,7.88 1.03,7.88 1.01,7.83 1.01,7.83 1.04)))

‎grid/data/7-mp-geom/720/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
720900 r default MULTIPOLYGON(((7.05 1.21,7.01 1.21,7.01 1.25,7.05 1.25,7.05 1.21),(7.04 1.22,7.02 1.22,7.02 1.24,7.04 1.24,7.04 1.22)))

‎grid/data/7-mp-geom/721/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
721900 r default MULTIPOLYGON(((7.15 1.21,7.11 1.21,7.11 1.25,7.15 1.25,7.15 1.21),(7.14 1.22,7.12 1.22,7.12 1.24,7.14 1.24,7.14 1.22)))

‎grid/data/7-mp-geom/722/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
722900 r default MULTIPOLYGON(((7.25 1.21,7.21 1.21,7.21 1.25,7.25 1.25,7.25 1.21),(7.24 1.22,7.22 1.22,7.22 1.24,7.24 1.24,7.24 1.22)))

‎grid/data/7-mp-geom/723/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
723900 r default MULTIPOLYGON(((7.35 1.21,7.31 1.21,7.31 1.25,7.35 1.25,7.35 1.21),(7.34 1.22,7.32 1.22,7.32 1.24,7.34 1.24,7.34 1.22)))

‎grid/data/7-mp-geom/724/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
724900 r default MULTIPOLYGON(((7.44 1.22,7.47 1.21,7.41 1.21,7.42 1.22,7.41 1.24,7.43 1.26,7.46 1.26,7.45 1.23,7.44 1.22),(7.43 1.22,7.42 1.24,7.44 1.25,7.45 1.24,7.43 1.22)))

‎grid/data/7-mp-geom/725/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
725900 r default MULTIPOLYGON(((7.53 1.21,7.54 1.21,7.52 1.23,7.54 1.25,7.53 1.25,7.51 1.23,7.53 1.21)))

‎grid/data/7-mp-geom/729/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
729900 r default MULTIPOLYGON(((7.91 1.21,7.91 1.29,7.99 1.29,7.99 1.21,7.91 1.21),(7.97 1.27,7.97 1.23,7.93 1.23,7.93 1.27,7.97 1.27)),((7.96 1.26,7.94 1.26,7.94 1.24,7.96 1.24,7.96 1.26)))

‎grid/data/7-mp-geom/730/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
730900 r default MULTIPOLYGON(((7.06 1.31,7.01 1.31,7.01 1.34,7.04 1.37,7.06 1.34,7.06 1.31),(7.02 1.33,7.03 1.33,7.03 1.32,7.02 1.32,7.02 1.33),(7.03 1.35,7.04 1.35,7.04 1.34,7.03 1.34,7.03 1.35),(7.05 1.33,7.04 1.33,7.04 1.32,7.05 1.32,7.05 1.33)))

‎grid/data/7-mp-geom/731/multipolygon.wkt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
731900 r default MULTIPOLYGON(((7.18 1.33,7.17 1.31,7.12 1.31,7.11 1.33,7.11 1.38,7.18 1.38,7.18 1.33),(7.17 1.32,7.12 1.32,7.12 1.36,7.13 1.36,7.13 1.33,7.16 1.33,7.16 1.34,7.17 1.35,7.17 1.32),(7.16 1.36,7.16 1.35,7.15 1.34,7.14 1.34,7.14 1.35,7.15 1.36,7.15 1.37,7.16 1.37,7.16 1.36)))

‎grid/grid.db

14 KB
Binary file not shown.

‎grid/setup.sql

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
PRAGMA synchronous = OFF;
3+
4+
CREATE TABLE grid (
5+
test_id INTEGER NOT NULL PRIMARY KEY,
6+
available INTEGER,
7+
result VARCHAR,
8+
description VARCHAR
9+
);
10+
SELECT AddGeometryColumn('grid', 'geom', 4326, 'POLYGON', 2);
11+
12+
CREATE TABLE titles (
13+
title VARCHAR
14+
);
15+
SELECT AddGeometryColumn('titles', 'geom', 4326, 'LINESTRING', 2);
16+
17+
CREATE TABLE nodes (
18+
test_id INTEGER NOT NULL,
19+
id INTEGER NOT NULL PRIMARY KEY
20+
);
21+
SELECT AddGeometryColumn('nodes', 'geom', 4326, 'POINT', 2);
22+
23+
CREATE TABLE ways (
24+
test_id INTEGER NOT NULL,
25+
id INTEGER NOT NULL PRIMARY KEY
26+
);
27+
SELECT AddGeometryColumn('ways', 'geom', 4326, 'LINESTRING', 2);
28+
29+
CREATE TABLE labels (
30+
label VARCHAR
31+
);
32+
SELECT AddGeometryColumn('labels', 'geom', 4326, 'POINT', 2);
33+
34+
CREATE TABLE multipolygons (
35+
test_id INTEGER NOT NULL,
36+
id INTEGER NOT NULL,
37+
from_type VARCHAR,
38+
variant VARCHAR
39+
);
40+
SELECT AddGeometryColumn('multipolygons', 'geom', 4326, 'MULTIPOLYGON', 2);
41+

0 commit comments

Comments
 (0)