roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/editor editor_plugin.c,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6196

Modified Files:
	editor_plugin.c 
Log Message:
Close DB on shutdown.

Index: editor_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editor_plugin.c	12 Dec 2005 20:44:44 -0000	1.3
--- editor_plugin.c	17 Dec 2005 21:58:09 -0000	1.4
***************
*** 131,134 ****
--- 131,140 ----
  
  
+ static void editor_plugin_shutdown (void) {
+ 
+    editor_track_end ();
+ }
+ 
+ 
  static RoadMapPluginHooks editor_plugin_hooks = {
  
***************
*** 147,151 ****
        &editor_street_get_closest,
        &editor_plugin_get_direction,
!       &editor_track_end
  };
  
--- 153,157 ----
        &editor_street_get_closest,
        &editor_plugin_get_direction,
!       &editor_plugin_shutdown
  };
  

[Roadmap-commit] roadmap_editor/src roadmap_start.c,1.8,1.9

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6123

Modified Files:
	roadmap_start.c 
Log Message:
Close DB on shutdown.
Bump editor version to 0.3.1.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_start.c	16 Dec 2005 14:40:35 -0000	1.8
--- roadmap_start.c	17 Dec 2005 21:57:36 -0000	1.9
***************
*** 150,154 ****
                         "A Street navigation system\n"
                         "for Linux & UNIX"
! 		       "\n\nEditor Plugin 0.3\n"
  		       "Ehud Shabtai\n"
  		       "esh...@gm...");
--- 150,154 ----
                         "A Street navigation system\n"
                         "for Linux & UNIX"
! 		       "\n\nEditor Plugin 0.3.1\n"
  		       "Ehud Shabtai\n"
  		       "esh...@gm...");
***************
*** 892,898 ****
      roadmap_plugin_shutdown ();
      roadmap_driver_shutdown ();
-     roadmap_gps_shutdown ();
      roadmap_history_save ();
      roadmap_config_save (0);
      roadmap_start_save_trip ();
  }
--- 892,899 ----
      roadmap_plugin_shutdown ();
      roadmap_driver_shutdown ();
      roadmap_history_save ();
      roadmap_config_save (0);
      roadmap_start_save_trip ();
+     roadmap_db_end ();
+     roadmap_gps_shutdown ();
  }

[Roadmap-commit] roadmap_editor/src roadmap_option.c,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6014

Modified Files:
	roadmap_option.c 
Log Message:
Restore verbose level to Warning.

Index: roadmap_option.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_option.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_option.c	16 Dec 2005 14:40:35 -0000	1.2
--- roadmap_option.c	17 Dec 2005 21:57:05 -0000	1.3
***************
*** 52,57 ****
  
  
! //static int roadmap_option_verbose = ROADMAP_MESSAGE_WARNING;
! static int roadmap_option_verbose = ROADMAP_MESSAGE_INFO;
  static int roadmap_option_no_area = 0;
  static int roadmap_option_square  = 0;
--- 52,56 ----
  
  
! static int roadmap_option_verbose = ROADMAP_MESSAGE_WARNING;
  static int roadmap_option_no_area = 0;
  static int roadmap_option_square  = 0;

[Roadmap-commit] roadmap_editor/src roadmap_serial.h,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5957

Modified Files:
	roadmap_serial.h 
Log Message:
Serial communication fix.

Index: roadmap_serial.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_serial.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_serial.h	16 Dec 2005 14:40:35 -0000	1.2
--- roadmap_serial.h	17 Dec 2005 21:56:37 -0000	1.3
***************
*** 33,41 ****
  #ifdef _WIN32
  
! #include <windows.h>
! struct Win32SerialConn;
  
  typedef struct Win32SerialConn *RoadMapSerial; /* WIN32 style. */
! #define ROADMAP_SERIAL_IS_VALID(f) (f != NULL)
  
  #else
--- 33,41 ----
  #ifdef _WIN32
  
! #include <windows.h>
! #include "win32/win32_serial.h"
  
  typedef struct Win32SerialConn *RoadMapSerial; /* WIN32 style. */
! #define ROADMAP_SERIAL_IS_VALID(f) ((f != NULL) && (f->valid))
  
  #else

[Roadmap-commit] roadmap/src roadmap_db_index.h,NONE,1.1

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29575

Added Files:
	roadmap_db_index.h 
Log Message:
Preliminary version of the future map format (index)

--- NEW FILE: roadmap_db_index.h ---
/* roadmap_db_index.h - the format of the index table used by RoadMap.
 *
 * LICENSE:
 *
 *   Copyright 2005 Pascal F. Martin
 *
 *   This file is part of RoadMap.
 *
 *   RoadMap is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   RoadMap is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with RoadMap; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * SYNOPSYS:
 *
 *   The RoadMap index is described by the following table:
 *
 *   index/authorities The authority body. Links to territories.
 *   index/territories The territory. Sorted by authority, links to maps.
 *   index/files       A map file (a specific territory & class).
 *   index/names       Describes the names of a specific authority.
 *   index/cities      Links the name of a city with its associated territory.
 *
 * NOTE:
 *
 *   The format of the wtid field is defined using decimal digits:
 *
 *   - The wtid is made of 10 decimal digits. There are two major classes
 *   of wti format: one is defined by legal boundaries and the other is
 *   defined by a longitude/latitude grid.
 *
 *   - The legal-boundaries wtid for the USA has the format 00000SSCCC where
 *   SSCCC is the county's FIPS code. Note that, in this case, the value of
 *   the wtid exactly matches the value of the FIPS code. A CCC of 000 means
 *   the whole state. A wtid value of 0 represents the whole US.
 *
 *   - the legal-boundaries wtid for other countries has the format 0CCCCXXXXX,
 *   where CCCC is the telephone dialing code for the country covered by the
 *   maps and XXXXX is a subdivision inside that country, wich format depends
 *   on the country's legal organization. A XXXXX of 00000 represents the
 *   whole country.
 *
 *   - The grid wtid have the format: 1CCLLLLllll where LLLL is a number that
 *   represents the longitude span covered by the map and llll is a number
 *   that represents the latitude covered by the map. CC identifies the type
 *   of grid used to define the map; value 00 represents the USGS "quad" grid.
 *   When the USGS quad gris is used, LLLL and llll are formatted as DDDQ,
 *   where DDD is the decimal degree (range 0-360 for longitude and 0-180
 *   for latitude) and Q is the quad index (range 1-8, where 1 represents
 *   the low order longitude or latitude value and 8 the high order value).
 *
 *   The details of the format of the wtid is never used by RoadMap: its
 *   sole purpose is to ensure the generation of a unique and consistent
 *   map identification code.
 *
 *   The main goal of the wtid format is to serve for identifying maps
 *   using 32 bits entities. A map will be uniquely identified in RoadMap
 *   using two integers: the wtid and the class index. The class index is
 *   defined when RoadMap starts and is never stored on disk. The wtid is
 *   predefined (see above) and is stored in the map files.
 *
 *   The international dialing codes are defined in the ITU Operational
 *   Bulletin No. 835. For more information, go to:
 *
 *      http://www.itu.int/itu-t/bulletin/annex.html.
 *
 *   The code name of a map mimics the wtid using ASCII codes. The format
 *   is <country> / <subdivision>, where subdivision may also be a slash-
 *   separated list of legal entities. For example, the format of the code
 *   name for the US is: us/<state code> (the code name for California is
 *   thus "us/ca"). The code name must be suitable for address search.
 *   The country code name follow the iso 3166-1 standard. See:
 *
 *      http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
 *
 *   The goal of the city names and postal code range is to allow for
 *   the search by address.
 *
 *   Note that it is legal for the same authority to appear more than
 *   once. This can happen for optimization reason, when the authority
 *   covers multiple non-contiguous areas. Instead of listing a single,
 *   huge, area, one can list the same authority multiple times, one per
 *   area covered.
 */

#ifndef INCLUDE__ROADMAP_DB_INDEX__H
#define INCLUDE__ROADMAP_DB_INDEX__H

#include "roadmap_types.h"

typedef struct { /* table index/authorities */

   RoadMapString symbol;    /* Relative to the index's parent. */
   RoadMapString pathname;  /* Relative or absolute path for the maps. */

   RoadMapArea edges;       /* Bounding earth area for this authority. */

   unsigned short name_first;
   unsigned short name_count; /* Cannot be 0. */

   unsigned short territory_first;
   unsigned short territory_count; /* If 0, it must have a sub-index file. */

} RoadMapAuthority;


typedef struct {  /* table index/territory */

   int wtid;                /* Stands for "world territory ID". */

   RoadMapString pathname;  /* Relative or absolute path for the map files. */
   unsigned short reserved; /* Must be 0. */

   RoadMapArea edges;       /* Bounding earth area for this territory. */

   unsigned short map_first;
   unsigned short map_count; /* Cannot be 0. */

   unsigned short city_first;
   unsigned short city_count; /* 0 if no city is listed. */

   unsigned int postal_low;   /* Lowest postal code in that territory. */
   unsigned int postal_high;  /* Highest postal code in that territory. */

} RoadMapTerritory;


typedef struct {  /* table index/files */

   RoadMapString class;
   RoadMapString filename;  /* ... relative to the authority/territory path. */

} RoadMapFile;

/* table index/names is an array of RoadMapString sorted by authority. */

/* table index/cities is an array of RoadMapString sorted by map. */

#endif // INCLUDE__ROADMAP_DB_INDEX__H

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

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/howtos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29371

Added Files:
	makemaps.txt 
Log Message:
Preliminary version of a documentation for the future map format

--- NEW FILE: makemaps.txt ---
                               ---------
                    Creating a Map for RoadMap HOWTO
                               ---------
                 Pascal Martin (pas...@po...)
                               ---------
                                                                                                            December 2005


INTRODUCTION

   This HOWTO describes how to create a new map for RoadMap. The intend is
   not to provide a complete description of the RoadMap map format, only
   to guide the authors of new maps in the complicated process of gathering
   and organizing the data.

   Some programming is usually necessary, as the map data may come in
   various forms. In this document the term "RoadMap code" always make
   reference to the source of the buildmap programs. In no circumstance
   should the roadmap program itself be modified, as this would break
   compatibility with pre-existing maps.


