ST_buffer replaced by text-dy to offset boundary labels

diff --git a/hdm.mml b/hdm.mml
index 155070f2b71469f35bc57d336cf3b0374fae9579..a80b188ced6a7939548e6546034dd1a74e700000 100644 (file)
--- a/hdm.mml
+++ b/hdm.mml
@@ -1163,7 +1163,7 @@
       "Datasource": {
         "type": "postgis",
         "extent": "-20037508,-19929239,20037508,19929239",
-        "table": "( SELECT ST_Simplify(ST_buffer(p.way,-!pixel_width!*7),1) as way, name, cast(regexp_replace(admin_level,'[^0-9]','','g') as integer) as admin_level FROM planet_osm_polygon p where ST_Intersects(p.way,!bbox!) AND not ST_ContainsProperly(!bbox!, p.way) AND boundary='administrative' AND admin_level IN ('0', '2', '3', '4') order by admin_level) as data",
+        "table": "( SELECT p.way as way, name, cast(regexp_replace(admin_level,'[^0-9]','','g') as integer) as admin_level FROM planet_osm_polygon p where ST_Intersects(p.way,!bbox!) AND not ST_ContainsProperly(!bbox!, p.way) AND boundary='administrative' AND admin_level IN ('0', '2', '3', '4') order by admin_level) as data",
         "key_field": "",
         "geometry_field": "way",
         "extent_cache": "auto",
@@ -1189,7 +1189,7 @@
       "Datasource": {
         "type": "postgis",
         "extent": "-20037508,-19929239,20037508,19929239",
-        "table": "( SELECT ST_Simplify(ST_buffer(p.way,-!pixel_width!*7),1) as way, name, cast(regexp_replace(admin_level,'[^0-9]','','g') as integer) as admin_level FROM planet_osm_polygon p where ST_Intersects(p.way,!bbox!) AND not ST_ContainsProperly(!bbox!, p.way) AND boundary='administrative' AND admin_level IN ('5', '6', '7', '8', '9', '10') order by admin_level) as data",
+        "table": "( SELECT p.way as way, name, cast(regexp_replace(admin_level,'[^0-9]','','g') as integer) as admin_level FROM planet_osm_polygon p where ST_Intersects(p.way,!bbox!) AND not ST_ContainsProperly(!bbox!, p.way) AND boundary='administrative' AND admin_level IN ('5', '6', '7', '8', '9', '10') order by admin_level) as data",
         "key_field": "",
         "geometry_field": "way",
         "extent_cache": "auto",

diff --git a/labels.mss b/labels.mss
index 5be10a362a5918d86b99176004b6fbe827efd1aa..740c7fde157e65634a820a48d9e6f4de85cf1f09 100644 (file)
--- a/labels.mss
+++ b/labels.mss
@@ -554,6 +554,7 @@
   text-fill: @admin_2_text;
   text-size: 10;
   text-placement: line;
+  text-dy: -7;
   text-face-name: @sans_lt_italic;
   text-halo-radius: 2;
   text-halo-fill: @place_halo;