diff options
Diffstat (limited to 'navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm')
-rw-r--r-- | navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm b/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm index fdc65e1a9..50dfeea6d 100644 --- a/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm +++ b/navit/script/osm/Geo/OSM/OsmChangeReaderV5.pm @@ -33,7 +33,7 @@ use constant FILETYPE_OSM => 2; # With this initialiser, your process will get called with instantiated objects sub init -{ +{ my $obj = bless{}, shift; my $proc = shift; my $prog = shift; @@ -48,12 +48,12 @@ sub init sub _process { my($self, $command, $entity, $attr, $tags, $members) = @_; - + if( defined $self->{oldproc} ) { return $self->{oldproc}->($command, $entity, $attr, $tags, $members); } - + my $ent; if( $entity eq "node" ) { @@ -77,7 +77,7 @@ sub load{ $self->{filetype} = FILETYPE_UNKNOWN; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); my $fh = data_open($file_name); @@ -107,7 +107,7 @@ sub parse($) my ($self, $string) = @_; $self->{state} = STATE_INIT; - + my $start_time = time(); my $P = new XML::Parser(Handlers => {Start => sub{ DoStart( $self, @_ )}, End => sub { DoEnd( $self, @_ )}}); $self->{input_length} = length($string); @@ -132,7 +132,7 @@ sub parse($) # Function is called whenever an XML tag is started sub DoStart { -#print @_,"\n"; +#print @_,"\n"; my ($self, $Expat, $Name, %Attr) = @_; if( $self->{filetype} == FILETYPE_UNKNOWN ) @@ -148,7 +148,7 @@ sub DoStart } elsif($Name eq "osm"){ $self->{state} = STATE_EXPECT_ENTITY; $self->{filetype} = FILETYPE_OSM; - + if( $Attr{version} ne "0.5" ) { die "OsmChangeReaderV3 can only read 0.5 files, found '$Attr{version}'\n" } } else { @@ -276,7 +276,7 @@ OsmChangeReaderV5 - Module for reading OpenStreetMap V5 Change XML data files my $OSM = new Geo::OSM::OsmChangeReader(\&process); $OSM->load("Data/changes.osc"); - + sub process { my($OSM, $command, $entity) = @_; |