update tomtom

3 files changed, 99 insertions, 120 deletions

diff --git a/Toolchain/arm-linux.cmake b/Toolchain/arm-linux.cmake
index a9cb20d02..c85a8a6dc 100644
--- a/Toolchain/arm-linux.cmake
+++ b/Toolchain/arm-linux.cmake
@@ -11,3 +11,4 @@ set ( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
 set ( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
 set ( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
 set ( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
+add_definitions(-D_GNU_SOURCE)
diff --git a/ci/build_tomtom.sh b/ci/build_tomtom.sh
index ab1972180..792109fd4 100644
--- a/ci/build_tomtom.sh
+++ b/ci/build_tomtom.sh
@@ -1,13 +1,8 @@
 #!/bin/sh
 
-# installs tomtom toolchain according instructions from:
-# http://wiki.navit-project.org/index.php/TomTom_development
-
-# also read this thread:
-# http://sourceforge.net/p/navit/discussion/512959/thread/c8bcd427
-
 # in case you want to build a standalone system
 # https://github.com/george-hopkins/opentom
+# https://github.com/gefin/opentom
 
 set -e
 
@@ -43,11 +38,6 @@ if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.
   wget -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
 fi
 
-# if ! test -f "~/tomtom_assets/flite-2.0.0-release.tar.bz2"
-# then 
-#   wget -c www.festvox.org/flite/packed/flite-2.0/flite-2.0.0-release.tar.bz2 -P ~/tomtom_assets
-# fi
-
 if ! test -f "~/tomtom_assets/libpng-1.6.25.tar.gz"
 then 
   wget -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.25.tar.gz -P ~/tomtom_assets
@@ -69,7 +59,6 @@ sed -i "s/DATADIR=\/usr\/share\/espeak-data/DATADIR=~\/share\/espeak-data/g" src
 sed -i "s/AUDIO = portaudio/#AUDIO = portaudio/g" src/Makefile
 sed -i "s/-fvisibility=hidden//g" src/Makefile
 cat src/Makefile
-ls -la
 make -C src
 cd src
 make install
@@ -253,23 +242,20 @@ make install
 
 
 # tslib
-if ! test -f "$PREFIX/include/tslib.h"
-then
-  cd /tmp
-  rm -rf tslib-svn
-  git clone https://github.com/playya/tslib-svn.git
-  cd tslib-svn
-  sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
-  sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
-  sed -i "124i\#endif" plugins/input-raw.c
-  sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
-  sed -i "294i\#endif" plugins/input-raw.c
-  sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
-  ./autogen.sh
-  ./configure --prefix=$PREFIX --host=$ARCH
-  make -j$JOBS
-  make install
-fi
+cd /tmp
+rm -rf tslib-svn
+git clone https://github.com/playya/tslib-svn.git
+cd tslib-svn
+sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
+sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "124i\#endif" plugins/input-raw.c
+sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
+sed -i "294i\#endif" plugins/input-raw.c
+sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
+./autogen.sh
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
 
 
 cd /tmp
@@ -291,22 +277,18 @@ cd test
 ./configure --prefix=$PREFIX --host=$ARCH
 make testvidinfo
 cp testvidinfo $PREFIX/usr/bin/
-ls -la
 
 # to find sdl-config
 export PATH=$PREFIX/bin:$PATH
 
 # sdl image
- if ! test -f "$PREFIX/include/SDL/SDL_image.h"
- then
-   cd /tmp
-   wget -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
-   tar xzf SDL_image-1.2.12.tar.gz
-   cd SDL_image-1.2.12
-   ./configure --prefix=$PREFIX --host=$ARCH
-   make -j$JOBS
-   make install
- fi
+cd /tmp
+wget -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
+tar xzf SDL_image-1.2.12.tar.gz
+cd SDL_image-1.2.12
+./configure --prefix=$PREFIX --host=$ARCH
+make -j$JOBS
+make install
 
 # sdl ttf
 # cd /tmp
@@ -319,7 +301,8 @@ export PATH=$PREFIX/bin:$PATH
 
 # flite 
 # cd /tmp
-# tar jxvf ~/tomtom_assets/flite-2.0.0-release.tar.bz2
+# wget -c www.festvox.org/flite/packed/flite-2.0/flite-2.0.0-release.tar.bz2
+# tar jxvf flite-2.0.0-release.tar.bz2
 # cd flite-2.0.0-release
 # ./configure --prefix=$PREFIX --host=$ARCH
 # make -j$JOBS
@@ -346,14 +329,15 @@ cat > ~/navit/navit/xpm/tomtom_plus.svg << EOF
 </svg>
 EOF
 
+
 # navit
 cd ~/navit
 sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
 mkdir -p build
 cd build
-cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE -DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake -DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
-cat config.h
-cat navit/xpm/Makefile
+cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
+-DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
+-DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
 make -j$JOBS
 make install
 cd ..
@@ -371,10 +355,6 @@ cd share
 mkdir -p fonts
 cd ..
 
-# libraries
-ls -la $PREFIX/lib
-ls -la $PREFIX/bin
-ls -la $PREFIX/usr
 
 cp $PREFIX/lib/libfreetype.so.6 lib
 cp $PREFIX/lib/libSDL-1.2.so.0 lib
@@ -433,18 +413,19 @@ export SDL_AUDIODRIVER=dsp
 export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
 
 # Set language.
-export LANG=nl_BE
-export LANGUAGE=nl_BE
+export LANG=en_US
+export LANGUAGE=en_US
 
 export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
 
 # Run Navit.
 if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
 then
-	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
-elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
-then
-	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
+	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
+# tomtom320xml is not provided yet
+# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
+# then
+# 	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
 else
 	exit 1
 fi
@@ -456,7 +437,6 @@ while [ $? -eq 0 ]
 do
 echo "\0" > /dev/watchdog
 sleep 10
-#cat /dev/fb > /mnt/sdcard/navit/`date +%s`.raw
 ps | grep -v grep | grep -v wrapper | grep navit
 done
 
@@ -472,7 +452,7 @@ cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
 cp -r $PREFIX/lib/ts $OUT_PATH/navit/lib/
 cp $PREFIX/bin/ts_* $OUT_PATH/navit/ts/
 
-# images 
+# images and xml
 cd share
 mkdir xpm
 cd xpm
@@ -483,7 +463,7 @@ cp $PREFIX/share/navit/xpm/*64.png ./
 cp $PREFIX/share/navit/xpm/nav*.* ./
 cp $PREFIX/share/navit/xpm/country*.png ./
 cd ..
-cp $PREFIX/share/navit/navit.xml ./
+cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
 mkdir -p maps
 
 
diff --git a/navit/xslt/tomtom.xslt b/navit/xslt/tomtom.xslt
index 1bd505e91..85c783e7b 100644
--- a/navit/xslt/tomtom.xslt
+++ b/navit/xslt/tomtom.xslt
@@ -1,63 +1,61 @@
-<?xml version="1.0"?>

-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude" version="1.0">

-

-	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>

-

-	<xsl:template match="/">

-		<xsl:apply-templates select="config"/>

-	</xsl:template>

-

-	<xsl:template match="config">

-		<xsl:copy>

-			<xsl:apply-templates select="navit"/>

-		</xsl:copy>

-	</xsl:template>	

-

-	<xsl:template match="navit">

-		<xsl:copy>

-			<xsl:attribute name="zoom">32</xsl:attribute>

-			<xsl:attribute name="tracking">1</xsl:attribute>

-			<xsl:attribute name="orientation">-1</xsl:attribute>

-			<xsl:attribute name="autozoom_active">1</xsl:attribute>

-			<xsl:attribute name="recent_dest">25</xsl:attribute>

-			<graphics type="sdl" w="480" h="272" bpp="16" frame="0" flags="1"/>

-			<xsl:copy-of select="gui[@type='internal']"/>

-			<osd enabled="yes" type="text" x="80" y="0" w="320" h="40" font_size="360" align="0" label="${{tracking.item.street_name}} ${{tracking.item.street_name_systematic}}" background_color="#00008080"/>

-			<osd enabled="yes" type="text" x="80" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item[1].length[named]}}" background_color="#00008080"/>

-			<osd enabled="yes" type="text" x="160" y="232" w="240" h="40" font_size="360" align="0" label="${{vehicle.position_speed}} / ${{tracking.item.route_speed}}" background_color="#00008080"/>

-			<osd enabled="yes" type="text" x="400" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_length[named]}}" background_color="#00008080"/>

-			<osd enabled="yes" type="text" x="400" y="192" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_time[arrival]}}" background_color="#00008080"/>

-			<osd enabled="yes" type="compass" x="400" y="80" w="80" h="112" background_color="#00008080" font_size="300"/>

-			<osd enabled="yes" type="gps_status" x="0" y="80" w="80" h="40" background_color="#00008080"/>

-			<osd enabled="yes" type="speed_warner" x="0" y="120" w="80" h="72" background_color="#00008080" font_size="300"/>

-			<osd enabled="yes" type="navigation_next_turn" x="0" y="192" w="80" h="80" icon_w="48" icon_h="48" icon_src="%s_wh_48_48.png" background_color="#00008080"/> 

-			<osd enabled="yes" type="button" x="400" y="0" command="zoom_in()" src="tomtom_plus_80_80.png"/>

-			<osd enabled="yes" type="button" x="0" y="0" command="zoom_out()" src="tomtom_minus_80_80.png"/>

-			<vehicle name="Local GPS" profilename="car" enabled="yes" active="yes" follow="1" source="file:/var/run/gpspipe">

-			<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->

-				<log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,position_radius" data="/mnt/sdcard/navit/track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>

-			</vehicle>

-			<vehicle name="Demo" profilename="car" enabled="yes" active="no" follow="1" source="demo://" speed="100"/>

-			<xsl:copy-of select="tracking"/>

-			

-			<xsl:copy-of select="vehicleprofile[@name='car']"/>

-			<xsl:copy-of select="vehicleprofile[@name='car_shortest']"/>

-			<xsl:copy-of select="vehicleprofile[@name='car_avoid_tolls']"/>

-			<xsl:copy-of select="vehicleprofile[@name='bike']"/>

-			<xsl:copy-of select="vehicleprofile[@name='pedestrian']"/>

-			

-			<xsl:copy-of select="route"/>

-			<xsl:copy-of select="navigation"/>

-

-			<xsl:comment>Use espeak.</xsl:comment>

-			<speech type="cmdline" data="/mnt/sdcard/navit/bin/espeakdsp -v nl '%s'"/>

-			<xsl:comment>Use one of TomTom's voices.</xsl:comment>

-			<xsl:comment>speech type="cmdline" data="speak Simon '%s'"/</xsl:comment>

-			

-			<mapset enabled="yes">

-				<map type="binfile" enabled="yes" data="$NAVIT_SHAREDIR/maps/*.bin"/>

-			</mapset>

-			<xsl:copy-of select="layout"/>

-		</xsl:copy>

-	</xsl:template>

-</xsl:transform>

+<?xml version="1.0"?>
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude" version="1.0">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+	<xsl:template match="/">
+		<xsl:apply-templates select="config"/>
+	</xsl:template>
+
+	<xsl:template match="config">
+		<xsl:copy>
+			<xsl:apply-templates select="navit"/>
+		</xsl:copy>
+	</xsl:template>	
+
+	<xsl:template match="navit">
+		<xsl:copy>
+			<xsl:attribute name="zoom">32</xsl:attribute>
+			<xsl:attribute name="tracking">1</xsl:attribute>
+			<xsl:attribute name="orientation">-1</xsl:attribute>
+			<xsl:attribute name="autozoom_active">1</xsl:attribute>
+			<xsl:attribute name="recent_dest">25</xsl:attribute>
+			<graphics type="sdl" w="480" h="272" bpp="16" frame="0" flags="1"/>
+			<xsl:copy-of select="gui[@type='internal']"/>
+			<osd enabled="yes" type="text" x="80" y="0" w="320" h="40" font_size="360" align="0" label="${{tracking.item.street_name}} ${{tracking.item.street_name_systematic}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="80" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item[1].length[named]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="160" y="232" w="240" h="40" font_size="360" align="0" label="${{vehicle.position_speed}} / ${{tracking.item.route_speed}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="400" y="232" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_length[named]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="text" x="400" y="192" w="80" h="40" font_size="360" align="0" label="${{navigation.item.destination_time[arrival]}}" background_color="#00008080"/>
+			<osd enabled="yes" type="compass" x="400" y="80" w="80" h="112" background_color="#00008080" font_size="300"/>
+			<osd enabled="yes" type="gps_status" x="0" y="80" w="80" h="40" background_color="#00008080"/>
+			<osd enabled="yes" type="speed_warner" x="0" y="120" w="80" h="72" background_color="#00008080" font_size="300"/>
+			<osd enabled="yes" type="navigation_next_turn" x="0" y="192" w="80" h="80" icon_w="48" icon_h="48" icon_src="%s_wh_48_48.png" background_color="#00008080"/> 
+			<osd enabled="yes" type="button" x="400" y="0" command="zoom_in()" src="tomtom_plus_80_80.png"/>
+			<osd enabled="yes" type="button" x="0" y="0" command="zoom_out()" src="tomtom_minus_80_80.png"/>
+			<vehicle name="Local GPS" profilename="car" enabled="yes" active="yes" follow="1" source="file:/var/run/gpspipe">
+			<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
+				<log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,position_radius" data="/mnt/sdcard/navit/track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>
+			</vehicle>
+			<vehicle name="Demo" profilename="car" enabled="yes" active="no" follow="1" source="demo://" speed="100"/>
+			<xsl:copy-of select="tracking"/>
+			
+			<xsl:copy-of select="vehicleprofile[@name='car']"/>
+			<xsl:copy-of select="vehicleprofile[@name='car_shortest']"/>
+			<xsl:copy-of select="vehicleprofile[@name='car_avoid_tolls']"/>
+			<xsl:copy-of select="vehicleprofile[@name='bike']"/>
+			<xsl:copy-of select="vehicleprofile[@name='pedestrian']"/>
+			
+			<xsl:copy-of select="route"/>
+			<xsl:copy-of select="navigation"/>
+
+			<xsl:comment>Use espeak.</xsl:comment>
+			<speech type="cmdline" data="/mnt/sdcard/navit/bin/espeakdsp -v en '%s'"/>
+
+			<mapset enabled="yes">
+				<map type="binfile" enabled="yes" data="$NAVIT_SHAREDIR/maps/*.bin"/>
+			</mapset>
+			<xsl:copy-of select="layout"/>
+		</xsl:copy>
+	</xsl:template>
+</xsl:transform>