Labelling: Bugfixes in get_closure

[leo.git] / map.cf

diff --git a/map.cf b/map.cf
index 145ea6565e6e355c47be8cffc14ff5e9b31acd16..3f3a70b8eb85f0ef53988a321cf3b95f0cc00bb2 100644 (file)
--- a/map.cf
+++ b/map.cf
@@ -2,7 +2,7 @@ Map {
        # Data sources
        Source {
                # Input file
-               File dump.osm
+               File lada.osm
 
                # File format:
                #       osmxml          OpenStreetMap XML
@@ -14,19 +14,14 @@ Map {
                StyleSheet poskole.css
        }
 
-       Source {
-               Format fixed
-               StyleSheet poskole.css
-       }
-
        # Projection of our map
        Projection "+proj=utm +zone=33 +ellps=WGS84"
 
        # Which part of the map should drawn (in projected coordinates)
-       MinX 464737
-       MaxX 471140
-       MinY 5552849
-       MaxY 5557376
+       MinX 466902
+       MaxX 468293
+       MinY 5615902
+       MaxY 5616938
 
        # Draw on A3 paper
        PageWidth 420
@@ -37,28 +32,18 @@ Map {
        # PageHeight 210
 
        # Clip output to the requested rectangle
-       Clip 1
+       Clip 0
 
        # Rotate the map by 90 degrees
        Rotate 0
 
        # Draw blue border around the requested rectangle
-       DrawBorder 0
+       DrawBorder 1
 
        # Write SVG output here
        SVGOutput output.svg
 }
 
-FixedObjects {
-       # Fixed objects may be placed at specific positions on the paper
-       # with specific tags. Remember to enable the "fixed" data source.
-       Object {
-               X 100
-               Y 100
-               Tag legend logo
-       }
-}
-
 Debug {
        # Dump map data exactly as parsed
        DumpSource 0
@@ -82,6 +67,15 @@ Debug {
        DumpSymbols 0
 }
 
+Labelling {
+       # Maximal length of line section in milimeters
+       MaxSectionLenght 80
+       # Section's length may exceed limit by at most [mm]
+       MaxSectionOverlay 10
+       # Bitmap granularity (bitmap points per milimeter)
+       BitmapGranularity 1
+}
+
 Evolution {
        # Number of individuals in each generation
        PopSize 50
@@ -96,6 +90,11 @@ Evolution {
        StagnationBound 10
        IterationLimit 200
 
+       # Ranking parameters
+       DistanceWeight  1
+       OmittmentWeight 1
+       OverlapWeight   1
+
        # Create that part of generation by breeding
        BreedPopSize 0.45
        # Use that part of best individuals for parent selection
@@ -115,9 +114,4 @@ Evolution {
        MutateChvarBound 0.1
 
        ElitePopSize 0.1
-
-       # Maximal length of line section in milimeters
-       MaxSectionLenght 80
-       # Section's length may exceed limit by at most [mm]
-       MaxSectionOverlay 10
 }