update tests with polylabel and new interior algorithm

mapnik · Oct 11, 2017 · c13cdd7 · c13cdd7
1 parent e858453
commit c13cdd7
Show file tree

Hide file tree

Showing 148 changed files with 817 additions and 119 deletions.
diff --git a/images/interior-point-10-512-512-1.0-agg-reference.png b/images/interior-point-10-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-10-512-512-1.0-cairo-reference.png b/images/interior-point-10-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-10-512-512-1.0-grid-reference.png b/images/interior-point-10-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-10-512-512-2.0-agg-reference.png b/images/interior-point-10-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-10-512-512-2.0-cairo-reference.png b/images/interior-point-10-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-10-512-512-2.0-grid-reference.png b/images/interior-point-10-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-11-512-512-1.0-agg-reference.png b/images/interior-point-11-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-11-512-512-1.0-cairo-reference.png b/images/interior-point-11-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-11-512-512-1.0-grid-reference.png b/images/interior-point-11-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-11-512-512-2.0-agg-reference.png b/images/interior-point-11-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-11-512-512-2.0-cairo-reference.png b/images/interior-point-11-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-11-512-512-2.0-grid-reference.png b/images/interior-point-11-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-12-512-512-1.0-agg-reference.png b/images/interior-point-12-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-12-512-512-1.0-cairo-reference.png b/images/interior-point-12-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-12-512-512-1.0-grid-reference.png b/images/interior-point-12-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-12-512-512-2.0-agg-reference.png b/images/interior-point-12-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-12-512-512-2.0-cairo-reference.png b/images/interior-point-12-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-12-512-512-2.0-grid-reference.png b/images/interior-point-12-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-13-512-512-1.0-agg-reference.png b/images/interior-point-13-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-13-512-512-1.0-cairo-reference.png b/images/interior-point-13-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-13-512-512-1.0-grid-reference.png b/images/interior-point-13-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-13-512-512-2.0-agg-reference.png b/images/interior-point-13-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-13-512-512-2.0-cairo-reference.png b/images/interior-point-13-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-13-512-512-2.0-grid-reference.png b/images/interior-point-13-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-14-512-512-1.0-agg-reference.png b/images/interior-point-14-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-14-512-512-1.0-cairo-reference.png b/images/interior-point-14-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-14-512-512-1.0-grid-reference.png b/images/interior-point-14-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-14-512-512-2.0-agg-reference.png b/images/interior-point-14-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-14-512-512-2.0-cairo-reference.png b/images/interior-point-14-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-14-512-512-2.0-grid-reference.png b/images/interior-point-14-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-15-512-512-1.0-agg-reference.png b/images/interior-point-15-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-15-512-512-1.0-cairo-reference.png b/images/interior-point-15-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-15-512-512-1.0-grid-reference.png b/images/interior-point-15-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-15-512-512-2.0-agg-reference.png b/images/interior-point-15-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-15-512-512-2.0-cairo-reference.png b/images/interior-point-15-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-15-512-512-2.0-grid-reference.png b/images/interior-point-15-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-16-512-512-1.0-agg-reference.png b/images/interior-point-16-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-16-512-512-1.0-cairo-reference.png b/images/interior-point-16-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-16-512-512-1.0-grid-reference.png b/images/interior-point-16-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-16-512-512-2.0-agg-reference.png b/images/interior-point-16-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-16-512-512-2.0-cairo-reference.png b/images/interior-point-16-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-16-512-512-2.0-grid-reference.png b/images/interior-point-16-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-17-512-512-1.0-agg-reference.png b/images/interior-point-17-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-17-512-512-1.0-cairo-reference.png b/images/interior-point-17-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-17-512-512-1.0-grid-reference.png b/images/interior-point-17-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-17-512-512-2.0-agg-reference.png b/images/interior-point-17-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-17-512-512-2.0-cairo-reference.png b/images/interior-point-17-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-17-512-512-2.0-grid-reference.png b/images/interior-point-17-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-18-512-512-1.0-agg-reference.png b/images/interior-point-18-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-18-512-512-1.0-cairo-reference.png b/images/interior-point-18-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-18-512-512-1.0-grid-reference.png b/images/interior-point-18-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-18-512-512-2.0-agg-reference.png b/images/interior-point-18-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-18-512-512-2.0-cairo-reference.png b/images/interior-point-18-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-18-512-512-2.0-grid-reference.png b/images/interior-point-18-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-2-512-512-1.0-agg-reference.png b/images/interior-point-2-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-2-512-512-1.0-cairo-reference.png b/images/interior-point-2-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-2-512-512-1.0-grid-reference.png b/images/interior-point-2-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-2-512-512-2.0-agg-reference.png b/images/interior-point-2-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-2-512-512-2.0-cairo-reference.png b/images/interior-point-2-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-2-512-512-2.0-grid-reference.png b/images/interior-point-2-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-3-512-512-1.0-agg-reference.png b/images/interior-point-3-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-3-512-512-1.0-cairo-reference.png b/images/interior-point-3-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-3-512-512-1.0-grid-reference.png b/images/interior-point-3-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-3-512-512-2.0-agg-reference.png b/images/interior-point-3-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-3-512-512-2.0-cairo-reference.png b/images/interior-point-3-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-3-512-512-2.0-grid-reference.png b/images/interior-point-3-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-4-512-512-1.0-agg-reference.png b/images/interior-point-4-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-4-512-512-1.0-cairo-reference.png b/images/interior-point-4-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-4-512-512-1.0-grid-reference.png b/images/interior-point-4-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-4-512-512-2.0-agg-reference.png b/images/interior-point-4-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-4-512-512-2.0-cairo-reference.png b/images/interior-point-4-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-4-512-512-2.0-grid-reference.png b/images/interior-point-4-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-5-512-512-1.0-agg-reference.png b/images/interior-point-5-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-5-512-512-1.0-cairo-reference.png b/images/interior-point-5-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-5-512-512-1.0-grid-reference.png b/images/interior-point-5-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-5-512-512-2.0-agg-reference.png b/images/interior-point-5-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-5-512-512-2.0-cairo-reference.png b/images/interior-point-5-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-5-512-512-2.0-grid-reference.png b/images/interior-point-5-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-6-512-512-1.0-agg-reference.png b/images/interior-point-6-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-6-512-512-1.0-cairo-reference.png b/images/interior-point-6-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-6-512-512-1.0-grid-reference.png b/images/interior-point-6-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-6-512-512-2.0-agg-reference.png b/images/interior-point-6-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-6-512-512-2.0-cairo-reference.png b/images/interior-point-6-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-6-512-512-2.0-grid-reference.png b/images/interior-point-6-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-7-512-512-1.0-agg-reference.png b/images/interior-point-7-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-7-512-512-1.0-cairo-reference.png b/images/interior-point-7-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-7-512-512-1.0-grid-reference.png b/images/interior-point-7-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-7-512-512-2.0-agg-reference.png b/images/interior-point-7-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-7-512-512-2.0-cairo-reference.png b/images/interior-point-7-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-7-512-512-2.0-grid-reference.png b/images/interior-point-7-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-8-512-512-1.0-agg-reference.png b/images/interior-point-8-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-8-512-512-1.0-cairo-reference.png b/images/interior-point-8-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-8-512-512-1.0-grid-reference.png b/images/interior-point-8-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-8-512-512-2.0-agg-reference.png b/images/interior-point-8-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-8-512-512-2.0-cairo-reference.png b/images/interior-point-8-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-8-512-512-2.0-grid-reference.png b/images/interior-point-8-512-512-2.0-grid-reference.png
diff --git a/images/interior-point-9-512-512-1.0-agg-reference.png b/images/interior-point-9-512-512-1.0-agg-reference.png
diff --git a/images/interior-point-9-512-512-1.0-cairo-reference.png b/images/interior-point-9-512-512-1.0-cairo-reference.png
diff --git a/images/interior-point-9-512-512-1.0-grid-reference.png b/images/interior-point-9-512-512-1.0-grid-reference.png
diff --git a/images/interior-point-9-512-512-2.0-agg-reference.png b/images/interior-point-9-512-512-2.0-agg-reference.png
diff --git a/images/interior-point-9-512-512-2.0-cairo-reference.png b/images/interior-point-9-512-512-2.0-cairo-reference.png
diff --git a/images/interior-point-9-512-512-2.0-grid-reference.png b/images/interior-point-9-512-512-2.0-grid-reference.png
diff --git a/images/polygon-interior-1-800-800-1.0-agg-reference.png b/images/polygon-interior-1-800-800-1.0-agg-reference.png
diff --git a/images/polygon-interior-1-800-800-1.0-cairo-reference.png b/images/polygon-interior-1-800-800-1.0-cairo-reference.png
diff --git a/images/polygon-interior-1-800-800-1.0-grid-reference.png b/images/polygon-interior-1-800-800-1.0-grid-reference.png
diff --git a/images/polygon-interior-1-800-800-2.0-agg-reference.png b/images/polygon-interior-1-800-800-2.0-agg-reference.png
diff --git a/images/polygon-interior-1-800-800-2.0-cairo-reference.png b/images/polygon-interior-1-800-800-2.0-cairo-reference.png
diff --git a/images/polygon-interior-1-800-800-2.0-grid-reference.png b/images/polygon-interior-1-800-800-2.0-grid-reference.png
diff --git a/images/polygon-interior-2-800-800-1.0-agg-reference.png b/images/polygon-interior-2-800-800-1.0-agg-reference.png
diff --git a/images/polygon-interior-2-800-800-1.0-cairo-reference.png b/images/polygon-interior-2-800-800-1.0-cairo-reference.png
diff --git a/images/polygon-interior-2-800-800-1.0-grid-reference.png b/images/polygon-interior-2-800-800-1.0-grid-reference.png
diff --git a/images/polygon-interior-2-800-800-2.0-agg-reference.png b/images/polygon-interior-2-800-800-2.0-agg-reference.png
diff --git a/images/polygon-interior-2-800-800-2.0-cairo-reference.png b/images/polygon-interior-2-800-800-2.0-cairo-reference.png
diff --git a/images/polygon-interior-2-800-800-2.0-grid-reference.png b/images/polygon-interior-2-800-800-2.0-grid-reference.png
diff --git a/images/polygon-interior-3-800-800-1.0-agg-reference.png b/images/polygon-interior-3-800-800-1.0-agg-reference.png
diff --git a/images/polygon-interior-3-800-800-1.0-cairo-reference.png b/images/polygon-interior-3-800-800-1.0-cairo-reference.png
diff --git a/images/polygon-interior-3-800-800-1.0-grid-reference.png b/images/polygon-interior-3-800-800-1.0-grid-reference.png
diff --git a/images/polygon-interior-3-800-800-2.0-agg-reference.png b/images/polygon-interior-3-800-800-2.0-agg-reference.png
diff --git a/images/polygon-interior-3-800-800-2.0-cairo-reference.png b/images/polygon-interior-3-800-800-2.0-cairo-reference.png
diff --git a/images/polygon-interior-3-800-800-2.0-grid-reference.png b/images/polygon-interior-3-800-800-2.0-grid-reference.png
diff --git a/images/tiff-reprojection-2-250-250-1.0-agg-reference.png b/images/tiff-reprojection-2-250-250-1.0-agg-reference.png
diff --git a/images/tiff-reprojection-2-250-250-1.0-cairo-reference.png b/images/tiff-reprojection-2-250-250-1.0-cairo-reference.png
diff --git a/images/tiff-reprojection-2-250-250-2.0-agg-reference.png b/images/tiff-reprojection-2-250-250-2.0-agg-reference.png
diff --git a/images/tiff-reprojection-2-250-250-2.0-cairo-reference.png b/images/tiff-reprojection-2-250-250-2.0-cairo-reference.png
diff --git a/images/tiff-reprojection-2-raster-250-250-1.0-agg-reference.png b/images/tiff-reprojection-2-raster-250-250-1.0-agg-reference.png
diff --git a/images/tiff-reprojection-2-raster-250-250-1.0-cairo-reference.png b/images/tiff-reprojection-2-raster-250-250-1.0-cairo-reference.png
diff --git a/images/tiff-reprojection-2-raster-250-250-2.0-agg-reference.png b/images/tiff-reprojection-2-raster-250-250-2.0-agg-reference.png
diff --git a/images/tiff-reprojection-2-raster-250-250-2.0-cairo-reference.png b/images/tiff-reprojection-2-raster-250-250-2.0-cairo-reference.png
diff --git a/styles/interior-point-10.xml b/styles/interior-point-10.xml
@@ -21,41 +21,73 @@
                 stroke="red"
                 stroke-width="1"
                 />
