roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src roadmap_main.h,1.15,1.16

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16240

Modified Files:
	roadmap_main.h 
Log Message:
reformat doxygen source text slightly


Index: roadmap_main.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_main.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_main.h	12 Jul 2008 09:50:43 -0000	1.15
--- roadmap_main.h	27 Jan 2009 16:20:32 -0000	1.16
***************
*** 98,102 ****
  /**
   *
!  * @mainpage A Car Navigation System for Linux and UNIX (and PocketPC too)
   *
   *
--- 98,102 ----
  /**
   *
!  * @mainpage A Car Navigation System for Linux, UNIX, and Others
   *
   *
***************
*** 104,116 ****
   * More information is available in the documentation distributed with RoadMap.
   *
!  * RoadMap is an open source (GPL) program that provides a car navigation for Linux,
!  * UNIX and now Windows CE (a.k.a. PocketPC).
!  * It displays a map of the streets,
!  * tracks the position provided by a NMEA-compliant GPS receiver,
!  * identifies the street matching this GPS position,
!  * and announces the name of the crossing street at the next intersection.
!  * A trip feature allows RoadMap to display routes, tracks,
!  * and provide some basic navigation information
!  * (distance to the next waypoint, direction, speed, etc..).
!  * Voice messages are generated that duplicate some of the screen information. 
   */
--- 104,117 ----
   * More information is available in the documentation distributed with RoadMap.
   *
!  * RoadMap is an open source (GPL) program that provides a car
!  * navigation for Linux, UNIX and now Windows CE and even the
!  * iPhone/iPod.  It displays a map of the streets, tracks the
!  * position provided by a NMEA-compliant GPS receiver, identifies
!  * the street matching this GPS position, and announces the name
!  * of the crossing street at the next intersection.  A trip
!  * feature allows RoadMap to display routes, tracks, and provides
!  * some basic navigation information (distance to the next
!  * waypoint, direction, speed, etc..).  Voice messages are
!  * generated that duplicate some of the screen information. 
!  *
   */

[Roadmap-commit] roadmap/src mk_all_desktops,NONE,1.1

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26417

Added Files:
	mk_all_desktops 
Log Message:
utility script useful for doing test builds


--- NEW FILE: mk_all_desktops ---
#!/bin/sh

# script which will run make for all the unix-supported desktops
# Paul Fox, Jan 2009

# list all the easily buildable desktops
# wince should be in this list, but i don't currently have
# the right toolchain installed.
desktops="gtk gtk2 gtk2agg qt4 qt" # wince

if [ "$1" = "-n" ]
then
    noclean='y'
    shift
fi

test "$1" && desktops="$*"

# preserve whatever it is we usually work on
cp overrides.mk saved.overrides.mk
trap "mv saved.overrides.mk overrides.mk" 0

create_overrides()
{
    local desk=$1

    >overrides.mk

cat <<-EOF >>overrides.mk
	CFLAGS += -DINTERNAL_GPS_CONSOLE
	MODE=DEBUG
	SHAPEFILES = YES
EOF

    case $desk in

    gtk2agg)
	cat <<-EOF >>overrides.mk
		DESKTOP = GTK2
		AGG = rgb565
	EOF
	;;
    gtk2)
	cat <<-EOF >>overrides.mk
		DESKTOP = GTK2
		AGG = NO
	EOF
	;;
    gtk)
	cat <<-EOF >>overrides.mk
		DESKTOP = GTK
	EOF
	;;
    qt4)
	cat <<-EOF >>overrides.mk
		DESKTOP = QT4
		QTDIR = /usr/share/qt4
		CFLAGS += -I/usr/include/qt4
	EOF
	;;
    qt)
	cat <<-EOF >>overrides.mk
		DESKTOP = QT
		QTDIR = /usr/share/qt3
		CFLAGS += -I/usr/include/qt3
	EOF
	;;
    wince)
	cat <<-EOF >>overrides.mk
		DESKTOP = WINCE
		CROSS=/opt/mingw32ce/bin/arm-wince-mingw32ce-
		EXPAT = NO
		SHAPEFILES = NO
	EOF
	;;
    *)
	echo "error: unknown desktop '$desk'" >&2
	exit 1
	;;
    esac

}


# the logs of all the buils will end up here
mkdir -p mk.logs

# now do all the builds.
for desk in $desktops
do

    echo -------------
    echo Building for $desk
    echo

    # create the right overrides file for each desktop
    create_overrides $desk

    # do the build, saving the log.  remember if we fail.
    (test "$noclean" || make clean; make) >mk.logs/$desk.log 2>&1 || quit=1

    # summarize the important failures on stdout
    if egrep -ql 'warning:|error:|undefined reference' mk.logs/$desk.log
    then
	echo Warnings/Errors, if any, follow
	egrep 'warning:|error:|undefined reference' mk.logs/$desk.log
    fi

    # did we fail?  quit.
    test "$quit" = 1 && exit

done

[Roadmap-commit] roadmap README,1.162,1.163

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25439

Modified Files:
	README 
Log Message:
unbelievably minor cosmetic change


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** README	7 Nov 2008 13:46:54 -0000	1.162
--- README	27 Jan 2009 01:46:45 -0000	1.163
***************
*** 1,3 ****
! RoadMap - User Manual and README
  
  November 2008
--- 1,3 ----
! RoadMap User Manual and README
  
  November 2008

[Roadmap-commit] roadmap/doc ChangeLog,1.2,1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25045

Modified Files:
	ChangeLog 
Log Message:
bring up to date


Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	7 Nov 2008 23:23:52 -0000	1.2
--- ChangeLog	27 Jan 2009 01:38:38 -0000	1.3
***************
*** 7,15 ****
   This list is current as of 11/7/2008, created with the help of
  ```
!    cvs2cl.pl -l "-d2008/03/17<2008/11/30"
  ```
  
   Items marked (*) originated on Ehud Shabtai's roadmap_editor code branch.
  
    - Refactored the documentation into more files for easier maintenance.
      Switched to "txt2tags" (from "aptconvert") for generating online
--- 7,21 ----
   This list is current as of 11/7/2008, created with the help of
  ```
!    cvs2cl.pl -l "-d2008/11/29<2009/1/27"
  ```
  
   Items marked (*) originated on Ehud Shabtai's roadmap_editor code branch.
  
+   - Support for building .rdm data from OpenStreetMap country snapshots,
+     in addition to quadtiles.  Preparatory work for allowing navigation
+     using those maps.  (Danny Backx)
+ 
+   - New 'V' key-binding to create waypoint from current GPS position.
+ 
    - Refactored the documentation into more files for easier maintenance.
      Switched to "txt2tags" (from "aptconvert") for generating online
***************
*** 43,47 ****
  
    - Resurrection of WinCE support, from Danny Backx (uses minw32ce).
!     Includes GPS autodetection.
  
    - Added several revisions' worth of support for Apple iPhone and iPod,
--- 49,53 ----
  
    - Resurrection of WinCE support, from Danny Backx (uses minw32ce).
!     Includes GPS autodetection, and CAB files for installation.
  
    - Added several revisions' worth of support for Apple iPhone and iPod,

[Roadmap-commit] roadmap/doc Bugs, 1.1, 1.2 ChangeLog, 1.3, 1.4 Coding, 1.1, 1.2 Configuration, 1.2, 1.3 Developer-Guide, 1.2, 1.3 Installation, 1.1, 1.2 Map-Building, 1.1, 1.2 Map-Format, 1.1, 1.2 OpenStreetMap, 1.1, 1.2 Platforms, 1.3, 1.4 Quickstart, 1.1, 1.2 Status, 1.2, 1.3 ToDo, 1.2, 1.3 Usage, 1.2, 1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25154

Modified Files:
	Bugs ChangeLog Coding Configuration Developer-Guide 
	Installation Map-Building Map-Format OpenStreetMap Platforms 
	Quickstart Status ToDo Usage 
Log Message:
bump dates to january,


Index: Status
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Status,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status	27 Jan 2009 00:07:31 -0000	1.2
--- Status	27 Jan 2009 01:42:13 -0000	1.3
***************
*** 1,9 ****
  RoadMap Project Status
  Paul Fox, current RoadMap maintainer
! November 2008
  
  = New Release 1.2.0 =
  
!     RoadMap has another new release.  It's been over a year
      since 1.1.0 was released.  Lots of work has been done since
      then, both in terms of features, and platform support.
--- 1,9 ----
  RoadMap Project Status
  Paul Fox, current RoadMap maintainer
! January 2009
  
  = New Release 1.2.0 =
  
!     RoadMap has another new release.  It's been well over a year
      since 1.1.0 was released.  Lots of work has been done since
      then, both in terms of features, and platform support.
***************
*** 22,27 ****
  
          - Initial support of the iPhone.
-         
- 
  
      There's more detail in the changelog.
--- 22,25 ----

Index: OpenStreetMap
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/OpenStreetMap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpenStreetMap	7 Nov 2008 13:46:54 -0000	1.1
--- OpenStreetMap	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap and OpenStreetMap map data
  
! November 2008
  
  
--- 1,5 ----
  RoadMap and OpenStreetMap map data
  
! January 2009
  
  

Index: Installation
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Installation,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Installation	7 Nov 2008 13:46:54 -0000	1.1
--- Installation	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap Installation
  
! November 2008
  
  = Full Installation Guide =
--- 1,5 ----
  RoadMap Installation
  
! January 2009
  
  = Full Installation Guide =

Index: Quickstart
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Quickstart,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Quickstart	7 Nov 2008 13:46:54 -0000	1.1
--- Quickstart	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap Quickstart
  
! November 2008
  
  = Quickstart =
--- 1,5 ----
  RoadMap Quickstart
  
! January 2009
  
  = Quickstart =

Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog	27 Jan 2009 01:38:38 -0000	1.3
--- ChangeLog	27 Jan 2009 01:42:13 -0000	1.4
***************
*** 1,5 ****
  RoadMap Changelog
  
! November 2008
  
  Roadmap v1.2.0 (??)
--- 1,5 ----
  RoadMap Changelog
  
! January 2009
  
  Roadmap v1.2.0 (??)

Index: Map-Format
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Map-Format,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Map-Format	7 Nov 2008 13:46:54 -0000	1.1
--- Map-Format	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap Quickstart
  
! November 2008
  
  
--- 1,5 ----
  RoadMap Quickstart
  
! January 2009
  
  
***************
*** 556,560 ****
    - THE EXCHANGE FORMAT
  
!      (As of November of 2008, the exchange format described here is not
       supported -- the code is incomplete.)
  
--- 556,560 ----
    - THE EXCHANGE FORMAT
  
