Diff of /trunk/src/osm.h

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

revision 54 by harbaum, Fri Feb 6 12:06:30 2009 UTC revision 103 by harbaum, Tue Mar 3 12:12:53 2009 UTC
# Line 28  Line 28 
28  #define OSM_FLAG_HIDDEN   (1<<3)  #define OSM_FLAG_HIDDEN   (1<<3)
29    
30  typedef gulong item_id_t;  typedef gulong item_id_t;
31    #define G_TYPE_ITEM_ID_T G_TYPE_ULONG
32    
33  #define ID_ILLEGAL  ((item_id_t)0)  #define ID_ILLEGAL  ((item_id_t)0)
34    
# Line 172  typedef struct member_s { Line 173  typedef struct member_s {
173      node_t *node;      node_t *node;
174      way_t *way;      way_t *way;
175      relation_t *relation;      relation_t *relation;
176        void *ptr;
177      item_id_t id;      item_id_t id;
178    };    };
179    
# Line 248  way_chain_t *osm_node_to_way(osm_t *osm, Line 250  way_chain_t *osm_node_to_way(osm_t *osm,
250  /* ----------- edit functions ----------- */  /* ----------- edit functions ----------- */
251  node_t *osm_node_new(osm_t *osm, gint x, gint y);  node_t *osm_node_new(osm_t *osm, gint x, gint y);
252  void osm_node_attach(osm_t *osm, node_t *node);  void osm_node_attach(osm_t *osm, node_t *node);
253    void osm_node_restore(osm_t *osm, node_t *node);
254  way_chain_t *osm_node_delete(osm_t *osm, struct icon_s **icon, node_t *node,  way_chain_t *osm_node_delete(osm_t *osm, struct icon_s **icon, node_t *node,
255                               gboolean permanently, gboolean affect_ways);                               gboolean permanently, gboolean affect_ways);
256  void osm_way_delete(osm_t *osm, struct icon_s **icon, way_t *way,  void osm_way_delete(osm_t *osm, struct icon_s **icon, way_t *way,
# Line 260  gboolean osm_position_within_bounds(osm_ Line 263  gboolean osm_position_within_bounds(osm_
263  item_id_t osm_new_way_id(osm_t *osm);  item_id_t osm_new_way_id(osm_t *osm);
264  gboolean osm_way_ends_with_node(way_t *way, node_t *node);  gboolean osm_way_ends_with_node(way_t *way, node_t *node);
265    
266  void osm_way_revert(way_t *way);  void osm_way_reverse(way_t *way);
267    guint osm_way_reverse_direction_sensitive_tags(way_t *way);
268    guint osm_way_reverse_direction_sensitive_roles(osm_t *osm, way_t *way);
269    
270  void osm_node_remove_from_relation(osm_t *osm, node_t *node);  void osm_node_remove_from_relation(osm_t *osm, node_t *node);
271  void osm_way_remove_from_relation(osm_t *osm, way_t *way);  void osm_way_remove_from_relation(osm_t *osm, way_t *way);
# Line 272  void osm_way_rotate(way_t *way, gint off Line 277  void osm_way_rotate(way_t *way, gint off
277  tag_t *osm_tags_copy(tag_t *tag, gboolean update_creator);  tag_t *osm_tags_copy(tag_t *tag, gboolean update_creator);
278    
279  char *osm_type_string(type_t type);  char *osm_type_string(type_t type);
280    char *osm_id_string(type_t type, void *object);
281    char *osm_object_string(type_t type, void *object);
282    tag_t *osm_object_get_tags(type_t type, void *object);
283    
284    relation_t *osm_relation_new(void);
285    void osm_relation_free(relation_t *relation);
286    void osm_relation_attach(osm_t *osm, relation_t *relation);
287    void osm_relation_delete(osm_t *osm, relation_t *relation,
288                             gboolean permanently);
289    gint osm_relation_members_num(relation_t *relation);
290    
291  #endif /* OSM_H */  #endif /* OSM_H */
292    
Legend:
Removed from v.54  
changed lines
  Added in v.103