Skip to content

Commit 2739b4b

Browse files
Rub21Rub21
authored
Update attributes for transport_lines and add address (#746)
* Fix expressway in transport_lines * Add config for adr:housenumber * Remove addr:* from imposm exclude list * Add address points config for mv * Add lang to json scripts in martin * Update expressway for multilines * Create mv for address * Update expressway column type * Fix function for expressway column * Set two volumens for martin, static an dynamic * Set Null when values is 0 for tunnel, bridge, oneway and expressway * Fix function for transport lines * Rename columns for address with prefix "addr_" and remove address atribute from other_points * Add address points layer
1 parent 372d22c commit 2739b4b

21 files changed

Lines changed: 439 additions & 78 deletions

‎compose/martin.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Martin tile server + Varnish cache
2-
# Caching: Varnish only. Nginx in Martin does routing/gzip/tilejson/static.
3-
# Invalidation: BAN requests from tiler-cache (replaces TTL-based invalidation).
41
services:
52
varnish:
63
image: varnish:7.5
@@ -76,4 +73,4 @@ services:
7673

7774
networks:
7875
ohm_network:
79-
external: true
76+
external: true

‎hetzner/tiler/tiler.production.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,11 @@ services:
8888
ports:
8989
- "3030:80"
9090
volumes:
91-
- tiler_martin_nginx_cache:/var/cache/nginx
91+
- tiler_martin_nginx_cache_dynamic:/var/cache/nginx/tiles
92+
- tiler_martin_nginx_cache_static:/var/cache/nginx/static_tiles
9293
networks:
9394
- ohm_network
94-
95+
9596

9697
volumes:
9798
tiler_pgdata:
@@ -103,9 +104,12 @@ volumes:
103104
tiler_monitor_data:
104105
driver: local
105106
name: tiler_monitor_1704
106-
tiler_martin_nginx_cache:
107+
tiler_martin_nginx_cache_dynamic:
108+
driver: local
109+
name: tiler_martin_nginx_cache_dynamic_1704
110+
tiler_martin_nginx_cache_static:
107111
driver: local
108-
name: tiler_martin_nginx_cache_1704
112+
name: tiler_martin_nginx_cache_static
109113
networks:
110114
ohm_network:
111115
external: true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"contact:*",
2727
"opening_hours",
2828
"opening_hours:*",
29-
"addr:*",
3029
"is_in",
3130
"is_in:*",
3231
"attribution",

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

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
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+
"address_points": {
13+
"fields": [
14+
{
15+
"type": "id",
16+
"name": "osm_id",
17+
"key": null
18+
},
19+
{
20+
"type": "geometry",
21+
"name": "geometry",
22+
"key": null
23+
},
24+
{
25+
"type": "string",
26+
"name": "name",
27+
"key": "name"
28+
},
29+
{
30+
"type": "string",
31+
"name": "addr_housenumber",
32+
"key": "addr:housenumber"
33+
},
34+
{
35+
"type": "string",
36+
"name": "addr_housename",
37+
"key": "addr:housename"
38+
},
39+
{
40+
"type": "string",
41+
"name": "addr_unit",
42+
"key": "addr:unit"
43+
},
44+
{
45+
"type": "string",
46+
"name": "addr_street",
47+
"key": "addr:street"
48+
},
49+
{
50+
"type": "string",
51+
"name": "addr_city",
52+
"key": "addr:city"
53+
},
54+
{
55+
"type": "string",
56+
"name": "addr_postcode",
57+
"key": "addr:postcode"
58+
},
59+
{
60+
"type": "string",
61+
"name": "start_date",
62+
"key": "start_date"
63+
},
64+
{
65+
"type": "string",
66+
"name": "end_date",
67+
"key": "end_date"
68+
},
69+
{
70+
"type": "hstore_tags",
71+
"name": "tags",
72+
"key": null
73+
}
74+
],
75+
"type": "point",
76+
"filters": {
77+
"reject": {
78+
"building": ["__any__"],
79+
"shop": ["__any__"],
80+
"amenity": ["__any__"],
81+
"tourism": ["__any__"],
82+
"office": ["__any__"],
83+
"craft": ["__any__"],
84+
"leisure": ["__any__"],
85+
"historic": ["__any__"],
86+
"man_made": ["__any__"],
87+
"emergency": ["__any__"],
88+
"healthcare": ["__any__"],
89+
"public_transport": ["__any__"],
90+
"aeroway": ["__any__"],
91+
"railway": ["__any__"],
92+
"highway": ["__any__"],
93+
"power": ["__any__"],
94+
"natural": ["__any__"],
95+
"landuse": ["__any__"],
96+
"place": ["__any__"],
97+
"military": ["__any__"]
98+
}
99+
},
100+
"mapping": {
101+
"addr:housenumber": ["__any__"]
102+
}
103+
}
104+
}
105+
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,36 @@
4646
"name": "end_date",
4747
"key": "end_date"
4848
},
49+
{
50+
"type": "string",
51+
"name": "addr_housenumber",
52+
"key": "addr:housenumber"
53+
},
54+
{
55+
"type": "string",
56+
"name": "addr_housename",
57+
"key": "addr:housename"
58+
},
59+
{
60+
"type": "string",
61+
"name": "addr_unit",
62+
"key": "addr:unit"
63+
},
64+
{
65+
"type": "string",
66+
"name": "addr_street",
67+
"key": "addr:street"
68+
},
69+
{
70+
"type": "string",
71+
"name": "addr_city",
72+
"key": "addr:city"
73+
},
74+
{
75+
"type": "string",
76+
"name": "addr_postcode",
77+
"key": "addr:postcode"
78+
},
4979
{
5080
"type": "area",
5181
"name": "area",

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,36 @@
4646
"name": "end_date",
4747
"key": "end_date"
4848
},
49+
{
50+
"type": "string",
51+
"name": "addr_housenumber",
52+
"key": "addr:housenumber"
53+
},
54+
{
55+
"type": "string",
56+
"name": "addr_housename",
57+
"key": "addr:housename"
58+
},
59+
{
60+
"type": "string",
61+
"name": "addr_unit",
62+
"key": "addr:unit"
63+
},
64+
{
65+
"type": "string",
66+
"name": "addr_street",
67+
"key": "addr:street"
68+
},
69+
{
70+
"type": "string",
71+
"name": "addr_city",
72+
"key": "addr:city"
73+
},
74+
{
75+
"type": "string",
76+
"name": "addr_postcode",
77+
"key": "addr:postcode"
78+
},
4979
{
5080
"type": "hstore_tags",
5181
"name": "tags",

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,36 @@
5151
"name": "end_date",
5252
"key": "end_date"
5353
},
54+
{
55+
"type": "string",
56+
"name": "addr_housenumber",
57+
"key": "addr:housenumber"
58+
},
59+
{
60+
"type": "string",
61+
"name": "addr_housename",
62+
"key": "addr:housename"
63+
},
64+
{
65+
"type": "string",
66+
"name": "addr_unit",
67+
"key": "addr:unit"
68+
},
69+
{
70+
"type": "string",
71+
"name": "addr_street",
72+
"key": "addr:street"
73+
},
74+
{
75+
"type": "string",
76+
"name": "addr_city",
77+
"key": "addr:city"
78+
},
79+
{
80+
"type": "string",
81+
"name": "addr_postcode",
82+
"key": "addr:postcode"
83+
},
5484
{
5585
"type": "area",
5686
"name": "area",

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,36 @@
4646
"name": "end_date",
4747
"key": "end_date"
4848
},
49+
{
50+
"type": "string",
51+
"name": "addr_housenumber",
52+
"key": "addr:housenumber"
53+
},
54+
{
55+
"type": "string",
56+
"name": "addr_housename",
57+
"key": "addr:housename"
58+
},
59+
{
60+
"type": "string",
61+
"name": "addr_unit",
62+
"key": "addr:unit"
63+
},
64+
{
65+
"type": "string",
66+
"name": "addr_street",
67+
"key": "addr:street"
68+
},
69+
{
70+
"type": "string",
71+
"name": "addr_city",
72+
"key": "addr:city"
73+
},
74+
{
75+
"type": "string",
76+
"name": "addr_postcode",
77+
"key": "addr:postcode"
78+
},
4979
{
5080
"type": "hstore_tags",
5181
"name": "tags",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"type": "string",
4646
"name": "end_date",
4747
"key": "end_date"
48-
},
48+
},
4949
{
5050
"type": "hstore_tags",
5151
"name": "tags",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"key": "route"
114114
},
115115
{
116-
"type": "string",
116+
"type": "boolint",
117117
"name": "expressway",
118118
"key": "expressway"
119119
},

0 commit comments

Comments
 (0)