!      (As of January of 2009, the exchange format described here is not
       supported -- the code is incomplete.)
  

Index: Coding
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Coding,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Coding	7 Nov 2008 13:46:54 -0000	1.1
--- Coding	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap Developer Information
  
! November 2008
  
  = Developer Information =
--- 1,5 ----
  RoadMap Developer Information
  
! January 2009
  
  = Developer Information =

Index: Bugs
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Bugs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Bugs	7 Nov 2008 13:46:54 -0000	1.1
--- Bugs	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  Approximate bug list for RoadMap
  
! November 2008
  
  //(patches welcome!)//
--- 1,5 ----
  Approximate bug list for RoadMap
  
! January 2009
  
  //(patches welcome!)//

Index: Map-Building
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Map-Building,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Map-Building	7 Nov 2008 13:46:54 -0000	1.1
--- Map-Building	27 Jan 2009 01:42:13 -0000	1.2
***************
*** 1,5 ****
  RoadMap Map Building 
  
! November 2008
  
  
--- 1,5 ----
  RoadMap Map Building 
  
! January 2009
  
  

Index: Platforms
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Platforms,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Platforms	7 Nov 2008 23:27:12 -0000	1.3
--- Platforms	27 Jan 2009 01:42:13 -0000	1.4
***************
*** 1,5 ****
  RoadMap Platform Specifics
  
! November 2008
  
  
--- 1,5 ----
  RoadMap Platform Specifics
  
! January 2009
  
  

Index: Usage
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Usage,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Usage	26 Jan 2009 19:41:27 -0000	1.2
--- Usage	27 Jan 2009 01:42:13 -0000	1.3
***************
*** 1,5 ****
  RoadMap and RoadGps Usage
  
! November 2008
  
  = Using RoadMap =
--- 1,5 ----
  RoadMap and RoadGps Usage
  
! January 2009
  
  = Using RoadMap =

Index: Configuration
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Configuration,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Configuration	27 Jan 2009 00:07:31 -0000	1.2
--- Configuration	27 Jan 2009 01:42:13 -0000	1.3
***************
*** 1,5 ****
  RoadMap Configuration
  
! November 2008
  
  = Configuration =
--- 1,5 ----
  RoadMap Configuration
  
! January 2009
  
  = Configuration =

Index: ToDo
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ToDo,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ToDo	19 Nov 2008 21:53:36 -0000	1.2
--- ToDo	27 Jan 2009 01:42:13 -0000	1.3
***************
*** 1,5 ****
  To-do list for RoadMap
  
! November 2008
  
  This is a list of changes envisioned for future versions of RoadMap. 
--- 1,5 ----
  To-do list for RoadMap
  
! January 2009
  
  This is a list of changes envisioned for future versions of RoadMap. 

Index: Developer-Guide
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Developer-Guide,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Developer-Guide	27 Jan 2009 00:07:31 -0000	1.2
--- Developer-Guide	27 Jan 2009 01:42:13 -0000	1.3
***************
*** 1,5 ****
  RoadMap Developer Guide
  
! November 2008
  
  = Developer Guide =
--- 1,5 ----
  RoadMap Developer Guide
  
! January 2009
  
  = Developer Guide =

[Roadmap-commit] roadmap/web Makefile, 1.13, 1.14 documentation.html, 1.10, 1.11 download.html, 1.44, 1.45 index.html, 1.33, 1.34 list.html, 1.13, 1.14 maps.html, 1.37, 1.38 navbar.html, 1.8, 1.9 screenshots.html, 1.18, 1.19 sitestandard.css, 1.7, 1.8

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25534

Modified Files:
	Makefile documentation.html download.html index.html list.html 
	maps.html navbar.html screenshots.html sitestandard.css 
Log Message:
sizing and formatting changes in prep for using a simple 64bit icon on
the navbar rather than the wider version used now.


Index: download.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/download.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** download.html	14 May 2008 16:12:01 -0000	1.44
--- download.html	27 Jan 2009 01:48:47 -0000	1.45
***************
*** 7,12 ****
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap: Download</H1><BR></CENTER>
! <P>
  <H2>Disclaimer</H2>
  RoadMap is known to have bugs.  The data
--- 7,12 ----
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap Downloads</H1>
! </CENTER>
  <H2>Disclaimer</H2>
  RoadMap is known to have bugs.  The data

Index: index.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/index.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** index.html	7 Nov 2008 13:46:54 -0000	1.33
--- index.html	27 Jan 2009 01:48:47 -0000	1.34
***************
*** 6,15 ****
  <BODY class=roadmap>
  <!--#include virtual="navbar.html" --><hr>
! <CENTER>
! <H1>A Car Navigation System for Linux and UNIX (and PocketPC too)</H1>
! </CENTER>
! <BR>
  
! <p>In addition to this introductory page, you might want to look at
  a short note describing <a class="normal" href="status.html">
  current project status</a>.
--- 6,12 ----
  <BODY class=roadmap>
  <!--#include virtual="navbar.html" --><hr>
! <H1>RoadMap &mdash; A Car Navigation System for Linux, UNIX and Others</H1>
  
! In addition to this introductory page, you might want to look at
  a short note describing <a class="normal" href="status.html">
  current project status</a>.

Index: navbar.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/navbar.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** navbar.html	7 Nov 2008 15:15:10 -0000	1.8
--- navbar.html	27 Jan 2009 01:48:47 -0000	1.9
***************
*** 1,5 ****
  <!-- start of navigation bar -->
  <div class="navigation-bar">
!   <a class="navbar-image" href="index.html"><span class="navbar-image"></span></a>
    <a id="first-navitem"
  
--- 1,5 ----
  <!-- start of navigation bar -->
  <div class="navigation-bar">
!   <a href="index.html"><span class="navbar-image"></span></a>
    <a id="first-navitem"
  
***************
*** 14,21 ****
     <a class="navitem2" href="todolist.html">To-do list</a> <span class="invisible">|</span>
     <a class="navitem2" href="changelog.html">Changelog</a> <span class="invisible">|</span>
!   <a class="navitem" href="download.html">Download</a> <span class="invisible">|</span>
    <a class="navitem" href="screenshots.html">Screenshots</a> <span class="invisible">|</span>
    <a class="navitem" href="maps.html">Maps</a> <span class="invisible">|</span>
!   <a class="navitem" href="list.html">Mailing list</a>
     <a class="navitem2" href="http://sourceforge.net/mailarchive/forum.php?forum_name=roadmap-general">Archives</a> <span class="invisible">|</span>
    <a class="navitem" href="http://sourceforge.net/projects/roadmap">SourceForge</a> <span class="invisible">|</span>
--- 14,21 ----
     <a class="navitem2" href="todolist.html">To-do list</a> <span class="invisible">|</span>
     <a class="navitem2" href="changelog.html">Changelog</a> <span class="invisible">|</span>
!   <a class="navitem" href="download.html">Downloads</a> <span class="invisible">|</span>
    <a class="navitem" href="screenshots.html">Screenshots</a> <span class="invisible">|</span>
    <a class="navitem" href="maps.html">Maps</a> <span class="invisible">|</span>
!   <a class="navitem" href="list.html">Mailing lists</a>
     <a class="navitem2" href="http://sourceforge.net/mailarchive/forum.php?forum_name=roadmap-general">Archives</a> <span class="invisible">|</span>
    <a class="navitem" href="http://sourceforge.net/projects/roadmap">SourceForge</a> <span class="invisible">|</span>

Index: list.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/list.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** list.html	16 Oct 2007 16:04:13 -0000	1.13
--- list.html	27 Jan 2009 01:48:47 -0000	1.14
***************
*** 7,12 ****
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap: Mailing List</H1><BR></CENTER>
! <P>
  For many years, the RoadMap mailing list was hosted at saignon.net.  We
  thank the folks there for this service.
--- 7,12 ----
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap Mailing Lists</H1>
! </CENTER>
  For many years, the RoadMap mailing list was hosted at saignon.net.  We
  thank the folks there for this service.

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	7 Nov 2008 13:46:54 -0000	1.13
--- Makefile	27 Jan 2009 01:48:47 -0000	1.14
***************
*** 74,78 ****
  SUPPORT = \
  	background2.jpg \
! 	roadmap-right.png \
  	sitestandard.css
  
--- 74,78 ----
  SUPPORT = \
  	background2.jpg \
! 	roadmap-webicon.png \
  	sitestandard.css
  
***************
*** 114,118 ****
  	touch $@
  
! roadmap-right.png: ../src/icons/roadmap-right.png
  	cp $< $@
  
--- 114,118 ----
  	touch $@
  
! roadmap-webicon.png: ../src/icons/roadmap-64.png
  	cp $< $@
  
***************
*** 172,176 ****
  	mkdir -p favicon.tmpdir
  	cd favicon.tmpdir ;\
! 	pngtopnm ../../src/icons/roadmap-32.png >roadmap-32.pnm ;\
  	for size in 16 24 32 48 ;\
  	do \
--- 172,176 ----
  	mkdir -p favicon.tmpdir
  	cd favicon.tmpdir ;\
! 	pngtopnm ../../src/icons/roadmap-64.png >roadmap-64.pnm ;\
  	for size in 16 24 32 48 ;\
  	do \

Index: maps.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/maps.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** maps.html	19 Mar 2008 13:23:54 -0000	1.37
--- maps.html	27 Jan 2009 01:48:47 -0000	1.38
***************
*** 7,12 ****
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap: Pre-compiled Maps</H1><BR></CENTER>
! <P>
  <center>
  <b>USA maps built from the TIGER 2006 Second Edition files!</b>
--- 7,12 ----
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap Pre-compiled Maps</H1>
! </CENTER>
  <center>
  <b>USA maps built from the TIGER 2006 Second Edition files!</b>

Index: documentation.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/documentation.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** documentation.html	12 Oct 2007 21:16:00 -0000	1.10
--- documentation.html	27 Jan 2009 01:48:47 -0000	1.11
***************
*** 7,15 ****
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap: Documentation</H1>
  </CENTER>
- <BR>
  
! <P>The following documentation is available:
  <UL>
     <LI>The <a class="normal" href="manual.html">RoadMap Manual</a>.
--- 7,14 ----
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap Documentation</H1>
  </CENTER>
  
! The following documentation is available:
  <UL>
     <LI>The <a class="normal" href="manual.html">RoadMap Manual</a>.

Index: sitestandard.css
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/sitestandard.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sitestandard.css	6 Nov 2008 20:21:09 -0000	1.7
--- sitestandard.css	27 Jan 2009 01:48:47 -0000	1.8
***************
*** 6,10 ****
  	font-family:Times;
  	background-color: #48fbc4; /* matched to background2.jpg */