+
             <MarkersSymbolizer
                 placement="interior"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="blue"
+                width="15"
+                height="15"
                 />
             <MarkersSymbolizer
                 placement="point"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="green"
+                width="15"
+                height="15"
+                />
+            <MarkersSymbolizer
+                placement="polylabel"
+                ignore-placement="true"
+                allow-overlap="true"
+                fill="red"
+                width="15"
+                height="15"
                 />
+
             <TextSymbolizer
                 placement="interior"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="blue"
                 halo-radius="1"
                 halo-fill="white"
-                dx="-12"
+                dx="12"
+                dy="12"
                 >
-                "Interior\nplacement"
+                "Interior"
             </TextSymbolizer>
             <TextSymbolizer
                 placement="centroid"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
+                face-name="DejaVu Sans Book"
+                size="12"
+                fill="green"
+                halo-radius="1"
+                halo-fill="white"
+                dx="12"
+                dy="12"
+                >
+                "Centroid"
+            </TextSymbolizer>
+            <TextSymbolizer
+                placement="polylabel"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="red"
                 halo-radius="1"
                 halo-fill="white"
                 dx="12"
+                dy="12"
                 >
-                "Centroid\nplacement"
+                "Polylabel"
             </TextSymbolizer>
         </Rule>
     </Style>

