Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
71bbd54
Remove generalized_tables for admin adn create from single table the …
Rub21 Jan 5, 2026
07051f2
Update mviews refresh
Rub21 Jan 5, 2026
e9f3ed3
Restore tiler db
Rub21 Jan 5, 2026
0ad1418
Update deprecated imposm tags pseudoarea and exclude_tags
Rub21 Jan 5, 2026
d904e02
Update reject section for imposm
Rub21 Jan 5, 2026
4215e78
Update admin centroids
Rub21 Jan 5, 2026
79930a0
Build imposm image for staging
Rub21 Jan 6, 2026
8025620
Standardize transport_lines and route layers using the same simplific…
Rub21 Jan 6, 2026
cb81663
Merge pull request #667 from OpenHistoricalMap/1244_transport_lines_r…
Rub21 Jan 7, 2026
8e70c6d
Refactor zoom lavel for transport line and routes
Rub21 Jan 7, 2026
ab331b9
Remove generalized_tables for water and udpate mviews
Rub21 Jan 8, 2026
c0099d0
Standardize zoom level - water and landuse
Rub21 Jan 8, 2026
c47ea70
Standardize zoom level - landuse and transport lines
Rub21 Jan 8, 2026
7345305
Standardize zoom level - other areas , routes and transport areas
Rub21 Jan 8, 2026
ed97cc8
Comment refresh functions
Rub21 Jan 8, 2026
39ccc1b
Update toml file for vtiles and create documentation
Rub21 Jan 8, 2026
fd1b864
Fix discrepancies mviews adn tegola config
Rub21 Jan 8, 2026
bd6112d
Create mviews from high zoom level views
Rub21 Jan 8, 2026
f28e4a5
Update refresh views script
Rub21 Jan 8, 2026
a4a70e4
Add condition to run again the script
Rub21 Jan 8, 2026
e45085c
Delete views in cascade in routes
Rub21 Jan 8, 2026
df66889
Fix missing semicoloe in transport lines
Rub21 Jan 8, 2026
7f35631
Update water areas layer
Rub21 Jan 8, 2026
b9208c5
Update landuse lines layer - filter only tree_row
Rub21 Jan 9, 2026
d171053
Refresh landuse lines mviews
Rub21 Jan 9, 2026
97972c2
Update queries form water areas, and landuse
Rub21 Jan 9, 2026
d9c1124
Simplify materialized views by deriving them from higher-level materi…
Rub21 Jan 9, 2026
2122f3e
Update id_fieldname for admin lines
Rub21 Jan 9, 2026
9da5253
Update doc and transport areas
Rub21 Jan 9, 2026
e3a9af2
Add filters for each mview in docs
Rub21 Jan 9, 2026
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/chartpress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- 'main'
- 'staging'
- 'staging_deploy'
- 'tiler_refresh'
- 'vtiles_admin'
jobs:
build:
runs-on: ubuntu-22.04
Expand Down
260 changes: 260 additions & 0 deletions DOC-VTILES.md

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions hetzner/tiler/tiler.staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ services:

imposm_staging:
container_name: tiler_imposm_staging
image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3183.h59d5a56
# image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3183.h59d5a56
image: tiler-imposm:staging
build:
context: ../../images/tiler-imposm
dockerfile: Dockerfile
volumes:
- tiler_staging_imposmdata:/mnt/data
command:
Expand All @@ -35,7 +39,6 @@ services:
networks:
- ohm_network


tiler_server_staging:
container_name: tiler_server_staging
image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3175.hbdd6021
Expand Down Expand Up @@ -106,10 +109,10 @@ services:
volumes:
tiler_staging_pgdata:
driver: local
name: tiler_db_1212_v2
name: tiler_db_05_01_v9
tiler_staging_imposmdata:
driver: local
name: tiler_imposm_1212_v2
name: tiler_imposm_05_01_v9

networks:
ohm_network:
Expand Down
2 changes: 1 addition & 1 deletion images/tiler-db/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ RUN git clone https://github.com/OpenHistoricalMap/DateFunctions-plpgsql.git .

# Deploy improvements to negative year handling
RUN git checkout d9f06a4ac0674881247c38b29ba58ff1d167b7bb
RUN cp datefunctions.sql /docker-entrypoint-initdb.d/datefunctions.sql
RUN cp datefunctions.sql /docker-entrypoint-initdb.d/datefunctions.sql
Empty file modified images/tiler-db/scripts/docker-entrypoint.sh
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion images/tiler-db/scripts/update_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ for DB in template_postgis "$POSTGRES_DB" "${@}"; do
psql --dbname="$DB" -c "
CREATE EXTENSION IF NOT EXISTS hstore;
"
done
done
24 changes: 11 additions & 13 deletions images/tiler-imposm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM osgeo/gdal:ubuntu-small-3.2.3
FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.3

