diff --git a/project.mml b/project.mml index 45eb83bb16..33a3f01cf3 100644 --- a/project.mml +++ b/project.mml @@ -1354,7 +1354,7 @@ "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", "Datasource": { "extent": "-20037508,-20037508,20037508,20037508", - "table": " (SELECT way, highway, junction, ref, name\n FROM planet_osm_point\n WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'\n ) AS junctions", + "table": " ( SELECT way, highway, junction, ref, name\n FROM planet_osm_point\n WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'\n UNION\n SELECT ST_BuildArea(way), highway, junction, ref, name\n FROM planet_osm_line\n WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'\n ) AS junctions", "geometry_field": "way", "type": "postgis", "key_field": "", diff --git a/project.yaml b/project.yaml index ce5c76a9e4..1447ab5a89 100644 --- a/project.yaml +++ b/project.yaml @@ -1294,9 +1294,13 @@ Layer: Datasource: <<: *osm2pgsql table: |2- - (SELECT way, highway, junction, ref, name - FROM planet_osm_point - WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes' + ( SELECT way, highway, junction, ref, name + FROM planet_osm_point + WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes' + UNION + SELECT ST_BuildArea(way), highway, junction, ref, name + FROM planet_osm_line + WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes' ) AS junctions advanced: {} - id: "roads-text-ref" diff --git a/roads.mss b/roads.mss index 32524b0b2c..8a470f4cf7 100644 --- a/roads.mss +++ b/roads.mss @@ -1842,6 +1842,7 @@ text-halo-radius: 1; text-wrap-width: 30; text-min-distance: 2; + text-placement: interior; [zoom >= 14] { text-size: 9; }