X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=labeller.h;h=d6dfa27d3323d96b98ba41d83b95a772dfbcf708;hb=eadd63b657be979276b0f7bab89f76a632473ab4;hp=f17bda5b406b8a754242f88602f0aecad794aa64;hpb=5ac436112370bca9a88fe9ed31f399197b6b08cf;p=leo.git

diff --git a/labeller.h b/labeller.h
index f17bda5..d6dfa27 100644
--- a/labeller.h
+++ b/labeller.h
@@ -1,18 +1,22 @@
 #ifndef _LEO_LABELLER_H
 #define _LEO_LABELLER_H
 
-enum label_type
+enum edge_dir
 {
-  LABEL_POINT,
-  LABEL_LINE,
-  LABEL_AREA,
+  DIR_INVALID,
+  DIR_UNSET,
+  DIR_CENTER,
+  DIR_FWD,
+  DIR_BWD,
 };
 
 enum request_type
 {
+  REQUEST_INVALID,
   REQUEST_POINT,
-  REQUEST_AREALABEL,
-  REQUEST_LINELABEL,
+  REQUEST_AREA,
+  REQUEST_LINE,
+  REQUEST_SECTION,
   REQUEST_SEGMENT,
 };
 
@@ -23,24 +27,10 @@ enum term_cond
   TERM_COND_ITERATIONS,
 };
 
-struct sym_placement
-{
-  double x;
-  double y;
-  int variant;
-  struct request *request;
-};
-
-struct request
-{
-  enum request_type type;
-  int ind;
-};
-
 struct point_variant
 {
-  double width;
-  double height;
+  int width;
+  int height;
   bool *bitmap;
 };
 
@@ -49,11 +39,16 @@ struct line_variant
   bool *masks;
 };
 
+struct request
+{
+  enum request_type type;
+  int ind;
+};
+
 struct request_point
 {
   struct request request;
   struct symbol *sym;
-  struct osm_object *object; // FIXME: Linked also by sym
   z_index_t zindex;
   double x;
   double y;
@@ -66,34 +61,42 @@ struct request_point
 struct request_segment
 {
   struct request request;
+  struct request_line *rl;
   double x1;
   double y1;
   double x2;
   double y2;
-  double k;
-  struct sym_line *sym;
+  struct symbol *label;
   struct point_variant *variant;
-  struct sym_text *text;
   z_index_t zindex;
 };
 
+struct request_section
+{
+  struct request request;
+  int num_segments;
+  struct request_segment *segments;
+};
+
 struct request_line
 {
   struct request request;
-  struct symbol *sym;
+  struct symbol *line;
   int num_variants;
   int num_segments;
   struct line_variant *variants;
   struct request_segment *segments;
+  struct request_section *sections;
 };
 
 struct request_area
 {
   struct request request;
   struct osm_multipolygon *o;
-  struct sym_text *sym;
-  struct point_variant *text_variant;
+  struct symbol *label;
+  struct point_variant *variants;
   z_index_t zindex;
+  double cx, cy;
 };
 
 struct buffer_line
@@ -105,7 +108,7 @@ struct buffer_line
 struct buffer_linelabel
 {
   struct osm_way *way;
-  struct sym_text *text;
+  struct symbol *label;
   z_index_t zindex;
 };
 
@@ -122,16 +125,16 @@ struct graph_edge
   osm_id_t id;
   double length;
   color_t color;
-  bool visited;
+  int visited;
   struct graph_edge *prev;
   struct graph_edge *next;
   struct graph_node *n1;
   struct graph_node *n2;
   uns longline;
-  struct sym_text *text;
-  struct sym_line *sym;
+  struct symbol *label;
+  struct sym_line *line;
   z_index_t zindex;
-  int dir;
+  enum edge_dir dir;
   struct graph_node *anode;
   struct graph_node *bnode; // DEBUG PRINT
   int num; // DEBUG
@@ -145,11 +148,11 @@ struct longline
 
 struct placement
 {
+  struct request *request;
   double x;
   double y;
   int variant_used;
   bool processed;
-  struct request *request;
 };
 
 struct map_part
@@ -192,8 +195,6 @@ void perform_mutation(struct individual *individual);
 
 void init_placement(struct placement *p, struct request *r);
 void init_individual(struct individual *i);
-void gen_coords_point(struct placement *p);
-void gen_coords(struct placement *p);
 struct map_part **get_parts(struct placement *symbol, struct individual *individual);
 
 int randint(int min, int max);