! 	margin-left:    250px;    /* leave room for navigation bar */
  	margin-right:    50px;
  }
--- 6,10 ----
  	font-family:Times;
  	background-color: #48fbc4; /* matched to background2.jpg */
! 	margin-left:    170px;    /* leave room for navigation bar */
  	margin-right:    50px;
  }
***************
*** 14,18 ****
  	font-family:Times;
  	background-color: #48fbc4; /* matched to background2.jpg */
! 	margin-left:    250px;
  	margin-right:    50px;
  }
--- 14,18 ----
  	font-family:Times;
  	background-color: #48fbc4; /* matched to background2.jpg */
! 	margin-left:    170px;
  	margin-right:    50px;
  }
***************
*** 21,28 ****
  div.navigation-bar {
  
    left:           5px;         /* wide left margin  */
    position:       fixed;       /* prevent scrolling */
  
!   padding:        10px;
    background-image: url('background2.jpg');
    border-left:    1px solid black;
--- 21,30 ----
  div.navigation-bar {
  
+   top:            5px;         /* wide left margin  */
    left:           5px;         /* wide left margin  */
    position:       fixed;       /* prevent scrolling */
  
!   font-family:Times;
!   padding:        5px;
    background-image: url('background2.jpg');
    border-left:    1px solid black;
***************
*** 78,82 ****
  
    /* not important */
!   margin-top:     15px;
  }
  
--- 80,84 ----
  
    /* not important */
!   /* margin-top:     10px; */
  }
  
***************
*** 90,94 ****
  
    /* important */
!   content: url(roadmap-right.png); /* inserts image after dummy SPAN element */
  }
  
--- 92,97 ----
  
    /* important */
!   margin-left: 23px;
!   content: url(roadmap-webicon.png); /* inserts image after dummy SPAN element */
  }
  

Index: screenshots.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/screenshots.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** screenshots.html	10 Oct 2007 17:33:25 -0000	1.18
--- screenshots.html	27 Jan 2009 01:48:47 -0000	1.19
***************
*** 7,11 ****
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap: Screenshots</H1><BR></CENTER>
  Most screenshots below were made with the GTK2 version of RoadMap.
  <HR>
--- 7,12 ----
  <!--#include virtual="navbar.html" --><hr>
  <CENTER>
! <H1>RoadMap Screenshots</H1>
! </CENTER>
  Most screenshots below were made with the GTK2 version of RoadMap.
  <HR>

[Roadmap-commit] roadmap/src roadmap_copyright.h, 1.30, 1.31 roadmap_start.c, 1.150, 1.151

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25833

Modified Files:
	roadmap_copyright.h roadmap_start.c 
Log Message:
fix the real copyright strings in at least roadmap_start.c and
roadmap_copyright.h to match what we put in the About box.


Index: roadmap_copyright.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_copyright.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** roadmap_copyright.h	13 Sep 2008 20:56:47 -0000	1.30
--- roadmap_copyright.h	27 Jan 2009 01:53:41 -0000	1.31
***************
*** 3,7 ****
   * LICENSE:
   *
!  *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 3,9 ----
   * LICENSE:
   *
!  *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
!  *	 Pascal F. Martin, Paul Fox, Ehud Shabtai, Danny Backx,
!  *	 and others.
   *
   *   This file is part of RoadMap.
***************
*** 25,30 ****
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.1.0-post"
! #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008"
  
  #endif // INCLUDE__ROADMAP_COPYRIGHT__H
--- 27,32 ----
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.2.0-pre"
! #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009"
  
  #endif // INCLUDE__ROADMAP_COPYRIGHT__H

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** roadmap_start.c	26 Jan 2009 19:41:27 -0000	1.150
--- roadmap_start.c	27 Jan 2009 01:53:41 -0000	1.151
***************
*** 3,7 ****
   * LICENSE:
   *
!  *   (c) Copyright 2002, 2003 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 3,9 ----
   * LICENSE:
   *
!  *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
!  *	 Pascal F. Martin, Paul Fox, Ehud Shabtai, Danny Backx,
!  *	 and others.
   *
   *   This file is part of RoadMap.

[Roadmap-commit] roadmap/howtos makemaps.txt,1.4,NONE

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/howtos
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26140

Removed Files:
	makemaps.txt 
Log Message:
for better or worse, the contents of makemaps.txt is now in
Map-Designing in the doc directory.


--- makemaps.txt DELETED ---

[Roadmap-commit] roadmap/src Makefile,1.132,1.133

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27442

Modified Files:
	Makefile 
Log Message:
add doxygen config file to sources list


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** Makefile	24 Dec 2008 12:19:11 -0000	1.132
--- Makefile	27 Jan 2009 02:31:12 -0000	1.133
***************
*** 324,328 ****
  MISCFILES = roadmap.desktop roadmap.menu default/All \
  		roadmap.toolbar.ex roadmap.actionlabels.ex \
! 		app_a02.txt usstates.txt
  SCRIPTS = rdmdownload rdmcompare \
  		rdmgenmaps rdmgenshpmaps rdmgenstatemaps rdmgendcwmaps
--- 324,328 ----
  MISCFILES = roadmap.desktop roadmap.menu default/All \
  		roadmap.toolbar.ex roadmap.actionlabels.ex \
! 		app_a02.txt usstates.txt roadmap.doxy
  SCRIPTS = rdmdownload rdmcompare \
  		rdmgenmaps rdmgenshpmaps rdmgenstatemaps rdmgendcwmaps

[Roadmap-commit] roadmap/doc Coding,1.2,1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27815

Modified Files:
	Coding 
Log Message:
add doxygen note


Index: Coding
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Coding,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Coding	27 Jan 2009 01:42:13 -0000	1.2
--- Coding	27 Jan 2009 02:39:58 -0000	1.3
***************
*** 5,8 ****
--- 5,19 ----
  = Developer Information =
  
+   - Doxygen
+ 
+      Some, but nowhere near all, of the RoadMap codebase has been
+      annotated with doxygen-compatible markup.  Running "make apidocs"
+      in the "src" directory will result in a "doc/api/html" subdirectory
+      containing the doxygen-generated output.  It's best to run this
+      is a fairly clean source tree, because currently the doxygen
+      configuration examines all source files, whether or not they're
+      really part of RoadMap (e.g., old debug files, or test harnesses,
+      will be examined and "documented" as well.
+ 
    - Porting RoadMap
  

[Roadmap-commit] roadmap/doc Configuration, 1.1, 1.2 Developer-Guide, 1.1, 1.2 Map-Designing, 1.1, 1.2 Status, 1.1, 1.2

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20803

Modified Files:
	Configuration Developer-Guide Map-Designing Status 
Log Message:

fix uppercase --> mixed case for headings.

add blank lines to Developer-Guide to force new sections to be
recognized in the sub-parts.


Index: Status
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Status,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Status	7 Nov 2008 13:46:54 -0000	1.1
--- Status	27 Jan 2009 00:07:31 -0000	1.2
***************
*** 1,3 ****
! Project Status
  Paul Fox, current RoadMap maintainer
  November 2008
--- 1,3 ----
! RoadMap Project Status
  Paul Fox, current RoadMap maintainer
  November 2008

Index: Map-Designing
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Map-Designing,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Map-Designing	7 Nov 2008 13:46:54 -0000	1.1
--- Map-Designing	27 Jan 2009 00:07:31 -0000	1.2
***************
*** 4,8 ****
  
  
! = INTRODUCTION =
  
     This HOWTO describes how to create a new map for RoadMap. The intent is
--- 4,8 ----
  
  
! = Map Building Introduction =
  
     This HOWTO describes how to create a new map for RoadMap. The intent is
***************
*** 18,22 ****
  
  
! = OVERVIEW =
  
     There are four major phases involved when creating maps for RoadMap:
--- 18,23 ----
  
  
! 
! = Overview =
  
     There are four major phases involved when creating maps for RoadMap:
***************
*** 122,126 ****
  
  
! = LAYERS =
  
  - LAYER CLASS
--- 123,127 ----
  
  
! = Layers =
  
  - LAYER CLASS
***************
*** 173,177 ****
  
  
! = MAP ORGANIZATION =
  
     RoadMap divides earth into territories, usually defined by administrative
--- 174,178 ----
  
  
! = Map Organization =
  
     RoadMap divides earth into territories, usually defined by administrative

Index: Configuration
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Configuration,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Configuration	7 Nov 2008 13:46:54 -0000	1.1
--- Configuration	27 Jan 2009 00:07:31 -0000	1.2
***************
*** 31,35 ****
       documentation for more details.
  
! == FILES ==
  
       The syntax of most RoadMap configuration files is similar to the X
--- 31,35 ----
       documentation for more details.
  
! == Files ==
  
       The syntax of most RoadMap configuration files is similar to the X
***************
*** 84,88 ****
       longer used.)
  
! == MESSAGES ==
  
       The RoadMap text displays and voice messages can be configured by the
--- 84,88 ----
       longer used.)
  
! == Messages ==
  
       The RoadMap text displays and voice messages can be configured by the
***************
*** 157,161 ****
  
  
! == MENUS AND TOOLBAR ==
  
       The items shown in the RoadMap and RoadGps menus and toolbars can be
--- 157,161 ----
  
  
! == Menus and Toolbar ==
  
       The items shown in the RoadMap and RoadGps menus and toolbars can be
***************
*** 292,296 ****
       has a limited size.
  
! == ON-SCREEN OBJECTS ==
  
       RoadMap can display small images on the screen (on-screen objects) which
--- 292,296 ----
       has a limited size.
  
! == On-Screen Objects ==
  
       RoadMap can display small images on the screen (on-screen objects) which
***************
*** 405,409 ****
  
  
! == PREFERENCE ITEMS ==
  
       : General.Unit
--- 405,409 ----
  
  
! == Preference Items ==
  
       : General.Unit
***************
*** 1050,1054 ****
           - //Default:// "yes"
  
! == SESSION ITEMS ==
  
       : Location.Position
--- 1050,1054 ----
           - //Default:// "yes"
  
! == Session Items ==
  
       : Location.Position
***************
*** 1151,1155 ****
  
  
! == SCHEMA ITEMS ==
  
       The schema file uses the same format as the preference file. It defines
--- 1151,1155 ----
  
  
! == Schema Items ==
  
       The schema file uses the same format as the preference file. It defines
***************
*** 1206,1210 ****
  
  
! == SPRITES ==
  
       This file defines the drawing commands used to draw the various symbols
