Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Ehud S. <esh...@us...> - 2006-06-22 18:50:54
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27251/agg Modified Files: agg.vcp Log Message: Add profiling support. Index: agg.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg/agg.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg.vcp 2 Jun 2006 12:47:34 -0000 1.1 --- agg.vcp 22 Jun 2006 18:50:49 -0000 1.2 *************** *** 20,23 **** --- 20,24 ---- !MESSAGE "agg - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "agg - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") + !MESSAGE "agg - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE *************** *** 45,50 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # 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" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 46,51 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # 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" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 70,75 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 71,101 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /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)" == "agg - Win32 (WCE ARMV4) Profiler" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "ARMV4Profiler" ! # PROP BASE Intermediate_Dir "ARMV4Profiler" ! # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" ! # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "ARMV4Profiler" ! # PROP Intermediate_Dir "ARMV4Profiler" ! # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" ! # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 85,88 **** --- 111,115 ---- # Name "agg - Win32 (WCE ARMV4) Release" # Name "agg - Win32 (WCE ARMV4) Debug" + # Name "agg - Win32 (WCE ARMV4) Profiler" # Begin Group "Source Files" *************** *** 164,226 **** DEP_CPP_ROADM=\ "..\..\..\agg\font_freetype\agg_font_freetype.h"\ - "..\..\..\agg\include\agg_array.h"\ - "..\..\..\agg\include\agg_basics.h"\ - "..\..\..\agg\include\agg_bezier_arc.h"\ - "..\..\..\agg\include\agg_clip_liang_barsky.h"\ - "..\..\..\agg\include\agg_color_rgba.h"\ - "..\..\..\agg\include\agg_config.h"\ - "..\..\..\agg\include\agg_conv_adaptor_vcgen.h"\ - "..\..\..\agg\include\agg_conv_contour.h"\ - "..\..\..\agg\include\agg_conv_curve.h"\ - "..\..\..\agg\include\agg_conv_stroke.h"\ - "..\..\..\agg\include\agg_conv_transform.h"\ - "..\..\..\agg\include\agg_curves.h"\ - "..\..\..\agg\include\agg_dda_line.h"\ - "..\..\..\agg\include\agg_ellipse.h"\ - "..\..\..\agg\include\agg_ellipse_bresenham.h"\ - "..\..\..\agg\include\agg_font_cache_manager.h"\ - "..\..\..\agg\include\agg_gamma_functions.h"\ - "..\..\..\agg\include\agg_line_aa_basics.h"\ - "..\..\..\agg\include\agg_math.h"\ - "..\..\..\agg\include\agg_math_stroke.h"\ - "..\..\..\agg\include\agg_path_storage.h"\ - "..\..\..\agg\include\agg_path_storage_integer.h"\ - "..\..\..\agg\include\agg_pixfmt_rgb_packed.h"\ - "..\..\..\agg\include\agg_pixfmt_rgba.h"\ - "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ - "..\..\..\agg\include\agg_rasterizer_outline.h"\ - "..\..\..\agg\include\agg_rasterizer_outline_aa.h"\ - "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ - "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ - "..\..\..\agg\include\agg_renderer_base.h"\ - "..\..\..\agg\include\agg_renderer_outline_aa.h"\ - "..\..\..\agg\include\agg_renderer_primitives.h"\ - "..\..\..\agg\include\agg_renderer_scanline.h"\ - "..\..\..\agg\include\agg_rendering_buffer.h"\ - "..\..\..\agg\include\agg_scanline_bin.h"\ - "..\..\..\agg\include\agg_scanline_p.h"\ - "..\..\..\agg\include\agg_scanline_storage_aa.h"\ - "..\..\..\agg\include\agg_scanline_storage_bin.h"\ - "..\..\..\agg\include\agg_scanline_u.h"\ - "..\..\..\agg\include\agg_trans_affine.h"\ - "..\..\..\agg\include\agg_vcgen_contour.h"\ - "..\..\..\agg\include\agg_vcgen_stroke.h"\ - "..\..\..\agg\include\agg_vertex_sequence.h"\ - "..\..\..\freetype\include\freetype\config\ftheader.h"\ - "..\..\..\freetype\include\ft2build.h"\ - "..\..\..\fribidi\fribidi.h"\ - "..\..\..\fribidi\fribidi_char_sets.h"\ - "..\..\..\fribidi\fribidi_char_sets.i"\ - "..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\ - "..\..\..\fribidi\fribidi_char_sets_cp1255.h"\ - "..\..\..\fribidi\fribidi_char_sets_cp1256.h"\ - "..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\ - "..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\ - "..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\ - "..\..\..\fribidi\fribidi_char_sets_utf8.h"\ - "..\..\..\fribidi\fribidi_config.h"\ - "..\..\..\fribidi\fribidi_types.h"\ - "..\..\..\fribidi\fribidi_types.i"\ - "..\..\..\fribidi\fribidi_unicode.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ --- 191,194 ---- *************** *** 237,241 **** NODEP_CPP_ROADM=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File --- 205,234 ---- NODEP_CPP_ROADM=\ ! "..\..\..\agg\agg_conv_contour.h"\ ! "..\..\..\agg\agg_conv_stroke.h"\ ! "..\..\..\agg\agg_conv_transform.h"\ ! "..\..\..\agg\agg_curves.h"\ ! "..\..\..\agg\agg_ellipse.h"\ ! "..\..\..\agg\agg_path_storage.h"\ ! "..\..\..\agg\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg\agg_rasterizer_outline.h"\ ! "..\..\..\agg\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\agg_renderer_outline_aa.h"\ ! "..\..\..\agg\agg_renderer_primitives.h"\ ! "..\..\..\agg\agg_renderer_scanline.h"\ ! "..\..\..\agg\agg_rendering_buffer.h"\ ! "..\..\..\agg\agg_scanline_p.h"\ ! "..\..\..\agg\font_freetype\agg_conv_curve.h"\ ! "..\..\..\agg\font_freetype\agg_font_cache_manager.h"\ ! "..\..\..\agg\font_freetype\agg_path_storage_integer.h"\ ! "..\..\..\agg\font_freetype\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_aa.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_u.h"\ ! "..\..\..\agg\font_freetype\agg_trans_affine.h"\ ! "..\..\..\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg_pixfmt_rgba.h"\ # End Source File |
|
From: Ehud S. <esh...@us...> - 2006-06-22 18:50:54
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27251/fribidi Modified Files: fribidi.vcp Log Message: Add profiling support. Index: fribidi.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi/fribidi.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fribidi.vcp 23 Apr 2006 13:32:24 -0000 1.1 --- fribidi.vcp 22 Jun 2006 18:50:49 -0000 1.2 *************** *** 99,104 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "WIN32" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D "_LIB" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /O2 /M$(CECrtMT) /c ! # SUBTRACT CPP /YX LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 99,103 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "WIN32" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D "_LIB" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo |
|
From: Ehud S. <esh...@us...> - 2006-06-22 18:46:32
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25427 Modified Files: roadmap_spawn.c Log Message: Fix flite DLL lookup. Index: roadmap_spawn.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_spawn.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_spawn.c 5 Jun 2006 18:52:30 -0000 1.3 --- roadmap_spawn.c 22 Jun 2006 18:46:29 -0000 1.4 *************** *** 76,81 **** if (!flite_dll_initialized) { ! flite_dll_inst = LoadLibrary(L"\\Storage card\\RoadMap\\flite_dll.dll"); if (!flite_dll_inst) { flite_dll_initialized = -1; --- 76,87 ---- if (!flite_dll_initialized) { + char full_name[MAX_PATH]; + LPWSTR full_name_unicode; ! snprintf(full_name, MAX_PATH, "%s\\flite_dll.dll", RoadMapSpawnPath); ! full_name_unicode = ConvertToWideChar(full_name, CP_UTF8); ! ! flite_dll_inst = LoadLibrary(full_name_unicode); ! free (full_name_unicode); if (!flite_dll_inst) { flite_dll_initialized = -1; |
Update of /cvsroot/roadmap/roadmap_editor/src/icons/bmp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24999 Modified Files: nav_approaching.bmp nav_continue.bmp nav_keep_left.bmp nav_keep_right.bmp nav_turn_left.bmp nav_turn_right.bmp nav_u_turn.bmp Log Message: Update navigation icons - Avi Romano. Index: nav_approaching.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_approaching.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsC8HOuJ and /tmp/cvsbQYiOh differ Index: nav_turn_right.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_turn_right.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsKCbZAP and /tmp/cvsp9RJ0n differ Index: nav_keep_left.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_keep_left.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsQaPRQP and /tmp/cvsqVnblo differ Index: nav_turn_left.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_turn_left.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsQ2LDhU and /tmp/cvszpdqPs differ Index: nav_continue.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_continue.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsuWjgtV and /tmp/cvsr5KS6t differ Index: nav_keep_right.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_keep_right.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvswbELt1 and /tmp/cvsG96ddA differ Index: nav_u_turn.bmp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/icons/bmp/nav_u_turn.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsq8XOt2 and /tmp/cvshCp7iB differ |
|
From: Ehud S. <esh...@us...> - 2006-06-22 18:44:48
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24562 Modified Files: editor_main.c Log Message: Bump version. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** editor_main.c 11 Jun 2006 11:20:13 -0000 1.9 --- editor_main.c 22 Jun 2006 18:44:45 -0000 1.10 *************** *** 41,45 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.7.0_pre2"; int editor_is_enabled (void) { --- 41,45 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.7.0_pre3"; int editor_is_enabled (void) { |
|
From: Ehud S. <esh...@us...> - 2006-06-22 18:44:27
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24522 Modified Files: roadmap_preferences.c Log Message: Fix combo box selection. Index: roadmap_preferences.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_preferences.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_preferences.c 15 May 2006 19:22:36 -0000 1.3 --- roadmap_preferences.c 22 Jun 2006 18:44:23 -0000 1.4 *************** *** 168,172 **** case ROADMAP_CONFIG_ENUM: ! count = 1; values[0] = (char *)value; /* Always make the original value appear first. */ --- 168,172 ---- case ROADMAP_CONFIG_ENUM: ! count = 0; values[0] = (char *)value; /* Always make the original value appear first. */ *************** *** 177,181 **** values[count] = roadmap_config_get_enumeration_value (enumeration); ! if (strcmp (values[count], value) != 0) { if (count >= 256) { --- 177,181 ---- values[count] = roadmap_config_get_enumeration_value (enumeration); ! //if (strcmp (values[count], value) != 0) { if (count >= 256) { *************** *** 185,189 **** } count += 1; ! } } roadmap_dialog_new_choice --- 185,189 ---- } count += 1; ! //} } roadmap_dialog_new_choice |
|
From: Paul F. <pg...@us...> - 2006-06-20 16:26:07
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28002 Modified Files: roadmap_track.c Log Message: suppress the most recent trackpoint if it's coincident with the GPS position. Index: roadmap_track.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_track.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_track.c 20 Jun 2006 01:25:26 -0000 1.5 --- roadmap_track.c 20 Jun 2006 16:26:03 -0000 1.6 *************** *** 37,40 **** --- 37,41 ---- static int RoadMapTrackDisplay; static int RoadMapTrackRefresh; + RoadMapGpsPosition RoadMapTrackGpsPosition; typedef enum { *************** *** 85,88 **** --- 86,91 ---- route_add_wpt_tail (RoadMapTrack, w); + RoadMapTrackGpsPosition = *gps_position; + maxtrack = roadmap_config_get_integer (&RoadMapConfigLength); while (RoadMapTrack->rte_waypt_ct > maxtrack) { *************** *** 214,218 **** RoadMapGuiPoint guipoint; ! if (roadmap_math_point_is_visible (&waypointp->pos)) { roadmap_math_coordinate (&waypointp->pos, &guipoint); --- 217,228 ---- RoadMapGuiPoint guipoint; ! /* Don't draw the trackpoint if it coincides with our most recent ! * GPS position. Otherwise, at least in "deviation" mode, we get ! * a continuously moving trackpoint, right under the tip of the ! * GPS arrow. ! */ ! if (roadmap_math_point_is_visible (&waypointp->pos) && ! (RoadMapTrackGpsPosition.latitude != waypointp->pos.latitude || ! RoadMapTrackGpsPosition.longitude != waypointp->pos.longitude) ) { roadmap_math_coordinate (&waypointp->pos, &guipoint); |
|
From: Paul F. <pg...@us...> - 2006-06-20 16:17:42
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23192 Modified Files: roadmap_screen.c Log Message: make sure roadmap_screen_draw_line always gets an initialized "first_shape" Index: roadmap_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_screen.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** roadmap_screen.c 6 Feb 2006 01:45:26 -0000 1.60 --- roadmap_screen.c 20 Jun 2006 16:17:36 -0000 1.61 *************** *** 851,859 **** if (first_shape_line >= 0) { ! roadmap_shape_of_line (real_line, ! first_shape_line, last_shape_line, ! &first_shape, &last_shape); ! } else { ! first_shape = last_shape = -1; } --- 851,859 ---- if (first_shape_line >= 0) { ! if (roadmap_shape_of_line (real_line, ! first_shape_line, last_shape_line, ! &first_shape, &last_shape) == 0) { ! first_shape = -1; ! } } |
|
From: Paul F. <pg...@us...> - 2006-06-20 01:25:30
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15317 Modified Files: roadmap_track.c Log Message: implement the "deviation" method for storing track points Index: roadmap_track.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_track.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_track.c 8 Dec 2005 21:13:55 -0000 1.4 --- roadmap_track.c 20 Jun 2006 01:25:26 -0000 1.5 *************** *** 35,40 **** route_head *RoadMapTrack = NULL; static int RoadMapTrackModified; - static RoadMapGpsPosition RoadMapLastTrackPosition; - static int RoadMapLastTrackTime; static int RoadMapTrackDisplay; static int RoadMapTrackRefresh; --- 35,38 ---- *************** *** 93,98 **** } - RoadMapLastTrackPosition = *gps_position; - RoadMapLastTrackTime = gps_time; RoadMapTrackModified = 1; } --- 91,94 ---- *************** *** 134,140 **** int need_point = 0; ! int distance; RoadMapTrackPolicy policy; ! RoadMapPosition gpspos, lastpos; policy = roadmap_track_policy(); --- 130,137 ---- int need_point = 0; ! int ab_dist, ac_dist, bc_dist; RoadMapTrackPolicy policy; ! RoadMapPosition pos[3]; ! waypoint *w; policy = roadmap_track_policy(); *************** *** 149,163 **** if (gps_position->speed == 0) return; ! if ((RoadMapLastTrackPosition.latitude == gps_position->latitude) && ! (RoadMapLastTrackPosition.longitude == gps_position->longitude)) { return; } - gpspos.latitude = gps_position->latitude; - gpspos.longitude = gps_position->longitude; - lastpos.latitude = RoadMapLastTrackPosition.latitude; - lastpos.longitude = RoadMapLastTrackPosition.longitude; ! distance = roadmap_math_distance ( &lastpos, &gpspos); switch(policy) { --- 146,162 ---- if (gps_position->speed == 0) return; ! pos[0].latitude = gps_position->latitude; ! pos[0].longitude = gps_position->longitude; ! w = (waypoint *)QUEUE_LAST (&RoadMapTrack->waypoint_list); ! pos[1].latitude = w->pos.latitude; ! pos[1].longitude = w->pos.longitude; ! ! if ((pos[0].latitude == pos[1].latitude) && ! (pos[0].longitude == pos[1].longitude)) { return; } ! ab_dist = roadmap_math_distance ( &pos[0], &pos[1]); switch(policy) { *************** *** 167,177 **** case RoadMapTrackPolicyTime: ! need_point = ((distance > 10) && (roadmap_config_get_integer (&RoadMapConfigTimeInterval) < ! (gps_time - RoadMapLastTrackTime))); break; case RoadMapTrackPolicyDistance: ! need_point = ( distance > roadmap_config_get_integer (&RoadMapConfigDistanceInterval) ); --- 166,176 ---- case RoadMapTrackPolicyTime: ! need_point = ((ab_dist > 10) && (roadmap_config_get_integer (&RoadMapConfigTimeInterval) < ! (gps_time - w->creation_time))); break; case RoadMapTrackPolicyDistance: ! need_point = ( ab_dist > roadmap_config_get_integer (&RoadMapConfigDistanceInterval) ); *************** *** 179,197 **** case RoadMapTrackPolicyDeviation: ! #if LATER ! // FIXME -- This calculation should determine the answer ! // to this question: "How far am I from the point at ! // which I would have been if I'd travelled in a straight ! // line determined by my previous two trackpoints, and is ! // that distance larger than the configured interval?" ! // ! // also need to be sure the "final" point is recorded ! need_point = (roadmap_config_get_integer ! (&RoadMapConfigDistanceInterval) < ! roadmap_math_distance ( &gpspos, ! roadmap_track_projected (distance, &lastpos))); ! #else ! need_point = 0; ! #endif break; --- 178,200 ---- case RoadMapTrackPolicyDeviation: ! if (RoadMapTrack->rte_waypt_ct > 2) { ! w = (waypoint *)QUEUE_LAST(&w->Q); ! pos[2].latitude = w->pos.latitude; ! pos[2].longitude = w->pos.longitude; ! ! /* The current most recent three points are A, B, and C. ! * Drop point B if dist(A,B)+dist(B,C) is approximately ! * equal to dist (A,C). ! */ ! bc_dist = roadmap_math_distance (&pos[1], &pos[2]); ! ac_dist = roadmap_math_distance (&pos[0], &pos[2]); ! ! if (abs (ab_dist + bc_dist - ac_dist) < 10) { ! w = (waypoint *) QUEUE_LAST (&RoadMapTrack->waypoint_list); ! route_del_wpt ( RoadMapTrack, w); ! } ! } ! ! need_point = 1; break; *************** *** 275,281 **** *defaulted = 1; } else { ! if (strcasecmp(name, "NONE") == 0) { ! return NULL; ! } *defaulted = 0; } --- 278,284 ---- *defaulted = 1; } else { ! if (strcasecmp(name, "NONE") == 0) { ! return NULL; ! } *defaulted = 0; } *************** *** 343,347 **** roadmap_config_declare_enumeration ("preferences", &RoadMapConfigPolicyString, ! "off", "deviation", "distance", "time", NULL); roadmap_config_declare --- 346,350 ---- roadmap_config_declare_enumeration ("preferences", &RoadMapConfigPolicyString, ! "off", "Deviation", "Distance", "Time", NULL); roadmap_config_declare |
|
From: Paul F. <pg...@us...> - 2006-06-20 00:53:39
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31817 Modified Files: roadmap_nmea.c Log Message: squash a tab Index: roadmap_nmea.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_nmea.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** roadmap_nmea.c 19 Jun 2006 19:49:31 -0000 1.26 --- roadmap_nmea.c 20 Jun 2006 00:53:35 -0000 1.27 *************** *** 725,729 **** nmea_checksum, checksum); ! return 0; } } --- 725,729 ---- nmea_checksum, checksum); ! return 0; } } |
|
From: Paul F. <pg...@us...> - 2006-06-20 00:52:03
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30826 Modified Files: roadmap_input.c Log Message: typo fix Index: roadmap_input.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_input.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_input.c 4 Nov 2005 18:51:01 -0000 1.4 --- roadmap_input.c 20 Jun 2006 00:51:59 -0000 1.5 *************** *** 1,3 **** ! /* roadmap_input.c - Decode an SCII data stream. * * LICENSE: --- 1,3 ---- ! /* roadmap_input.c - Decode an ASCII data stream. * * LICENSE: |
|
From: Paul F. <pg...@us...> - 2006-06-19 23:58:14
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3743 Modified Files: roadmap_start.c Log Message: log start and stop of program, to make postmortem file more useful. these are only WARNING level in order to get them into the file. also, log receipt of signals. Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** roadmap_start.c 21 Apr 2006 18:56:19 -0000 1.93 --- roadmap_start.c 19 Jun 2006 23:58:08 -0000 1.94 *************** *** 932,935 **** --- 932,943 ---- } + roadmap_start_now() { + + char *buf; + time_t t = time(0);; + buf = ctime(&t); + buf[strlen(buf)-1] = '\0'; + return buf; + } void roadmap_start (int argc, char **argv) { *************** *** 944,947 **** --- 952,956 ---- #endif + roadmap_log (ROADMAP_WARNING, "RoadMap starting, %s", roadmap_start_now()); roadmap_log_redirect (ROADMAP_MESSAGE_ERROR, roadmap_start_error); roadmap_log_redirect (ROADMAP_MESSAGE_FATAL, roadmap_start_fatal); *************** *** 1055,1057 **** --- 1064,1067 ---- #endif roadmap_config_save (0); + roadmap_log (ROADMAP_WARNING, "RoadMap exiting, %s", roadmap_start_now()); } |
|
From: Paul F. <pg...@us...> - 2006-06-19 23:58:11
|
Update of /cvsroot/roadmap/roadmap/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3743/gtk2 Modified Files: Makefile roadmap_signals.c Log Message: log start and stop of program, to make postmortem file more useful. these are only WARNING level in order to get them into the file. also, log receipt of signals. Index: roadmap_signals.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_signals.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_signals.c 16 Dec 2005 14:09:57 -0000 1.2 --- roadmap_signals.c 19 Jun 2006 23:58:08 -0000 1.3 *************** *** 90,93 **** --- 90,94 ---- continue; /* discard the garbage and keep fingers crossed */ } + roadmap_log(ROADMAP_WARNING, "received signal %d", buf.signal); roadmap_main_exit(); Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gtk2/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile 7 Dec 2005 18:57:36 -0000 1.23 --- Makefile 19 Jun 2006 23:58:08 -0000 1.24 *************** *** 24,28 **** LDFLAGS=-pg $(LDFLAGS) else ! STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer $(WARNFLAGS) $(OPTIONS) endif endif --- 24,28 ---- LDFLAGS=-pg $(LDFLAGS) else ! STDCFLAGS=-O2 -ffast-math -fomit-frame-pointer -g $(WARNFLAGS) $(OPTIONS) endif endif |
|
From: Paul F. <pg...@us...> - 2006-06-19 23:58:11
|
Update of /cvsroot/roadmap/roadmap/src/gtk In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3743/gtk Modified Files: roadmap_signals.c Log Message: log start and stop of program, to make postmortem file more useful. these are only WARNING level in order to get them into the file. also, log receipt of signals. Index: roadmap_signals.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_signals.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_signals.c 16 Dec 2005 14:09:57 -0000 1.2 --- roadmap_signals.c 19 Jun 2006 23:58:08 -0000 1.3 *************** *** 83,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 */ } roadmap_main_exit(); break; --- 83,91 ---- 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 */ } + roadmap_log(ROADMAP_WARNING, "received signal %d", buf.signal); roadmap_main_exit(); break; |
|
From: Paul F. <pg...@us...> - 2006-06-19 20:09:46
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20059 Modified Files: roadmap_street.c Log Message: oops. typo. Index: roadmap_street.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_street.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** roadmap_street.c 19 Jun 2006 18:16:13 -0000 1.23 --- roadmap_street.c 19 Jun 2006 20:09:43 -0000 1.24 *************** *** 434,438 **** /* { "", "Ramp"}, */ { "Road", "Rd"}, ! { "Ranch Road", "RMRd"}, */ /* { "", "Row"}, */ { "Route", "Rte"}, --- 434,438 ---- /* { "", "Ramp"}, */ { "Road", "Rd"}, ! { "Ranch Road", "RMRd"}, /* { "", "Row"}, */ { "Route", "Rte"}, |
|
From: Paul F. <pg...@us...> - 2006-06-19 19:50:35
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9907 Modified Files: roadmap_log.c Log Message: log WARNING level messages to file. previously only ERROR and above. Index: roadmap_log.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_log.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** roadmap_log.c 2 Dec 2005 21:36:16 -0000 1.13 --- roadmap_log.c 19 Jun 2006 19:50:28 -0000 1.14 *************** *** 62,66 **** {ROADMAP_MESSAGE_DEBUG, 0, 0, 0, "++", NULL}, {ROADMAP_MESSAGE_INFO, 0, 0, 0, "--", NULL}, ! {ROADMAP_MESSAGE_WARNING, 0, 0, 0, "==", NULL}, {ROADMAP_MESSAGE_ERROR, 1, 1, 0, "**", NULL}, {ROADMAP_MESSAGE_FATAL, 1, 1, 1, "##", NULL}, --- 62,66 ---- {ROADMAP_MESSAGE_DEBUG, 0, 0, 0, "++", NULL}, {ROADMAP_MESSAGE_INFO, 0, 0, 0, "--", NULL}, ! {ROADMAP_MESSAGE_WARNING, 0, 1, 0, "==", NULL}, {ROADMAP_MESSAGE_ERROR, 1, 1, 0, "**", NULL}, {ROADMAP_MESSAGE_FATAL, 1, 1, 1, "##", NULL}, |
|
From: Paul F. <pg...@us...> - 2006-06-19 19:49:35
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9178 Modified Files: roadmap_nmea.c Log Message: toss nmea sentences with bad checksums (else why check?). reduce log level from ERROR to WARNING. fix typos, too. Index: roadmap_nmea.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_nmea.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** roadmap_nmea.c 27 Nov 2005 05:59:31 -0000 1.25 --- roadmap_nmea.c 19 Jun 2006 19:49:31 -0000 1.26 *************** *** 717,728 **** if (*p == '*') { ! unsigned char mnea_checksum = hex2bin(p[1]) * 16 + hex2bin(p[2]); ! if (mnea_checksum != checksum) { ! roadmap_log (ROADMAP_ERROR, ! "mnea checksum error for '%s' (nmea=%02x, calculated=%02x)", sentence, ! mnea_checksum, checksum); } } --- 717,729 ---- if (*p == '*') { ! unsigned char nmea_checksum = hex2bin(p[1]) * 16 + hex2bin(p[2]); ! if (nmea_checksum != checksum) { ! roadmap_log (ROADMAP_WARNING, ! "nmea checksum error for '%s' (nmea=%02x, calculated=%02x)", sentence, ! nmea_checksum, checksum); + return 0; } } |
|
From: Paul F. <pg...@us...> - 2006-06-19 18:16:18
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29766 Modified Files: roadmap_street.c Log Message: completed list of street type expansions Index: roadmap_street.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_street.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** roadmap_street.c 12 Jun 2006 11:08:41 -0000 1.22 --- roadmap_street.c 19 Jun 2006 18:16:13 -0000 1.23 *************** *** 401,408 **** static RoadmapStreetTypeMap RoadmapStreetFullTypes[] = { { "Alley", "Aly"}, ! /* { "", "Arc"}, */ { "Avenue", "Ave"}, { "Boulevard", "Blvd"}, ! { "Bridge", "Br"}, { "Bridge", "Brg"}, { "Bypass", "Byp"}, --- 401,408 ---- static RoadmapStreetTypeMap RoadmapStreetFullTypes[] = { { "Alley", "Aly"}, ! { "Arcade", "Arc"}, { "Avenue", "Ave"}, { "Boulevard", "Blvd"}, ! { "Branch", "Br"}, { "Bridge", "Brg"}, { "Bypass", "Byp"}, *************** *** 416,421 **** { "Drive", "Dr"}, { "Expressway", "Expy"}, { "Freeway", "Fwy"}, ! /* ?? { "", "Grd"}, */ { "Highway", "Hwy"}, { "Hiway", "Hwy"}, --- 416,422 ---- { "Drive", "Dr"}, { "Expressway", "Expy"}, + { "Farm Road", "FMRd"}, { "Freeway", "Fwy"}, ! { "Grade", "Grd"}, { "Highway", "Hwy"}, { "Hiway", "Hwy"}, *************** *** 423,426 **** --- 424,428 ---- /* { "", "Loop"}, */ { "Mall", "Mal"}, + { "Motorway", "Mtwy"}, { "Overpass", "Ovps"}, /* { "", "Pass"}, */ *************** *** 432,435 **** --- 434,438 ---- /* { "", "Ramp"}, */ { "Road", "Rd"}, + { "Ranch Road", "RMRd"}, */ /* { "", "Row"}, */ { "Route", "Rte"}, *************** *** 445,448 **** --- 448,452 ---- { "Throughway", "Thwy"}, { "Thruway", "Thwy"}, + { "Trafficway", "Tfwy"}, { "Trail", "Trl"}, { "Tunnel", "Tunl"}, |
|
From: Paul F. <pg...@us...> - 2006-06-16 18:33:05
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20922 Modified Files: README Log Message: fixed typos Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** README 25 Apr 2006 21:54:21 -0000 1.90 --- README 16 Jun 2006 18:32:55 -0000 1.91 *************** *** 653,659 **** california). ! The rdmgemaps tool is a shell script that extract the TIGER files from the downloaded ZIP files, invokes the buildmap tool and then cleans ! up the TIGER files. Last, rdmgemaps invokes the buildus tool to generate the US states & counties catalog. The main purpose of rdmgenmaps is really to keep the TIGER files in compressed form, considering their huge size.. --- 653,659 ---- california). ! The rdmgenmaps tool is a shell script that extract the TIGER files from the downloaded ZIP files, invokes the buildmap tool and then cleans ! up the TIGER files. Last, rdmgenmaps invokes the buildus tool to generate the US states & counties catalog. The main purpose of rdmgenmaps is really to keep the TIGER files in compressed form, considering their huge size.. |
|
From: Ehud S. <esh...@us...> - 2006-06-14 12:16:20
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2190 Modified Files: buildmap_dglib.c buildmap_line.c buildmap_line.h buildmap_shape.c buildmap_shape.h buildmap_tiger.c Log Message: Add dglib support for tiger maps. Index: buildmap_shape.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_shape.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** buildmap_shape.h 15 Oct 2005 22:18:50 -0000 1.1.1.1 --- buildmap_shape.h 14 Jun 2006 12:16:05 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- void buildmap_shape_initialize (void); int buildmap_shape_add (int line, int sequence, int longitude, int latitude); + int buildmap_shape_get (int line, int sequence, int *longitude, int *latitude); void buildmap_shape_sort (void); Index: buildmap_shape.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_shape.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** buildmap_shape.c 8 May 2006 13:53:42 -0000 1.4 --- buildmap_shape.c 14 Jun 2006 12:16:05 -0000 1.5 *************** *** 183,186 **** --- 183,217 ---- + int buildmap_shape_get + (int line, int sequence, int *longitude, int *latitude) { + + int index; + int line_exists; + int block; + int offset; + BuildMapShape *this_shape; + + for (index = roadmap_hash_get_first (ShapeByLine, line); + index >= 0; + index = roadmap_hash_get_next (ShapeByLine, index)) { + + this_shape = Shape[index / BUILDMAP_BLOCK] + (index % BUILDMAP_BLOCK); + + if (this_shape->line == line) { + + if (this_shape->sequence == (unsigned int)sequence) { + + *longitude = this_shape->longitude; + *latitude = this_shape->latitude; + + return 0; + } + } + } + + return -1; + } + + static int buildmap_shape_compare (const void *r1, const void *r2) { Index: buildmap_tiger.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_tiger.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** buildmap_tiger.c 12 Dec 2005 20:35:41 -0000 1.2 --- buildmap_tiger.c 14 Jun 2006 12:16:05 -0000 1.3 *************** *** 57,60 **** --- 57,61 ---- #include "buildmap_shape.h" #include "buildmap_polygon.h" + #include "buildmap_dglib.h" *************** *** 531,534 **** --- 532,639 ---- + static void buildmap_tiger_gen_route (const char *source, int verbose) { + + int size; + int estimated; + int line_count; + int record_count; + char *data; + char *cursor; + char *end_of_data; + + int line; + + char cfcc; + int tlid; + + data = buildmap_tiger_read (source, ".RT1", verbose, &size); + if (data == NULL) return; + + estimated = size / 229; + + line_count = 0; + record_count = 0; + end_of_data = data + size; + + for (cursor = data; cursor < end_of_data; cursor += 229) { + + line_count += 1; + buildmap_set_line (line_count); + + cfcc = tiger2type (cursor, 56, 58); + tlid = tiger2int (cursor, 6, 15); + + if (cfcc >= ROADMAP_ROAD_FIRST && + cfcc <= ROADMAP_ROAD_LAST) { + + int from_car_allowed = 1; + int to_car_allowed = 0; + int from_max_speed = 0; + int to_max_speed = 0; + int from_cross_time = 0; + int to_cross_time = 0; + int line_length; + + line = buildmap_line_find_sorted(tlid); + + line_length = buildmap_line_length (line); + + switch (cfcc) { + case ROADMAP_ROAD_FREEWAY: + from_cross_time = to_cross_time = line_length / 30; + to_car_allowed = 1; + break; + + case ROADMAP_ROAD_RAMP: + from_cross_time = line_length / 10; + break; + + case ROADMAP_ROAD_MAIN: + from_cross_time = to_cross_time = line_length / 15; + to_car_allowed = 1; + break; + + case ROADMAP_ROAD_STREET: + from_cross_time = to_cross_time = line_length / 7; + to_car_allowed = 1; + break; + + case ROADMAP_ROAD_TRAIL: + from_cross_time = to_cross_time = line_length / 5; + to_car_allowed = 1; + break; + + default: + buildmap_fatal (0, "Should not be here!"); + } + + buildmap_dglib_add + (from_car_allowed, to_car_allowed, from_max_speed, to_max_speed, + from_cross_time, to_cross_time, cfcc, + line); + } + + record_count += 1; + + if (verbose) { + if ((line_count & 0xff) == 0) { + buildmap_progress (line_count, estimated); + } + } + + if (cursor[228] == '\r') { + cursor += 1; /* Case of an MS-DOS format file. */ + } + if (cursor[228] != '\n') { + buildmap_error (0, "bad end of line"); + } + } + + munmap (data, size); + + tiger_summary (verbose, record_count); + } + + static void buildmap_tiger_read_rt2 (const char *source, int verbose) { *************** *** 981,984 **** --- 1086,1091 ---- buildmap_tiger_read_rt2 (base, verbose); + buildmap_tiger_gen_route (base, verbose); + free(base); } Index: buildmap_line.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_line.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** buildmap_line.c 8 May 2006 13:53:42 -0000 1.3 --- buildmap_line.c 14 Jun 2006 12:16:05 -0000 1.4 *************** *** 49,52 **** --- 49,53 ---- #include <string.h> #include <ctype.h> + #include <math.h> #include "roadmap_db_line.h" *************** *** 57,60 **** --- 58,62 ---- #include "buildmap_point.h" #include "buildmap_square.h" + #include "buildmap_shape.h" #include "buildmap_line.h" *************** *** 81,84 **** --- 83,103 ---- static RoadMapHash *LongLinesHash = NULL; + static int buildmap_line_calc_length (int from_lon, int from_lat, + int to_lon, int to_lat) { + + double nRadius = 6378.137; + double nRadians = M_PI / 180.0; + double nLon1 = from_lon / 1000000.0; + double nLat1 = from_lat / 1000000.0; + double nLon2 = to_lon / 1000000.0; + double nLat2 = to_lat / 1000000.0; + double nCose = sin(nRadians * nLon1) * sin(nRadians * nLon2) + + cos(nRadians * nLon1) * cos(nRadians * nLon2) * + cos(nRadians * (nLat1 - nLat2)); + double nDistance = nRadius * acos(nCose); + return (int)(nDistance * 1000); + } + + static void buildmap_shape_update_long_line (RoadMapLongLine *line, int longitude, int latitude) { *************** *** 320,323 **** --- 339,373 ---- + int buildmap_line_length (int line) { + + int length = 0; + BuildMapLine *this_line = buildmap_line_get_record_sorted (line); + int from_lon; + int from_lat; + int to_lon; + int to_lat; + int i; + + from_lon = buildmap_point_get_longitude_sorted (this_line->record.from); + from_lat = buildmap_point_get_latitude_sorted (this_line->record.from); + + i=0; + while (buildmap_shape_get (line, i, &to_lon, &to_lat) != -1) { + + length += buildmap_line_calc_length (from_lon, from_lat, to_lon, to_lat); + from_lon = to_lon; + from_lat = to_lat; + i++; + } + + + to_lon = buildmap_point_get_longitude_sorted (this_line->record.to); + to_lat = buildmap_point_get_latitude_sorted (this_line->record.to); + length += buildmap_line_calc_length (from_lon, from_lat, to_lon, to_lat); + + return length; + } + + static int buildmap_line_compare (const void *r1, const void *r2) { Index: buildmap_line.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_line.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** buildmap_line.h 8 May 2006 13:53:42 -0000 1.2 --- buildmap_line.h 14 Jun 2006 12:16:05 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- (int line, int *longitude, int *latitude); void buildmap_line_sort (void); + int buildmap_line_length (int line); void buildmap_line_test_long (int line, int longitude, int latitude); Index: buildmap_dglib.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_dglib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** buildmap_dglib.c 15 May 2006 19:54:37 -0000 1.2 --- buildmap_dglib.c 14 Jun 2006 12:16:05 -0000 1.3 *************** *** 110,119 **** if (to_flags & ROUTE_CAR_ALLOWED) { - EgdesCount++; ! status = dglAddEdgeX( &graph , to , from , to_cross_time , ! -line , NULL , NULL , &layer, 0 ); ! if ( status < 0 ) { ! buildmap_fatal (0, "dglAddEdge error: %s\n", dglStrerror( &graph ) ); } } --- 110,124 ---- if (to_flags & ROUTE_CAR_ALLOWED) { ! if (line == 0) { ! buildmap_error (0, "buildmap_dglib_add - can't set line as bi-directional (id = 0)"); ! } else { ! EgdesCount++; ! ! status = dglAddEdgeX( &graph , to , from , to_cross_time , ! -line , NULL , NULL , &layer, 0 ); ! if ( status < 0 ) { ! buildmap_fatal (0, "dglAddEdge error: %s\n", dglStrerror( &graph ) ); ! } } } |
|
From: Paul F. <pg...@us...> - 2006-06-12 11:08:48
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1737 Modified Files: roadmap_street.c Log Message: make address matching more forgiving, by adding a table of "standard" spellings to match against the map's street-type dictionary. there's duplication of this mapping table against a similar table in roadmap_voice.c, but the sorting and lookup requirements are quite different. Index: roadmap_street.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_street.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** roadmap_street.c 6 Feb 2006 06:40:52 -0000 1.21 --- roadmap_street.c 12 Jun 2006 11:08:41 -0000 1.22 *************** *** 376,379 **** --- 376,480 ---- + /* + * the list of possible types (second column) was generated with: + * + * for x in /usr/local/share/roadmap/maps/ *.rdm + * do + * dumpmap --volume=type --strings $x | + * awk '/ --> / && $5 !~ /\"\"/ { printf " { \"\", %s},\n", $5; } ' + * done | sort -u + * + * the "fullnames" (first column) were added by hand, and then + * the list was re-alphabetized by first column. the '??' entries + * may have fullnames, but i can't guess them. -pgf + */ + + + typedef struct { + const char *fullname; + const char *abbrev; + } RoadmapStreetTypeMap; + + /* Both many-to-one and one-to-many mappings are supported, but + * the first column must be alphabetical! + */ + static RoadmapStreetTypeMap RoadmapStreetFullTypes[] = { + { "Alley", "Aly"}, + /* { "", "Arc"}, */ + { "Avenue", "Ave"}, + { "Boulevard", "Blvd"}, + { "Bridge", "Br"}, + { "Bridge", "Brg"}, + { "Bypass", "Byp"}, + { "Causeway", "Cswy"}, + { "Center", "Ctr"}, + { "Circle", "Cir"}, + { "Court", "Ct"}, + { "Cove", "Cv"}, + { "Crescent", "Cres"}, + { "Crossing", "Xing"}, + { "Drive", "Dr"}, + { "Expressway", "Expy"}, + { "Freeway", "Fwy"}, + /* ?? { "", "Grd"}, */ + { "Highway", "Hwy"}, + { "Hiway", "Hwy"}, + { "Lane", "Ln"}, + /* { "", "Loop"}, */ + { "Mall", "Mal"}, + { "Overpass", "Ovps"}, + /* { "", "Pass"}, */ + /* { "", "Path"}, */ + /* { "", "Pike"}, */ + { "Parkway", "Pky"}, + { "Place", "Pl"}, + { "Plaza", "Plz"}, + /* { "", "Ramp"}, */ + { "Road", "Rd"}, + /* { "", "Row"}, */ + { "Route", "Rte"}, + { "Rt", "Rte"}, + /* { "", "Rue"}, */ + /* { "", "Run"}, */ + { "Skyway", "Skwy"}, + /* { "", "Spur"}, */ + { "Street", "St"}, + { "Square", "Sq"}, + { "Terrace", "Ter"}, + { "Terrace", "Trce"}, + { "Throughway", "Thwy"}, + { "Thruway", "Thwy"}, + { "Trail", "Trl"}, + { "Tunnel", "Tunl"}, + { "Turnpike", "Tpke"}, + { "Underpass", "Unp"}, + /* { "", "Walk"}, */ + /* { "", "Way"}, */ + { "Walkway", "Wkwy"}, + { 0, 0 } + }; + + static RoadmapStreetTypeMap *roadmap_street_type_to_abbrev ( + const char *type, RoadmapStreetTypeMap *last) { + + RoadmapStreetTypeMap *tm; + int r; + + /* If we match a fullname, return the corresponding abbreviation. + * If we're passed a "last" pointer, start there instead of at + * the beginning. + */ + for (tm = last ? ++last : RoadmapStreetFullTypes; + tm->fullname; tm++) { + r = strcasecmp(tm->fullname, type); + if (r == 0) + return tm; + if (r > 0) + break; + } + return 0; + } + + static void roadmap_street_locate (const char *name, RoadMapStreetIdentifier *street) { *************** *** 382,389 **** --- 483,499 ---- char buffer[128]; + street->prefix = 0; street->suffix = 0; street->type = 0; + /* trim leading spaces */ + while (*name == ' ' && *name != 0) ++name; + if (*name == 0) { + street->name = 0; + return; + } + + /* Search for a prefix. If found, remove the prefix from the name * by shifting the name's pointer. *************** *** 413,417 **** /* Search for a street type. If found, extract the street name ! * and stor it in the temporary buffer, which will be substituted * for the name. */ --- 523,527 ---- /* Search for a street type. If found, extract the street name ! * and store it in the temporary buffer, which will be substituted * for the name. */ *************** *** 420,430 **** if (space != NULL) { ! char *trailer; ! trailer = space + 1; ! street->type = roadmap_dictionary_locate ! (RoadMapRangeActive->RoadMapStreetType, trailer); if (street->type > 0) { --- 530,563 ---- if (space != NULL) { ! char *ptr; ! RoadmapStreetTypeMap *typemap; ! strcpy(buffer, space + 1); ! /* trim trailing spaces and dots, since types are ! * usually abbreviations, and users type dots */ ! ptr = &buffer[strlen(buffer)-1]; ! while (*ptr == ' ' || *ptr == '.') { ! *ptr = 0; ! --ptr; ! } ! ! typemap = 0; ! do { ! ! /* Try fullname mappings until there are no more, then ! * try the string that was given. ! */ ! typemap = roadmap_street_type_to_abbrev(buffer, typemap); ! ! street->type = roadmap_dictionary_locate ! (RoadMapRangeActive->RoadMapStreetType, ! typemap ? typemap->abbrev : buffer); ! ! if (street->type > 0) ! break; ! ! } while(typemap != 0); if (street->type > 0) { *************** *** 443,446 **** --- 576,581 ---- if (space != NULL) { + char *trailer; + trailer = space + 1; |
|
From: Ehud S. <esh...@us...> - 2006-06-11 12:44:09
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14461 Modified Files: install.inf Log Message: Add navigation panel. Index: install.inf =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/install.inf,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install.inf 2 May 2006 15:25:16 -0000 1.6 --- install.inf 11 Jun 2006 12:44:06 -0000 1.7 *************** *** 57,60 **** --- 57,69 ---- rm_zoomin.bmp = 7 rm_zoomout.bmp = 7 + nav_approaching.bmp = 7 + nav_continue.bmp = 7 + nav_keep_left.bmp = 7 + nav_keep_right.bmp = 7 + nav_panel.bmp = 7 + nav_panel_wide.bmp = 7 + nav_turn_left.bmp = 7 + nav_turn_right.bmp = 7 + nav_u_turn.bmp = 7 [SourceDisksFiles.ARM] *************** *** 104,107 **** --- 113,125 ---- rm_zoomin.bmp,,,0x00000010 rm_zoomout.bmp,,,0x00000010 + nav_approaching.bmp,,,0x00000010 + nav_continue.bmp,,,0x00000010 + nav_keep_left.bmp,,,0x00000010 + nav_keep_right.bmp,,,0x00000010 + nav_panel.bmp,,,0x00000010 + nav_panel_wide.bmp,,,0x00000010 + nav_turn_left.bmp,,,0x00000010 + nav_turn_right.bmp,,,0x00000010 + nav_u_turn.bmp,,,0x00000010 [Files.Maps] |
|
From: Ehud S. <esh...@us...> - 2006-06-11 12:43:47
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14110 Modified Files: navigate_main.c Log Message: Follow GPS when GPS is in focus. Index: navigate_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** navigate_main.c 11 Jun 2006 11:41:58 -0000 1.9 --- navigate_main.c 11 Jun 2006 12:43:43 -0000 1.10 *************** *** 62,65 **** --- 62,66 ---- int NavigatePluginID = -1; static int NavigateTrackEnabled = 0; + static int NavigateTrackFollowGPS = 0; static RoadMapPen NavigatePen; *************** *** 94,99 **** static int navigate_find_track_points (PluginLine *from_line, int *from_point, ! PluginLine *to_line, int *to_point, ! int use_gps_location) { const RoadMapPosition *position = NULL; --- 95,99 ---- static int navigate_find_track_points (PluginLine *from_line, int *from_point, ! PluginLine *to_line, int *to_point) { const RoadMapPosition *position = NULL; *************** *** 108,112 **** *from_point = -1; ! if (use_gps_location) { RoadMapPosition pos; --- 108,112 ---- *from_point = -1; ! if (NavigateTrackFollowGPS) { RoadMapPosition pos; *************** *** 244,248 **** if (navigate_find_track_points (&from_line, &from_point, ! &NavigateDestination, &NavigateDestPoint, 1) < 0) { return -1; --- 244,248 ---- if (navigate_find_track_points (&from_line, &from_point, ! &NavigateDestination, &NavigateDestPoint) < 0) { return -1; *************** *** 564,568 **** PluginLine from_line; int from_point; ! int use_gps_location = (strcmp (roadmap_trip_get_focus_name (), "GPS") == 0); NavigateDestination.plugin_id = INVALID_PLUGIN_ID; --- 564,570 ---- PluginLine from_line; int from_point; ! ! NavigateTrackFollowGPS = ! (strcmp (roadmap_trip_get_focus_name (), "GPS") == 0); NavigateDestination.plugin_id = INVALID_PLUGIN_ID; *************** *** 575,580 **** if (navigate_find_track_points ! (&from_line, &from_point, &NavigateDestination, &NavigateDestPoint, ! use_gps_location) < 0) { return; --- 577,581 ---- if (navigate_find_track_points ! (&from_line, &from_point, &NavigateDestination, &NavigateDestPoint)) { return; *************** *** 612,616 **** navigate_bar_set_mode (NavigateTrackEnabled); ! if (use_gps_location) { NavigateCurrentSegment = 0; --- 613,617 ---- navigate_bar_set_mode (NavigateTrackEnabled); ! if (NavigateTrackFollowGPS) { NavigateCurrentSegment = 0; *************** *** 632,635 **** --- 633,645 ---- if (!NavigateTrackEnabled) return; + if (!NavigateTrackFollowGPS && + !strcmp (roadmap_trip_get_focus_name (), "GPS")) { + + NavigateTrackFollowGPS = 1; + + roadmap_trip_stop (); + roadmap_navigate_route (NavigateCallbacks); + } + for (i=0; i<NavigateNumSegments; i++) { |
|
From: Ehud S. <esh...@us...> - 2006-06-11 12:43:24
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14053 Modified Files: editor_screen.c Log Message: Lower accuracy for selecting roads. Index: editor_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** editor_screen.c 11 Jun 2006 11:20:13 -0000 1.13 --- editor_screen.c 11 Jun 2006 12:43:15 -0000 1.14 *************** *** 224,228 **** if (roadmap_navigate_retrieve_line ! (&position, 20, &line, &distance, LAYER_ALL_ROADS) == -1) { roadmap_display_hide ("Selected Street"); --- 224,228 ---- if (roadmap_navigate_retrieve_line ! (&position, 1, &line, &distance, LAYER_ALL_ROADS) == -1) { roadmap_display_hide ("Selected Street"); |
|
From: Ehud S. <esh...@us...> - 2006-06-11 12:42:52
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13602 Modified Files: roadmap_address.c Log Message: Rename Other to Search. Index: roadmap_address.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_address.c 15 May 2006 19:26:39 -0000 1.4 --- roadmap_address.c 11 Jun 2006 12:42:49 -0000 1.5 *************** *** 50,54 **** #define MAX_NAMES 100 ! static char *def_values[2] = {"", "Other"}; static int RoadMapAddressSearchCount; static char *RoadMapAddressSearchNames[MAX_NAMES]; --- 50,54 ---- #define MAX_NAMES 100 ! static char *def_values[2] = {"", "Search"}; static int RoadMapAddressSearchCount; static char *RoadMapAddressSearchNames[MAX_NAMES]; |
