Diff of /trunk/src/osm.c

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

revision 191 by harbaum, Tue Jul 7 07:36:27 2009 UTC revision 194 by harbaum, Tue Jul 7 19:31:45 2009 UTC
# Line 2254  char *osm_object_type_string(object_t *o Line 2254  char *osm_object_type_string(object_t *o
2254    return NULL;    return NULL;
2255  }  }
2256    
2257    char *osm_object_get_name(object_t *object) {
2258      tag_t *tags = osm_object_get_tags(object);
2259    
2260      if(!tags) return NULL;
2261      return osm_tag_get_by_key(tags, "name");
2262    }
2263    
2264  char *osm_object_string(object_t *object) {  char *osm_object_string(object_t *object) {
2265    char *type_str = osm_object_type_string(object);    char *type_str = osm_object_type_string(object);
2266    
2267    if(!object)    if(!object)
2268      return g_strdup_printf("%s #<invalid>", type_str);      return g_strdup_printf("%s #<invalid>", type_str);
2269    
2270      char *name = osm_object_get_name(object);
2271      if(name)
2272        return g_strdup_printf("%s \"%s\"", type_str, name);
2273    
2274    switch(object->type) {    switch(object->type) {
2275    case ILLEGAL:    case ILLEGAL:
2276      return g_strdup_printf("%s #<unspec>", type_str);      return g_strdup_printf("%s #<unspec>", type_str);
Legend:
Removed from v.191  
changed lines
  Added in v.194