--- 1206,1210 ----
  
  
! == Sprites ==
  
       This file defines the drawing commands used to draw the various symbols
***************
*** 1294,1298 ****
  
  
! == TRIP FILES ==
  
       RoadMap trip data is stored in GPX format.  More about the widely-used
--- 1294,1298 ----
  
  
! == Trip Files ==
  
       RoadMap trip data is stored in GPX format.  More about the widely-used
***************
*** 1447,1451 ****
       user's preferences and session file are found.)
  
! == FEATURE FILES ==
  
       Like the RoadMap trip data, feature data is stored in GPX format.  Each
--- 1447,1451 ----
       user's preferences and session file are found.)
  
! == Feature Files ==
  
       Like the RoadMap trip data, feature data is stored in GPX format.  Each

Index: Developer-Guide
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Developer-Guide,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Developer-Guide	7 Nov 2008 13:46:54 -0000	1.1
--- Developer-Guide	27 Jan 2009 00:07:31 -0000	1.2
***************
*** 12,16 ****
--- 12,22 ----
  % -- CUT HERE --
  %!include: Coding
+ 
+ 
  %!include: Map-Building
+ 
+ 
  %!include: Map-Format
+ 
+ 
  %!include: Map-Designing

[Roadmap-commit] roadmap/src/win32 Makefile,1.15,1.16

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6016

Modified Files:
	Makefile 
Log Message:
update the sourcelist rule.  use "find" instead of list, to prevent
future lossage.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	7 Dec 2008 13:02:16 -0000	1.15
--- Makefile	26 Jan 2009 19:46:37 -0000	1.16
***************
*** 83,95 ****
  # for win32 we aren't as rigorous about producing
  # this list of source as we are for the other RoadMap
! # directories.  (using wildcards will do for now.)
  sourcelist:
! 	@ls Makefile \
! 	    *.[ch] *.cpp *.ico \
! 	    roadmap.rc preferences \
! 	    install.inf \
! 	    wince_env/Roadmap.vcw \
! 	    wince_env/*/*.vcp \
! 	    icons/rm_*.bmp
  
  WINDRES=$(CROSS)windres
--- 83,89 ----
  # for win32 we aren't as rigorous about producing
  # this list of source as we are for the other RoadMap
! # directories.  (basically, pick up everything.)
  sourcelist:
! 	@find . -name 'CVS' -prune -o -print
  
  WINDRES=$(CROSS)windres

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.9,1.10

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5841

Modified Files:
	buildmap_osm_text.c 
Log Message:
remove unused vars (warning cleanup)


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildmap_osm_text.c	5 Jan 2009 20:32:17 -0000	1.9
--- buildmap_osm_text.c	26 Jan 2009 19:42:45 -0000	1.10
***************
*** 148,152 ****
  {
  	int		i, j, k, l, found;
! 	static char	res[256], xml[16];
  
  	for (i=j=0; s[i]; i++)
--- 148,152 ----
  {
  	int		i, j, k, l, found;
! 	static char	res[256];
  
  	for (i=j=0; s[i]; i++)
***************
*** 157,161 ****
  					;
  				/* When not equal, must be at end of code */
! 				if (XmlIsms[k].code[l] == NULL &&
  						s[l+i+1] == ';') {
  					found = 1;
--- 157,161 ----
  					;
  				/* When not equal, must be at end of code */
! 				if (XmlIsms[k].code[l] == '\0' &&
  						s[l+i+1] == ';') {
  					found = 1;
***************
*** 490,495 ****
  buildmap_osm_text_nd_pass1(char *data)
  {
! 	int	node, ix;
! 	float	lon, lat;
  
  	if (sscanf(data, "nd ref=%*[\"']%d%*[\"']", &node) != 1)
--- 490,494 ----
  buildmap_osm_text_nd_pass1(char *data)
  {
! 	int	node;
  
  	if (sscanf(data, "nd ref=%*[\"']%d%*[\"']", &node) != 1)

[Roadmap-commit] roadmap/src roadmap_start.c,1.149,1.150

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5728/src

Modified Files:
	roadmap_start.c 
Log Message:
add 'V' as key-binding for "create waypoint from current GPS location"


Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** roadmap_start.c	19 Sep 2008 16:21:40 -0000	1.149
--- roadmap_start.c	26 Jan 2009 19:41:27 -0000	1.150
***************
*** 1048,1052 ****
     "T"               ROADMAP_MAPPED_TO "tracktoggle",
     "U"               ROADMAP_MAPPED_TO "toggleorientation",
!    /* V Unused. */
     "W"               ROADMAP_MAPPED_TO "addaswaypoint",
     "X"               ROADMAP_MAPPED_TO "intersection",
--- 1048,1052 ----
     "T"               ROADMAP_MAPPED_TO "tracktoggle",
     "U"               ROADMAP_MAPPED_TO "toggleorientation",
!    "V"               ROADMAP_MAPPED_TO "gpsaswaypoint",
     "W"               ROADMAP_MAPPED_TO "addaswaypoint",
     "X"               ROADMAP_MAPPED_TO "intersection",

[Roadmap-commit] roadmap/doc Usage,1.1,1.2

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5728/doc

Modified Files:
	Usage 
Log Message:
add 'V' as key-binding for "create waypoint from current GPS location"


Index: Usage
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Usage,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Usage	7 Nov 2008 13:46:54 -0000	1.1
--- Usage	26 Jan 2009 19:41:27 -0000	1.2
***************
*** 291,294 ****
--- 291,295 ----
       |   T              |  Toggle display of the current track.
       |   U              |  Center the map on the GPS position (north up).
+      |   V              |  Create new waypoint based on current GPS position.
       |   W              |  Set the selected street block as waypoint.
       |   X              |  Find an intersection.

[Roadmap-commit] roadmap/src/gtk2 roadmap_main.c,1.41,1.42

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22970/gtk2

Modified Files:
	roadmap_main.c 
Log Message:
argh.  revert patches inadvertently applied with last commit.


Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** roadmap_main.c	16 Jan 2009 16:57:51 -0000	1.41
--- roadmap_main.c	16 Jan 2009 17:03:29 -0000	1.42
***************
*** 34,40 ****
  #include <signal.h>
  
- #include <X11/Xlib.h>
  #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
  
--- 34,38 ----
***************
*** 251,304 ****
  }
  
- // set X window properties so we act as a proper activity in the
- // sugar environment
- static void roadmap_main_sugarize(void) {
- 
- #if MAYBE_SOMEDAY_SUGARIZED_ACTIVITY 
- 
-     Display *dpy;
-     Window win;
-     Atom a_activity, a_bundle, a_pid, a_name, a_cardinal, a_string, a_utf8;
-     int pid;
- 
-     const char *sugar_bundle_id = getenv("SUGAR_BUNDLE_ID");
-     const char *sugar_activity_id = getenv("SUGAR_ACTIVITY_ID");
-     const char *sugar_object_id = getenv("SUGAR_OBJECT_ID");
-     const char *net_wm_name = getenv("NET_WM_NAME");
- 
-     roadmap_log (ROADMAP_DEBUG, "sugar: %s, %s, %s, %s", 
-         sugar_bundle_id ? : "none", sugar_activity_id ? : "none", sugar_object_id ? : "none", net_wm_name ? : "none");
- 
-     if (!sugar_bundle_id || !sugar_activity_id ||
-         !sugar_object_id || !net_wm_name) {
-         /* apparently not a sugar activity today */
-         return;
-     }
- 
-     // dpy = GDK_WINDOW_XDISPLAY(RoadMapMainWindow->window);
- 
-     win = GDK_WINDOW_XID(RoadMapMainWindow);
- 
-     a_activity = XInternAtom(GDK_DISPLAY(), "_SUGAR_ACTIVITY_ID", 0);
-     a_bundle = XInternAtom(GDK_DISPLAY(), "_SUGAR_BUNDLE_ID", 0);
-     a_pid = XInternAtom(GDK_DISPLAY(), "_NET_WM_PID", 0);
-     a_name = XInternAtom(GDK_DISPLAY(), "_NET_WM_NAME", 0);
-     a_cardinal = XInternAtom(GDK_DISPLAY(), "CARDINAL", 0);
-     a_string = XInternAtom(GDK_DISPLAY(), "STRING", 0);
-     a_utf8 = XInternAtom(GDK_DISPLAY(), "UTF8_STRING", 0);
- 
-     pid = getpid();
- 
-     XChangeProperty(GDK_DISPLAY(), win, a_name, a_utf8, 8,
-         PropModeReplace, (void *)net_wm_name, strlen(net_wm_name));
-     XChangeProperty(GDK_DISPLAY(), win, a_pid, a_cardinal, 32,
-         PropModeReplace, (unsigned char *) &pid, 1);
-     XChangeProperty(GDK_DISPLAY(), win, a_activity, a_string, 8,
-         PropModeReplace, (void *)sugar_activity_id, strlen(sugar_activity_id));
-     XChangeProperty(GDK_DISPLAY(), win, a_bundle, a_string, 8,
-         PropModeReplace, (void *)sugar_bundle_id, strlen(sugar_bundle_id));
- #endif
- }
- 
  void roadmap_main_new (const char *title, int width, int height) {
  
--- 249,252 ----
***************
*** 337,342 ****
     }
     RoadMapMainTitle = strdup (title);
- 
-    roadmap_main_sugarize();
  }
  
--- 285,288 ----
***************
*** 771,776 ****
  
     if (!gtk) {
!         fprintf(stderr, "%s: cannot open X11 display\n", argv[0]);
!         exit(1);
     }
  
--- 717,722 ----
  
     if (!gtk) {
! 	fprintf(stderr, "%s: cannot open X11 display\n", argv[0]);
! 	exit(1);
     }
  

[Roadmap-commit] roadmap/src roadmap_download.c, 1.22, 1.23 roadmap_gps.c, 1.49, 1.50 roadmap_osm.c, 1.7, 1.8

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22970

Modified Files:
	roadmap_download.c roadmap_gps.c roadmap_osm.c 
Log Message:
argh.  revert patches inadvertently applied with last commit.


Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gps.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** roadmap_gps.c	16 Jan 2009 16:57:51 -0000	1.49
--- roadmap_gps.c	16 Jan 2009 17:03:29 -0000	1.50
***************
*** 1068,1074 ****
        }
     }
-   if (RoadMapGpsLink.subsystem == ROADMAP_IO_FILE) {
-      usleep (250000);
-   }
  
  }
--- 1068,1071 ----

Index: roadmap_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_download.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** roadmap_download.c	16 Jan 2009 16:57:50 -0000	1.22
--- roadmap_download.c	16 Jan 2009 17:03:29 -0000	1.23
***************
*** 379,389 ****
     roadmap_path_free (directory);
  
