Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend-overpass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@v6
with:
repository: OpenHistoricalMap/overpass-turbo
ref: f7c69c8bb16f37f88d55de44fd5854a1485890aa
ref: 527c3accf412f73766b70193f4577f2d2021d534
path: overpass-turbo

- name: Enable Corepack
Expand Down
10 changes: 5 additions & 5 deletions hetzner/tiler/tiler.production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

tiler_imposm:
container_name: tiler_imposm
image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3349.h2739b4b1
image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3371.hef98f958
volumes:
- tiler_imposm_data:/mnt/data
env_file:
Expand Down Expand Up @@ -79,7 +79,7 @@ services:

tiler_server_martin:
container_name: tiler_server_martin
image: ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3359.h756000d2
image: ghcr.io/openhistoricalmap/tiler-server-martin:0.0.1-0.dev.git.3371.hef98f958
restart: always
environment:
- OHM_DOMAIN=${OHM_DOMAIN:-openhistoricalmap.org}
Expand Down Expand Up @@ -132,13 +132,13 @@ services:
volumes:
tiler_pgdata:
driver: local
name: tiler_db_2104
name: tiler_db_2105
tiler_imposm_data:
driver: local
name: tiler_imposm_2104
name: tiler_imposm_2105
tiler_monitor_data:
driver: local
name: tiler_monitor_2104
name: tiler_monitor_2105
networks:
ohm_network:
external: true
Expand Down
5 changes: 0 additions & 5 deletions images/tiler-imposm/config/imposm3.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@
"odbl:note",
"history",

"roof:*",
"building:levels",
"building:part",
"building:material",
"building:colour",
"generator:*",
"tactile_paving",
"crossing:markings",
Expand Down
69 changes: 69 additions & 0 deletions images/tiler-imposm/config/layers/buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,66 @@
"name": "height",
"key": "height"
},
{
"type": "string",
"name": "min_height",
"key": "min_height"
},
{
"type": "string",
"name": "building_height",
"key": "building:height"
},
{
"type": "string",
"name": "building_min_level",
"key": "building:min_level"
},
{
"type": "string",
"name": "building_use",
"key": "building:use"
},
{
"type": "string",
"name": "building_material",
"key": "building:material"
},
{
"type": "string",
"name": "building_levels",
"key": "building:levels"
},
{
"type": "string",
"name": "building_colour",
"key": "building:colour"
},
{
"type": "string",
"name": "building_part",
"key": "building:part"
},
{
"type": "string",
"name": "roof_material",
"key": "roof:material"
},
{
"type": "string",
"name": "roof_colour",
"key": "roof:colour"
},
{
"type": "string",
"name": "roof_shape",
"key": "roof:shape"
},
{
"type": "string",
"name": "roof_height",
"key": "roof:height"
},
{
"type": "string",
"name": "start_date",
Expand Down Expand Up @@ -96,7 +156,16 @@
"mapping": {
"building": [
"__any__"
],
"building:part": [
"__any__"
]
},
"filters": {
"reject": {
"building": ["no", "none", "No"],
"building:part": ["no", "none", "No"]
}
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions images/tiler-imposm/config/layers/buildings_points.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
"name": "class",
"key": null
},
{
"type": "string",
"name": "building_use",
"key": "building:use"
},
{
"type": "string",
"name": "start_date",
Expand Down
72 changes: 72 additions & 0 deletions images/tiler-imposm/config/layers/buildings_relation_members.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"tags": {
"load_all": true,
"exclude": [
"created_by",
"source",
"source:datetime"
]
},
"generalized_tables": {},
"tables": {
"buildings_relation_members": {
"type": "relation_member",
"fields": [
{
"type": "id",
"name": "osm_id",
"key": null
},
{
"type": "mapping_value",
"name": "type",
"key": null
},
{
"type": "mapping_key",
"name": "class",
"key": null
},
{
"type": "hstore_tags",
"name": "tags",
"key": null
},
{
"name": "geometry",
"type": "geometry"
},
{
"name": "member",
"type": "member_id"
},
{
"name": "role",
"type": "member_role"
},
{
"name": "me_building",
"type": "string",
"key": "building",
"from_member": true
},
{
"name": "me_building_part",
"type": "string",
"key": "building:part",
"from_member": true
},
{
"type": "hstore_tags",
"name": "me_tags",
"from_member": true
}
],
"mapping": {
"type": [
"building"
]
}
}
}
}
89 changes: 89 additions & 0 deletions images/tiler-imposm/config/layers/water_multilines.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"tags": {
"load_all": true,
"exclude": [
"created_by",
"source",
"source:datetime"
]
},
"generalized_tables": {},
"tables": {
"water_multilines": {
"type": "relation_member",
"fields": [
{
"type": "id",
"name": "osm_id",
"key": null
},
{
"type": "geometry",
"name": "geometry",
"key": null
},
{
"type": "string",
"name": "name",
"key": "name"
},
{
"type": "mapping_value",
"name": "type",
"key": null
},
{
"type": "mapping_key",
"name": "class",
"key": null
},
{
"type": "string",
"name": "bridge",
"key": "bridge"
},
{
"type": "string",
"name": "start_date",
"key": "start_date"
},
{
"type": "string",
"name": "end_date",
"key": "end_date"
},
{
"type": "hstore_tags",
"name": "tags",
"key": null
},
{
"type": "member_id",
"name": "member"
},
{
"type": "hstore_tags",
"name": "me_tags",
"from_member": true
},
{
"type": "string",
"name": "me_name",
"key": "name",
"from_member": true
},
{
"type": "string",
"name": "me_waterway",
"key": "waterway",
"from_member": true
}
],
"mapping": {
"type": [
"waterway"
]
}
}
}
}
Loading
Loading