Labelling: Segments: A bunch of improvements

[leo.git] / labeller.h

diff --git a/labeller.h b/labeller.h
index c03a80e0f40dde3ba20aab4cff9e151fdeffaeb8..4fe0d922b12ff5cf57394368244486374dbe5b56 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -158,27 +158,25 @@ struct placement
   int ind;
   bool processed;
   // FIXME: Replace with clist?
-  struct placement_link *map_links;
+  struct map_placement *map_links;
   struct individual *individual;
 };
 
-struct placement_link
-{
-  struct map_placement *mp;
-  struct placement_link *next;
-};
-
 struct map_placement
 {
   struct placement *placement;
-  struct map_placement *next;
-  struct map_placement *prev;
+  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
@@ -189,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);