Skip to content

Commit 31df660

Browse files
Rub21Rub21
authored
Merge pull request #767 from OpenHistoricalMap/staging
Production release - Localized names, 3D Buildings, overpass-turbo v2.1.14
2 parents a7efbdc + bd92988 commit 31df660

14 files changed

Lines changed: 470 additions & 53 deletions

File tree

‎.github/workflows/frontend-overpass.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/checkout@v6
4646
with:
4747
repository: OpenHistoricalMap/overpass-turbo
48-
ref: f7c69c8bb16f37f88d55de44fd5854a1485890aa
48+
ref: 527c3accf412f73766b70193f4577f2d2021d534
4949
path: overpass-turbo
5050

5151
- name: Enable Corepack

‎hetzner/tiler/tiler.production.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818

1919
tiler_imposm:
2020
container_name: tiler_imposm
21-
image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3349.h2739b4b1
21+
image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3371.hef98f958
2222
volumes:
2323
- tiler_imposm_data:/mnt/data
2424
env_file:
@@ -79,7 +79,7 @@ services:
7979

8080
tiler_server_martin:
8181
container_name: tiler_server_martin
82-
image: ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3359.h756000d2
82+
image: ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3371.hef98f958
8383
restart: always
8484
environment:
8585
- OHM_DOMAIN=${OHM_DOMAIN:-openhistoricalmap.org}
@@ -132,13 +132,13 @@ services:
132132
volumes:
133133
tiler_pgdata:
134134
driver: local
135-
name: tiler_db_2104
135+
name: tiler_db_2105
136136
tiler_imposm_data:
137137
driver: local
138-
name: tiler_imposm_2104
138+
name: tiler_imposm_2105
139139
tiler_monitor_data:
140140
driver: local
141-
name: tiler_monitor_2104
141+
name: tiler_monitor_2105
142142
networks:
143143
ohm_network:
144144
external: true

‎images/tiler-imposm/config/imposm3.template.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@
7373
"odbl:note",
7474
"history",
7575

76-
"roof:*",
77-
"building:levels",
78-
"building:part",
79-
"building:material",
80-
"building:colour",
8176
"generator:*",
8277
"tactile_paving",
8378
"crossing:markings",

‎images/tiler-imposm/config/layers/buildings.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,66 @@
4141
"name": "height",
4242
"key": "height"
4343
},
44+
{
45+
"type": "string",
46+
"name": "min_height",
47+
"key": "min_height"
48+
},
49+
{
50+
"type": "string",
51+
"name": "building_height",
52+
"key": "building:height"
53+
},
54+
{
55+
"type": "string",
56+
"name": "building_min_level",
57+
"key": "building:min_level"
58+
},
59+
{
60+
"type": "string",
61+
"name": "building_use",
62+
"key": "building:use"
63+
},
64+
{
65+
"type": "string",
66+
"name": "building_material",
67+
"key": "building:material"
68+
},
69+
{
70+
"type": "string",
71+
"name": "building_levels",
72+
"key": "building:levels"
73+
},
74+
{
75+
"type": "string",
76+
"name": "building_colour",
77+
"key": "building:colour"
78+
},
79+
{
80+
"type": "string",
81+
"name": "building_part",
82+
"key": "building:part"
83+
},
84+
{
85+
"type": "string",
86+
"name": "roof_material",
87+
"key": "roof:material"
88+
},
89+
{
90+
"type": "string",
91+
"name": "roof_colour",
92+
"key": "roof:colour"
93+
},
94+
{
95+
"type": "string",
96+
"name": "roof_shape",
97+
"key": "roof:shape"
98+
},
99+
{
100+
"type": "string",
101+
"name": "roof_height",
102+
"key": "roof:height"
103+
},
44104
{
45105
"type": "string",
46106
"name": "start_date",
@@ -96,7 +156,16 @@
96156
"mapping": {
97157
"building": [
98158
"__any__"
159+
],
160+
"building:part": [
161+
"__any__"
99162
]
163+
},
164+
"filters": {
165+
"reject": {
166+
"building": ["no", "none", "No"],
167+
"building:part": ["no", "none", "No"]
168+
}
100169
}
101170
}
102171
}