OVERVIEW

   There are four major phases involved when creating maps for RoadMap:

   * One must decide how the maps will be organized. It is important to
   have a good idea of how the country is organized and how individual
   addresses are formatted (the format of addresses will have an influence
   on the maps organization).

   * Then the format of the data source must be identified and analyzed.
   Knowing the data come in a shape file is not enough, as there are many
   different ways of organizing shape file data. Typical questions to answer
   are: what are the layers? What field describes the layer for a specific
   feature? How does the data source layers match the Roadmap layers?

   * A map builder input module may need to be modified or customized to
   handle the specific format used by the data source.

   * The map builder application must be run and the map indexes created.

* PLANNING THE MAP ORGANIZATION

   The preliminary step when building a map is always to decide how the
   data will be organized. There are a many different cases, among them
   the main ones are:

   * The map will represent a new class of features.

   * The map will cover a new country.

   * The map will cover an existing country and represent existing features.

   Even in the more complex cases when the map to be built represents new
   features for a new country, it is recommended to reduce the problem by
   separating these two steps: first define a new class of features and
   then define a new country.

   It is strongly recommended to reuse existing classes as much as possible,
   even if that requires to split the data in more RoadMap map files.

   If maps already exist for this country, the existing country subdivision
   system must be reused as is. Changing the way the country's maps are
   organized would require to regenerate the existing maps and would cause
   the new set of maps to be incompatible with maps from other authors.

   RoadMap use index files to retrieve which map files to use to represent
   the visible area or to locate a given address. These index files represent
   a hierachical organization that provide RoadMap with a fast search and
   access mechanism to the maps. Many of the constraint regarding the
   organization of the maps are direct consequences of the way the index
   files are organized.

* DATA SOURCE FORMAT

   There are two main situations: either the format of the data source is
   or is not supported by the RoadMap map builder (buildmap).

   In the first case, a new buildmap module must be created (see the section
   IMPLEMENTING A NEW BUILDMAP MODULE).

   In the second case the odds are that your data implements a <<variant>>
   of the supported format and the existing support code in RoadMap must be
   modified.

   Why is it that way? Lets consider the ESRI "shape file" format. This
   format defines two files: the shape file itself (.shp) describes the
   lines and polygons. This is where all the geometry information is stored.
   A database file (.dbf) describes the attributes associated with each
   feature described in the shape file. This is actually a DBASE III file.
   It seems that different data sources describe the features using
   different fields and conventions, so the RoadMap code must be modified
   to access the correct fields. Also, each data source defines its own
   set of layers and thus the mapping of these layers to the RoadMap layers
   must be customized as well.

   Most map data organization is kind of complicated, especially the way
   attributes are organized. So one would be wise to take some time to
   understand what is exactly the data he is going to process.

   It is common for the layers to be split in separate file sets. The RoadMap
   code is not really organized to handle this. So either the RoadMap code
   must be modified, or else the data must be merged using standard GIS tools.

* BUILDMAP INPUT MODULES

   A buildmap input module must provide the following function:

----
   buildmap_xxx_process (const char *input, const char *class);
----

   This function must be called in buildmap_main.c

   The input parameter indicates the file or files to load the data from.
   This name follows whatever conventions are specific to the format of
   the data. The class parameter indicates which Roadmap class is to be
   processed.

   Note that no output name is provided: the output map has already been setup
   by buildmap and the input module should call the appropriate buildmap
   table modules. The buildmap table modules are documented in the RoadMap
   documentation.


LAYERS

* LAYER CLASS

   Every feature stored in a RoadMap map file belongs to one layer. Layers
   are organized in classes. Each map file provides features that belong to
   layers within a single class.

   In other words, a class describes all the layers provided in one set
   of map files. A typical example would be a class representing all roads
   or a class representing all land uses (city area, national parks, etc..)


* DEFINING A NEW LAYER CLASS

   A layer class is made of two lists of layers:

   * One list for all line features (for example: streets).

   * One list for all polygon features (for example: lakes).

   Each list is an ordered sequence of layers. The order in the sequence
   defines the drawing order. Note that all polygons are drawn before any
   line, no matter what class these belong to.

   Each class is described in a class description file. This is a text file
   that contains a list of properties. This is where the lists of lines and
   polygons are defined, as well as the colors and width used for each feature.

   At a minimum there must be one class description file, representing the
   "default" representation of the class, or else there can be two such files,
   one defining the daylight time representation and the other the night
   time representation.

   Note that one can create alternate skins by redefining a complete set
   of description files for all classes. These alternate skins must implement
   the same classes and features as in the default description files.

   The drawing order across classes is defined by defining sorting criteria:
   the "before" and "after" properties. The "before" property lists classes
   that this class must be before of, i.e. the current class must be drawn
   before the listed classes. The "after" property lists classes that this
   class must be after of, i.e. the current class must be drawn after the
   listed classes.

   Note that all maps for a given territory are treated as one set in the
   index files. In other words, the index system stops at the territory:
   Roadmap will scan all the maps files for that territory with no or little
   optimizations.


MAP ORGANIZATION

   RoadMap divides earth into territories, usually defined by administrative
   boundaries (international borders, local goverment with one country,
   etc...). Other organizations are possible (such as maps defined by a
   geographical location) but are not yet supported.

   The territories are organized in a tree fashion, where the top level is
   the country, as defined by its international borders. The rational for
   this division of the world is that the source of most map data is usually
   defined by country (most of the time the data is provided by a government
   body).

   The country level follows the agreed (or not so agreed on) international
   borders. If the list of countries changes, the organization of the maps
   must change. That the least of the problems that are to be faced when
   this happens...

   The territory tree can have 2 or more levels, depending on the country.
   The top and middle levels must have a name and are usually called
   "authority" within Roadmap. Each item at the lowest level defines one
   territory covered by one set of map files. The top and middle levels
   only exist in the index files.

   In order to limit the size of each individual maps, the low level
   territories should represent a entity of a limited size. 

   A RoadMap map file will represent a class of features for a given low
   level territory.  Example of feature classes are: roads, water area,
   elevation lines, etc..


