/[zanavi_public1]/navit/navit/item.h
ZANavi

Diff of /navit/navit/item.h

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

Revision 30 Revision 31
… …
33#undef ITEM2 33#undef ITEM2
34#undef ITEM 34#undef ITEM
35}; 35};
36 36
37#define route_item_first type_street_0 37#define route_item_first type_street_0
38#define route_item_last type_path 38#define route_item_last type_footway_and_piste_nordic
39extern int default_flags[]; 39extern int default_flags[];
40 40
41#include "attr.h" 41#include "attr.h"
42 42
43 43
44/* NOTE: we treat districts as towns for now, since 44/* NOTE OLD: we treat districts as towns for now, since
45 a) navit does not implement district search yet 45 a) navit does not implement district search yet
46 b) OSM "place=suburb" maps to type_district in maptool. with the OSM USA maps, 46 b) OSM "place=suburb" maps to type_district in maptool. with the OSM USA maps,
47 there are many "suburbs" that users will consider towns (not districts/counties); 47 there are many "suburbs" that users will consider towns (not districts/counties);
48 we want navit's town search to find them 48 we want navit's town search to find them
49
50 NOTE NEW: oct.2012: now we DONT treat districts as towns
51
49*/ 52*/
50#define item_type_is_area(type) ((type) >= type_area) 53#define item_type_is_area(type) ((type) >= type_area)
51#define item_is_town(item) ((item).type >= type_town_label && (item).type <= type_district_label_1e7) 54#define item_is_town(item) ((item).type >= type_town_label && (item).type < type_district_label)
52#define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7) 55#define item_is_district(item) ((item).type >= type_district_label && (item).type <= type_district_label_1e7)
53#define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6) 56#define item_is_poly_place(item) ((item).type >= type_poly_place1 && (item).type <= type_poly_place6)
54#define item_is_point(item) ((item).type < type_line) 57#define item_is_point(item) ((item).type < type_line)
55#define item_is_custom_poi(item) ((item).type >= type_poi_custom0 && (item).type < type_line) 58#define item_is_custom_poi(item) ((item).type >= type_poi_custom0 && (item).type < type_line)
56#define item_is_street(item) (((item).type >= type_street_0 && (item).type < type_street_1_land) \ 59#define item_is_street(item) (((item).type >= type_street_0 && (item).type < type_street_1_land) \
Legend:
Removed from v.30  
changed lines
  Added in v.31
   
Visit the ZANavi Wiki