‎images/tiler-imposm/config/layers/buildings_points.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
"name": "class",
3737
"key": null
3838
},
39+
{
40+
"type": "string",
41+
"name": "building_use",
42+
"key": "building:use"
43+
},
3944
{
4045
"type": "string",
4146
"name": "start_date",

‎images/tiler-imposm/config/layers/buildings_relation_members.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"tags": {
3+
"load_all": true,
4+
"exclude": [
5+
"created_by",
6+
"source",
7+
"source:datetime"
8+
]
9+
},
10+
"generalized_tables": {},
11+
"tables": {
12+
"buildings_relation_members": {
13+
"type": "relation_member",
14+
"fields": [
15+
{
16+
"type": "id",
17+
"name": "osm_id",
18+
"key": null
19+
},
20+
{
21+
"type": "mapping_value",
22+
"name": "type",
23+
"key": null
24+
},
25+
{
26+
"type": "mapping_key",
27+
"name": "class",
28+
"key": null
29+
},
30+
{
31+
"type": "hstore_tags",
32+
"name": "tags",
33+
"key": null
34+
},
35+
{
36+
"name": "geometry",
37+
"type": "geometry"
38+
},
39+
{
40+
"name": "member",
41+
"type": "member_id"
42+
},
43+
{
44+
"name": "role",
45+
"type": "member_role"
46+
},
47+
{
48+
"name": "me_building",
49+
"type": "string",
50+
"key": "building",
51+
"from_member": true
52+
},
53+
{
54+
"name": "me_building_part",
55+
"type": "string",
56+
"key": "building:part",
57+
"from_member": true
58+
},
59+
{
60+
"type": "hstore_tags",
61+
"name": "me_tags",
62+
"from_member": true
63+
}
64+
],
65+
"mapping": {
66+
"type": [
67+
"building"
68+
]
69+
}
70+
}
71+
}
72+
}

‎images/tiler-imposm/config/layers/water_multilines.json‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"tags": {
3+
"load_all": true,
4+
"exclude": [
5+
"created_by",
6+
"source",
7+
"source:datetime"
8+
]
9+
},
10+
"generalized_tables": {},
11+
"tables": {
12+
"water_multilines": {
13+
"type": "relation_member",
14+
"fields": [
15+
{
16+
"type": "id",
17+
"name": "osm_id",
18+
"key": null
19+
},
20+
{
21+
"type": "geometry",
22+
"name": "geometry",
23+
"key": null
24+
},
25+
{
26+
"type": "string",
27+
"name": "name",
28+
"key": "name"
29+
},
30+
{
31+
"type": "mapping_value",
32+
"name": "type",
33+
"key": null
34+
},
35+
{
36+
"type": "mapping_key",
37+
"name": "class",
38+
"key": null
39+
},
40+
{
41+
"type": "string",
42+
"name": "bridge",
43+
"key": "bridge"
44+
},
45+
{
46+
"type": "string",
47+
"name": "start_date",
48+
"key": "start_date"
49+
},
50+
{
51+
"type": "string",
52+
"name": "end_date",
53+
"key": "end_date"
54+
},
55+
{
56+
"type": "hstore_tags",
57+
"name": "tags",
58+
"key": null
59+
},
60+
{
61+
"type": "member_id",
62+
"name": "member"
63+
},
64+
{
65+
"type": "hstore_tags",
66+
"name": "me_tags",
67+
"from_member": true
68+
},
69+
{
70+
"type": "string",
71+
"name": "me_name",
72+
"key": "name",
73+
"from_member": true
74+
},
75+
{
76+
"type": "string",
77+
"name": "me_waterway",
78+
"key": "waterway",
79+
"from_member": true
80+
}
81+
],
82+
"mapping": {
83+
"type": [
84+
"waterway"
85+
]
86+
}
87+
}
88+
}
89+
}

0 commit comments

Comments
 (0)