* MAPS IDENTIFICATION

   It is important to understand how maps are identified. RoadMap uses a
   32 bits integer named World Territory ID (wtid) and defined as follow:

    * The wtid is made of 10 decimal digits. There are two major classes
    of wtid format: one is defined by legal boundaries and the other is
    defined by a longitude/latitude grid. At that time, only the legal
    boundaries class of wtid is supported in RoadMap.

    * The legal-boundaries wtid for the USA has the format 00000SSCCC where
    SSCCC is the county's FIPS code. Note that, in this case, the value of
    the wtid exactly matches the value of the FIPS code. A CCC of 000 means
    the whole state. A wtid value of 0 represents the whole US.

    * the legal-boundaries wtid for other countries has the format 0CCCCXXXXX,
    where CCCC is the telephone dialing code for the country covered by the
    maps and XXXXX is a subdivision inside that country, wich format depends
    on the country's legal organization. A XXXXX of 00000 represents the
    whole country.
 
    * The grid wtid have the format: 1CCLLLLllll where LLLL is a number that
    represents the longitude span covered by the map and llll is a number
    that represents the latitude covered by the map. CC identifies the type
    of grid used to define the map; value 00 represents the USGS "quad" grid.
    When the USGS quad gris is used, LLLL and llll are formatted as DDDQ,
    where DDD is the decimal degree (range 0-360 for longitude and 0-180
    for latitude) and Q is the quad index (range 1-8, where 1 represents
    the low order longitude or latitude value and 8 the high order value).
 
   The details of the format of the wtid is never used by RoadMap: its
   sole purpose is to ensure the generation of a unique and consistent
   map identification code.
 
   An individual map will be uniquely identified in RoadMap using two
   integers: the wtid and the class index. The class index is defined using
   the list of classes when RoadMap loads the class description files and
   is never stored on disk. The wtid is predefined (see above) and is stored
   in the map files.

   The international dialing codes are defined in the ITU Operational
   Bulletin No. 835. For more information, go to:

      {{http://www.itu.int/itu-t/bulletin/annex.html}}

   RoadMap also use names to identify authorities (such as when it searches
   for the location of a given address). These names mimics the wtid using
   ASCII official codes for the countries and sub-territories. The format
   is <country> / <sub-authority>, where sub-authority may also be a slash-
   separated list of legal entities. For example, the format of the code
   name for the US is: us/<state code> (the code name for California is
   thus "us/ca"). The code name must be suitable for address search.
   The country code name follow the iso 3166-1 standard. See:

      {{http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html}}

   The sub-authority levels must follow the local country convention for
   postal addresses and city identification.

   Each country can also be subdivided into a single level list of territories
   (flat model) or using multiple levels (subtree model). For example the US
   is split into its individual states, and each state is split into counties,
   so that the tree is: country (US) / state / county. Only the lowest
   territory level is represented by map files. The upper levels (named
   "authority" levels in RoadMap) only exist in the RoadMap index files.

   As a general rule, the choice between a flat or sub-tree model should
   be directed by the format of a street address, especially how a city
   is identified. For example, a country like France has a single authority
   that administers city name, so a name like "Lyon" identifies a single
   city in France and a flat model should be used. This is not true in
   the US, where the city names are managed at the state level, so that
   a US city name must be suffixed using the state symbol. In the case of
   the US a two-level model should be used.

   Note that one index file may contains 1 or 2 levels of the tree: one
   authority level only (a "grand index"), the territory level only (a map
   index) or both (a multilevel index). The index itself belongs to its
   own parent authority (as described in the metadata table), like any other
   map file. This parent authority is the common upper level authority above
   all listed authority, or the common level above the listed territories
   (if there is no authority table).

   Continuing with the US example, the US can be represented in two ways:

     * as a single index, which belongs to the US country, authorities are
     the US states and territories are the counties.

     * as a two-level tree of indexes: the top-level index lists the states
     as authorities and contains no territory, map or cities tables; each
     lower level index represents one state, lists counties as territories
     and contain no authority table.

   Usually the world is represented using a grand index that contains the
   list of countries as authorities.


* DEFINING A NEW COUNTRY

   If the country was not represented in RoadMap yet, the division of the
   country into sub-territories must be decided. There are several criteria
   to consider:

      * The territories must be compatible with the way postal addresses
      are organized. The major requirements are that city names should be
      unique inside a map file. If possible, the middle level authority levels
      defined for that country, if any, should match the country's postal
      convention as well.

      * The territories should be compatible with the way the data source is
      organized. It is possible to reorganize the data according to different
      criteria, for example by splitting or merging files, but this introduces
      a new level of complexity and should be avoided when possible.

   Once this is achieved, a numerical identification system must be decided.
   It is recommended to use the country identification scheme when it exists.
   Many countries have defined a numerical ID for each legal entity and that
   ID should be as much as possible the basis for the encoding of the wtid.

   Names must be defined for each authority. Postal conventions must be used
   when they exist. An authority is identified using either a short symbol
   (such as "CA" for Califoria), or a full name ("California" to follow with
   our previous example). When RoadMap will try to locate an address, it
   will assume that the names in the address either match the symbols or
   full name of authorities. The best performances will be achieved if the
   authority tree for that country matches the postal conventions exactly.

   For example, if the address reads "san francisco, ca, usa", RoadMap will
   search for a top level authority identified as "usa", then a lower level
   authority identified as "ca". Some defaults might be used, depending on
   the current location (so that "san francisco, ca" would also search through
   California if you happen to be in the USA). Some confusions may be avoided
   by using full names (such as "vancouver, canada").

   A new country must be described in the file countries.txt. Here is an
   example  of a countries.txt file describing the US and canada:

------
       # List of countries, format: iso 3166-1, itu E.164A (except USA), name
       us,0,USA
       ca,1,Canada
------

   The country's list of parent territories must be described in a separate
   file for each country, so that each country can be maintained independently.
   The file's name must follow the convention: country-<country-symbol>.txt
   (for example, "country-us.txt" for the US).

   The format of the file is:

------
        wtid,symbol,name[,parent-authority-symbol]
------

   The wtid must be empty if an authority is described (since no map file
   exists for an authority) and the parent authority's symbol must be empty
   if the authority is the country itself. The symbol item is usually empty
   for the territory level, but this is not required.

   Here is an example that describes the state of Rhode Island (USA):

------
        ,RI,RHODE ISLAND
        44001,,Bristol,RI
        44003,,Kent,RI
        44005,,Newport,RI
        44007,,Providence,RI
        44009,,Washington,RI
------

   For large countries it is recommended to locate the official description
   of legal entities and to write a tool to translates it's original format
   into the format assumed by RoadMap. This saves from painful updates when
   the list changes.

[Roadmap-commit] roadmap/howtos - New directory

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/howtos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29161/howtos

Log Message:
Directory /cvsroot/roadmap/roadmap/howtos added to the repository

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

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4607

Modified Files:
	roadmap_fuzzy.c 
Log Message:
Fix roadmap_fuzzy_connected.


Index: roadmap_fuzzy.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_fuzzy.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_fuzzy.c	27 Nov 2005 06:05:33 -0000	1.5
--- roadmap_fuzzy.c	17 Dec 2005 07:38:56 -0000	1.6
***************
*** 154,159 ****
      for (i = 0; i <= 1; ++i) {
          for (j = 0; j <= 1; ++j) {
!             if ((line_point[i].latitude == line_point[j].latitude) &&
!                 (line_point[i].longitude == line_point[j].longitude)) {
                  *connection = line_point[i];
                  return (FUZZY_TRUTH_MAX * 2) / 3;
--- 154,159 ----
      for (i = 0; i <= 1; ++i) {
          for (j = 0; j <= 1; ++j) {
!             if ((line_point[i].latitude == reference_point[j].latitude) &&
!                 (line_point[i].longitude == reference_point[j].longitude)) {
                  *connection = line_point[i];
                  return (FUZZY_TRUTH_MAX * 2) / 3;

[Roadmap-commit] roadmap README,1.86,1.87

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19049

Modified Files:
	README 
Log Message:
Add reference to --debug in the troubleshooting section

Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** README	8 Dec 2005 21:13:54 -0000	1.86
--- README	16 Dec 2005 17:29:54 -0000	1.87
***************
*** 722,725 ****
--- 722,728 ----
       step was not performed.
  
+    * If things do not go any better, start roadmap with the --debug option
+      and check what roadmap tells you it is doing.
+ 
  
  ROADMAP APPLICATIONS

[Roadmap-commit] roadmap_editor/src/editor/track editor_track_filter.c,1.2,1.3 editor_track_main.c,1.5,1.6 editor_track_unknown.c,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/track
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15916

Modified Files:
	editor_track_filter.c editor_track_main.c 
	editor_track_unknown.c 
Log Message:
Check for a valid dilution.
Fix turn detection.

Index: editor_track_filter.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_filter.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** editor_track_filter.c	1 Dec 2005 16:48:54 -0000	1.2
--- editor_track_filter.c	16 Dec 2005 14:46:26 -0000	1.3
***************
*** 99,106 ****
  
     if (gps_position->speed == 0) return 0;
!    
     if ((filter->last_gps_point.latitude == gps_position->latitude) &&
         (filter->last_gps_point.longitude == gps_position->longitude)) return 0;
!    
     if ((roadmap_math_distance
              ((RoadMapPosition *) &filter->last_gps_point,
--- 99,111 ----
  
     if (gps_position->speed == 0) return 0;
! 
     if ((filter->last_gps_point.latitude == gps_position->latitude) &&
         (filter->last_gps_point.longitude == gps_position->longitude)) return 0;
! 
!    if (dilution->dilution_horizontal > 6) {
! 
!       return 0;
!    }
! 
     if ((roadmap_math_distance
              ((RoadMapPosition *) &filter->last_gps_point,

Index: editor_track_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editor_track_main.c	12 Dec 2005 20:52:56 -0000	1.5
--- editor_track_main.c	16 Dec 2005 14:46:26 -0000	1.6
***************
*** 467,471 ****
        }
  
!       roadmap_fuzzy_set_cycle_params (30, 200);
        
        track_rec_locate_point (point_id);
--- 467,471 ----
        }
  
!       roadmap_fuzzy_set_cycle_params (40, 300);
        
        track_rec_locate_point (point_id);

Index: editor_track_unknown.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_unknown.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** editor_track_unknown.c	28 Nov 2005 19:47:50 -0000	1.1
--- editor_track_unknown.c	16 Dec 2005 14:46:26 -0000	1.2
***************
*** 139,146 ****
        }
  
!       prev_azymuth = 
!          roadmap_math_azymuth
!             (track_point_pos (i-1),
!              track_point_pos (i));
  
        diff = roadmap_math_delta_direction (prev_azymuth, current_azymuth);
--- 139,150 ----
        }
  
!       if (i == last_point) {
! 	      prev_azymuth = last_azymuth;
! 		} else {
! 	      prev_azymuth = 
!    	      roadmap_math_azymuth
!       	      (track_point_pos (i-1),
!          	    track_point_pos (i));
! 		}
  
        diff = roadmap_math_delta_direction (prev_azymuth, current_azymuth);
***************
*** 170,173 ****
--- 174,179 ----
           
           assert (j<(current_point-last_point+1));
+          if (j>=(current_point-last_point+1)) break;
+ 
           angle_sum += pairs[j].angle;
           if (pairs[j].index < *middle1) {

[Roadmap-commit] roadmap_editor/src/editor/static editor_dialog.c,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor/static
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469

Modified Files:
	editor_dialog.c 
Log Message:
Fix properties edit.

Index: editor_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/editor_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editor_dialog.c	12 Dec 2005 20:45:28 -0000	1.3
--- editor_dialog.c	16 Dec 2005 14:45:00 -0000	1.4
***************
*** 247,254 ****
        }
  
!       if (line->line.plugin_id == EditorPluginID) {
! 
!          editor_line_modify_properties (line->line.line_id, cfcc, 0);
!       } else { /* != Editor line */
  
           int new_line = editor_line_copy (line->line.line_id, line->line.cfcc, line->line.fips);
--- 247,251 ----
        }
  
!       if (line->line.plugin_id != EditorPluginID) {
  
           int new_line = editor_line_copy (line->line.line_id, line->line.cfcc, line->line.fips);
***************
*** 264,267 ****
--- 261,266 ----
        }
  
+       editor_line_modify_properties (line->line.line_id, cfcc, 0);
+ 
        editor_line_get_street (line->line.line_id, &street_id, &street_range_id);
        street_id = editor_street_create (street_name, street_type, "", "");

[Roadmap-commit] roadmap_editor/src/win32/wince_env/Roadmap Roadmap.vcp,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15219

Modified Files:
	Roadmap.vcp 
Log Message:
Fix profiler profile.

Index: Roadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap/Roadmap.vcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Roadmap.vcp	15 Oct 2005 22:19:23 -0000	1.1.1.1
--- Roadmap.vcp	16 Dec 2005 14:44:13 -0000	1.2
***************
*** 52,70 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
- # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
- # ADD CPP /nologo /W3 /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE ARM) Debug"
--- 52,70 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+ # ADD CPP /nologo /W3 /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+ # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE ARM) Debug"
***************
*** 85,103 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- LINK32=link.exe
- # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
- # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
- # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE x86) Release"
--- 85,103 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+ # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+ # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE x86) Release"
***************
*** 256,260 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /fastcap /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 256,260 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /fastcap /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 407,415 ****
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
- 	{$(INCLUDE)}"aygshell.h"\
- 	{$(INCLUDE)}"sipapi.h"\
- 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADM=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 407,415 ----
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
  	
  NODEP_CPP_ROADM=\
+ 	".\inuserm.h"\
+ 	".\ipapi.h"\
+ 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
***************
*** 436,444 ****
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
- 	{$(INCLUDE)}"aygshell.h"\
- 	{$(INCLUDE)}"sipapi.h"\
- 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADM=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 436,444 ----
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
  	
  NODEP_CPP_ROADM=\
+ 	".\inuserm.h"\
+ 	".\ipapi.h"\
+ 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libwinceguiroadmap libwinceguiroadmap.vcp,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15151

Modified Files:
	libwinceguiroadmap.vcp 
Log Message:
Fix profiler profile.

Index: libwinceguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libwinceguiroadmap.vcp	15 Oct 2005 22:19:23 -0000	1.1.1.1
--- libwinceguiroadmap.vcp	16 Dec 2005 14:43:58 -0000	1.2
***************
*** 51,63 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug"
--- 51,63 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug"
***************
*** 77,89 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release"
--- 77,89 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release"
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 382,390 ****
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
- 	{$(INCLUDE)}"aygshell.h"\
- 	{$(INCLUDE)}"sipapi.h"\
- 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADMA=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 382,390 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  NODEP_CPP_ROADMA=\
+ 	".\inuserm.h"\
+ 	".\ipapi.h"\
+ 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
***************
*** 398,406 ****
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
- 	{$(INCLUDE)}"aygshell.h"\
- 	{$(INCLUDE)}"sipapi.h"\
- 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADMA=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 398,406 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  NODEP_CPP_ROADMA=\
+ 	".\inuserm.h"\
+ 	".\ipapi.h"\
+ 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libroadmap libroadmap.vcp,1.4,1.5

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079

Modified Files:
	libroadmap.vcp 
Log Message:
Fix profiler profile.

Index: libroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** libroadmap.vcp	12 Dec 2005 20:50:39 -0000	1.4
--- libroadmap.vcp	16 Dec 2005 14:43:44 -0000	1.5
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "l:\shared\roadmap_editor\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /I "l:\shared\roadmap_editor\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 508,511 ****
--- 508,513 ----
  	"..\..\..\roadmap_line.h"\
  	"..\..\..\roadmap_locator.h"\
+ 	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_metadata.h"\
  	"..\..\..\roadmap_path.h"\
  	"..\..\..\roadmap_plugin.h"\
***************
*** 681,684 ****
--- 683,687 ----
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_dialog.h"\
***************
*** 686,689 ****
--- 689,693 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_locator.h"\
  	"..\..\..\roadmap_plugin.h"\
***************
*** 918,921 ****
--- 922,926 ----
  	"..\..\..\editor\db\editor_line.h"\
  	"..\..\..\editor\db\editor_point.h"\
+ 	"..\..\..\editor\db\editor_route.h"\
  	"..\..\..\editor\db\editor_shape.h"\
  	"..\..\..\editor\db\editor_square.h"\
***************
*** 924,937 ****
--- 929,952 ----
  	"..\..\..\editor\editor_log.h"\
  	"..\..\..\editor\export\editor_export.h"\
+ 	"..\..\..\editor\track\editor_track_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_fileselection.h"\
+ 	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
  	"..\..\..\roadmap_layer.h"\
+ 	"..\..\..\roadmap_line_route.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_path.h"\
  	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_point.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 1263,1278 ****
  	"..\..\..\editor\editor_plugin.h"\
  	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
- NODEP_CPP_EDITOR_M=\
- 	"..\..\..\editor\track\editor_track.h"\
- 	
  
  !ENDIF 
--- 1278,1298 ----
  	"..\..\..\editor\editor_plugin.h"\
  	"..\..\..\editor\editor_screen.h"\
+ 	"..\..\..\editor\track\editor_track_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
  	"..\..\..\roadmap_layer.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_pointer.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  
  !ENDIF 
***************
*** 1485,1488 ****
--- 1505,1509 ----
  	"..\..\..\editor\db\editor_line.h"\
  	"..\..\..\editor\db\editor_override.h"\
+ 	"..\..\..\editor\db\editor_route.h"\
  	"..\..\..\editor\db\editor_square.h"\
  	"..\..\..\editor\db\editor_street.h"\
***************
*** 1490,1499 ****
--- 1511,1528 ----
  	"..\..\..\editor\editor_plugin.h"\
  	"..\..\..\editor\editor_screen.h"\
+ 	"..\..\..\editor\track\editor_track_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_dbread.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 1694,1699 ****
--- 1723,1730 ----
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_street.h"\
***************
*** 1929,1936 ****
--- 1960,1970 ----
  	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\editor\static\editor_dialog.h"\
+ 	"..\..\..\editor\track\editor_track_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
+ 	"..\..\..\roadmap_display.h"\
  	"..\..\..\roadmap_file.h"\
  	"..\..\..\roadmap_fuzzy.h"\
***************
*** 1941,1944 ****
--- 1975,1979 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 1955,1964 ****
  	"..\..\..\roadmap_square.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
- NODEP_CPP_EDITOR_S=\
- 	"..\..\..\editor\track\editor_track.h"\
- 	
  
  !ENDIF 
--- 1990,1997 ----
  	"..\..\..\roadmap_square.h"\
  	"..\..\..\roadmap_street.h"\
+ 	"..\..\..\roadmap_trip.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  
  !ENDIF 
***************
*** 2567,2570 ****
--- 2600,2604 ----
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_file.h"\
***************
*** 2574,2577 ****
--- 2608,2612 ----
  	"..\..\..\roadmap_io.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_math.h"\
***************
*** 3126,3129 ****
--- 3161,3165 ----
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_file.h"\
***************
*** 3134,3137 ****
--- 3170,3174 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 4146,4149 ****
--- 4183,4187 ----
  DEP_CPP_ROADMAP_G=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
***************
*** 4158,4161 ****
--- 4196,4200 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_serial.h"\
***************
*** 5151,5160 ****
--- 5190,5205 ----
  DEP_CPP_ROADMAP_LO=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_county.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_dictionary.h"\
+ 	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_locator.h"\
+ 	"..\..\..\roadmap_metadata.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_point.h"\
  	"..\..\..\roadmap_polygon.h"\
***************
*** 5983,5989 ****
--- 6028,6036 ----
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_locator.h"\
  	"..\..\..\roadmap_plugin.h"\
***************
*** 6520,6523 ****
--- 6567,6571 ----
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_db_range.h"\
***************
*** 6529,6532 ****
--- 6577,6581 ----
  	"..\..\..\roadmap_locator.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_shape.h"\
  	"..\..\..\roadmap_square.h"\
***************
*** 6535,6546 ****
  	"..\..\roadmap_win32.h"\
  	
- NODEP_CPP_ROADMAP_ST=\
- 	"..\..\..\editor\editor_db.h"\
- 	"..\..\..\editor\editor_dictionary.h"\
- 	"..\..\..\editor\editor_line.h"\
- 	"..\..\..\editor\editor_override.h"\
- 	"..\..\..\editor\editor_square.h"\
- 	"..\..\..\editor\editor_street.h"\
- 	
  
  !ENDIF 
--- 6584,6587 ----

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libosroadmap libosroadmap.vcp,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15025

Modified Files:
	libosroadmap.vcp 
Log Message:
Fix profiler profile.

Index: libosroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap/libosroadmap.vcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libosroadmap.vcp	15 Oct 2005 22:19:23 -0000	1.1.1.1
--- libosroadmap.vcp	16 Dec 2005 14:43:33 -0000	1.2
***************
*** 51,63 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  
  !ELSEIF  "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Debug"
--- 51,63 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Debug"
***************
*** 77,89 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  
  !ELSEIF  "$(CFG)" == "libosroadmap - Win32 (WCE x86) Release"
--- 77,89 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libosroadmap - Win32 (WCE x86) Release"
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libguiroadmap libguiroadmap.vcp,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14958

Modified Files:
	libguiroadmap.vcp 
Log Message:
Fix profiler profile.

Index: libguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libguiroadmap.vcp	15 Oct 2005 22:19:23 -0000	1.1.1.1
--- libguiroadmap.vcp	16 Dec 2005 14:43:20 -0000	1.2
***************
*** 51,63 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
--- 51,63 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
***************
*** 77,89 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
--- 77,89 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 429,432 ****
--- 429,433 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 659,662 ****
--- 660,664 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 974,977 ****
--- 976,980 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 1124,1127 ****
--- 1127,1131 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_message.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_street.h"\
***************
*** 1316,1319 ****
--- 1320,1324 ----
  DEP_CPP_ROADMAP_DO=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_county.h"\
***************
*** 1596,1605 ****
--- 1601,1613 ----
  DEP_CPP_ROADMAP_FU=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_fuzzy.h"\
+ 	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_line.h"\
  	"..\..\..\roadmap_locator.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 1893,1897 ****
  
  DEP_CPP_ROADMAP_L=\
- 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1901,1904 ----
***************
*** 1900,1903 ****
--- 1907,1911 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
***************
*** 2105,2108 ****
--- 2113,2117 ----
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_display.h"\
***************
*** 2114,2117 ****
--- 2123,2127 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 2120,2123 ****
--- 2130,2134 ----
  	"..\..\..\roadmap_navigate.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
***************
*** 2682,2686 ****
  
  DEP_CPP_ROADMAP_S=\
- 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 2693,2696 ----
***************
*** 2690,2693 ****
--- 2700,2704 ----
  	"..\..\..\roadmap_display.h"\
  	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_fuzzy.h"\
  	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
***************
*** 2701,2704 ****
--- 2712,2716 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_object.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_point.h"\
  	"..\..\..\roadmap_pointer.h"\
***************
*** 2710,2713 ****
--- 2722,2726 ----
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_square.h"\
+ 	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_trip.h"\
***************
*** 3116,3120 ****
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
--- 3129,3134 ----
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\editor_main.h"\
! 	"..\..\..\editor\export\editor_export.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
***************
*** 3149,3152 ****
--- 3163,3167 ----
  	"..\..\..\roadmap_object.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_preferences.h"\
***************
*** 3382,3385 ****
--- 3397,3401 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libguiroadgps libguiroadgps.vcp,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14883

Modified Files:
	libguiroadgps.vcp 
Log Message:
Fix profiler profile.

Index: libguiroadgps.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps/libguiroadgps.vcp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libguiroadgps.vcp	15 Oct 2005 22:19:21 -0000	1.1.1.1
--- libguiroadgps.vcp	16 Dec 2005 14:43:04 -0000	1.2
***************
*** 51,63 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug"
--- 51,63 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug"
***************
*** 77,89 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release"
--- 77,89 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release"
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo

[Roadmap-commit] roadmap_editor/src/win32 win32_serial.h,NONE,1.1

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14579

Added Files:
	win32_serial.h 
Log Message:
Rewrite win32 serial communication support.
It should now work fine with a bluetooth GPS.

--- NEW FILE: win32_serial.h ---
#ifndef __WIN32_SERIAL_
#define __WIN32_SERIAL_

#include <windows.h>

typedef struct Win32SerialConn {
   
   HANDLE handle;
   char name[20];
   char mode[10];
   int baud_rate;
   char data[10240];
   int data_count;
   int ref_count;
   
} Win32SerialConn;

#endif //__WIN32_SERIAL_

[Roadmap-commit] roadmap_editor/src/win32 roadmap_main.cpp,1.3,1.4 roadmap_serial.c,1.2,1.3 time.c,1.1.1.1,1.2 wince_input_mon.c,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14483

Modified Files:
	roadmap_main.cpp roadmap_serial.c time.c wince_input_mon.c 
Log Message:
Rewrite win32 serial communication support.
It should now work fine with a bluetooth GPS.

Index: wince_input_mon.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_input_mon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wince_input_mon.c	12 Dec 2005 20:48:29 -0000	1.2
--- wince_input_mon.c	16 Dec 2005 14:41:32 -0000	1.3
***************
*** 23,57 ****
   */
  
! #include <windows.h>
  #include "../roadmap.h"
  #include "../roadmap_io.h"
  #include "../roadmap_serial.h"
! #include "wince_input_mon.h"
  
  extern HWND RoadMapMainWindow;
  
! DWORD WINAPI SerialMonThread(LPVOID lpParam)
  {
  	roadmap_main_io *data = (roadmap_main_io*)lpParam;
! 	RoadMapIO *io = data->io;
! 	DWORD fdwCommMask;
! 	HANDLE hCommPort = data->io->os.serial;
  
! 	while(io->subsystem != ROADMAP_IO_INVALID)
! 	{
!       int error = 0;
  
! 		SetCommMask (hCommPort, EV_RXCHAR);
! 		if(!WaitCommEvent (hCommPort, &fdwCommMask, 0))
! 		{
  
!          error = 1;
! 			if(GetLastError() == ERROR_INVALID_HANDLE) {
  				roadmap_log (ROADMAP_INFO,
  						"Com port is closed.");
  			} else {
  				roadmap_log (ROADMAP_ERROR,
! 						"Error in WaitCommEvent.");
!             roadmap_serial_close (hCommPort);
  			}
  		
--- 23,159 ----
   */
  
! #include <windows.h>
! #include <assert.h>
  #include "../roadmap.h"
  #include "../roadmap_io.h"
  #include "../roadmap_serial.h"
! #include "wince_input_mon.h"
! #include "win32_serial.h"
  
  extern HWND RoadMapMainWindow;
  
! static HANDLE serial_open(const char *name,
!                           const char *mode,
! 		                    int baud_rate) {
! 
! 	HANDLE hCommPort = INVALID_HANDLE_VALUE;
! 	LPWSTR url_unicode = ConvertToWideChar(name, CP_UTF8);
! 	DCB dcb;
!    COMMTIMEOUTS ct;
! 
! 	hCommPort = CreateFile (url_unicode,
! 		GENERIC_READ | GENERIC_WRITE,
! 		0,
! 		NULL,
! 		OPEN_EXISTING,
! 		0,
! 		NULL);
! 
! 	free(url_unicode);
! 
! 	if(hCommPort == INVALID_HANDLE_VALUE) {
! 		return INVALID_HANDLE_VALUE;
! 	}
! 
! 	dcb.DCBlength = sizeof(DCB);
! 	if(!GetCommState(hCommPort, &dcb)) {
! 		roadmap_serial_close(hCommPort);
! 		return INVALID_HANDLE_VALUE;
! 	}
! 
! //	dcb.fBinary			   = TRUE;
! 	dcb.BaudRate	       = baud_rate;
! //	dcb.fOutxCtsFlow       = TRUE;
! 	dcb.fRtsControl        = RTS_CONTROL_DISABLE;
! 	dcb.fDtrControl        = DTR_CONTROL_DISABLE;
! //	dcb.fOutxDsrFlow       = FALSE;
! //	dcb.fOutX              = FALSE;
! //	dcb.fInX               = FALSE;
! 	dcb.ByteSize           = 8;
! 	dcb.fParity             = FALSE;
! 	dcb.StopBits           = ONESTOPBIT;
! 
! 	if(!SetCommState(hCommPort, &dcb)) {
! 		roadmap_serial_close(hCommPort);
! 		return INVALID_HANDLE_VALUE;
! 	}
! 
! 	ct.ReadIntervalTimeout = MAXDWORD;
! 	ct.ReadTotalTimeoutMultiplier = MAXDWORD;
! 	ct.ReadTotalTimeoutConstant = 10000;
! 	ct.WriteTotalTimeoutMultiplier = 10;
! 	ct.WriteTotalTimeoutConstant = 100;
! 
! 	if(!SetCommTimeouts(hCommPort, &ct)) {
! 		roadmap_serial_close(hCommPort);
! 		return INVALID_HANDLE_VALUE;
! 	}
! 
! 	return hCommPort;
! }
! 
! 
! static int serial_read(HANDLE handle, void *data, int size)
  {
+    DWORD dwBytesRead;
+ 
+    if(!ReadFile(handle,
+                 data,
+                 size,
+                 &dwBytesRead,
+                 NULL)) {
+       return -1;
+    }
+ 
+    return dwBytesRead;
+ }
+ 
+ 
+ DWORD WINAPI SerialMonThread(LPVOID lpParam) {
+ 
  	roadmap_main_io *data = (roadmap_main_io*)lpParam;
!    Win32SerialConn *conn = data->io->os.serial;
  
!    conn->handle = serial_open (conn->name, conn->mode, conn->baud_rate);
! 
!    if (conn->handle == INVALID_HANDLE_VALUE) {
! 
!       /* Send a message to main window. A read attempt will fail
!        * and this input will be removed.
!        */
! 
!       conn->data_count = -1;
!       SendMessage(RoadMapMainWindow, WM_USER_READ, (WPARAM)data, (LPARAM)conn);
!    }
  
! 	while(conn->handle != INVALID_HANDLE_VALUE) {
  
!       if (conn->data_count == 0) {
! 
!          do {
!             conn->data_count =
!                serial_read (conn->handle, conn->data, sizeof(conn->data));
! 
!          } while (conn->data_count == 0);
!       }
! 
!    	/* Check if this input was unregistered while we were
! 		 * sleeping.
! 		 */
! 		if (conn->handle == INVALID_HANDLE_VALUE) {
! 			break;
! 		}
! 
!    
!       if (conn->data_count < 0) {
!          
!          int error_code = GetLastError();
! 
! 			if( error_code == ERROR_INVALID_HANDLE) {
  				roadmap_log (ROADMAP_INFO,
  						"Com port is closed.");
  			} else {
  				roadmap_log (ROADMAP_ERROR,
! 						"Error in serial_read: %d", error_code);
  			}
  		
***************
*** 61,81 ****
  			 */
  
-          error = 1;
- 		}
- 
- 		/* Check if this input was unregistered while we were
- 		 * sleeping.
- 		 */
- 		if (io->subsystem == ROADMAP_IO_INVALID) {
- 			break;
  		}
  
  		/* Send a message to main window so it can read. */
! 		SendMessage(RoadMapMainWindow, WM_USER_READ, (WPARAM)data, (LPARAM)error);
! 
!       if (error) break;
  	}
  
! 	free(io);
  
  	return 0;
--- 163,181 ----
  			 */
  
  		}
  
  		/* Send a message to main window so it can read. */
! 		SendMessage(RoadMapMainWindow, WM_USER_READ, (WPARAM)data, (LPARAM)conn);
  	}
  
!    if (!--conn->ref_count) {
!    	free(conn);
!    } else {
! 
!       roadmap_log
!          (ROADMAP_ERROR, "conn ref_count is not zero: %d",
!           conn->ref_count);
!       assert (0);
!    }
  
  	return 0;

Index: time.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/time.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** time.c	15 Oct 2005 22:19:21 -0000	1.1.1.1
--- time.c	16 Dec 2005 14:41:32 -0000	1.2
***************
*** 70,79 ****
  time_t time(time_t *t)
  {
! 	SYSTEMTIME st;
  	GetSystemTime(&st);
! 	
! 	return _mktime(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute,
! 		st.wSecond);
! 	
  }
  
--- 70,84 ----
  time_t time(time_t *t)
  {
! 	SYSTEMTIME st;
!    unsigned long seconds;
! 
  	GetSystemTime(&st);
! 	
! 	seconds = _mktime(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute,
! 		st.wSecond);
! 
!    if (t != NULL) *t = seconds;
! 
!    return seconds;
  }
  

Index: roadmap_serial.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_serial.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_serial.c	12 Dec 2005 20:48:29 -0000	1.2
--- roadmap_serial.c	16 Dec 2005 14:41:32 -0000	1.3
***************
*** 1,3 ****
! /* wince_serial.c - serial connection management.
   *
   * LICENSE:
--- 1,3 ----
! /* roadmap_serial.c - serial connection management.
   *
   * LICENSE:
***************
*** 26,86 ****
  #include "../roadmap.h"
  #include "../roadmap_serial.h"
  
  RoadMapSerial roadmap_serial_open(const char *name, const char *mode,
  		int baud_rate)
  {
- 	HANDLE hCommPort = INVALID_HANDLE_VALUE;
- 	LPWSTR url_unicode = ConvertToWideChar(name, CP_UTF8);
- 	COMMTIMEOUTS ct;
- 	DCB dcb;
- 
- 	hCommPort = CreateFile (url_unicode,
- 		GENERIC_READ | GENERIC_WRITE,
- 		0,
- 		NULL,
- 		OPEN_EXISTING,
- 		FILE_FLAG_WRITE_THROUGH,
- 		NULL);
- 
- 	free(url_unicode);
  
! 	if(hCommPort == INVALID_HANDLE_VALUE) {
! 		return (HANDLE)-1;
! 	}
! 
! 	dcb.DCBlength = sizeof(DCB);
! 	if(!GetCommState(hCommPort, &dcb)) {
! 		roadmap_serial_close(hCommPort);
! 		return (HANDLE)-1;
! 	}
  
! //	dcb.fBinary			   = TRUE;
! 	dcb.BaudRate	       = baud_rate;
! //	dcb.fOutxCtsFlow       = TRUE;
! 	dcb.fRtsControl        = RTS_CONTROL_DISABLE;
! 	dcb.fDtrControl        = DTR_CONTROL_DISABLE;
! //	dcb.fOutxDsrFlow       = FALSE;
! //	dcb.fOutX              = FALSE;
! //	dcb.fInX               = FALSE;
! 	dcb.ByteSize           = 8;
! 	dcb.fParity             = FALSE;
! 	dcb.StopBits           = ONESTOPBIT;
  
! 	if(!SetCommState(hCommPort, &dcb)) {
! 		roadmap_serial_close(hCommPort);
! 		return (HANDLE)-1;
! 	}
  
! 	ct.ReadIntervalTimeout = MAXDWORD;
! 	ct.ReadTotalTimeoutMultiplier = 0;
! 	ct.ReadTotalTimeoutConstant = 0;
! 	ct.WriteTotalTimeoutMultiplier = 10;
! 	ct.WriteTotalTimeoutConstant = 1000;
! 	if(!SetCommTimeouts(hCommPort, &ct)) {
! 		roadmap_serial_close(hCommPort);
! 		return (HANDLE)-1;
! 	}
  
! 	return hCommPort;
  }
  
--- 26,50 ----
  #include "../roadmap.h"
  #include "../roadmap_serial.h"
+ #include "win32_serial.h"
  
  RoadMapSerial roadmap_serial_open(const char *name, const char *mode,
  		int baud_rate)
  {
  
!    Win32SerialConn *conn = malloc (sizeof(Win32SerialConn));
  
!    if (conn == NULL) return NULL;
  
!    strncpy (conn->name, name, sizeof(conn->name));
!    conn->name[sizeof(conn->name)-1] = '\0';
!    strncpy (conn->mode, mode, sizeof(conn->mode));
!    conn->mode[sizeof(conn->mode)-1] = '\0';
!    conn->baud_rate = baud_rate;
  
!    conn->handle = INVALID_HANDLE_VALUE;
!    conn->data_count = 0;
!    conn->ref_count = 1;
  
!    return conn;
  }
  
***************
*** 88,93 ****
  void roadmap_serial_close(RoadMapSerial serial)
  {
! 	if (serial != INVALID_HANDLE_VALUE) {
! 		CloseHandle(serial);
  	}
  }
--- 52,63 ----
  void roadmap_serial_close(RoadMapSerial serial)
  {
! 	if (ROADMAP_SERIAL_IS_VALID (serial) &&
!          (serial->handle != INVALID_HANDLE_VALUE)) {
! 		CloseHandle(serial->handle);
!       serial->handle = INVALID_HANDLE_VALUE;
!       
!       if (!--serial->ref_count) {
!          free (serial);
!       }
  	}
  }
***************
*** 96,117 ****
  int roadmap_serial_read(RoadMapSerial serial, void *data, int size)
  {
-    DWORD dwBytesRead;
  
!    if(!ReadFile((HANDLE)serial,
!                 data,
!                 size,
!                 &dwBytesRead,
!                 NULL)) {
        return -1;
     }
  
!    return dwBytesRead;
  }
  
  int roadmap_serial_write (RoadMapSerial serial, const void *data, int length)
  {
     DWORD dwBytesWritten;
  
!    if(!WriteFile((HANDLE)serial,
                  data,
                  length,
--- 66,100 ----
  int roadmap_serial_read(RoadMapSerial serial, void *data, int size)
  {
  
!    if (!ROADMAP_SERIAL_IS_VALID (serial) ||
!          (serial->handle == INVALID_HANDLE_VALUE)) {
! 
        return -1;
     }
  
!    if (serial->data_count <= 0) return serial->data_count;
! 
!    if (size > serial->data_count) size = serial->data_count;
! 
!    memcpy (data, serial->data, size);
! 
!    serial->data_count -= size;
! 
!    return size;
  }
  
+ 
  int roadmap_serial_write (RoadMapSerial serial, const void *data, int length)
  {
     DWORD dwBytesWritten;
  
!    if (!ROADMAP_SERIAL_IS_VALID (serial) ||
!          (serial->handle == INVALID_HANDLE_VALUE)) {
! 
!       return -1;
!    }
! 
! 
!    if(!WriteFile(serial->handle,
                  data,
                  length,

Index: roadmap_main.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_main.cpp	12 Dec 2005 20:48:29 -0000	1.3
--- roadmap_main.cpp	16 Dec 2005 14:41:32 -0000	1.4
***************
*** 42,46 ****
  #include "../roadmap_main.h"
  #include "../roadmap_serial.h"
! #include "wince_input_mon.h"
  #include "roadmap_wincecanvas.h"
  }
--- 42,47 ----
  #include "../roadmap_main.h"
  #include "../roadmap_serial.h"
! #include "wince_input_mon.h"
! #include "win32_serial.h"
  #include "roadmap_wincecanvas.h"
  }
***************
*** 392,401 ****
  	case WM_USER_READ:
  		{
! 			roadmap_main_io *context = (roadmap_main_io *) wParam;
           
!          if (lParam) {
!             /* An error occured */
!             context->io->subsystem = ROADMAP_IO_INVALID;
!          }
  			(*context->callback) (context->io);
  			break;
--- 393,404 ----
  	case WM_USER_READ:
  		{
! 			roadmap_main_io *context = (roadmap_main_io *) wParam;
!          Win32SerialConn *conn = (Win32SerialConn *) lParam;
           
!          if (conn->handle == INVALID_HANDLE_VALUE) {
!             /* An old input which was removed */
!             break;
!          }
! 
  			(*context->callback) (context->io);
  			break;
***************
*** 640,645 ****
  		for (i = 0; i < ROADMAP_MAX_IO; ++i) {
  			if (RoadMapMainIo[i].io == NULL) {
! 				RoadMapMainIo[i].io = (RoadMapIO*)malloc(sizeof(RoadMapIO));
! 				*(RoadMapMainIo[i].io) = *io;
  				RoadMapMainIo[i].callback = callback;
  				break;
--- 643,647 ----
  		for (i = 0; i < ROADMAP_MAX_IO; ++i) {
  			if (RoadMapMainIo[i].io == NULL) {
! 				RoadMapMainIo[i].io = io;
  				RoadMapMainIo[i].callback = callback;
  				break;
***************
*** 655,658 ****
--- 657,661 ----
  		switch (io->subsystem) {
  		case ROADMAP_IO_SERIAL:
+          io->os.serial->ref_count++;
  			monitor_thread = CreateThread(NULL, 0,
  				SerialMonThread, (void*)&RoadMapMainIo[i], 0, NULL);
***************
*** 685,695 ****
  				
  		for (i = 0; i < ROADMAP_MAX_IO; ++i) {
! 			if (RoadMapMainIo[i].io == NULL) continue;
! 
! 			if (!memcmp(RoadMapMainIo[i].io, io, sizeof(RoadMapIO))) {
! 				RoadMapMainIo[i].io->subsystem = ROADMAP_IO_INVALID;
  
- 				// We mark this io as null, as the monitor thread will free
- 				// the allocation.
  				RoadMapMainIo[i].io = NULL;
  				break;
--- 688,693 ----
  				
  		for (i = 0; i < ROADMAP_MAX_IO; ++i) {
!          if (RoadMapMainIo[i].io == io) {
  
  				RoadMapMainIo[i].io = NULL;
  				break;

[Roadmap-commit] roadmap_editor/src roadmap_gps.c,1.2,1.3 roadmap_input.h,1.1.1.1,1.2 roadmap_layer.c,1.2,1.3 roadmap_log.c,1.2,1.3 roadmap_navigate.c,1.4,1.5 roadmap_option.c,1.1.1.1,1.2 roadmap_serial.h,1.1.1.1,1.2 roadmap_start.c,1.7,1.8

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14314

Modified Files:
	roadmap_gps.c roadmap_input.h roadmap_layer.c roadmap_log.c 
	roadmap_navigate.c roadmap_option.c roadmap_serial.h 
	roadmap_start.c 
Log Message:
Rewrite win32 serial communication support.
It should now work fine with a bluetooth GPS.

Index: roadmap_log.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_log.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_log.c	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_log.c	16 Dec 2005 14:40:35 -0000	1.3
***************
*** 37,40 ****
--- 37,41 ----
  #include <string.h>
  #include <stdarg.h>
+ #include <time.h>
  
  #include "roadmap.h"
***************
*** 118,124 ****
                               va_list ap) {
  
!    int i;
  
!    fprintf (file, "%c%s %s, line %d: ", saved, category->prefix, source, line);
     vfprintf(file, format, ap);
     fprintf (file, "\n");
--- 119,147 ----
                               va_list ap) {
  
!    int i;
! 
! #ifndef _WIN32
!    time_t now;
!    struct tm *tms;
  
!    time (&now);
!    tms = localtime (&now);
! 
!    fprintf (file, "%d:%d:%d %c%s %s, line %d ",
!          tms->tm_hour, tms->tm_min, tms->tm_sec,
!          saved, category->prefix, source, line);
! #else
! 	DWORD tm = GetTickCount();
! 
! 	//GetSystemTime(&st);
! 
!    fprintf (file, "%d.%d %c%s %s, line %d ",
!          tm / 1000, tm % 1000,
!          saved, category->prefix, source, line);
! 
! #endif
!    if (!category->show_stack && (RoadMapLogStackCursor > 0)) {
!       fprintf (file, "(%s): ", RoadMapLogStack[RoadMapLogStackCursor-1]);
!    }
     vfprintf(file, format, ap);
     fprintf (file, "\n");
***************
*** 139,143 ****
  void roadmap_log (int level, char *source, int line, char *format, ...) {
  
!    FILE *file;
     va_list ap;
     char saved = ' ';
--- 162,166 ----
  void roadmap_log (int level, char *source, int line, char *format, ...) {
  
!    static FILE *file;
     va_list ap;
     char saved = ' ';
***************
*** 146,149 ****
--- 169,176 ----
  
     if (level < roadmap_verbosity()) return;
+ 
+ #ifdef DEBUG
+    return;
+ #endif
  
     debug = roadmap_debug();
***************
*** 159,168 ****
     if (category->save_to_file) {
  
!       file = roadmap_file_fopen (roadmap_path_user(), "postmortem", "sa");
  
        if (file != NULL) {
  
           roadmap_log_one (category, file, ' ', source, line, format, ap);
!          fclose (file);
  
           va_end(ap);
--- 186,199 ----
     if (category->save_to_file) {
  
!       if (file == NULL) {
! 
!          file = roadmap_file_fopen (roadmap_path_user(), "postmortem", "sa");
!       }
  
        if (file != NULL) {
  
           roadmap_log_one (category, file, ' ', source, line, format, ap);
!          fflush (file);
!          //fclose (file);
  
           va_end(ap);

Index: roadmap_input.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_input.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_input.h	15 Oct 2005 22:19:01 -0000	1.1.1.1
--- roadmap_input.h	16 Dec 2005 14:40:35 -0000	1.2
***************
*** 66,70 ****
     RoadMapInputDecode  decoder;
  
!    char data[1024];
     int  cursor;
  
--- 66,70 ----
     RoadMapInputDecode  decoder;
  
!    char data[5120];
     int  cursor;
  

Index: roadmap_gps.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_gps.c	12 Dec 2005 20:38:11 -0000	1.2
--- roadmap_gps.c	16 Dec 2005 14:40:35 -0000	1.3
***************
*** 376,379 ****
--- 376,382 ----
  
        roadmap_nmea_subscribe
+          (NULL, "GSA", roadmap_gps_gsa, RoadMapGpsNmeaAccount);
+ 
+       roadmap_nmea_subscribe
           ("GRM", "E", roadmap_gps_pgrme, RoadMapGpsNmeaAccount);
  
***************
*** 385,391 ****
  
        roadmap_nmea_subscribe
-          (NULL, "GSA", roadmap_gps_gsa, RoadMapGpsNmeaAccount);
- 
-       roadmap_nmea_subscribe
           (NULL, "GSV", roadmap_gps_gsv, RoadMapGpsNmeaAccount);
     }
--- 388,391 ----
***************
*** 793,796 ****
--- 793,797 ----
  
     static RoadMapInputContext decode;
+    int res;
  
  
***************
*** 827,831 ****
     }
  
!    if (roadmap_input (&decode) < 0) {
  
        (*RoadMapGpsLinkRemove) (io);
--- 828,835 ----
     }
  
! 
!    res = roadmap_input (&decode);
! 
!    if (res < 0) {
  
        (*RoadMapGpsLinkRemove) (io);

Index: roadmap_serial.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_serial.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_serial.h	15 Oct 2005 22:18:52 -0000	1.1.1.1
--- roadmap_serial.h	16 Dec 2005 14:40:35 -0000	1.2
***************
*** 34,40 ****
  
  #include <windows.h>
  
! typedef HANDLE RoadMapSerial; /* WIN32 style. */
! #define ROADMAP_SERIAL_IS_VALID(f) (f != INVALID_HANDLE_VALUE)
  
  #else
--- 34,41 ----
  
  #include <windows.h>
+ struct Win32SerialConn;
  
! typedef struct Win32SerialConn *RoadMapSerial; /* WIN32 style. */
! #define ROADMAP_SERIAL_IS_VALID(f) (f != NULL)
  
  #else

Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_layer.c	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_layer.c	16 Dec 2005 14:40:35 -0000	1.3
***************
*** 373,377 ****
          category->declutter.name     = "Declutter";
          roadmap_config_declare
!             ("schema", &category->declutter, "20248000000");
  
  
--- 373,377 ----
          category->declutter.name     = "Declutter";
          roadmap_config_declare
!             ("schema", &category->declutter, "2024800000");
  
  

Index: roadmap_navigate.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_navigate.c	12 Dec 2005 20:35:42 -0000	1.4
--- roadmap_navigate.c	16 Dec 2005 14:40:35 -0000	1.5
***************
*** 119,123 ****
                 RoadMapNeighbour *neighbours, int max) {
  
!     int count;
      int layers[128];
      int layer_count;
--- 119,123 ----
                 RoadMapNeighbour *neighbours, int max) {
  
!     int count = 0;
      int layers[128];
      int layer_count;

Index: roadmap_option.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_option.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_option.c	15 Oct 2005 22:18:54 -0000	1.1.1.1
--- roadmap_option.c	16 Dec 2005 14:40:35 -0000	1.2
***************
*** 52,56 ****
  
  
! static int roadmap_option_verbose = ROADMAP_MESSAGE_WARNING;
  static int roadmap_option_no_area = 0;
  static int roadmap_option_square  = 0;
--- 52,57 ----
  
  
! //static int roadmap_option_verbose = ROADMAP_MESSAGE_WARNING;
! static int roadmap_option_verbose = ROADMAP_MESSAGE_INFO;
  static int roadmap_option_no_area = 0;
  static int roadmap_option_square  = 0;

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_start.c	12 Dec 2005 20:38:11 -0000	1.7
--- roadmap_start.c	16 Dec 2005 14:40:35 -0000	1.8
***************
*** 708,712 ****
  static void roadmap_start_set_timeout (RoadMapCallback callback) {
  
!    roadmap_main_set_periodic (3000, callback);
  }
  
--- 708,712 ----
  static void roadmap_start_set_timeout (RoadMapCallback callback) {
  
!    roadmap_main_set_periodic (10000, callback);
  }
  

[Roadmap-commit] roadmap/src/gtk2 roadmap_main.c,1.23,1.24

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

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7733/gtk2

Modified Files:
	roadmap_main.c 
Log Message:
check return from gtk_main_iteration() in order to die quietly in
case gtk_main_quit() was called while it was running.  (this is a
fix "by inspection", not by testing.  i noticed the possibility
while looking for an unrelated failure of roadmap to die when
requested.)


Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** roadmap_main.c	6 Dec 2005 23:19:40 -0000	1.23
--- roadmap_main.c	16 Dec 2005 14:13:48 -0000	1.24
***************
*** 562,566 ****
  
     while (gtk_events_pending ()) {
!       gtk_main_iteration ();
     }
  }
--- 562,568 ----
  
     while (gtk_events_pending ()) {
!       if (gtk_main_iteration ()) {
! 	 exit(0);  /* gtk_main_quit() called */
!       }
     }
  }
***************
*** 576,580 ****
  
     while (gtk_events_pending ()) {
!       gtk_main_iteration ();
     }
     gdk_flush();
--- 578,584 ----
  
     while (gtk_events_pending ()) {
!       if (gtk_main_iteration ()) {
! 	 exit(0);  /* gtk_main_quit() called */
!       }
     }
     gdk_flush();

[Roadmap-commit] roadmap/src/gtk roadmap_main.c,1.16,1.17

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

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7733/gtk

Modified Files:
	roadmap_main.c 
Log Message:
check return from gtk_main_iteration() in order to die quietly in
case gtk_main_quit() was called while it was running.  (this is a
fix "by inspection", not by testing.  i noticed the possibility
while looking for an unrelated failure of roadmap to die when
requested.)


Index: roadmap_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** roadmap_main.c	6 Dec 2005 23:19:39 -0000	1.16
--- roadmap_main.c	16 Dec 2005 14:13:48 -0000	1.17
***************
*** 465,469 ****
  
     while (gtk_events_pending ()) {
!       gtk_main_iteration ();
     }
  }
--- 465,471 ----
  
     while (gtk_events_pending ()) {
!       if (gtk_main_iteration ()) {
! 	 exit(0);  /* gtk_main_quit() called */
!       }
     }
  }
***************
*** 479,483 ****
  
     while (gtk_events_pending ()) {
!       gtk_main_iteration ();
     }
     gdk_flush();
--- 481,487 ----
  
     while (gtk_events_pending ()) {
!       if (gtk_main_iteration ()) {
! 	 exit(0);  /* gtk_main_quit() called */
!       }
     }
     gdk_flush();

[Roadmap-commit] roadmap/src/gtk2 roadmap_signals.c,1.1,1.2

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

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7119/gtk2

Modified Files:
	roadmap_signals.c 
Log Message:
replace fprintf() error calls with roadmap_log()


Index: roadmap_signals.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_signals.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_signals.c	6 Dec 2005 23:19:40 -0000	1.1
--- roadmap_signals.c	16 Dec 2005 14:09:57 -0000	1.2
***************
*** 21,24 ****
--- 21,26 ----
  #include <gtk/gtk.h>        /* well guess for what ... */
  
+ #include "roadmap.h"
+ 
  void roadmap_main_exit (void);
  
***************
*** 42,46 ****
  
      if(write(signal_pipe[1], &signal, sizeof(int)) != sizeof(int)) {
!         fprintf(stderr, "unix signal %d lost\n", signal);
      }
  }
--- 44,48 ----
  
      if(write(signal_pipe[1], &signal, sizeof(int)) != sizeof(int)) {
!         roadmap_log(ROADMAP_WARNING, "unix signal %d lost", signal);
      }
  }
***************
*** 83,88 ****
           */
          if(bytes_read != sizeof(int)){
!             fprintf(stderr, 
!                     "lost data in signal pipe (expected %d, received %d)\n",
                      sizeof(int), bytes_read);
              continue;               /* discard the garbage and keep fingers crossed */
--- 85,90 ----
           */
          if(bytes_read != sizeof(int)){
!             roadmap_log(ROADMAP_WARNING, 
!                     "lost data in signal pipe (expected %d, received %d)",
                      sizeof(int), bytes_read);
              continue;               /* discard the garbage and keep fingers crossed */
***************
*** 97,105 ****
       */
      if(error != NULL) {
!         fprintf(stderr, "reading signal pipe failed: %s\n", error->message);
          exit(1);
      }
      if(status == G_IO_STATUS_EOF) {
!         fprintf(stderr, "signal pipe has been closed\n");
          exit(1);
      }
--- 99,107 ----
       */
      if(error != NULL) {
!         roadmap_log(ROADMAP_WARNING, "reading signal pipe failed: %s", error->message);
          exit(1);
      }
      if(status == G_IO_STATUS_EOF) {
!         roadmap_log(ROADMAP_WARNING, "signal pipe has been closed");
          exit(1);
      }
***************
*** 163,167 ****
      g_io_channel_set_encoding(g_signal_in, NULL, &error);
      if(error != NULL) {      /* handle potential errors */
!         fprintf(stderr, "g_io_channel_set_encoding failed %s\n",
              error->message);
          exit(1);
--- 165,169 ----
      g_io_channel_set_encoding(g_signal_in, NULL, &error);
      if(error != NULL) {      /* handle potential errors */
!         roadmap_log(ROADMAP_WARNING, "g_io_channel_set_encoding failed %s",
              error->message);
          exit(1);
***************
*** 173,177 ****
  
      if(error != NULL) {      /* read errors */
!         fprintf(stderr, "g_io_set_flags failed %s\n", error->message);
          exit(1);
      }
--- 175,179 ----
  
      if(error != NULL) {      /* read errors */
!         roadmap_log(ROADMAP_WARNING, "g_io_set_flags failed %s", error->message);
          exit(1);
      }

[Roadmap-commit] roadmap/src/gtk roadmap_signals.c,1.1,1.2

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

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7119/gtk

Modified Files:
	roadmap_signals.c 
Log Message:
replace fprintf() error calls with roadmap_log()


Index: roadmap_signals.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_signals.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_signals.c	6 Dec 2005 23:19:39 -0000	1.1
--- roadmap_signals.c	16 Dec 2005 14:09:57 -0000	1.2
***************
*** 18,21 ****
--- 18,23 ----
  #include <gtk/gtk.h>        /* well guess for what ... */
  
+ #include "roadmap.h"
+ 
  void roadmap_main_exit (void);
  
***************
*** 39,43 ****
  
      if(write(signal_pipe[1], &signal, sizeof(int)) != sizeof(int)) {
!         fprintf(stderr, "unix signal %d lost\n", signal);
      }
  }
--- 41,45 ----
  
      if(write(signal_pipe[1], &signal, sizeof(int)) != sizeof(int)) {
!         roadmap_log(ROADMAP_WARNING, "unix signal %d lost", signal);
      }
  }
***************
*** 80,85 ****
           */
          if(bytes_read != sizeof(int)){
!             fprintf(stderr,
! 		    "lost data in signal pipe (expected %d, received %d)\n",
                      sizeof(int), bytes_read);
              continue;               /* discard the garbage and keep fingers crossed */
--- 82,87 ----
           */
          if(bytes_read != sizeof(int)){
!             roadmap_log(ROADMAP_WARNING,
! 		    "lost data in signal pipe (expected %d, received %d)",
                      sizeof(int), bytes_read);
              continue;               /* discard the garbage and keep fingers crossed */
***************
*** 98,102 ****
       * potential errors and return from the callback.
       */
!     fprintf(stderr, "signal pipe has been closed\n");
  
      return (FALSE);      /* don't keep the event source */
--- 100,104 ----
       * potential errors and return from the callback.
       */
!     roadmap_log (ROADMAP_WARNING, "signal pipe has been closed");
  
      return (FALSE);      /* don't keep the event source */

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

[Pascal F M. <pas...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4997

Modified Files:
	roadmap_voice.c 
Log Message:
Crude attempt at differentiating St (saint) from St (Street)

Index: roadmap_voice.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_voice.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_voice.c	3 Apr 2005 06:45:27 -0000	1.8
--- roadmap_voice.c	16 Dec 2005 08:10:10 -0000	1.9
***************
*** 81,88 ****
  /* The translations below must be sorted by decreasing size,
   * so that the longest match is always selected first.
   */
! static struct voice_translation RoadMapVoiceTranslation[] = {
      {"Blvd", "boulevard"},
!     {"Hwy",  "Highway"},
      {"Cir",  "circle"},
      {"St",   "street"},
--- 81,94 ----
  /* The translations below must be sorted by decreasing size,
   * so that the longest match is always selected first.
+  * There are two translation lists: the first is for the tail of
+  * the message (suffixes) and the second one is for the head (prefix).
+  *
+  * A prefix is supposed to be followed by a reasonably long word (3
+  * characters or more).
   */
! static struct voice_translation RoadMapVoiceTranslate1[] = {
      {"Blvd", "boulevard"},
!     {"Hwy",  "highway"},
!     {"Fwy",  "freeway"},
      {"Cir",  "circle"},
      {"St",   "street"},
***************
*** 99,102 ****
--- 105,114 ----
  };
  
+ static struct voice_translation RoadMapVoiceTranslate2[] = {
+     {"St", "saint"},
+     {"Dr", "Doctor"},
+     {NULL, NULL}
+ };
+ 
  
  static void roadmap_voice_launch (const char *name, const char *arguments) {
***************
*** 204,268 ****
      struct voice_translation *cursor_found;
  
!     if (size <= 0) {
!         return 0;
!     }
      
!     acronym = input;
!     acronym_length = 0;
!     acronym_found = input + strlen(input);
!     cursor_found  = NULL;
      
!     for (cursor = RoadMapVoiceTranslation; cursor->from != NULL; ++cursor) {
          
!         acronym = strstr (input, cursor->from);
!         if (acronym != NULL) {
!             if (acronym < acronym_found) {
                  acronym_found = acronym;
                  cursor_found  = cursor;
!             }
!         }
!     }
      
!     if (cursor_found == NULL) {
!         strncpy (output, input, size);
!         return 1;
!     }
  
!     acronym = acronym_found;
!     cursor  = cursor_found;
!     acronym_length = strlen(cursor->from);
      
!     length = acronym - input;
          
!     if (length > size) return 0;
      
!     /* Copy the unexpanded part, up to the acronym that was found. */
!     strncpy (output, input, length);
!     output += length;
!     size -= length;
  
!     if (size <= 0) return 0;
      
!     if ((acronym_length != 0) &&
!         (acronym[acronym_length] == 0 ||
!          (! isalnum(acronym[acronym_length])))) {
          
!         /* This is a valid acronym: translate it. */
!         length = strlen(cursor->to);
!         strncpy (output, cursor->to, size);
!         output += length;
!         size   -= length;
          
!         if (size <= 0) return 0;
  
!     } else {
!         /* This is not a valid acronym: leave it unchanged. */
!         strncpy (output, acronym, acronym_length);
!         output += acronym_length;
!         size   -= acronym_length;
!     }
!         
          
!     return roadmap_voice_expand (acronym + acronym_length, output, size);
  }
  
--- 216,307 ----
      struct voice_translation *cursor_found;
  
!     for (;;) {
! 
!        if (size <= 0) {
!           return 0;
!        }
      
!        acronym = input;
!        acronym_length = 0;
!        acronym_found = input + strlen(input);
!        cursor_found  = NULL;
      
!        for (cursor = RoadMapVoiceTranslate1; cursor->from != NULL; ++cursor) {
          
!           acronym = strstr (input, cursor->from);
!           if (acronym != NULL) {
!              if (acronym < acronym_found) {
                  acronym_found = acronym;
                  cursor_found  = cursor;
!              }
!           }
!        }
      
!        for (cursor = RoadMapVoiceTranslate2; cursor->from != NULL; ++cursor) {
!         
!           acronym = strstr (input, cursor->from);
!           if (acronym != NULL) {
!              if (acronym < acronym_found) {
!                 acronym_found = acronym;
!                 cursor_found  = cursor;
!              } else if (acronym == acronym_found) {
  
!                 int count = 0;
!                 int word_end = strlen(cursor->from);
! 
!                 if (acronym[word_end] == ' ') {
!                    while (isalpha(acronym[++word_end])) ++count;
!                 }
! 
!                 if (count > 2) {
!                    /* Chance are this is a prefix. */
!                    acronym_found = acronym;
!                    cursor_found  = cursor;
!                 }
!              }
!           }
!        }
      
!        if (cursor_found == NULL) {
!           strncpy (output, input, size);
!           return 1;
!        }
! 
!        acronym = acronym_found;
!        cursor  = cursor_found;
!        acronym_length = strlen(cursor->from);
!     
!        length = acronym - input;
          
!        if (length > size) return 0;
      
!        /* Copy the unexpanded part, up to the acronym that was found. */
!        strncpy (output, input, length);
!        output += length;
!        size -= length;
  
!        if (size <= 0) return 0;
      
!        if ((acronym_length != 0) &&
!              (acronym[acronym_length] == 0 ||
!               (! isalnum(acronym[acronym_length])))) {
          
!           /* This is a valid acronym: translate it. */
!           length = strlen(cursor->to);
!           strncpy (output, cursor->to, size);
!           output += length;
!           size   -= length;
          
!           if (size <= 0) return 0;
  
!        } else {
!           /* This is not a valid acronym: leave it unchanged. */
!           strncpy (output, acronym, acronym_length);
!           output += acronym_length;
!           size   -= acronym_length;
!        }
          
!        input = acronym + acronym_length;
!     }
  }