diff --git a/styles/interior-point-11.xml b/styles/interior-point-11.xml
@@ -21,41 +21,73 @@
                 stroke="red"
                 stroke-width="1"
                 />
+
             <MarkersSymbolizer
                 placement="interior"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="blue"
+                width="15"
+                height="15"
                 />
             <MarkersSymbolizer
                 placement="point"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="green"
+                width="15"
+                height="15"
+                />
+            <MarkersSymbolizer
+                placement="polylabel"
+                ignore-placement="true"
+                allow-overlap="true"
+                fill="red"
+                width="15"
+                height="15"
                 />
+
             <TextSymbolizer
                 placement="interior"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="blue"
                 halo-radius="1"
                 halo-fill="white"
-                dx="-12"
+                dx="12"
+                dy="12"
                 >
-                "Interior\nplacement"
+                "Interior"
             </TextSymbolizer>
             <TextSymbolizer
                 placement="centroid"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
+                face-name="DejaVu Sans Book"
+                size="12"
+                fill="green"
+                halo-radius="1"
+                halo-fill="white"
+                dx="12"
+                dy="12"
+                >
+                "Centroid"
+            </TextSymbolizer>
+            <TextSymbolizer
+                placement="polylabel"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="red"
                 halo-radius="1"
                 halo-fill="white"
                 dx="12"
