Routino SVN Repository Browser

Check out the latest version of Routino: svn co http://routino.org/svn/trunk routino

/[routino]/trunk/src/segmentsx.c
ViewVC logotype

Log of /trunk/src/segmentsx.c

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:


Revision 1161 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 14:16:58 2012 UTC (12 years, 3 months ago) by amb
File length: 31111 byte(s)
Diff to previous 1160
Tidy up all of the recent code changes - change the name of a few of the
functions.


Revision 1160 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 14:04:44 2012 UTC (12 years, 3 months ago) by amb
File length: 31107 byte(s)
Diff to previous 1155
Tidy up all of the recent code changes - change the order of the functions
within the files to a more sensible and consitent order.


Revision 1155 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 19 16:15:53 2012 UTC (12 years, 3 months ago) by amb
File length: 31103 byte(s)
Diff to previous 1153
De-duplicate segments when sorting only if they have the same nodes, way and
distance - i.e. the same data imported twice.


Revision 1153 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 18 17:30:44 2012 UTC (12 years, 3 months ago) by amb
File length: 30728 byte(s)
Diff to previous 1151
When sorting segments use the distance flags as the tie-breaker so that
duplicated segments with different flags get sorted into the same order when
applying changes as when not applying changes.


Revision 1151 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 18 17:24:50 2012 UTC (12 years, 3 months ago) by amb
File length: 30458 byte(s)
Diff to previous 1146
Using --parse-only and --preserve must sort the data so that it is ready to
apply the changes.


Revision 1146 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 17 14:06:57 2012 UTC (12 years, 4 months ago) by amb
File length: 30532 byte(s)
Diff to previous 1140
Suppress some error log messages when applying changes (false positive duplicate
detection due to modification of existing items).


Revision 1140 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 16 18:47:07 2012 UTC (12 years, 4 months ago) by amb
File length: 30359 byte(s)
Diff to previous 1139
Code to allow adding OSC change files (.osc files) to an existing set of parsed
(and preserved) data.


Revision 1139 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 15 19:16:47 2012 UTC (12 years, 4 months ago) by amb
File length: 27575 byte(s)
Diff to previous 1137
Fixed the --preserve option.


Revision 1137 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 11 16:05:10 2012 UTC (12 years, 4 months ago) by amb
File length: 27430 byte(s)
Diff to previous 1136
Mark those segments that come from ways which are areas with an explicit flag
rather than an implicit one (also fixes a bug).


Revision 1136 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 10 19:23:32 2012 UTC (12 years, 4 months ago) by amb
File length: 27333 byte(s)
Diff to previous 1133
Added a --preserve option which keeps the raw data files after parsing, sorting
and de-duplication.


Revision 1133 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 10 14:15:38 2012 UTC (12 years, 4 months ago) by amb
File length: 27261 byte(s)
Diff to previous 1132
The MergeSuperSegments function creates the output file in the sorted order
already, there is no need to re-sort it.


Revision 1132 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 10 13:42:30 2012 UTC (12 years, 4 months ago) by amb
File length: 28205 byte(s)
Diff to previous 1131
De-duplicate the super-segments as a post-processing function after the sort so
both operations are combined in a single function.


Revision 1131 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 10 12:18:56 2012 UTC (12 years, 4 months ago) by amb
File length: 27753 byte(s)
Diff to previous 1123
De-duplicate the raw segments before any other processing (to match the node,
way and turn relation processing).


Revision 1123 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 3 10:44:59 2012 UTC (12 years, 4 months ago) by amb
File length: 26301 byte(s)
Diff to previous 1122
Don't open the input file for appending if there is no intention to write
anything to it.


Revision 1122 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 3 08:58:47 2012 UTC (12 years, 4 months ago) by amb
File length: 26124 byte(s)
Diff to previous 1120
Change the UnmapFile() function to take a pointer to the data instead of the
filename (like the CloseFile() function takes the file descriptor).


Revision 1120 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 1 20:00:27 2012 UTC (12 years, 4 months ago) by amb
File length: 26148 byte(s)
Diff to previous 1118
Introduce a new'--append' option for appending data from a file to the currently
parsed data.  Rename the intermediate file used for storing data to be appended
to.  Add a function to call after appending to a file which closes the file and
renames it to a temporary filename which is used for the remaining processing.


Revision 1118 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 31 19:01:40 2012 UTC (12 years, 4 months ago) by amb
File length: 25545 byte(s)
Diff to previous 1115
Add the option for the sorting function to preserve the input order of
equivalent items on the output.  Use this feature in sorting so that slim mode
and normal mode give the same results.


Revision 1115 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Oct 24 08:12:55 2012 UTC (12 years, 4 months ago) by amb
File length: 25518 byte(s)
Diff to previous 1112
Remove a debugging print statement.


Revision 1112 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 22 07:53:51 2012 UTC (12 years, 4 months ago) by amb
File length: 25665 byte(s)
Diff to previous 1111
Fix bug with index parameter in new pre-sort function and change comments to
clarify.


Revision 1111 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 22 07:43:38 2012 UTC (12 years, 4 months ago) by amb
File length: 25671 byte(s)
Diff to previous 1110
Use the new pre-sort function to allow RemovePrunedSegments() to delete the
pruned segments before sorting them.


Revision 1110 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 22 07:41:55 2012 UTC (12 years, 4 months ago) by amb
File length: 25671 byte(s)
Diff to previous 1107
Change the message after sorting geographically to be consistent with others.


Revision 1107 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Oct 21 16:13:43 2012 UTC (12 years, 4 months ago) by amb
File length: 25633 byte(s)
Diff to previous 1106
Use the new pre-sort function to allow UpdateSegments() and SortSegmentList() to
be combined into a single SortSegmentListGeographically() function that only
reads and writes the data once instead of twice.


Revision 1106 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Oct 21 15:55:48 2012 UTC (12 years, 4 months ago) by amb
File length: 25433 byte(s)
Diff to previous 1102
Change the sorting functions to have a pre-sort and post-sort selection function
instead of just a post-selection one (this will allow deletion of some items
before sorting instead of after sorting in some cases).


Revision 1102 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Oct 21 14:03:26 2012 UTC (12 years, 4 months ago) by amb
File length: 25198 byte(s)
Diff to previous 1100
Reallocate the firstnode array when indexing segments because there may be fewer
nodes now.


Revision 1100 - (view) (download) (as text) (annotate) - [select for diffs]
Added Sat Oct 20 16:52:20 2012 UTC (12 years, 4 months ago) by amb
File length: 25182 byte(s)
Diff to previous 1098
Move the compacting of the ways back to the top, delete the unused ways at this
point and also call the function again after pruning segments.



This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a