Check out the latest version of Routino: svn co http://routino.org/svn/trunk routino
Log of /trunk/src/osmparser.c
Parent Directory
|
Revision Log
Links to HEAD: | (view) (download) (as text) (annotate) |
Sticky Revision: |
Revision 1246 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 21 18:53:32 2013 UTC (12 years, 1 month ago) by amb
File length: 35841 byte(s)
Diff to previous 1243
Remove unnecessary word from logerror messages.
Revision 1243 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 20 14:17:14 2013 UTC (12 years, 1 month ago) by amb
File length: 36075 byte(s)
Diff to previous 1236
Replace 'motorbike' with 'motorcycle' everywhere.
Revision 1236 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 9 18:18:51 2013 UTC (12 years, 2 months ago) by amb
File length: 36069 byte(s)
Diff to previous 1234
Reset the to/via/from indexes before parsing each relation.
Revision 1234 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 29 11:11:11 2012 UTC (12 years, 2 months ago) by amb
File length: 35983 byte(s)
Diff to previous 1233
Re-factor parsing code to remove duplicated parts from three parsers (osmo5mparse.c, osmpbfparse.c and osmxmlparse.c) into a common place (osmparser.c), also removes lots of global variables. Change the node, way and relation count to uint64_t instead of index_t to avoid wrap-around (although it would have been a cosmetic problem only), also removes dependency on types.h. Make the node, way and relation counters be 'int64_t' instead of 'long long' in the XML parsers for consistency with the non-XML parsers.
Revision 1233 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 28 12:48:19 2012 UTC (12 years, 2 months ago) by amb
File length: 33236 byte(s)
Diff to previous 1232
Log errors for areas that are oneway.
Revision 1232 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 28 11:51:48 2012 UTC (12 years, 2 months ago) by amb
File length: 33111 byte(s)
Diff to previous 1231
Log errors for areas that are not closed.
Revision 1231 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 27 14:00:23 2012 UTC (12 years, 2 months ago) by amb
File length: 32966 byte(s)
Diff to previous 1227
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 1227 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 24 16:35:46 2012 UTC (12 years, 2 months ago) by amb
File length: 32497 byte(s)
Diff to previous 1226
Added parsing of O5M/O5C format (a binary format but otherwise very close to OSM/OSC).
Revision 1226 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 24 11:02:10 2012 UTC (12 years, 2 months ago) by amb
File length: 29895 byte(s)
Diff to previous 1221
The PBF format does not support change files (the 'visible' part of the info message is only for historical data and not for changes).
Revision 1221 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 21 16:08:44 2012 UTC (12 years, 2 months ago) by amb
File length: 29978 byte(s)
Diff to previous 1204
Add a parser for OSM PBF format. Separate the XML parser from the data processing in osmparser.c. Update planetsplitter and documentation to use new format.
Revision 1204 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 15 15:15:22 2012 UTC (12 years, 3 months ago) by amb
File length: 49133 byte(s)
Diff to previous 1199
Change the xsd-to-xmlparser functions to output the source code in the same order as the XSD file and do not attempt to sort them into reverse order of reference.
Revision 1199 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 15 11:35:56 2012 UTC (12 years, 3 months ago) by amb
File length: 48626 byte(s)
Diff to previous 1186
Allow the tagging rule syntax to contain nested <if ...> statements.
Revision 1186 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Dec 10 18:36:08 2012 UTC (12 years, 3 months ago) by amb
File length: 48647 byte(s)
Diff to previous 1174
New XML parser doesn't use stdio buffered file access but lower level read functions.
Revision 1174 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Dec 1 16:17:34 2012 UTC (12 years, 3 months ago) by amb
File length: 48640 byte(s)
Diff to previous 1173
Rename the Way_* enumerated values to Highway_*, add a new Highway_None type, change the HighwayType() function to return Highway_None instead of Highway_Count if no match found - all changes for consistency with similar types and functions.
Revision 1173 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 27 19:51:08 2012 UTC (12 years, 3 months ago) by amb
File length: 48615 byte(s)
Diff to previous 1168
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 1168 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 21 09:20:57 2012 UTC (12 years, 3 months ago) by amb
File length: 48337 byte(s)
Diff to previous 1166
Revert r1164 - some super-segments are longer than 65535 metres even if no individual segment is.
Revision 1166 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 16:12:08 2012 UTC (12 years, 3 months ago) by amb
File length: 48341 byte(s)
Diff to previous 1165
Replace all assert statements with a custom error message that explains the cause and suggests a solution.
Revision 1165 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 15:30:13 2012 UTC (12 years, 3 months ago) by amb
File length: 48012 byte(s)
Diff to previous 1164
Use a specific type for the node flags instead of a generic uint16_t.
Revision 1164 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Nov 20 15:24:30 2012 UTC (12 years, 3 months ago) by amb
File length: 48009 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, 3 months ago) by amb
File length: 48005 byte(s)
Diff to previous 1159
Tidy up all of the recent code changes - change the name of a few of the functions.
Revision 1159 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 19 18:59:16 2012 UTC (12 years, 3 months ago) by amb
File length: 47981 byte(s)
Diff to previous 1154
Unconditionally mark ways as deleted if they have been modified to handle the case when applying more than one change file if a way is created by the first of the change files and modified by the second it will not be in the index.
Revision 1154 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 18 19:41:47 2012 UTC (12 years, 3 months ago) by amb
File length: 48013 byte(s)
Diff to previous 1152
When marking modified nodes as deleted don't accidentally re-include them as new ways with the deleted flag set.
Revision 1152 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Nov 18 17:29:26 2012 UTC (12 years, 3 months ago) by amb
File length: 47996 byte(s)
Diff to previous 1145
Mark modified relations as deleted before storing the modification to handle the case where the modification causes it to be invalid and not stored therefore leaving the old version.
Revision 1145 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Nov 17 13:31:14 2012 UTC (12 years, 4 months ago) by amb
File length: 47952 byte(s)
Diff to previous 1140
Fix applying changes for ways (highways that have been modified to be non-highways were not added to the database so the original remains).
Revision 1140 - (view) (download) (as text) (annotate) - [select for diffs]
Added Fri Nov 16 18:47:07 2012 UTC (12 years, 4 months ago) by amb
File length: 47973 byte(s)
Diff to previous 1137
Code to allow adding OSC change files (.osc files) to an existing set of parsed (and preserved) data.
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.