- // pgf -- really need to fix this.
- // the final rename will need to be done in buildmap_osm for OSM maps.
- // and in roadmap_[http]copy.c for the others.
- 
- // for OSM dloads, "destination" must be just the --maps arg -- not
- // a full path.  but i guess that's already going to be the case.
- 
  
     /* FIXME: at this point, we should set a temporary destination
--- 379,382 ----
***************
*** 446,452 ****
     char buffer[2048];
  
- // FIXME --
- // create separate dialog for tileid downloads.  (distinguish by fips.)
- // create separate ConfigSource var for OSM dloads.
  
     source = roadmap_config_get (&RoadMapConfigSource);
--- 439,442 ----

Index: roadmap_osm.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_osm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_osm.c	16 Jan 2009 16:57:51 -0000	1.7
--- roadmap_osm.c	16 Jan 2009 17:03:29 -0000	1.8
***************
*** 82,86 ****
  #include "roadmap_config.h"
  #include "roadmap_math.h"
- #include "roadmap_messagebox.h"
  #include "roadmap_scan.h"
  #include "roadmap_file.h"
--- 82,85 ----
***************
*** 371,410 ****
  }
  
- #if SOON
- static int RoadMapOSMDownloadInProgress;
- 
- void roadmap_osm_start_download (void) {
- 
-     RoadMapPosition *center;
-     char *distance;
-     char downloadcmd[256];
- 
- #if MOVE_CHECK_TO_NON_BUILDMAP_FILE
-     if (RoadMapOSMDownloadInProgress) {
-         roadmap_messagebox_wait ("Download in Progress",
- 		"Please wait for the current download to complete,"
- 		"or else cancel it");
- 	return;
-     }
- #endif
- 
-     center = roadmap_math_get_center();
-     distance = "10km";
- 
-     snprintf(downloadcmd, sizeof(downloadcmd),
- 	    "buildmap_osm -c %s/%s -m %s %s,%s:%s",
- 	    "path_to_default_all",
- 	    "default/All",
- 	    "path_to_maps",
-             roadmap_math_to_floatstring(NULL, center->latitude, MILLIONTHS),
-             roadmap_math_to_floatstring(NULL, center->longitude, MILLIONTHS),
- 	    distance);
- 
-     system(downloadcmd);
- 
-     RoadMapOSMDownloadInProgress = 1;
- }
- #endif
- 
  void roadmap_osm_initialize (void) {
  
--- 370,373 ----

[Roadmap-commit] roadmap/src roadmap_download.c, 1.21, 1.22 roadmap_gps.c, 1.48, 1.49 roadmap_osm.c, 1.6, 1.7 roadmap_trip.c, 1.103, 1.104

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22529

Modified Files:
	roadmap_download.c roadmap_gps.c roadmap_osm.c roadmap_trip.c 
Log Message:
add display of timestamp to the waypoint edit window.  it's not editable,
but it can at least be seen now.


Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** roadmap_trip.c	10 Jun 2008 03:50:03 -0000	1.103
--- roadmap_trip.c	16 Jan 2009 16:57:51 -0000	1.104
***************
*** 398,401 ****
--- 398,403 ----
      char *newlon = (char *) roadmap_dialog_get_data ("Data", "Longitude:");
      char *newlat = (char *) roadmap_dialog_get_data ("Data", "Latitude:");
+     // can't edit timestamp yet
+     // char *timestr = (char *) roadmap_dialog_get_data ("Data", "Timestamp:");
      void *which = roadmap_dialog_get_data ("Data", ".which");
      waypoint *wpt = data;
***************
*** 444,448 ****
          (waypoint *wpt, void *which, int use_keyboard) {
  
!     static char lon[20], lat[20];
  
      if (roadmap_dialog_activate ("Waypoint Edit", wpt)) {
--- 446,450 ----
          (waypoint *wpt, void *which, int use_keyboard) {
  
!     static char lon[20], lat[20], timestr[40];
  
      if (roadmap_dialog_activate ("Waypoint Edit", wpt)) {
***************
*** 452,455 ****
--- 454,458 ----
          roadmap_dialog_new_entry ("Data", "Longitude:");
          roadmap_dialog_new_entry ("Data", "Latitude:");
+         roadmap_dialog_new_entry ("Data", "Timestamp:");
  
          roadmap_dialog_add_button ("Cancel",
***************
*** 468,471 ****
--- 471,482 ----
          ("Data", "Comment:", wpt->description ? wpt->description : "");
  
+     if (wpt->creation_time) {
+         strftime(timestr, sizeof(timestr), "%F %T", gmtime(&wpt->creation_time));
+     } else {
+         strcpy(timestr, "N/A");
+     }
+     roadmap_dialog_set_data
+         ("Data", "Timestamp:", timestr);
+ 
      roadmap_dialog_set_data("Data", ".which", which);
  

Index: roadmap_download.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_download.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** roadmap_download.c	17 Jun 2008 01:30:13 -0000	1.21
--- roadmap_download.c	16 Jan 2009 16:57:50 -0000	1.22
***************
*** 379,382 ****
--- 379,389 ----
     roadmap_path_free (directory);
  
+ // pgf -- really need to fix this.
+ // the final rename will need to be done in buildmap_osm for OSM maps.
+ // and in roadmap_[http]copy.c for the others.
+ 
+ // for OSM dloads, "destination" must be just the --maps arg -- not
+ // a full path.  but i guess that's already going to be the case.
+ 
  
     /* FIXME: at this point, we should set a temporary destination
***************
*** 439,442 ****
--- 446,452 ----
     char buffer[2048];
  
+ // FIXME --
+ // create separate dialog for tileid downloads.  (distinguish by fips.)
+ // create separate ConfigSource var for OSM dloads.
  
     source = roadmap_config_get (&RoadMapConfigSource);

Index: roadmap_osm.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_osm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_osm.c	15 Jun 2008 17:36:14 -0000	1.6
--- roadmap_osm.c	16 Jan 2009 16:57:51 -0000	1.7
***************
*** 82,85 ****
--- 82,86 ----
  #include "roadmap_config.h"
  #include "roadmap_math.h"
+ #include "roadmap_messagebox.h"
  #include "roadmap_scan.h"
  #include "roadmap_file.h"
***************
*** 370,373 ****
--- 371,410 ----
  }
  
+ #if SOON
+ static int RoadMapOSMDownloadInProgress;
+ 
+ void roadmap_osm_start_download (void) {
+ 
+     RoadMapPosition *center;
+     char *distance;
+     char downloadcmd[256];
+ 
+ #if MOVE_CHECK_TO_NON_BUILDMAP_FILE
+     if (RoadMapOSMDownloadInProgress) {
+         roadmap_messagebox_wait ("Download in Progress",
+ 		"Please wait for the current download to complete,"
+ 		"or else cancel it");
+ 	return;
+     }
+ #endif
+ 
+     center = roadmap_math_get_center();
+     distance = "10km";
+ 
+     snprintf(downloadcmd, sizeof(downloadcmd),
+ 	    "buildmap_osm -c %s/%s -m %s %s,%s:%s",
+ 	    "path_to_default_all",
+ 	    "default/All",
+ 	    "path_to_maps",
+             roadmap_math_to_floatstring(NULL, center->latitude, MILLIONTHS),
+             roadmap_math_to_floatstring(NULL, center->longitude, MILLIONTHS),
+ 	    distance);
+ 
+     system(downloadcmd);
+ 
+     RoadMapOSMDownloadInProgress = 1;
+ }
+ #endif
+ 
  void roadmap_osm_initialize (void) {
  

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_gps.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** roadmap_gps.c	6 Nov 2008 03:31:03 -0000	1.48
--- roadmap_gps.c	16 Jan 2009 16:57:51 -0000	1.49
***************
*** 1068,1071 ****
--- 1068,1074 ----
        }
     }
+   if (RoadMapGpsLink.subsystem == ROADMAP_IO_FILE) {
+      usleep (250000);
+   }
  
  }

[Roadmap-commit] roadmap/src/gtk2 roadmap_main.c,1.40,1.41

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22529/gtk2

Modified Files:
	roadmap_main.c 
Log Message:
add display of timestamp to the waypoint edit window.  it's not editable,
but it can at least be seen now.


Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** roadmap_main.c	12 Jul 2008 09:24:15 -0000	1.40
--- roadmap_main.c	16 Jan 2009 16:57:51 -0000	1.41
***************
*** 34,38 ****
--- 34,40 ----
  #include <signal.h>
  
+ #include <X11/Xlib.h>
  #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
  
***************
*** 249,252 ****
--- 251,304 ----
  }
  
+ // set X window properties so we act as a proper activity in the
+ // sugar environment
+ static void roadmap_main_sugarize(void) {
+ 
+ #if MAYBE_SOMEDAY_SUGARIZED_ACTIVITY 
+ 
+     Display *dpy;
+     Window win;
+     Atom a_activity, a_bundle, a_pid, a_name, a_cardinal, a_string, a_utf8;
+     int pid;
+ 
+     const char *sugar_bundle_id = getenv("SUGAR_BUNDLE_ID");
+     const char *sugar_activity_id = getenv("SUGAR_ACTIVITY_ID");
+     const char *sugar_object_id = getenv("SUGAR_OBJECT_ID");
+     const char *net_wm_name = getenv("NET_WM_NAME");
+ 
+     roadmap_log (ROADMAP_DEBUG, "sugar: %s, %s, %s, %s", 
+         sugar_bundle_id ? : "none", sugar_activity_id ? : "none", sugar_object_id ? : "none", net_wm_name ? : "none");
+ 
+     if (!sugar_bundle_id || !sugar_activity_id ||
+         !sugar_object_id || !net_wm_name) {
+         /* apparently not a sugar activity today */
+         return;
+     }
+ 
+     // dpy = GDK_WINDOW_XDISPLAY(RoadMapMainWindow->window);
+ 
+     win = GDK_WINDOW_XID(RoadMapMainWindow);
+ 
+     a_activity = XInternAtom(GDK_DISPLAY(), "_SUGAR_ACTIVITY_ID", 0);
+     a_bundle = XInternAtom(GDK_DISPLAY(), "_SUGAR_BUNDLE_ID", 0);
+     a_pid = XInternAtom(GDK_DISPLAY(), "_NET_WM_PID", 0);
+     a_name = XInternAtom(GDK_DISPLAY(), "_NET_WM_NAME", 0);
+     a_cardinal = XInternAtom(GDK_DISPLAY(), "CARDINAL", 0);
+     a_string = XInternAtom(GDK_DISPLAY(), "STRING", 0);
+     a_utf8 = XInternAtom(GDK_DISPLAY(), "UTF8_STRING", 0);
+ 
+     pid = getpid();
+ 
+     XChangeProperty(GDK_DISPLAY(), win, a_name, a_utf8, 8,
+         PropModeReplace, (void *)net_wm_name, strlen(net_wm_name));
+     XChangeProperty(GDK_DISPLAY(), win, a_pid, a_cardinal, 32,
+         PropModeReplace, (unsigned char *) &pid, 1);
+     XChangeProperty(GDK_DISPLAY(), win, a_activity, a_string, 8,
+         PropModeReplace, (void *)sugar_activity_id, strlen(sugar_activity_id));
+     XChangeProperty(GDK_DISPLAY(), win, a_bundle, a_string, 8,
+         PropModeReplace, (void *)sugar_bundle_id, strlen(sugar_bundle_id));
+ #endif
+ }
+ 
  void roadmap_main_new (const char *title, int width, int height) {
  
***************
*** 285,288 ****
--- 337,342 ----
     }
     RoadMapMainTitle = strdup (title);
