Skip to content

Commit 4b5ffc4

Browse files
Rub21Rub21
committed
Merge from tiler config
2 parents 928f3d2 + e97d199 commit 4b5ffc4

File tree

4 files changed

+120
-192
lines changed

4 files changed

+120
-192
lines changed

‎.env-tiler.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ POSTGRES_PORT=5432
2424
# tiler-imposm evn variables
2525
# ====================================================================================================
2626
TILER_IMPORT_FROM=osm
27-
TILER_IMPORT_PBF_URL=https://osmseed.s3.amazonaws.com/planet/planet-latest.osm.pbf
27+
TILER_IMPORT_PBF_URL=http://glunimore.geofabrik.de/europe/monaco-latest.osm.pbf
2828
#TILER_IMPORT_LIMIT='geojson url'
2929
SEQUENCE_NUMBER=0
30-
REPLICATION_URL=https://osmseed.s3.amazonaws.com/replication/minute/
30+
REPLICATION_URL=http://download.openstreetmap.fr/replication/europe/monaco/minute/
3131

3232
# ====================================================================================================
3333
# tiler-serve env variables,

‎docker-compose.yml

Lines changed: 41 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -1,198 +1,54 @@
11
version: '3'
22
services:
3-
# web:
4-
# image: osmseed-openstreetmap-website:v1
5-
# build:
6-
# context: ./openstreetmap-website
7-
# dockerfile: Dockerfile
8-
# ports:
9-
# - "80:80"
10-
# env_file:
11-
# - ./.env
12-
# depends_on:
13-
# - db
14-
# db:
15-
# image: osmseed-db:v1
16-
# build:
17-
# context: ./db
18-
# dockerfile: Dockerfile
19-
# ports:
20-
# - "5432:5432"
21-
# volumes:
22-
# - ./postgres-data:/var/lib/postgresql/data
23-
# env_file:
24-
# - ./.env
25-
# planet-dump:
26-
# image: osmseed-planet-dump:v1
27-
# build:
28-
# context: ./planet-dump
29-
# dockerfile: Dockerfile
30-
# depends_on:
31-
# - db
32-
# volumes:
33-
# - ./planet-dump-data:/app
34-
# command: >
35-
# /bin/bash -c "
36-
# echo Sleep the planet-dump for a while!;
37-
# sleep 40;
38-
# echo Creating the planet-dump!;
39-
# ./start.sh"
40-
# env_file:
41-
# - ./.env
42-
# db-backup-restore:
43-
# image: osmseed-db-backup-restore:v1
44-
# build:
45-
# context: ./db-backup-restore
46-
# dockerfile: Dockerfile
47-
# depends_on:
48-
# - db
49-
# command: >
50-
# /bin/bash -c "
51-
# echo Sleep for a while!;
52-
# sleep 20;
53-
# echo Building backup!;
54-
# ./start.sh"
55-
# env_file:
56-
# - ./.env
57-
# replication-job:
58-
# image: osmseed-replication-job:v1
59-
# build:
60-
# context: ./replication-job
61-
# dockerfile: Dockerfile
62-
# volumes:
63-
# - ./replication-job:/mnt/data
64-
# depends_on:
65-
# - db
66-
# command: >
67-
# /bin/bash -c "
68-
# echo Sleep the replication-job for a while!;
69-
# sleep 40;
70-
# echo Creating the replication-job!;
71-
# ./start.sh"
72-
# env_file:
73-
# - ./.env
74-
# populate-apidb:
75-
# image: osmseed-populate-apidb:v1
76-
# build:
77-
# context: ./populate-apidb
78-
# dockerfile: Dockerfile
79-
# volumes:
80-
# - ./populate-apidb-data:/app/data
81-
# depends_on:
82-
# - db
83-
# command: >
84-
# /bin/bash -c "
85-
# echo Sleep for a while populate-apidb!;
86-
# sleep 70s;
87-
# echo Starting populate-apidb!;
88-
# ./start.sh"
89-
# env_file:
90-
# - ./.env
91-
# osm-processor:
92-
# image: osmseed-osm-processor:v1
93-
# build:
94-
# context: ./osm-processor
95-
# dockerfile: Dockerfile
96-
# env_file:
97-
# - ./.env
98-
# full-history:
99-
# image: osmseed-full-history:v1
100-
# build:
101-
# context: ./full-history
102-
# dockerfile: Dockerfile
103-
# depends_on:
104-
# - web
105-
# - db
106-
# volumes:
107-
# - ./full-history-data:/mnt/data
108-
# command: >
109-
# /bin/bash -c "
110-
# echo Sleep full-history for a while!;
111-
# sleep 40;
112-
# echo Starting full-history!;
113-
# ./start.sh"
114-
# env_file:
115-
# - ./.env
116-
# # #=========================================================================
117-
# # OMS-SEED-TILER section
118-
# #=========================================================================
119-
# tiler-db:
120-
# image: osmseed-tiler-db:v1
121-
# build:
122-
# context: ./tiler-db
123-
# dockerfile: Dockerfile
124-
# ports:
125-
# - "5433:5432"
126-
# volumes:
127-
# - ./postgres-gis-data:/var/lib/postgresql/data
128-
# env_file:
129-
# - ./.env-tiler
130-
# tiler-imposm:
131-
# image: osmseed-tiler-imposm:v1
132-
# build:
133-
# context: ./tiler-imposm
134-
# dockerfile: Dockerfile
135-
# volumes:
136-
# - ./tiler-imposm-data:/mnt/data
137-
# depends_on:
138-
# - tiler-db
139-
# env_file:
140-
# - ./.env-tiler
141-
# command: >
142-
# /bin/bash -c "
143-
# echo Sleep for a while!;
144-
# sleep 20;
145-
# echo starting imposm!;
146-
# ./start.sh"
147-
# tiler-server:
148-
# image: osmseed-tiler-server:v1
149-
# build:
150-
# context: ./tiler-server
151-
# dockerfile: Dockerfile
152-
# volumes:
153-
# - ./tiler-server-data:/mnt/data
154-
# depends_on:
155-
# - tiler-db
156-
# - tiler-imposm
157-
# ports:
158-
# - "9090:9090"
159-
# command: >
160-
# /bin/bash -c "
161-
# echo Sleep for a while!;
162-
# sleep 100;
163-
# echo Starting tiles server!;
164-
# ./start.sh"
165-
# env_file:
166-
# - ./.env-tiler
1673
#=========================================================================
168-
# NOMINATIM section
4+
# OMS-SEED-TILER section
1695
#=========================================================================
170-
171-
# nominatim-db:
172-
# image: nominatim-db:v1
173-
# build:
174-
# context: ./images/nominatim
6+
# tiler-db:
7+
# image: osmseed-tiler-db:v1
8+
# build:
9+
# context: ./images/tiler-db
17510
# dockerfile: Dockerfile
17611
# ports:
177-
# - '6432:5432'
12+
# - "5433:5432"
17813
# volumes:
179-
# - ./nominatim-pgdata:/var/lib/postgresql/data
14+
# - ./postgres-gis-data:/var/lib/postgresql/data
18015
# env_file:
181-
# - ./.env-nominatim
16+
# - ./.env-tiler
17+
# tiler-imposm:
18+
# image: osmseed-tiler-imposm:v1
19+
# build:
20+
# context: ./images/tiler-imposm
21+
# dockerfile: Dockerfile
22+
# volumes:
23+
# - ./tiler-imposm-data:/mnt/data
24+
# depends_on:
25+
# - tiler-db
26+
# env_file:
27+
# - ./.env-tiler
18228
# command: >
183-
# /bin/bash -c "sh /app/start.sh"
184-
185-
# nominatim-api:
186-
# image: nominatim-api:v1
187-
# build:
188-
# context: ./images/nominatim
29+
# /bin/bash -c "
30+
# echo Sleep for a while!;
31+
# sleep 20;
32+
# echo starting imposm!;
33+
# ./start.sh"
34+
# tiler-server:
35+
# image: osmseed-tiler-server:v1
36+
# build:
37+
# context: ./images/tiler-server
18938
# dockerfile: Dockerfile
39+
# volumes:
40+
# - ./tiler-server-data:/mnt/data
41+
# depends_on:
42+
# - tiler-db
43+
# - tiler-imposm
19044
# ports:
191-
# - '7070:8080'
192-
# env_file:
193-
# - ./.env-nominatim
194-
# entrypoint: sh /app/startapache.sh
195-
45+
# - "9090:9090"
46+
# command: >
47+
# /bin/bash -c "
48+
# echo Sleep for a while!;
49+
# sleep 100;
50+
# echo Starting tiles server!;
51+
# ./start.sh"
19652
#=========================================================================
19753
# OVERPASS section
19854
#=========================================================================
@@ -206,4 +62,4 @@ services:
20662
volumes:
20763
- ./overpass-api-db:/db
20864
env_file:
209-
- ./.env-overpass
65+
- ./.env-overpass

