Labelling: Segments: A bunch of improvements

[leo.git] / labeller.h

diff --git a/labeller.h b/labeller.h
index c16c43dd11518a40c37b82733c2f08e4d4aa74a9..4fe0d922b12ff5cf57394368244486374dbe5b56 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -1,6 +1,16 @@
 #ifndef _LEO_LABELLER_H
 #define _LEO_LABELLER_H
 
+enum verbosity
+{
+  VERBOSITY_NONE,
+  VERBOSITY_GENERAL,
+  VERBOSITY_POPULATION,
+  VERBOSITY_INDIVIDUAL,
+  VERBOSITY_PLACEMENT,
+  VERBOSITY_ALL,
+};
+
 enum edge_dir
 {
   DIR_INVALID,
@@ -27,22 +37,20 @@ enum term_cond
   TERM_COND_ITERATIONS,
 };
 
-struct point_variant
+struct variant
 {
   int width;
   int height;
+  int offset_x;
+  int offset_y;
   bool *bitmap;
 };
 
-struct line_variant
-{
-  bool *masks;
-};
-
 struct request
 {
   enum request_type type;
   int ind;
+  struct variant *variants;
 };
 
 struct request_point
@@ -55,7 +63,6 @@ struct request_point
   double offset_x;
   double offset_y;
   int num_variants;
-  struct point_variant *variants;
 };
 
 struct request_segment
@@ -66,9 +73,8 @@ struct request_segment
   double y1;
   double x2;
   double y2;
-  double angle;
+  double slope;
   struct symbol *label;
-  struct point_variant *variant;
   z_index_t zindex;
 };
 
@@ -84,7 +90,6 @@ struct request_line
   struct request request;
   struct symbol *line;
   int num_variants;
-  struct line_variant *variants;
   struct request_section *sections;
 };
 
@@ -93,7 +98,6 @@ struct request_area
   struct request request;
   struct osm_multipolygon *o;
   struct symbol *label;
-  struct point_variant *variants;
   z_index_t zindex;
   double cx, cy;
 };
@@ -151,11 +155,28 @@ struct placement
   double x;
   double y;
   int variant_used;
+  int ind;
   bool processed;
+  // FIXME: Replace with clist?
+  struct map_placement *map_links;
+  struct individual *individual;
+};
+
+struct map_placement
+{
+  struct placement *placement;
+  struct map_part *part;
+  struct map_placement *next_in_map;
+  struct map_placement *prev_in_map;
+  struct map_placement *next_in_placement;
+  struct map_placement *prev_in_placement;
 };
 
 struct map_part
 {
+  // FIXME: Replace with clist?
+  struct map_placement *placement;
+  int ind;
 };
 
 struct individual
@@ -166,6 +187,8 @@ struct individual
 };
 
 void labeller_init(void);
+void labeller_cleanup(void);
+
 void labeller_add_point(struct symbol *sym, struct osm_object *object, z_index_t zindex);
 void labeller_add_line(struct symbol *sym, z_index_t zindex);
 void labeller_label(void);