Diff of /trunk/src/osm.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 154 by harbaum, Tue Mar 31 06:31:53 2009 UTC revision 155 by harbaum, Tue Mar 31 10:19:50 2009 UTC
# Line 173  typedef struct { Line 173  typedef struct {
173      node_t *node;      node_t *node;
174      way_t *way;      way_t *way;
175      relation_t *relation;      relation_t *relation;
176        item_id_t id;
177      void *ptr;      void *ptr;
178    };    };
179  } object_t;  } object_t;
180    
181  typedef struct member_s {  typedef struct member_s {
182    type_t type;    object_t object;
183    char   *role;    char   *role;
   
   union {  
     node_t *node;  
     way_t *way;  
     relation_t *relation;  
     void *ptr;  
     item_id_t id;  
   };  
   
184    struct member_s *next;    struct member_s *next;
185  } member_t;  } member_t;
186    
# Line 288  void osm_way_rotate(way_t *way, gint off Line 280  void osm_way_rotate(way_t *way, gint off
280    
281  tag_t *osm_tags_copy(tag_t *tag, gboolean update_creator);  tag_t *osm_tags_copy(tag_t *tag, gboolean update_creator);
282    
 char *osm_type_string(type_t type);  
 char *osm_id_string(type_t type, void *object);  
 char *osm_object_string(type_t type, void *object);  
 tag_t *osm_object_get_tags(type_t type, void *object);  
   
283  relation_t *osm_relation_new(void);  relation_t *osm_relation_new(void);
284  void osm_relation_free(relation_t *relation);  void osm_relation_free(relation_t *relation);
285  void osm_relation_attach(osm_t *osm, relation_t *relation);  void osm_relation_attach(osm_t *osm, relation_t *relation);
# Line 300  void osm_relation_delete(osm_t *osm, rel Line 287  void osm_relation_delete(osm_t *osm, rel
287                           gboolean permanently);                           gboolean permanently);
288  gint osm_relation_members_num(relation_t *relation);  gint osm_relation_members_num(relation_t *relation);
289    
290    char *osm_object_type_string(object_t *object);
291    char *osm_object_id_string(object_t *object);
292    char *osm_object_string(object_t *object);
293    tag_t *osm_object_get_tags(object_t *object);
294  void osm_object_set_flags(object_t *map_item, int set, int clr);  void osm_object_set_flags(object_t *map_item, int set, int clr);
295    
296  #endif /* OSM_H */  #endif /* OSM_H */
Legend:
Removed from v.154  
changed lines
  Added in v.155