Merge branch 'master' into labelling

[leo.git] / labeller.h

diff --git a/labeller.h b/labeller.h
index d6dfa27d3323d96b98ba41d83b95a772dfbcf708..c16c43dd11518a40c37b82733c2f08e4d4aa74a9 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -66,6 +66,7 @@ struct request_segment
   double y1;
   double x2;
   double y2;
+  double angle;
   struct symbol *label;
   struct point_variant *variant;
   z_index_t zindex;
@@ -83,9 +84,7 @@ struct request_line
   struct request request;
   struct symbol *line;
   int num_variants;
-  int num_segments;
   struct line_variant *variants;
-  struct request_segment *segments;
   struct request_section *sections;
 };
 
@@ -173,45 +172,4 @@ void labeller_label(void);
 void labeller_add_linelabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 void labeller_add_arealabel(struct symbol *sym, struct osm_object *o, z_index_t zindex);
 
-void make_bitmap_icon(struct point_variant *v, struct sym_icon *si);
-void make_bitmap_point(struct point_variant *v, struct sym_point *sp);
-void make_bitmap_label(struct point_variant *v, struct sym_text *text);
-
-void make_graph(void);
-void label_graph(void);
-void join_edge(struct graph_edge *e, int dir);
-void bfs(void);
-void make_segments(void);
-
-void make_population(void);
-bool shall_terminate(void);
-void breed(void);
-void mutate(void);
-void elite(void);
-void rank_population(void);
-
-struct individual **perform_crossover(struct individual *parent1, struct individual *parent2);
-void perform_mutation(struct individual *individual);
-
-void init_placement(struct placement *p, struct request *r);
-void init_individual(struct individual *i);
-struct map_part **get_parts(struct placement *symbol, struct individual *individual);
-
-int randint(int min, int max);
-
-struct placement **get_closure(struct placement *placement, struct individual *parent1, struct individual *parent2);
-void copy_symbols(struct placement **closure, struct individual *parent, struct individual *child);
-void move_symbol(struct placement *p);
-void move_symbol_point(struct placement *p);
-
-struct placement **get_overlapping(struct placement *p);
-void filter(struct placement **list, bool *pred);
-
-int flip(int a, int b);
-double randdouble(void);
-
-void cleanup(void);
-
-void copy_individual(struct individual *src, struct individual *dest);
-
 #endif