+                dy="12"
                 >
-                "Centroid\nplacement"
+                "Polylabel"
             </TextSymbolizer>
         </Rule>
     </Style>

diff --git a/styles/interior-point-12.xml b/styles/interior-point-12.xml
@@ -21,43 +21,73 @@
                 stroke="red"
                 stroke-width="1"
                 />
+
             <MarkersSymbolizer
                 placement="interior"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="blue"
-                width="20"
-                height="20"
+                width="15"
+                height="15"
                 />
             <MarkersSymbolizer
                 placement="point"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="green"
+                width="15"
+                height="15"
+                />
+            <MarkersSymbolizer
+                placement="polylabel"
+                ignore-placement="true"
+                allow-overlap="true"
+                fill="red"
+                width="15"
+                height="15"
                 />
+
             <TextSymbolizer
                 placement="interior"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="blue"
                 halo-radius="1"
                 halo-fill="white"
-                dx="-2"
+                dx="12"
+                dy="12"
                 >
-                "Interior\nplacement"
+                "Interior"
             </TextSymbolizer>
             <TextSymbolizer
                 placement="centroid"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
+                face-name="DejaVu Sans Book"
+                size="12"
+                fill="green"
+                halo-radius="1"
+                halo-fill="white"
+                dx="12"
+                dy="12"
+                >
+                "Centroid"
+            </TextSymbolizer>
+            <TextSymbolizer
+                placement="polylabel"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="red"
                 halo-radius="1"
                 halo-fill="white"
-                dx="2"
+                dx="12"
+                dy="12"
                 >
-                "Centroid\nplacement"
+                "Polylabel"
             </TextSymbolizer>
         </Rule>
     </Style>

diff --git a/styles/interior-point-13.xml b/styles/interior-point-13.xml
@@ -21,41 +21,73 @@
                 stroke="red"
                 stroke-width="1"
                 />
+
             <MarkersSymbolizer
                 placement="interior"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="blue"
+                width="15"
+                height="15"
                 />
             <MarkersSymbolizer
                 placement="point"
                 ignore-placement="true"
                 allow-overlap="true"
                 fill="green"
+                width="15"
+                height="15"
+                />
+            <MarkersSymbolizer
+                placement="polylabel"
+                ignore-placement="true"
+                allow-overlap="true"
+                fill="red"
+                width="15"
+                height="15"
                 />
+
             <TextSymbolizer
                 placement="interior"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="blue"
                 halo-radius="1"
                 halo-fill="white"
                 dx="12"
+                dy="12"
                 >
-                "Interior\nplacement"
+                "Interior"
             </TextSymbolizer>
             <TextSymbolizer
                 placement="centroid"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
                 face-name="DejaVu Sans Book"
-                allow-overlap="true"
                 size="12"
-                fill="black"
+                fill="green"
                 halo-radius="1"
                 halo-fill="white"
-                dx="-12"
+                dx="12"
+                dy="12"
+                >
+                "Centroid"
+            </TextSymbolizer>
+            <TextSymbolizer
+                placement="polylabel"
+                placement-type="simple"
+                placements="C,N,S,W,E,NE,SE,NW,SW"
+                face-name="DejaVu Sans Book"
+                size="12"
+                fill="red"
+                halo-radius="1"
+                halo-fill="white"
+                dx="12"
+                dy="12"
                 >
-                "Centroid\nplacement"
+                "Polylabel"
             </TextSymbolizer>
         </Rule>
     </Style>