summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel_j <aurel_j@ffa7fe5e-494d-0410-b361-a75ebd5db220>2008-04-13 22:21:55 +0000
committeraurel_j <aurel_j@ffa7fe5e-494d-0410-b361-a75ebd5db220>2008-04-13 22:21:55 +0000
commit3d40eb74e922ef750aa3d82d5c9851a31035cfc7 (patch)
treeb78c446c4526c5f6750b29e04fce59d0a3ac30bd
parent7b9467505c75d4e581bb16e97b0ee81775626674 (diff)
downloadnavit-svn-3d40eb74e922ef750aa3d82d5c9851a31035cfc7.tar.gz
Add:Core:Add rendering of tram and tram station
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/src@1007 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--item_def.h2
-rw-r--r--navit.xml14
-rw-r--r--osm2navit.c2
3 files changed, 18 insertions, 0 deletions
diff --git a/item_def.h b/item_def.h
index 92d35049..8f20aa11 100644
--- a/item_def.h
+++ b/item_def.h
@@ -237,6 +237,8 @@ ITEM(mini_roundabout)
ITEM(turning_circle)
ITEM(poi_townhall)
ITEM(poi_level_crossing)
+ITEM(poi_rail_halt)
+ITEM(poi_rail_tram_stop)
/* Line */
ITEM2(0x80000000,line)
ITEM2(0x80000001,line_unspecified)
diff --git a/navit.xml b/navit.xml
index f5d61b3f..c1bd64d9 100644
--- a/navit.xml
+++ b/navit.xml
@@ -725,6 +725,9 @@ Change to your home coordinates.
<polyline color="#6b6f5f" width="156" />
<polyline color="#d3dbbc" width="150" />
</item>
+ <item type="rail_tram" order="10-">
+ <polyline color="#606060" width="2" />
+ </item>
<item type="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
<circle color="#000000" radius="3" label_size="7" />
</item>
@@ -1008,10 +1011,21 @@ Change to your home coordinates.
<item type="poi_public_office" order="0-">
<icon src="public_office.xpm" />
</item>
+ <item type="poi_rail_halt" order="10-">
+ <circle color="#ff0000" radius="3" width="3" />
+ <circle color="#000000" radius="5" width="2" label_size="8" />
+ </item>
<item type="poi_rail_station" order="9-">
<circle color="#ff0000" radius="3" width="3" />
<circle color="#000000" radius="6" width="2" label_size="8" />
</item>
+ <item type="poi_rail_tram_stop" order="10-11">
+ <circle color="#ff0000" radius="2" width="2"/>
+ </item>
+ <item type="poi_rail_tram_stop" order="12-">
+ <circle color="#ff0000" radius="3" width="3" />
+ <circle color="#606060" radius="5" width="2" label_size="8" />
+ </item>
<item type="poi_repair_service" order="0-">
<icon src="repair_service.xpm" />
</item>
diff --git a/osm2navit.c b/osm2navit.c
index 36c91692..22d6be8b 100644
--- a/osm2navit.c
+++ b/osm2navit.c
@@ -113,8 +113,10 @@ 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=halt poi_rail_halt\n"
"n railway=level_crossing poi_level_crossing\n"
"n railway=station poi_rail_station\n"
+ "n railway=tram_stop poi_rail_tram_stop\n"
"w *=* street_unkn\n"
"w amenity=place_of_worship poly_building\n"
"w building=* poly_building\n"