Ticket #899: poi_filter.diff

File poi_filter.diff, 14.7 KB (added by korrosa, 10 years ago)
  • navit/navit_shipped.xml

     
    17211721                                <itemgra item_types="poi_bank" order="12-">
    17221722                                        <icon src="bank.png"/>
    17231723                                </itemgra>
     1724                                <itemgra item_types="poi_atm" order="12-">
     1725                                        <icon src="bank.png"/>
     1726                                </itemgra>
    17241727                                <itemgra item_types="poi_bay" order="12-">
    17251728                                        <icon src="bay.xpm"/>
    17261729                                </itemgra>
     
    21082111                                </itemgra>
    21092112                        </layer>
    21102113                        <layer name="POI Labels">
    2111                                 <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
     2114                                <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
    21122115                                        <circle color="#606060" radius="0" width="0" text_size="10"/>
    21132116                                </itemgra>
    21142117                                <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
     
    30853088                                <itemgra item_types="poi_bank" order="12-">
    30863089                                        <icon src="bank.png"/>
    30873090                                </itemgra>
     3091                                <itemgra item_types="poi_atm" order="12-">
     3092                                        <icon src="bank.png"/>
     3093                                </itemgra>
    30883094                                <itemgra item_types="poi_bay" order="0-">
    30893095                                        <icon src="bay.xpm"/>
    30903096                                </itemgra>
     
    34663472                                </itemgra>
    34673473                        </layer>
    34683474                        <layer name="POI Labels">
    3469                                 <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
     3475                                <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
    34703476                                        <circle color="#606060" radius="0" width="0" text_size="10"/>
    34713477                                </itemgra>
    34723478                        </layer>
     
    42704276        <itemgra item_types="poi_bank" order="13-">
    42714277          <icon src="bank.png" />
    42724278        </itemgra>
     4279        <itemgra item_types="poi_atm" order="13-">
     4280                <icon src="bank.png"/>
     4281        </itemgra>
    42734282        <itemgra item_types="poi_danger_area" order="13-">
    42744283          <icon src="danger_16_16.png" />
    42754284        </itemgra>
     
    42844293        </itemgra>
    42854294      </layer>
    42864295      <layer name="POI Labels" active="1">
    4287         <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
     4296        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
    42884297        order="15-">
    42894298          <circle color="#606060" radius="0" width="0"
    42904299          text_size="10" />
     
    43634372        <itemgra item_types="poi_bank" order="12-">
    43644373          <icon src="bank.png" />
    43654374        </itemgra>
     4375        <itemgra item_types="poi_atm" order="12-">
     4376          <icon src="bank.png"/>
     4377        </itemgra>
    43664378        <itemgra item_types="poi_bay" order="12-">
    43674379          <icon src="bay.png" />
    43684380        </itemgra>
     
    47544766        </itemgra>
    47554767      </layer>
    47564768      <layer name="Android-POI-Labels-full" active="0">
    4757         <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
     4769        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
    47584770        order="14-">
    47594771          <circle color="#606060" radius="0" width="0"
    47604772          text_size="10" />
     
    63226334                                        <icon src="bank.png"/>
    63236335                                        <circle color="#000000" radius="3" text_size="7"/>
    63246336                                </itemgra>
     6337                                <itemgra item_types="poi_atm" order="12-">
     6338                                        <icon src="bank.png"/>
     6339                                </itemgra>
    63256340                                <!-- amenity=fuel -->
    63266341                                <itemgra item_types="poi_fuel" order="14-">
    63276342                                        <icon src="fuel.png"/>
  • navit/maptool/osm.c

     
    372372        "?      aeroway=airport         poi_airport\n"
    373373        "?      aeroway=helipad         poi_heliport\n"
    374374        "?      aeroway=terminal        poi_airport\n"
    375         "?      amenity=atm             poi_bank\n"
     375        "?      amenity=atm             poi_atm\n"
    376376        "?      amenity=bank            poi_bank\n"
    377377        "?      amenity=bar             poi_bar\n"
    378378        "n      amenity=bench           poi_bench\n"
  • navit/item_def.h

     
    334334ITEM(vehicle_pedestrian)
    335335ITEM(bookmark_folder)
    336336ITEM(poi_pub)
     337ITEM(poi_atm)
    337338ITEM2(0x7ffffff0,poi_custom0)
    338339ITEM(poi_custom1)
    339340ITEM(poi_custom2)
  • navit/gui/internal/gui_internal.c

     
    21922192        enum item_type *types;
    21932193};
    21942194struct selector selectors[]={
    2195         {"bank","Bank",(enum item_type []){type_poi_bank,type_poi_bank,type_none}},
     2195        {"bank","Bank",(enum item_type []){
     2196                type_poi_bank,type_poi_bank,
     2197                type_poi_atm,type_poi_atm,
     2198                type_none}},
    21962199        {"fuel","Fuel",(enum item_type []){type_poi_fuel,type_poi_fuel,type_none}},
    21972200        {"hotel","Hotel",(enum item_type []) {
    21982201                type_poi_hotel,type_poi_camp_rv,
     
    22042207                type_poi_bar,type_poi_picnic,
    22052208                type_poi_burgerking,type_poi_fastfood,
    22062209                type_poi_restaurant,type_poi_restaurant,
     2210                type_poi_cafe,type_poi_cafe,
     2211                type_poi_pub,type_poi_pub,
    22072212                type_none}},
    22082213        {"shopping","Shopping",(enum item_type []) {
    22092214                type_poi_mall,type_poi_mall,
    22102215                type_poi_shop_grocery,type_poi_shop_grocery,
    22112216                type_poi_shopping,type_poi_shopping,
     2217                type_poi_shop_butcher,type_poi_shop_baker,
     2218                type_poi_shop_fruit,type_poi_shop_fruit,
     2219                type_poi_shop_beverages,type_poi_shop_beverages,
    22122220                type_none}},
    22132221        {"hospital","Service",(enum item_type []) {
    22142222                type_poi_marina,type_poi_marina,
     
    22162224                type_poi_public_utilities,type_poi_public_utilities,
    22172225                type_poi_police,type_poi_autoservice,
    22182226                type_poi_information,type_poi_information,
     2227                type_poi_pharmacy,type_poi_pharmacy,
    22192228                type_poi_personal_service,type_poi_repair_service,
    22202229                type_poi_restroom,type_poi_restroom,
    22212230                type_none}},
     
    22352244                type_poi_dam+1,type_poi_information-1,
    22362245                type_poi_information+1,type_poi_mall-1,
    22372246                type_poi_mall+1,type_poi_personal_service-1,
     2247                type_poi_pharmacy+1,type_poi_repair_service-1,
    22382248                type_poi_repair_service+1,type_poi_restaurant-1,
    22392249                type_poi_restaurant+1,type_poi_restroom-1,
    22402250                type_poi_restroom+1,type_poi_shop_grocery-1,
    22412251                type_poi_shop_grocery+1,type_poi_peak-1,
    22422252                type_poi_peak+1, type_poi_motel-1,
    2243                 type_poi_hostel+1,type_line-1,
     2253                type_poi_hostel+1,type_poi_shop_butcher-1,
     2254                type_poi_shop_baker+1,type_poi_shop_fruit-1,
     2255                type_poi_shop_fruit+1,type_poi_shop_beverages-1,
     2256                type_poi_shop_beverages+1,type_poi_pub-1,
     2257                type_poi_atm+1,type_line-1,
    22442258                type_none}},
    22452259/*      {"unknown","Unknown",(enum item_type []){
    22462260                type_point_unkn,type_point_unkn,