‎images/planet-dump/start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ osmosis --read-apidb \
3030
# AWS
3131
if [ $CLOUDPROVIDER == "aws" ]; then
3232
# Save the path file
33-
echo "https://$AWS_S3_BUCKET.s3.amazonaws.com/planet/$planetPBFFile" > $stateFile
33+
AWS_URL=${AWS_S3_BUCKET/s3:\/\//http:\/\/}
34+
echo "$AWS_URL.s3.amazonaws.com/planet/$planetPBFFile" > $stateFile
3435
# Upload to S3
3536
aws s3 cp $planetPBFFile $AWS_S3_BUCKET/planet/$planetPBFFile --acl public-read
3637
aws s3 cp $stateFile $AWS_S3_BUCKET/planet/$stateFile --acl public-read

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

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,46 @@
130130
]
131131
}
132132
},
133+
"place_areas": {
134+
"fields": [
135+
{
136+
"type": "id",
137+
"name": "osm_id",
138+
"key": null
139+
},
140+
{
141+
"type": "geometry",
142+
"name": "geometry",
143+
"key": null
144+
},
145+
{
146+
"type": "string",
147+
"name": "name",
148+
"key": "name"
149+
},
150+
{
151+
"type": "mapping_value",
152+
"name": "type",
153+
"key": null
154+
},
155+
{
156+
"type": "integer",
157+
"name": "population",
158+
"key": "population"
159+
},
160+
{
161+
"type": "hstore_tags",
162+
"name": "tags",
163+
"key": null
164+
}
165+
],
166+
"type": "polygon",
167+
"mapping": {
168+
"place": [
169+
"__any__"
170+
]
171+
}
172+
},
133173
"landuse_areas": {
134174
"fields": [
135175
{
@@ -398,6 +438,11 @@
398438
"name": "service",
399439
"key": "service"
400440
},
441+
{
442+
"type": "string",
443+
"name": "ford",
444+
"key": "ford"
445+
},
401446
{
402447
"type": "mapping_key",
403448
"name": "class",
@@ -416,25 +461,25 @@
416461
]
417462
},
418463
"mappings": {
419-
"railway": {
464+
"railway": {
420465
"mapping": {
421466
"railway": [
422467
"__any__"
423-
]
468+
]
424469
}
425470
},
426471
"highway": {
427472
"mapping": {
428473
"highway": [
429474
"__any__"
430-
]
475+
]
431476
}
432477
},
433478
"aeroway": {
434479
"mapping": {
435480
"aeroway": [
436481
"__any__"
437-
]
482+
]
438483
}
439484
}
440485
}
@@ -456,6 +501,11 @@
456501
"name": "name",
457502
"key": "name"
458503
},
504+
{
505+
"type": "string",
506+
"name": "area",
507+
"key": "area"
508+
},
459509
{
460510
"type": "mapping_value",
461511
"name": "type",
@@ -636,6 +686,27 @@
636686
"__any__"
637687
]
638688
}
689+
},
690+
"tourism": {
691+
"mapping": {
692+
"tourism": [
693+
"__any__"
694+
]
695+
}
696+
},
697+
"shop": {
698+
"mapping": {
699+
"shop": [
700+
"__any__"
701+
]
702+
}
703+
},
704+
"craft": {
705+
"mapping": {
706+
"craft": [
707+
"__any__"
708+
]
709+
}
639710
}
640711
}
641712
},

0 commit comments

Comments
 (0)