RUN apt-get -y update && apt-get install -y \
g++ \
Expand All @@ -18,21 +18,22 @@ RUN apt-get -y update && apt-get install -y \
curl \
wget \
unzip \
software-properties-common && \
ca-certificates \
software-properties-common \
python3-pip \
postgresql-client && \
rm -rf /var/lib/apt/lists/*

RUN add-apt-repository ppa:deadsnakes/ppa && \
apt-get update && \
apt-get install -y python3.9 python3.9-dev python3-pip && \
rm -rf /var/lib/apt/lists/* && \
python3 -m pip install pip --upgrade && \
python3 -m pip install wheel
RUN python3 -m pip install --no-cache-dir \
--break-system-packages \
awscli psycopg2-binary setuptools && \
rm -rf /root/.cache /var/cache/apk/*

RUN apt-get update && apt-get install -y postgresql-client && \
rm -rf /var/lib/apt/lists/*

RUN wget -c https://dl.google.com/go/go1.21.0.linux-amd64.tar.gz -O - | tar -xz -C /usr/local
ENV PATH $PATH:/usr/local/go/bin
RUN wget -c https://dl.google.com/go/go1.21.9.linux-amd64.tar.gz -O - | tar -xz -C /usr/local
ENV PATH="${PATH}:/usr/local/go/bin"

ENV DATEFUNCTIONS_GITSHA=90d8d0f0daea4c8c5aa62edf440f26e9eb0ab950
RUN git clone https://github.com/OpenHistoricalMap/DateFunctions-plpgsql.git /usr/local/datefunctions && cd /usr/local/datefunctions && git checkout $DATEFUNCTIONS_GITSHA
Expand All @@ -45,14 +46,11 @@ RUN git clone https://github.com/omniscale/imposm3.git $GOPATH/src/github.com/om
WORKDIR $GOPATH/src/github.com/omniscale/imposm3
RUN git checkout v0.14.2


# Apply fixes or patches (if necessary)
RUN sed -i '/setMaxFileSize/d' cache/ldb_pre_121.go
RUN go install github.com/omniscale/imposm3/cmd/imposm
ENV PATH $PATH:$GOPATH/bin

# Install AWS CLI for downloading files
RUN pip3 install -U setuptools awscli psycopg2
WORKDIR /osm
COPY . .
CMD ["./start.sh"]
64 changes: 23 additions & 41 deletions images/tiler-imposm/config/imposm3.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,9 @@
],
"type": "relation_member",
"filters": {
"exclude_tags": [
[
"area",
"yes"
]
]
"reject": {
"area": ["yes"]
}
},
"mappings": {
"railway": {
Expand Down Expand Up @@ -446,7 +443,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -557,12 +554,9 @@
]
},
"filters": {
"exclude_tags": [
[
"boundary",
"administrative"
]
]
"reject": {
"boundary": ["administrative"]
}
}
},
"water_areas": {
Expand All @@ -588,7 +582,7 @@
"key": null
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -768,7 +762,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -995,7 +989,7 @@
"key": null
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -1172,7 +1166,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -1534,12 +1528,9 @@
],
"type": "linestring",
"filters": {
"exclude_tags": [
[
"area",
"yes"
]
]
"reject": {
"area": ["yes"]
}
},
"mappings": {
"railway": {
Expand Down Expand Up @@ -1590,7 +1581,7 @@
"key": "name"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -1817,20 +1808,11 @@
],
"type": "linestring",
"filters": {
"exclude_tags": [
[
"area",
"yes"
],
[
"natural",
"coastline"
],
[
"boundary",
"administrative"
]
]
"reject": {
"area": ["yes"],
"natural": ["coastline"],
"boundary": ["administrative"]
}
},
"mappings": {
"landuse": {
Expand Down Expand Up @@ -1894,7 +1876,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -1955,7 +1937,7 @@
"key": null
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down Expand Up @@ -2043,7 +2025,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down
44 changes: 2 additions & 42 deletions images/tiler-imposm/config/layers/admin_areas.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,7 @@
"source:datetime"
]
},
"generalized_tables": {
"admin_areas_z0_2": {
"source": "admin_areas",
"tolerance": 5000,
"sql_filter": "admin_level IN (1,2)"
},

"admin_areas_z3_5": {
"source": "admin_areas",
"tolerance": 1000,
"sql_filter": "admin_level IN (1,2,3,4)"
},

"admin_areas_z6_7": {
"source": "admin_areas",
"tolerance": 200,
"sql_filter": "admin_level IN (1,2,3,4,5,6)"
},

"admin_areas_z8_9": {
"source": "admin_areas",
"tolerance": 100,
"sql_filter": "admin_level IN (1,2,3,4,5,6,7,8,9)"
},

"admin_areas_z10_12": {
"source": "admin_areas",
"tolerance": 20,
"sql_filter": "admin_level IN (1,2,3,4,5,6,7,8,9,10)"
},

"admin_areas_z13_15": {
"source": "admin_areas",
"tolerance": 5,
"sql_filter": "admin_level IN (1,2,3,4,5,6,7,8,9,10)"
},
"admin_areas_z16_20": {
"source": "admin_areas",
"sql_filter": "admin_level IN (1,2,3,4,5,6,7,8,9,10)"
}
},
"generalized_tables": {},
"tables": {
"admin_areas": {
"fields": [
Expand Down Expand Up @@ -92,7 +52,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down
22 changes: 1 addition & 21 deletions images/tiler-imposm/config/layers/admin_lines.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,7 @@
"source:datetime"
]
},
"generalized_tables": {
"admin_lines_z0_5": {
"source": "admin_lines_z6_9",
"sql_filter": "maritime='yes'",
"tolerance": 2000
},
"admin_lines_z6_9": {
"source": "admin_lines_z10_15",
"sql_filter": "maritime='yes'",
"tolerance": 500
},
"admin_lines_z10_15": {
"source": "admin_lines_z16_20",
"sql_filter": "maritime='yes'",
"tolerance": 10
},
"admin_lines_z16_20": {
"source": "admin_lines",
"sql_filter": "maritime='yes'"
}
},
"generalized_tables": {},
"tables": {
"admin_lines": {
"fields": [
Expand Down
2 changes: 1 addition & 1 deletion images/tiler-imposm/config/layers/amenity_areas.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down
2 changes: 1 addition & 1 deletion images/tiler-imposm/config/layers/buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down
2 changes: 1 addition & 1 deletion images/tiler-imposm/config/layers/landuse_areas.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"key": "end_date"
},
{
"type": "pseudoarea",
"type": "area",
"name": "area",
"key": null
},
Expand Down
Loading
Loading