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 1313 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat May 11 18:14:38 2013 UTC (11 years, 10 months ago) by amb
File length: 32119 byte(s)
Diff to previous 1297
Create a binary log file that contains the node, way and relation id and a link
to the error message for easy parsing.


Revision 1297 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 7 14:41:11 2013 UTC (11 years, 10 months ago) by amb
File length: 31903 byte(s)
Diff to previous 1231
Add cache functions for NodesX, SegmentsX and WaysX to speed up the
planetsplitter in slim mode.


Revision 1231 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 27 14:00:23 2012 UTC (12 years, 3 months ago) by amb
File length: 31670 byte(s)
Diff to previous 1228
Don't append segments if they are duplicates within a way or have duplicated
nodes.  Log errors for middle nodes that repeat within a way (can be non-trivial
unintentional loops).


Revision 1228 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Dec 26 10:57:06 2012 UTC (12 years, 3 months ago) by amb
File length: 31886 byte(s)
Diff to previous 1208
Make the log error messages more useful when there are missing nodes or ways.


Revision 1208 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 15 16:43:03 2012 UTC (12 years, 3 months ago) by amb
File length: 31797 byte(s)
Diff to previous 1173
Stop planetsplitter crashing out in unusual ways if there is no data.


Revision 1173 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 27 19:51:08 2012 UTC (12 years, 4 months ago) by amb
File length: 31645 byte(s)
Diff to previous 1171
Log an error about duplicated segments within a way while parsing the OSM
instead of later (will have been removed by de-duplication code before tested
later in most cases).


Revision 1171 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 27 19:19:01 2012 UTC (12 years, 4 months ago) by amb
File length: 31390 byte(s)
Diff to previous 1169
Don't log an error for duplicated nodes, ways or relations because it can only
occur when applying changes or if using multiple geographically overlapping
files and neither is a data error.


Revision 1169 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 21 11:12:04 2012 UTC (12 years, 4 months ago) by amb
File length: 31499 byte(s)
Diff to previous 1168
Finally fix the segment area handling - segments that are areas are discarded in
preference to those that are not (as it was between r914 and r1136) and segments
that are areas don't have the wrong distance (as they did between r914 and
r1136).

Revision r1137 correctly changed to use a flag and fixed the distance bug but
then didn't sort using the new flag.  Revision r1153 started sorting using the
segment flags but the area was not the most significant bit so they were not
sorted last.  Revision r1164 correctly cleared the area flag when no longer
needed but didn't fix the rest.  Revision r1168 reverted r1164 so needed to be
re-applied.


Revision 1168 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 21 09:20:57 2012 UTC (12 years, 4 months ago) by amb
File length: 31461 byte(s)
Diff to previous 1167
Revert r1164 - some super-segments are longer than 65535 metres even if no
individual segment is.


Revision 1167 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 16:21:27 2012 UTC (12 years, 4 months ago) by amb
File length: 31507 byte(s)
Diff to previous 1166
Rename the '--preserve' command line option to '--keep' for simplicity.


Revision 1166 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 16:12:08 2012 UTC (12 years, 4 months ago) by amb
File length: 31524 byte(s)
Diff to previous 1164
Replace all assert statements with a custom error message that explains the
cause and suggests a solution.


Revision 1164 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 15:24:30 2012 UTC (12 years, 4 months ago) by amb
File length: 31157 byte(s)
Diff to previous 1161
Replace the 32-bit combined distance and flags in the segment with 16 bits for
each.


Revision 1161 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 14:16:58 2012 UTC (12 years, 4 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, 4 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, 4 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, 4 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, 4 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]
Added 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).



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