Routino SVN Repository Browser

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

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

Log of /trunk/src/osmparser.c

Parent Directory Parent Directory | Revision Log Revision Log


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


Revision 1356 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 31 17:23:18 2013 UTC (11 years, 9 months ago) by amb
File length: 32235 byte(s)
Diff to previous 1347
Move some functions about so that osmparser.c can be replaced for other types of
parsing.


Revision 1347 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 27 17:36:11 2013 UTC (11 years, 9 months ago) by amb
File length: 36799 byte(s)
Diff to previous 1339
Redistributed error log messages from osmparser way handling.


Revision 1339 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 23 17:47:16 2013 UTC (11 years, 10 months ago) by amb
File length: 37686 byte(s)
Diff to previous 1338
Don't create segments when parsing input file but create the segments later
using the nodes stored in the ways file.  This makes applying changes simpler
(segments file is not kept with the --keep option) and handling changed ways is
simpler than changed segments.


Revision 1338 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 22 17:31:03 2013 UTC (11 years, 10 months ago) by amb
File length: 38254 byte(s)
Diff to previous 1336
Store the list of nodes in the raw ways file for use by the errorlog functions.


Revision 1336 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 20 18:51:45 2013 UTC (11 years, 10 months ago) by amb
File length: 38212 byte(s)
Diff to previous 1318
Store more logerror information even for items that are discarded to allow them
to be located geographically.


Revision 1318 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 13 18:06:15 2013 UTC (11 years, 10 months ago) by amb
File length: 37420 byte(s)
Diff to previous 1313
Move the logerror function prototypes back into logging.h and remove the
logerror.h header file from most source files again.


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: 37442 byte(s)
Diff to previous 1263
Create a binary log file that contains the node, way and relation id and a link
to the error message for easy parsing.


Revision 1263 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 2 14:13:14 2013 UTC (12 years ago) by amb
File length: 36549 byte(s)
Diff to previous 1247
Recognise mini-roundabouts tagged as junction=roundabout (as well as
highway=mini_roundabout).  Pass them through the parser as roundabout=yes.
Output them from the filedumper as junction=roundabout.  Update the
documentation for mini-roundabouts.


Revision 1247 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 24 18:50:02 2013 UTC (12 years, 1 month ago) by amb
File length: 36400 byte(s)
Diff to previous 1246
Change the "lanes=..." tag processing because it counts lanes in both
directions.  A normal road may be tagged as having two lanes (one in each
direction) but the multilane property is intended to allow prioritisation of
roads where traffic can use multiple lanes in each direction.


Revision 1246 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jan 21 18:53:32 2013 UTC (12 years, 2 months 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, 2 months 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, 3 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]
Added Wed Nov 21 09:20:57 2012 UTC (12 years, 4 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.



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