Skip to content

Commit

Permalink
add:maptool:enhance leisure=track handling and add poi_archeaological…
Browse files Browse the repository at this point in the history
…_site (#1005)

* add:map:add poi_archeaological_site.

historic=archeaological_site is quite often used on nodes only. Add
poi to show them.

* add:map:deal with sports_track being poly or not

OSM is unsure on leisure=track. It's either line style
or area. the latter only if area=yes is given, or it's a multipolygon.
This commit fixes that problem.

* fix:layout:add line width for sports_track
  • Loading branch information
metalstrolch committed May 28, 2020
1 parent 5673a3e commit 6cf08b8
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 2 deletions.
14 changes: 14 additions & 0 deletions navit/icons/archaeological_site.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions navit/item_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ ITEM(nav_exit_right)
ITEM(nav_keep_left)
ITEM(nav_keep_right)
ITEM(poi_cave)
ITEM(poi_archaeological_site)
ITEM2(0x7fffffe0,poi_customg)
ITEM(poi_customh)
ITEM(poi_customi)
Expand Down Expand Up @@ -526,6 +527,7 @@ ITEM(forest_way_4)
ITEM(former_itinerary)
ITEM(former_itinerary_part)
ITEM(cliff)
ITEM(sports_track)
/* Area */
ITEM2(0xc0000000,area)
ITEM2(0xc0000001,area_unspecified)
Expand Down
6 changes: 5 additions & 1 deletion navit/maptool/osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ static char *attrmap= {
"? historic=memorial poi_memorial\n"
"? historic=monument poi_monument\n"
"? historic=ruins poi_ruins\n"
"n historic=archaeological_site poi_archaeological_site\n"
// "? historic=* poi_ruins\n"
"? landuse=cemetery poi_cemetery\n"
"? leisure=fishing poi_fish\n"
Expand Down Expand Up @@ -721,7 +722,10 @@ static char *attrmap= {
"w leisure=playground poly_playground\n"
"w leisure=sports_centre poly_sport\n"
"w leisure=stadium poly_sports_stadium\n"
"w leisure=track poly_sports_track\n"
"w leisure=track,area=1 poly_sports_track\n"
"w leisure=track,area=0 sports_track\n"
"w leisure=track,type=multipolygon poly_sports_track\n"
"w leisure=track sports_track\n"
"w leisure=water_park poly_water_park\n"
"w military=airfield poly_airfield\n"
"w military=barracks poly_barracks\n"
Expand Down
9 changes: 8 additions & 1 deletion navit/navit_layout_car_shipped.xml
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,10 @@
<polygon color="#b6554e"/>
<text text_size="5"/>
</itemgra>
<itemgra item_types="sports_track" order="10-">
<polyline color="#b6554e" width="1"/>
<text text_size="5"/>
</itemgra>
<itemgra item_types="poly_garages" order="10-">
<polygon color="#deddcc"/>
<text text_size="5"/>
Expand Down Expand Up @@ -2035,6 +2039,9 @@
<itemgra item_types="poi_monument" order="12-">
<icon src="memorial.png"/>
</itemgra>
<itemgra item_types="poi_archaeological_site" order="12-">
<icon src="archaeological_site.png"/>
</itemgra>
<itemgra item_types="poi_shelter" order="11-">
<icon src="shelter.png"/>
</itemgra>
Expand Down Expand Up @@ -2064,7 +2071,7 @@
</itemgra>
</layer>
<layer name="POI Labels">
<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_cave,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_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,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_bicycle,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-">
<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_cave,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_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,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_bicycle,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_archaeological_site,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
<circle color="#606060" radius="0" width="0" text_size="10"/>
</itemgra>
<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-">
Expand Down

0 comments on commit 6cf08b8

Please sign in to comment.