summaryrefslogtreecommitdiff
path: root/navit/mapset.c
diff options
context:
space:
mode:
Diffstat (limited to 'navit/mapset.c')
-rw-r--r--navit/mapset.c436
1 files changed, 206 insertions, 230 deletions
diff --git a/navit/mapset.c b/navit/mapset.c
index 6c3d0b5d1..a2e914b6b 100644
--- a/navit/mapset.c
+++ b/navit/mapset.c
@@ -18,7 +18,7 @@
*/
/** @file
- *
+ *
* @brief Contains code used for loading more than one map
*
* The code in this file introduces "mapsets", which are collections of several maps.
@@ -42,49 +42,44 @@
* This structure holds a complete mapset
*/
struct mapset {
- NAVIT_OBJECT
- GList *maps; /**< Linked list of all the maps in the mapset */
+ NAVIT_OBJECT
+ GList *maps; /**< Linked list of all the maps in the mapset */
};
struct attr_iter {
- GList *last;
+ GList *last;
};
/**
* @brief Creates a new, empty mapset
*
- * @return The new mapset
+ * @return The new mapset
*/
-struct mapset *mapset_new(struct attr *parent, struct attr **attrs)
-{
- struct mapset *ms;
+struct mapset *mapset_new(struct attr *parent, struct attr **attrs) {
+ struct mapset *ms;
- ms=g_new0(struct mapset, 1);
- ms->func=&mapset_func;
- navit_object_ref((struct navit_object *)ms);
- ms->attrs=attr_list_dup(attrs);
+ ms=g_new0(struct mapset, 1);
+ ms->func=&mapset_func;
+ navit_object_ref((struct navit_object *)ms);
+ ms->attrs=attr_list_dup(attrs);
- return ms;
+ return ms;
}
-struct mapset *mapset_dup(struct mapset *ms)
-{
- struct mapset *ret=mapset_new(NULL, ms->attrs);
- ret->maps=g_list_copy(ms->maps);
- return ret;
+struct mapset *mapset_dup(struct mapset *ms) {
+ struct mapset *ret=mapset_new(NULL, ms->attrs);
+ ret->maps=g_list_copy(ms->maps);
+ return ret;
}
struct attr_iter *
-mapset_attr_iter_new(void)
-{
- return g_new0(struct attr_iter, 1);
+mapset_attr_iter_new(void) {
+ return g_new0(struct attr_iter, 1);
}
-void
-mapset_attr_iter_destroy(struct attr_iter *iter)
-{
- g_free(iter);
+void mapset_attr_iter_destroy(struct attr_iter *iter) {
+ g_free(iter);
}
/**
@@ -93,69 +88,62 @@ mapset_attr_iter_destroy(struct attr_iter *iter)
* @param ms The mapset to add the map to
* @param m The map to be added
*/
-int
-mapset_add_attr(struct mapset *ms, struct attr *attr)
-{
- switch (attr->type) {
- case attr_map:
- ms->attrs=attr_generic_add_attr(ms->attrs,attr);
- ms->maps=g_list_append(ms->maps, attr->u.map);
- return 1;
- default:
- return 0;
- }
+int mapset_add_attr(struct mapset *ms, struct attr *attr) {
+ switch (attr->type) {
+ case attr_map:
+ ms->attrs=attr_generic_add_attr(ms->attrs,attr);
+ ms->maps=g_list_append(ms->maps, attr->u.map);
+ return 1;
+ default:
+ return 0;
+ }
}
-int
-mapset_remove_attr(struct mapset *ms, struct attr *attr)
-{
- switch (attr->type) {
- case attr_map:
- ms->attrs=attr_generic_remove_attr(ms->attrs,attr);
- ms->maps=g_list_remove(ms->maps, attr->u.map);
- return 1;
- default:
- return 0;
- }
+int mapset_remove_attr(struct mapset *ms, struct attr *attr) {
+ switch (attr->type) {
+ case attr_map:
+ ms->attrs=attr_generic_remove_attr(ms->attrs,attr);
+ ms->maps=g_list_remove(ms->maps, attr->u.map);
+ return 1;
+ default:
+ return 0;
+ }
}
-int
-mapset_get_attr(struct mapset *ms, enum attr_type type, struct attr *attr, struct attr_iter *iter)
-{
- GList *map;
- map=ms->maps;
- attr->type=type;
- switch (type) {
- case attr_map:
- while (map) {
- if (!iter || iter->last == g_list_previous(map)) {
- attr->u.map=map->data;
- if (iter)
- iter->last=map;
- return 1;
- }
- map=g_list_next(map);
- }
- break;
- default:
- break;
- }
- return 0;
+int mapset_get_attr(struct mapset *ms, enum attr_type type, struct attr *attr, struct attr_iter *iter) {
+ GList *map;
+ map=ms->maps;
+ attr->type=type;
+ switch (type) {
+ case attr_map:
+ while (map) {
+ if (!iter || iter->last == g_list_previous(map)) {
+ attr->u.map=map->data;
+ if (iter)
+ iter->last=map;
+ return 1;
+ }
+ map=g_list_next(map);
+ }
+ break;
+ default:
+ break;
+ }
+ return 0;
}
/**
- * @brief Destroys a mapset.
+ * @brief Destroys a mapset.
*
* This destroys a mapset. Please note that it does not touch the contained maps
* in any way.
*
* @param ms The mapset to be destroyed
*/
-void mapset_destroy(struct mapset *ms)
-{
- g_list_free(ms->maps);
- attr_list_free(ms->attrs);
- g_free(ms);
+void mapset_destroy(struct mapset *ms) {
+ g_list_free(ms->maps);
+ attr_list_free(ms->attrs);
+ g_free(ms);
}
/**
@@ -165,7 +153,7 @@ void mapset_destroy(struct mapset *ms)
* all maps in a mapset.
*/
struct mapset_handle {
- GList *l; /**< Pointer to the current (next) map */
+ GList *l; /**< Pointer to the current (next) map */
};
/**
@@ -178,16 +166,14 @@ struct mapset_handle {
* @return The new mapset handle
*/
struct mapset_handle *
-mapset_open(struct mapset *ms)
-{
- struct mapset_handle *ret=NULL;
- if(ms)
- {
- ret=g_new(struct mapset_handle, 1);
- ret->l=ms->maps;
- }
-
- return ret;
+mapset_open(struct mapset *ms) {
+ struct mapset_handle *ret=NULL;
+ if(ms) {
+ ret=g_new(struct mapset_handle, 1);
+ ret->l=ms->maps;
+ }
+
+ return ret;
}
/**
@@ -200,35 +186,34 @@ mapset_open(struct mapset *ms)
* @param active Set to true to only get active maps (See description)
* @return The next map
*/
-struct map * mapset_next(struct mapset_handle *msh, int active)
-{
- struct map *ret;
- struct attr active_attr;
-
- for (;;) {
- if (!msh || !msh->l)
- return NULL;
- ret=msh->l->data;
- msh->l=g_list_next(msh->l);
- if (!active)
- return ret;
- if (active == 2 && map_get_attr(ret, attr_route_active, &active_attr, NULL)) {
- if (active_attr.u.num)
- return ret;
- else
- continue;
- }
- if (active == 3 && map_get_attr(ret, attr_search_active, &active_attr, NULL)) {
- if (active_attr.u.num)
- return ret;
- else
- continue;
- }
- if (!map_get_attr(ret, attr_active, &active_attr, NULL))
- return ret;
- if (active_attr.u.num)
- return ret;
- }
+struct map * mapset_next(struct mapset_handle *msh, int active) {
+ struct map *ret;
+ struct attr active_attr;
+
+ for (;;) {
+ if (!msh || !msh->l)
+ return NULL;
+ ret=msh->l->data;
+ msh->l=g_list_next(msh->l);
+ if (!active)
+ return ret;
+ if (active == 2 && map_get_attr(ret, attr_route_active, &active_attr, NULL)) {
+ if (active_attr.u.num)
+ return ret;
+ else
+ continue;
+ }
+ if (active == 3 && map_get_attr(ret, attr_search_active, &active_attr, NULL)) {
+ if (active_attr.u.num)
+ return ret;
+ else
+ continue;
+ }
+ if (!map_get_attr(ret, attr_active, &active_attr, NULL))
+ return ret;
+ if (active_attr.u.num)
+ return ret;
+ }
}
/**
@@ -238,26 +223,25 @@ struct map * mapset_next(struct mapset_handle *msh, int active)
* @param map_name the map name used by the search
* @return The next map
*/
-struct map *
-mapset_get_map_by_name(struct mapset *ms, const char*map_name)
-{
- struct mapset_handle*msh;
- struct map*curr_map;
- struct attr map_attr;
- if( !ms || !map_name ) {
- return NULL;
- }
- msh=mapset_open(ms);
- while ((curr_map=mapset_next(msh, 1))) {
- //get map name
- if(map_get_attr(curr_map,attr_name, &map_attr,NULL)) {
- if( ! strcmp(map_attr.u.str, map_name)) {
- break;
- }
- }
- }
- mapset_close(msh);
- return curr_map;
+struct map *
+mapset_get_map_by_name(struct mapset *ms, const char*map_name) {
+ struct mapset_handle*msh;
+ struct map*curr_map;
+ struct attr map_attr;
+ if( !ms || !map_name ) {
+ return NULL;
+ }
+ msh=mapset_open(ms);
+ while ((curr_map=mapset_next(msh, 1))) {
+ //get map name
+ if(map_get_attr(curr_map,attr_name, &map_attr,NULL)) {
+ if( ! strcmp(map_attr.u.str, map_name)) {
+ break;
+ }
+ }
+ }
+ mapset_close(msh);
+ return curr_map;
}
/**
@@ -265,26 +249,24 @@ mapset_get_map_by_name(struct mapset *ms, const char*map_name)
*
* @param msh Mapset handle to be closed
*/
-void
-mapset_close(struct mapset_handle *msh)
-{
- g_free(msh);
+void mapset_close(struct mapset_handle *msh) {
+ g_free(msh);
}
/**
* @brief Holds information about a search in a mapset
*
- * This struct holds information about a search (e.g. for a street) in a mapset.
+ * This struct holds information about a search (e.g. for a street) in a mapset.
*
* @sa For a more detailed description see the documentation of mapset_search_new().
*/
struct mapset_search {
- GList *map; /**< The list of maps to be searched within */
- struct map_search *ms; /**< A map search struct for the map currently active */
- struct item *item; /**< "Superior" item. */
- struct attr *search_attr; /**< Attribute to be searched for. */
- int partial; /**< Indicates if one would like to have partial matches */
- struct mapset *mapset; /**< reference to current mapset. Set to NULL when all maps are searched */
+ GList *map; /**< The list of maps to be searched within */
+ struct map_search *ms; /**< A map search struct for the map currently active */
+ struct item *item; /**< "Superior" item. */
+ struct attr *search_attr; /**< Attribute to be searched for. */
+ int partial; /**< Indicates if one would like to have partial matches */
+ struct mapset *mapset; /**< reference to current mapset. Set to NULL when all maps are searched */
};
/**
@@ -297,7 +279,7 @@ struct mapset_search {
* strings - a search for a street named "street" would match to "streetfoo", but not to
* "somestreet". Search is case insensitive.
*
- * The item passed to this function specifies a "superior item" to "search within" - e.g. a town
+ * The item passed to this function specifies a "superior item" to "search within" - e.g. a town
* in which we want to search for a street, or a country in which to search for a town.
*
* @param ms The mapset that should be searched
@@ -307,23 +289,19 @@ struct mapset_search {
* @return A new mapset search struct for this search
*/
struct mapset_search *
-mapset_search_new(struct mapset *ms, struct item *item, struct attr *search_attr, int partial)
-{
- struct mapset_search *this;
- dbg(lvl_debug,"enter(%p,%p,%p,%d)\n", ms, item, search_attr, partial);
- this=g_new0(struct mapset_search,1);
- if(this != NULL && ms!=NULL )
- {
- this->mapset=ms;
- this->item=item;
- this->search_attr=search_attr;
- this->partial=partial;
- return this;
- }
- else
- {
- return NULL;
- }
+mapset_search_new(struct mapset *ms, struct item *item, struct attr *search_attr, int partial) {
+ struct mapset_search *this;
+ dbg(lvl_debug,"enter(%p,%p,%p,%d)", ms, item, search_attr, partial);
+ this=g_new0(struct mapset_search,1);
+ if(this != NULL && ms!=NULL ) {
+ this->mapset=ms;
+ this->item=item;
+ this->search_attr=search_attr;
+ this->partial=partial;
+ return this;
+ } else {
+ return NULL;
+ }
}
/**
@@ -337,52 +315,52 @@ mapset_search_new(struct mapset *ms, struct item *item, struct attr *search_attr
* @return The next found item or NULL if there are no more items found
*/
struct item *
-mapset_search_get_item(struct mapset_search *this_)
-{
- struct item *ret=NULL;
- struct attr active_attr;
- int country_search=this_->search_attr->type >= attr_country_all && this_->search_attr->type <= attr_country_name;
-
- while ((this_) && (this_->mapset) && (!this_->ms || !(ret=map_search_get_item(this_->ms)))) { /* The current map has no more items to be returned */
-
- /* Use only the first map from the mapset to search for country codes. */
- if (this_->map && country_search)
- break;
-
- for (;;) {
- if (!this_->map)
- this_->map=this_->mapset->maps;
- else
- this_->map=g_list_next(this_->map);
-
- if (!this_->map) {
- /* No more maps left, mark this mapset_search as finished */
- this_->mapset=NULL;
- break;
- }
-
- /* Any map can be used for country search, regardless of it's attr_active value */
- if(country_search)
- break;
-
- if (map_get_attr(this_->map->data, attr_search_active, &active_attr, NULL)) {
- if (!active_attr.u.num)
- continue;
- }
- if (!map_get_attr(this_->map->data, attr_active, &active_attr, NULL))
- break;
- if (active_attr.u.num)
- break;
- }
- if(this_->ms) {
- map_search_destroy(this_->ms);
- this_->ms=NULL;
- }
- if (! this_->map)
- break;
- this_->ms=map_search_new(this_->map->data, this_->item, this_->search_attr, this_->partial);
- }
- return ret;
+mapset_search_get_item(struct mapset_search *this_) {
+ struct item *ret=NULL;
+ struct attr active_attr;
+ int country_search=this_->search_attr->type >= attr_country_all && this_->search_attr->type <= attr_country_name;
+
+ while ((this_) && (this_->mapset) && (!this_->ms
+ || !(ret=map_search_get_item(this_->ms)))) { /* The current map has no more items to be returned */
+
+ /* Use only the first map from the mapset to search for country codes. */
+ if (this_->map && country_search)
+ break;
+
+ for (;;) {
+ if (!this_->map)
+ this_->map=this_->mapset->maps;
+ else
+ this_->map=g_list_next(this_->map);
+
+ if (!this_->map) {
+ /* No more maps left, mark this mapset_search as finished */
+ this_->mapset=NULL;
+ break;
+ }
+
+ /* Any map can be used for country search, regardless of it's attr_active value */
+ if(country_search)
+ break;
+
+ if (map_get_attr(this_->map->data, attr_search_active, &active_attr, NULL)) {
+ if (!active_attr.u.num)
+ continue;
+ }
+ if (!map_get_attr(this_->map->data, attr_active, &active_attr, NULL))
+ break;
+ if (active_attr.u.num)
+ break;
+ }
+ if(this_->ms) {
+ map_search_destroy(this_->ms);
+ this_->ms=NULL;
+ }
+ if (! this_->map)
+ break;
+ this_->ms=map_search_new(this_->map->data, this_->item, this_->search_attr, this_->partial);
+ }
+ return ret;
}
/**
@@ -390,29 +368,27 @@ mapset_search_get_item(struct mapset_search *this_)
*
* @param this The mapset search to be destroyed
*/
-void
-mapset_search_destroy(struct mapset_search *this_)
-{
- if (this_) {
- map_search_destroy(this_->ms);
- g_free(this_);
- }
+void mapset_search_destroy(struct mapset_search *this_) {
+ if (this_) {
+ map_search_destroy(this_->ms);
+ g_free(this_);
+ }
}
struct object_func mapset_func = {
- attr_mapset,
- (object_func_new)mapset_new,
- (object_func_get_attr)mapset_get_attr,
- (object_func_iter_new)mapset_attr_iter_new,
- (object_func_iter_destroy)mapset_attr_iter_destroy,
- (object_func_set_attr)NULL,
- (object_func_add_attr)mapset_add_attr,
- (object_func_remove_attr)mapset_remove_attr,
- (object_func_init)NULL,
- (object_func_destroy)mapset_destroy,
- (object_func_dup)mapset_dup,
- (object_func_ref)navit_object_ref,
- (object_func_unref)navit_object_unref,
+ attr_mapset,
+ (object_func_new)mapset_new,
+ (object_func_get_attr)mapset_get_attr,
+ (object_func_iter_new)mapset_attr_iter_new,
+ (object_func_iter_destroy)mapset_attr_iter_destroy,
+ (object_func_set_attr)NULL,
+ (object_func_add_attr)mapset_add_attr,
+ (object_func_remove_attr)mapset_remove_attr,
+ (object_func_init)NULL,
+ (object_func_destroy)mapset_destroy,
+ (object_func_dup)mapset_dup,
+ (object_func_ref)navit_object_ref,
+ (object_func_unref)navit_object_unref,
};
View Lorry Controller Status