Add:Core:Add display of level crossing

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1006 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/item_def.h b/navit/src/item_def.h
index 337c853..92d3504 100644 (file)
--- a/navit/src/item_def.h
+++ b/navit/src/item_def.h
@@ -236,6 +236,7 @@ ITEM(poi_image)
 ITEM(mini_roundabout)
 ITEM(turning_circle)
 ITEM(poi_townhall)
+ITEM(poi_level_crossing)
 /* Line */
 ITEM2(0x80000000,line)
 ITEM2(0x80000001,line_unspecified)

diff --git a/navit/src/navit.xml b/navit/src/navit.xml
index 8eb0455..f5d61b3 100644 (file)
--- a/navit/src/navit.xml
+++ b/navit/src/navit.xml
@@ -954,6 +954,9 @@ Change to your home coordinates.
                        <item type="poi_levee" order="0-">
                                <icon src="levee.xpm" />
                        </item>
+                       <item type="poi_level_crossing" order="11-">
+                               <icon src="level_crossing.xpm" />
+                       </item>
                        <item type="poi_library" order="12-">
                                <icon src="library.xpm" />
                        </item>

diff --git a/navit/src/osm2navit.c b/navit/src/osm2navit.c
index 5d372cb..36c9169 100644 (file)
--- a/navit/src/osm2navit.c
+++ b/navit/src/osm2navit.c
@@ -113,6 +113,7 @@ static char *attrmap={
        "n      place=town              town_label_2e4\n"
        "n      place=village           town_label_2e3\n"
        "n      place=hamlet            town_label_2e2\n"
+       "n      railway=level_crossing          poi_level_crossing\n"
        "n      railway=station         poi_rail_station\n"
        "w      *=*                     street_unkn\n"
        "w      amenity=place_of_worship        poly_building\n"

diff --git a/navit/src/xpm/Makefile.am b/navit/src/xpm/Makefile.am
index 84b181a..82569dd 100644 (file)
--- a/navit/src/xpm/Makefile.am
+++ b/navit/src/xpm/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.inc
 xpm_DATA = airport.xpm attraction.xpm bank.xpm bar.xpm bus.xpm cafe.xpm camping.xpm car_dealer.xpm church.xpm cinema.xpm dumping-station.xpm exit.xpm fastfood.xpm firebrigade.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm flag_wh_bk.xpm fuel.xpm golf.xpm highway_exit.xpm hospital.xpm hotel.xpm information.xpm library.xpm museum.xpm nav_left_1.xpm nav_left_2.xpm nav_right_1.xpm nav_right_2.xpm nav_straight.xpm parking.xpm pharmacy.xpm picnic.xpm police.xpm post.xpm restaurant.xpm restroom.xpm skiing.xpm sports.xpm swimming.xpm telephone.xpm theater.xpm tower.xpm traffic_signals.xpm trailerpark.xpm unknown.xpm gc_tradi.xpm gc_multi.xpm gc_mystery.xpm gc_event.xpm
 xpm_DATA += gc_reference.xpm gc_webcam.xpm gc_question.xpm gc_stages.xpm
 xpm_DATA += shopping.xpm heliport.xpm cursor.xpm peak.xpm mini_roundabout.xpm
-xpm_DATA += townhall.xpm
+xpm_DATA += townhall.xpm level_crossing.xpm
 EXTRA_DIST = $(xpm_DATA)
 #burgerking.ico:
 #      wget http://www.burgerking.de/favicon.ico -O burgerking.ico

diff --git a/navit/src/xpm/level_crossing.xpm b/navit/src/xpm/level_crossing.xpm
new file mode 100644 (file)
index 0000000..83b2d71
--- /dev/null
+++ b/navit/src/xpm/level_crossing.xpm
@@ -0,0 +1,16 @@
+/* XPM */
+static char * level_crossing_xpm[] = {
+"11 11 2 1",
+"      c None",
+".     c #797774",
+".         .",
+"..       ..",
+" ..     .. ",
+"  ..   ..  ",
+"   .. ..   ",
+"    ...    ",
+"   .. ..   ",
+"  ..   ..  ",
+" ..     .. ",
+"..       ..",
+".         ."};