+ 
+    roadmap_main_sugarize();
  }
  
***************
*** 717,722 ****
  
     if (!gtk) {
! 	fprintf(stderr, "%s: cannot open X11 display\n", argv[0]);
! 	exit(1);
     }
  
--- 771,776 ----
  
     if (!gtk) {
!         fprintf(stderr, "%s: cannot open X11 display\n", argv[0]);
!         exit(1);
     }
  

[Roadmap-commit] roadmap/src roadmap_display.c,1.35,1.36

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22460

Modified Files:
	roadmap_display.c 
Log Message:
don't skip a character when display lines are split


Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** roadmap_display.c	2 Jan 2008 17:21:41 -0000	1.35
--- roadmap_display.c	16 Jan 2009 16:56:40 -0000	1.36
***************
*** 247,251 ****
  
  	*p1 = saved;
! 	text_line = p1 + 1;
  	position->y += height;
  
--- 247,251 ----
  
  	*p1 = saved;
! 	text_line = p1;
  	position->y += height;
  

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.8,1.9

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29238

Modified Files:
	buildmap_osm_text.c 
Log Message:
Translate XML stuff like ' into the right symbols.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** buildmap_osm_text.c	3 Jan 2009 06:55:32 -0000	1.8
--- buildmap_osm_text.c	5 Jan 2009 20:32:17 -0000	1.9
***************
*** 125,128 ****
--- 125,178 ----
  
  /**
+  * @brief table for translating the names in XML strings into readable format
+  */
+ static struct XmlIsms {
+ 	char	*code;		/**< the piece between & and ; */
+ 	char	*string;	/**< translates into this */
+ } XmlIsms[] = {
+ 	{ "apos",	"'" },
+ 	{ "gt",		">" },
+ 	{ "lt",		"<" },
+ 	{ "quot",	"""" },
+ 	{ "amp",	"&" },
+ 	{ NULL,		NULL }	/* end */
+ };
+ 
+ /**
+  * @brief remove XMLisms such as &apos; and strdup
+  * limitation : names must be shorter than 256 bytes
+  * @param s input string
+  * @return duplicate, to be freed elsewhere
+  */
+ static char *FromXmlAndDup(const char *s)
+ {
+ 	int		i, j, k, l, found;
+ 	static char	res[256], xml[16];
+ 
+ 	for (i=j=0; s[i]; i++)
+ 		if (s[i] == '&') {
+ 			found = 0;
+ 			for (k=0; XmlIsms[k].code && !found; k++) {
+ 				for (l=0; s[l+i+1] == XmlIsms[k].code[l]; l++)
+ 					;
+ 				/* When not equal, must be at end of code */
+ 				if (XmlIsms[k].code[l] == NULL &&
+ 						s[l+i+1] == ';') {
+ 					found = 1;
+ 					i += l+1;
+ 					for (l=0; XmlIsms[k].string[l]; l++)
+ 						res[j++] = XmlIsms[k].string[l];
+ 				}
+ 			}
+ 			if (!found)
+ 				res[j++] = s[i];
+ 		} else {
+ 			res[j++] = s[i];
+ 		}
+ 	res[j] = '\0';
+ 	return strdup(res);
+ }
+ 
+ /**
   * @brief reset all the info about this way
   */
***************
*** 521,525 ****
  		if (NodeTownName)
  			free(NodeTownName);
! 		NodeTownName = strdup(tagv);
  	}
  	return 0;
--- 571,575 ----
  		if (NodeTownName)
  			free(NodeTownName);
! 		NodeTownName = FromXmlAndDup(tagv);
  	}
  	return 0;
***************
*** 558,562 ****
  		if (WayStreetName)
  			free(WayStreetName);
! 		WayStreetName = strdup(value);
  		return 0;	/* FIX ME ?? */
  	} else if (strcmp(tag, "landuse") == 0) {
--- 608,612 ----
  		if (WayStreetName)
  			free(WayStreetName);
! 		WayStreetName = FromXmlAndDup(value);
  		return 0;	/* FIX ME ?? */
  	} else if (strcmp(tag, "landuse") == 0) {

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.7,1.8

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16045

Modified Files:
	buildmap_osm_text.c 
Log Message:
Add code to split OSM ways into separate lines when they have intersections.
So now a way with several nodes but no intersections becomes one roadmap
line (with shapes to indicate where it runs if not straight), and a way
that has intersections gets cut into multiple roadmap lines at those
intersections. Each piece then behaves as if it was specified as a separate
way (shapes still get registered for it).


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildmap_osm_text.c	28 Dec 2008 19:30:02 -0000	1.7
--- buildmap_osm_text.c	3 Jan 2009 06:55:32 -0000	1.8
***************
*** 96,99 ****
--- 96,102 ----
  
  static int	LineId = 0;		/**< for buildmap_line_add */
+ static int	nsplits = 0;		/**< number of times we've split a way */
+ static int	WaysSplit = 0,	/**< Number of ways that were split */
+ 		WaysNotSplit = 0;	/**< Number of ways not split */
  
  /**
***************
*** 326,329 ****
--- 329,400 ----
  static struct shapeinfo *shapes;
  
+ /*
+  * Count nodes
+  * Watch out : should be called in Pass 1.
+  */
+ struct node_counter {
+ 	int	count;
+ 	int	node;
+ };
+ struct node_counter_row {
+ 	int	max, alloc;
+ 	struct node_counter *row;
+ };
+ 
+ static struct node_counter_row nc[256];
+ static int node_counter_init = 0;
+ 
+ /**
+  * @brief add one to the use counter of this node
+  * @param node a node id
+  */
+ static void CountNode(int node)
+ {
+ 	int	i, row;
+ 
+ 	if (! node_counter_init) {
+ 		node_counter_init++;
+ 		for (i=0; i<256; i++) {
+ 			nc[i].max = nc[i].alloc = 0;
+ 			nc[i].row = NULL;
+ 		}
+ 	}
+ 
+ 	row = node % 256;
+ 	for (i=0; i<nc[row].max; i++)
+ 		if (node == nc[row].row[i].node) {
+ 			nc[row].row[i].count++;
+ 			return;
+ 		}
+ 
+ 	if (nc[row].alloc == nc[row].max) {
+ 		nc[row].alloc += 256;
+ 		nc[row].row = realloc(nc[row].row,
+ 				sizeof(struct node_counter) * nc[row].alloc);
+ 	}
+ 
+ 	i = nc[row].max;
+ 	nc[row].row[i].node = node;
+ 	nc[row].row[i].count = 1;
+ 	nc[row].max++;
+ }
+ 
+ /**
+  * @brief report the number of uses of this node
+  * @param node the node id
+  * @return the number of uses
+  */
+ static int NodeReportUse(int node)
+ {
+ 	int row = node % 256;
+ 	int i;
+ 
+ 	for (i=0; i<nc[row].max; i++)
+ 		if (node == nc[row].row[i].node)
+ 			return nc[row].row[i].count;
+ 	buildmap_fatal(0, "NodeReportUse %d", node);
+ 	return -1;
+ }
+ 
  /**
   * @brief
***************
*** 367,370 ****
--- 438,461 ----
   */
  static int
+ buildmap_osm_text_nd_pass1(char *data)
+ {
+ 	int	node, ix;
+ 	float	lon, lat;
+ 
+ 	if (sscanf(data, "nd ref=%*[\"']%d%*[\"']", &node) != 1)
+ 		return -1;
+ 
+ 	CountNode(node);
+ 	return 0;
+ }
+ /**
+  * @brief
+  * @param data points into the line of text being processed
+  * @return error indication
+  *
+  * Example line :
+  *     <nd ref="997470"/>
+  */
+ static int
  buildmap_osm_text_nd(char *data)
  {
***************
*** 516,519 ****
--- 607,611 ----
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
+ 	int		was_split = 0;
  
  	if (WayInvalid)
***************
*** 601,604 ****
--- 693,697 ----
  
  		int	*lonsbuf, *latsbuf;
+ 		int	from_ix;
  
  		/* Map begin and end points to internal point id */
***************
*** 610,619 ****
  			rms_name = str2dict(DictionaryStreet, WayStreetName);
  
! 		for (j=1; j<nWayNodes; j++) {
! 			int prev = buildmap_osm_text_point_get(WayNodes[j-1]);
! 			int point = buildmap_osm_text_point_get(WayNodes[j]);
  
  			LineId++;
! 			line = buildmap_line_add(LineId, WayLayer, prev, point);
  
  			street = buildmap_street_add(WayLayer,
--- 703,799 ----
  			rms_name = str2dict(DictionaryStreet, WayStreetName);
  
! 		/*
! 		 * Loop over the points of the way.
! 		 *
! 		 * If we find a (non-endpoint) node that is also referenced in another way,
! 		 * then this way needs to be split.
! 		 * In case of a split, and in case of the end node : create all the right
! 		 * stuff for the map.
! 		 */
! 		from_ix = 0;
! 		for (j=1; j<nWayNodes-1; j++) {
! 			int point = WayNodes[j];
! 			if (NodeReportUse(point) > 1) {
! 				int	k, num;
! 
! 				/* Keep track of what we did */
! 				nsplits++;
! 				was_split = 1;
! 
! 				/* Create a way */
! 				int from_point= buildmap_osm_text_point_get(WayNodes[from_ix]);
! 				int to_point = buildmap_osm_text_point_get(WayNodes[j]);
! 
! 				LineId++;
! 				line = buildmap_line_add(LineId, WayLayer, from_point, to_point);
! 
! 				street = buildmap_street_add(WayLayer,
! 						rms_dirp, rms_name, rms_type,
! 						rms_dirs, line);
! 				buildmap_range_add_no_address(line, street);
! 
! 				/*
! 				 * Pass stuff to the shape module.
! 				 *
! 				 * We're passing too much here - the endpoints of the line don't
! 				 * need to be passed to the shape module. We're keeping them
! 				 * here just to be on the safe side, they'll be ignored
! 				 * in buildmap_osm_text_ways_shapeinfo().
! 				 *
! 				 * The lonsbuf/latsbuf are never freed, need to be preserved
! 				 * for shape registration which happens at the end of the
! 				 * program run, so exit() will free this for us.
! 				 */
! 				num = j - from_ix + 1;
! 
! 				lonsbuf = calloc(num, sizeof(int));
! 				latsbuf = calloc(num, sizeof(int));
! 
! 				for (k=0; k<num; k++) {
! 					int point = buildmap_osm_text_point_get(WayNodes[from_ix+k]);
! 					int lon = buildmap_point_get_longitude(point);
! 					int lat = buildmap_point_get_latitude(point);
! 
! 					/* Keep info for the shapes */
! 					lonsbuf[k] = lon;
! 					latsbuf[k] = lat;
! 
! 					buildmap_square_adjust_limits(lon, lat);
! 				}
! 
! 				if (numshapes == nallocshapes) {
! 					/* Allocate additional space (in big chunks) when needed */
! 					nallocshapes += 1000;
! 					shapes = realloc(shapes, nallocshapes * sizeof(struct shapeinfo));
! 					buildmap_check_allocated(shapes);
! 				}
! 
! 				/* Keep info for the shapes */
! 				shapes[numshapes].lons = lonsbuf;
! 				shapes[numshapes].lats = latsbuf;
! 				shapes[numshapes].count = num;
! 				shapes[numshapes].lineid = LineId;
! 
! 				numshapes++;
! 
! 				/* Prepare for next iteration */
! 				from_ix = j;
! 			}
! 		}
! 
! 		if (was_split) {
! 			int	k, num;
! 			/*
! 			 * Need to create an additional way for the last piece
! 			 * This is from from_ix to nWayNodes-1
! 			 */
! 			j = nWayNodes-1;
! 
! 			/* Create a way */
! 			int from_point= buildmap_osm_text_point_get(WayNodes[from_ix]);
! 			int to_point = buildmap_osm_text_point_get(WayNodes[j]);
  
  			LineId++;
! 			line = buildmap_line_add(LineId, WayLayer, from_point, to_point);
  
  			street = buildmap_street_add(WayLayer,
***************
*** 621,660 ****
  					rms_dirs, line);
  			buildmap_range_add_no_address(line, street);
- 		}
  
! 		/* These are never freed, need to be preserved for shape registration. */
! 		lonsbuf = calloc(nWayNodes, sizeof(int));
! 		latsbuf = calloc(nWayNodes, sizeof(int));
  
! 		for (j=0; j<nWayNodes; j++) {
! 			int point = buildmap_osm_text_point_get(WayNodes[j]);
! 			int lon = buildmap_point_get_longitude(point);
! 			int lat = buildmap_point_get_latitude(point);
  
  			/* Keep info for the shapes */
! 			lonsbuf[j] = lon;
! 			latsbuf[j] = lat;
  
! 			buildmap_square_adjust_limits(lon, lat);
  		}
  
! 		if (numshapes == nallocshapes) {
! 			/* Allocate additional space (in big chunks) when needed */
! 			nallocshapes += 1000;
! 			shapes = realloc(shapes, nallocshapes * sizeof(struct shapeinfo));
! 			buildmap_check_allocated(shapes);
! 		}
  
! 		/* Keep info for the shapes */
! 		shapes[numshapes].lons = lonsbuf;
! 		shapes[numshapes].lats = latsbuf;
! 		shapes[numshapes].count = nWayNodes;
! 		shapes[numshapes].lineid = LineId;
  
! 		numshapes++;
  	}
  
  	buildmap_osm_text_reset_way();
  
  	return 0;
  }
--- 801,912 ----
  					rms_dirs, line);
  			buildmap_range_add_no_address(line, street);
  
! 			/*
! 			 * Pass stuff to the shape module.
! 			 *
! 			 * We're passing too much here - the endpoints of the line don't
! 			 * need to be passed to the shape module. We're keeping them
! 			 * here just to be on the safe side, they'll be ignored
! 			 * in buildmap_osm_text_ways_shapeinfo().
! 			 *
! 			 * The lonsbuf/latsbuf are never freed, need to be preserved
! 			 * for shape registration which happens at the end of the
! 			 * program run, so exit() will free this for us.
! 			 */
! 			num = j - from_ix + 1;
  
! 			lonsbuf = calloc(num, sizeof(int));
! 			latsbuf = calloc(num, sizeof(int));
! 
! 			for (k=0; k<num; k++) {
! 				int point = buildmap_osm_text_point_get(WayNodes[from_ix+k]);
! 				int lon = buildmap_point_get_longitude(point);
! 				int lat = buildmap_point_get_latitude(point);
! 
! 				/* Keep info for the shapes */
! 				lonsbuf[k] = lon;
! 				latsbuf[k] = lat;
! 
! 				buildmap_square_adjust_limits(lon, lat);
! 			}
! 
! 			if (numshapes == nallocshapes) {
! 				/* Allocate additional space (in big chunks) when needed */
! 				nallocshapes += 1000;
! 				shapes = realloc(shapes, nallocshapes * sizeof(struct shapeinfo));
! 				buildmap_check_allocated(shapes);
! 			}
  
  			/* Keep info for the shapes */
! 			shapes[numshapes].lons = lonsbuf;
! 			shapes[numshapes].lats = latsbuf;
! 			shapes[numshapes].count = num;
! 			shapes[numshapes].lineid = LineId;
  
! 			numshapes++;
  		}
  
! 		/* If we didn't split, process the whole way in one piece */
! 		if (! was_split) {
! 			int from_point = buildmap_osm_text_point_get(WayNodes[0]);
! 			int to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
! 			LineId++;
! 			line = buildmap_line_add(LineId, WayLayer, from_point, to_point);
  
! 			street = buildmap_street_add(WayLayer,
! 					rms_dirp, rms_name, rms_type,
! 					rms_dirs, line);
! 			buildmap_range_add_no_address(line, street);
! 
! 			/*
! 			 * We're passing too much here - the endpoints of the line don't
! 			 * need to be passed to the shape module. We're keeping them
! 			 * here just to be on the safe side, they'll be ignored
! 			 * in buildmap_osm_text_ways_shapeinfo().
! 			 *
! 			 * The lonsbuf/latsbuf are never freed, need to be preserved
! 			 * for shape registration which happens at the end of the
! 			 * program run, so exit() will free this for us.
! 			 */
! 			lonsbuf = calloc(nWayNodes, sizeof(int));
! 			latsbuf = calloc(nWayNodes, sizeof(int));
! 
! 			for (j=0; j<nWayNodes; j++) {
! 				int point = buildmap_osm_text_point_get(WayNodes[j]);
! 				int lon = buildmap_point_get_longitude(point);
! 				int lat = buildmap_point_get_latitude(point);
! 
! 				/* Keep info for the shapes */
! 				lonsbuf[j] = lon;
! 				latsbuf[j] = lat;
! 
! 				buildmap_square_adjust_limits(lon, lat);
! 			}
! 
! 			if (numshapes == nallocshapes) {
! 				/* Allocate additional space (in big chunks) when needed */
! 				nallocshapes += 1000;
! 				shapes = realloc(shapes, nallocshapes * sizeof(struct shapeinfo));
! 				buildmap_check_allocated(shapes);
! 			}
! 
! 			/* Keep info for the shapes */
! 			shapes[numshapes].lons = lonsbuf;
! 			shapes[numshapes].lats = latsbuf;
! 			shapes[numshapes].count = nWayNodes;
! 			shapes[numshapes].lineid = LineId;
! 
! 			numshapes++;
! 		}
  	}
  
  	buildmap_osm_text_reset_way();
  
+ 	if (was_split)
+ 		WaysSplit++;
+ 	else
+ 		WaysNotSplit++;
+ 
  	return 0;
  }
***************
*** 678,682 ****
  
      buildmap_line_sort();
! #if 0
      for (i = 0; i < numshapes; i++) {
  
--- 930,934 ----
  
      buildmap_line_sort();
! 
      for (i = 0; i < numshapes; i++) {
  
***************
*** 699,703 ****
          }
      }
! #endif
      return 1;
  }
--- 951,955 ----
          }
      }
! 
      return 1;
  }
***************
*** 781,785 ****
  		continue;
  	} else if (strncasecmp(p, "nd", 2) == 0) {
! //		ret += buildmap_osm_text_nd(p);
  		continue;
  	} else if (strncasecmp(p, "tag", 3) == 0) {
--- 1033,1037 ----
  		continue;
  	} else if (strncasecmp(p, "nd", 2) == 0) {
! 		ret += buildmap_osm_text_nd_pass1(p);
  		continue;
  	} else if (strncasecmp(p, "tag", 3) == 0) {
***************
*** 888,891 ****
--- 1140,1146 ----
      buildmap_info("Shape info processed (%d seconds)", t3 - t2);
  
+ 
+     buildmap_info("Splits %d, ways split %d, not split %d", nsplits, WaysSplit, WaysNotSplit);
+ 
      return ret;
  }

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.6,1.7

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9703

Modified Files:
	buildmap_osm_text.c 
Log Message:
This was a bit too verbose.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** buildmap_osm_text.c	28 Dec 2008 18:33:30 -0000	1.6
--- buildmap_osm_text.c	28 Dec 2008 19:30:02 -0000	1.7
***************
*** 548,553 ****
  		int line;
  
- 		buildmap_verbose("area %d nodes", nWayNodes);
- 
  		/*
  		 * Detect an AREA -> create a polygon
--- 548,551 ----
***************
*** 623,635 ****
  					rms_dirs, line);
  			buildmap_range_add_no_address(line, street);
- 
- 			int lon1 = buildmap_point_get_longitude(prev);
- 			int lat1 = buildmap_point_get_latitude(prev);
- 			int lon2 = buildmap_point_get_longitude(point);
- 			int lat2 = buildmap_point_get_latitude(point);
- 			buildmap_verbose("j %d prev %d point %d LineId %d street %d"
- 					" (%d,%d,%d,%d)",
- 					j, prev, point, LineId, street,
- 					lon1, lat1, lon2, lat2);
  		}
  
--- 621,624 ----

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.5,1.6

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4724

Modified Files:
	buildmap_osm_text.c 
Log Message:
Simplistic first cut at making a map that's also suitable for routing.

Ways consisting of multiple lines are now converted as such (not so
in the previous version). As a consequence, no more shapes are being
generated.

A logical next step is to figure out which OSM nodes are only used once
and use them as input for shapes.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildmap_osm_text.c	16 Dec 2008 23:43:57 -0000	1.5
--- buildmap_osm_text.c	28 Dec 2008 18:33:30 -0000	1.6
***************
*** 95,98 ****
--- 95,100 ----
  static int	nPolygons = 0;		/**< current polygon id (number of polygons until now) */
  
+ static int	LineId = 0;		/**< for buildmap_line_add */
+ 
  /**
   * @brief allow the user to specify a bounding box
***************
*** 392,395 ****
--- 394,398 ----
  	}
  	WayNodes[nWayNodes++] = node;
+ 
  	return 0;
  }
***************
*** 468,472 ****
  	} else if (strcmp(tag, "landuse") == 0) {
  		WayLandUseNotInteresting = 1;
! 		buildmap_info("discarding way %d, landuse %s", in_way, data);
  	}
  
--- 471,475 ----
  	} else if (strcmp(tag, "landuse") == 0) {
  		WayLandUseNotInteresting = 1;
! //		buildmap_info("discarding way %d, landuse %s", in_way, data);
  	}
  
***************
*** 513,517 ****
  	int		fromlon, tolon, fromlat, tolat;
  	int		j;
- 	static int	lineid = 0;
  
  	if (WayInvalid)
--- 516,519 ----
***************
*** 522,526 ****
  
  	if (WayLandUseNotInteresting) {
! 		buildmap_info("discarding way %d, landuse %s", in_way, data);
  		WayLandUseNotInteresting = 0;
  		buildmap_osm_text_reset_way();
--- 524,528 ----
  
  	if (WayLandUseNotInteresting) {
! //		buildmap_info("discarding way %d, landuse %s", in_way, data);
  		WayLandUseNotInteresting = 0;
  		buildmap_osm_text_reset_way();
***************
*** 546,549 ****
--- 548,553 ----
  		int line;
  
+ 		buildmap_verbose("area %d nodes", nWayNodes);
+ 
  		/*
  		 * Detect an AREA -> create a polygon
***************
*** 561,569 ****
  			int point = buildmap_osm_text_point_get(WayNodes[j]);
  
! 			lineid++;
! 			line = buildmap_line_add(lineid, WayLayer, prevpoint, point);
  #if 0
  			buildmap_verbose("%d <- buildmap_line_add(%d,%d,%d,%d) - nodes %d %d",
! 					line, lineid, WayLayer, prevpoint, point,
  					WayNodes[j-1], WayNodes[j]);
  #endif
--- 565,573 ----
  			int point = buildmap_osm_text_point_get(WayNodes[j]);
  
! 			LineId++;
! 			line = buildmap_line_add(LineId, WayLayer, prevpoint, point);
  #if 0
  			buildmap_verbose("%d <- buildmap_line_add(%d,%d,%d,%d) - nodes %d %d",
! 					line, LineId, WayLayer, prevpoint, point,
  					WayNodes[j-1], WayNodes[j]);
  #endif
***************
*** 571,575 ****
  #if 0
  			/* This will break on some polygons */
! 			buildmap_polygon_add_line(cenid, polyid, lineid, POLYGON_SIDE_RIGHT);
  #endif
  
--- 575,579 ----
  #if 0
  			/* This will break on some polygons */
! 			buildmap_polygon_add_line(cenid, polyid, LineId, POLYGON_SIDE_RIGHT);
  #endif
  
***************
*** 581,585 ****
  			buildmap_verbose("Poly %d add line %d %d %d"
  				       	" points prev %d (%d,%d) cur %d (%d,%d)",
! 					nPolygons, cenid, polyid, lineid,
  					WayNodes[j-1], lon1, lat1,
  					WayNodes[j], lon2, lat2);
--- 585,589 ----
  			buildmap_verbose("Poly %d add line %d %d %d"
  				       	" points prev %d (%d,%d) cur %d (%d,%d)",
! 					nPolygons, cenid, polyid, LineId,
  					WayNodes[j-1], lon1, lat1,
  					WayNodes[j], lon2, lat2);
***************
*** 604,617 ****
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
- 		lineid++;
- 		line = buildmap_line_add(lineid, WayLayer, from_point, to_point);
- 
  		/* Street name */
  		if (WayStreetName)
  			rms_name = str2dict(DictionaryStreet, WayStreetName);
! 		street = buildmap_street_add(WayLayer,
! 				rms_dirp, rms_name, rms_type,
!                                 rms_dirs, line);
! 		buildmap_range_add_no_address(line, street);
  
  		/* These are never freed, need to be preserved for shape registration. */
--- 608,636 ----
  		to_point = buildmap_osm_text_point_get(WayNodes[nWayNodes-1]);
  
  		/* Street name */
  		if (WayStreetName)
  			rms_name = str2dict(DictionaryStreet, WayStreetName);
! 
! 		for (j=1; j<nWayNodes; j++) {
! 			int prev = buildmap_osm_text_point_get(WayNodes[j-1]);
! 			int point = buildmap_osm_text_point_get(WayNodes[j]);
! 
! 			LineId++;
! 			line = buildmap_line_add(LineId, WayLayer, prev, point);
! 
! 			street = buildmap_street_add(WayLayer,
! 					rms_dirp, rms_name, rms_type,
! 					rms_dirs, line);
! 			buildmap_range_add_no_address(line, street);
! 
! 			int lon1 = buildmap_point_get_longitude(prev);
! 			int lat1 = buildmap_point_get_latitude(prev);
! 			int lon2 = buildmap_point_get_longitude(point);
! 			int lat2 = buildmap_point_get_latitude(point);
! 			buildmap_verbose("j %d prev %d point %d LineId %d street %d"
! 					" (%d,%d,%d,%d)",
! 					j, prev, point, LineId, street,
! 					lon1, lat1, lon2, lat2);
! 		}
  
  		/* These are never freed, need to be preserved for shape registration. */
***************
*** 642,646 ****
  		shapes[numshapes].lats = latsbuf;
  		shapes[numshapes].count = nWayNodes;
! 		shapes[numshapes].lineid = lineid;
  
  		numshapes++;
--- 661,665 ----
  		shapes[numshapes].lats = latsbuf;
  		shapes[numshapes].count = nWayNodes;
! 		shapes[numshapes].lineid = LineId;
  
  		numshapes++;
***************
*** 656,659 ****
--- 675,681 ----
   *
   * this needs to be a separate step because lines need to be sorted
+  *
+  * The shapes don't include the first and last points of a line, hence the strange loop
+  * beginning/end for the inner loop.
   */
  static int
***************
*** 667,671 ****
  
      buildmap_line_sort();
! 
      for (i = 0; i < numshapes; i++) {
  
--- 689,693 ----
  
      buildmap_line_sort();
! #if 0
      for (i = 0; i < numshapes; i++) {
  
***************
*** 682,686 ****
              lats = shapes[i].lats;
  
!             /* Add the shape points here */
              for (j = 1; j < count - 1; j++) {
                  buildmap_shape_add (line_index, i, lineid, j - 1, lons[j], lats[j]);
--- 704,708 ----
              lats = shapes[i].lats;
  
!             /* Add the shape points here, don't include beginning and end point */
              for (j = 1; j < count - 1; j++) {
                  buildmap_shape_add (line_index, i, lineid, j - 1, lons[j], lats[j]);
***************
*** 688,691 ****
--- 710,714 ----
          }
      }
+ #endif
      return 1;
  }

[Roadmap-commit] roadmap/src buildmap_line.c,1.15,1.16

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4574

Modified Files:
	buildmap_line.c 
Log Message:
Add a bit to two error messages so you can tell the difference.


Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_line.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** buildmap_line.c	4 Aug 2008 17:44:07 -0000	1.15
--- buildmap_line.c	28 Dec 2008 18:28:27 -0000	1.16
***************
*** 23,45 ****
  /**
   * @file
!  * @brief Build a line table & index for RoadMap.
!  *
!  * These functions are used to build a table of lines from
!  * the Tiger maps. The objective is double: (1) reduce the size of
!  * the Tiger data by sharing all duplicated information and
!  * (2) produce the index data to serve as the basis for a fast
!  * search mechanism for streets in roadmap.
!  *
!  *   int  buildmap_line_add (int tlid, int layer, int from, int to);
   *
!  *   int  buildmap_line_get_sorted  (int line);
!  *   void buildmap_line_find_sorted (int tlid);
!  *   int  buildmap_line_get_id_sorted (int line);
!  *   void buildmap_line_get_points_sorted (int line, int *from, int *to);
!  *   void buildmap_line_get_position (int line, int *longitude, int *latitude);
!  *   void buildmap_line_get_position_sorted
!  *           (int line, int *longitude, int *latitude);
!  *   void buildmap_line_get_square_sorted (int line);
   *
   */
  
--- 23,32 ----
  /**
   * @file
!  * @brief convert a map into a table of lines.
   *
!  * Objectives (1) reduce the size of the data by sharing all duplicated information and
!  * (2) produce the index data to serve as the basis for a fast search mechanism for streets.
   *
+  * Definition of a line is in roadmap_line.h .
   */
  
***************
*** 112,120 ****
  }
  
! 
  static BuildMapLine *buildmap_line_get_record (int line) {
  
     if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "invalid line index %d", line);
     }
  
--- 99,111 ----
  }
  
! /**
!  * @brief
!  * @param line
!  * @return
!  */
  static BuildMapLine *buildmap_line_get_record (int line) {
  
     if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "buildmap_line_get_record : invalid line index %d", line);
     }
  
***************
*** 122,130 ****
  }
  
! 
  static BuildMapLine *buildmap_line_get_record_sorted (int line) {
  
     if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "invalid line index %d", line);
     }
  
--- 113,125 ----
  }
  
! /**
!  * @brief
!  * @param line
!  * @return
!  */
  static BuildMapLine *buildmap_line_get_record_sorted (int line) {
  
     if ((line < 0) || (line > LineCount)) {
!       buildmap_fatal (0, "buildmap_line_get_record_sorted : invalid line index %d", line);
     }
  
***************
*** 180,184 ****
     if (LineById == NULL) buildmap_line_initialize();
  
- 
     block = LineCount / BUILDMAP_BLOCK;
     offset = LineCount % BUILDMAP_BLOCK;
--- 175,178 ----