pbf_parser 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea5dc0ea7ddbd1a9a7be824c3ed334094c700df
-  data.tar.gz: d89de3d4d8f6db32de7dde3cf4a7035d4f9f751a
+  metadata.gz: 5341b491bdc9e0695a864bb7b190d226dc8ad2ca
+  data.tar.gz: 988771cfcd757689ceb0c4875722d9653b345720
 SHA512:
-  metadata.gz: 7f3ed43da517eb4a534fb24b708645ceb23eadf9f41a51027f6215b982d7e01d21ad66d42a5936ab48fc1d27569efa58dd7fad236dcbfce65bde75227cbf20b8
-  data.tar.gz: 1427c6766cc9cede1b9467514e88762e030bca6fcc267937fffa3a354d3757f2b6c52e00c1aab98030b876cfa4992f59ad8d3d9de81322c5f0538e04ec4f9809
+  metadata.gz: 4eebbaf35074633ae16866fa1d59b888159aa9f53425fc3ebb61ffa46bf501c6c4a7d6e1c1fbb0f4b7cd41b184bd563d2b4ab9a77f2f53b8c66694a4121c95ee
+  data.tar.gz: b036b89bbaaa41f986a79686d61fe116eeb838be457cad07041c936dcabeba0de1e2a48f1e7b1fd4736bc6971c3eb64bf99c51445e60e1b10e7d9c0043838985

data/ext/pbf_parser/pbf_parser.c

@@ -590,9 +590,70 @@ static VALUE parse_osm_data(VALUE obj)
 
   primitive_block__free_unpacked(primitive_block, NULL);
 
+  // Increment position
+  rb_iv_set(obj, "@pos", INT2NUM(NUM2INT(rb_iv_get(obj, "@pos")) + 1));
+
   return Qtrue;
 }
 
+// Find position and size of all data blobs in the file
+static VALUE find_all_blobs(VALUE obj)
+{
+  FILE *input = DATA_PTR(obj);
+  long old_pos = ftell(input);
+
+  if (0 != fseek(input, 0, SEEK_SET)) {
+    rb_raise(rb_eIOError, "Unable to seek to beginning of file");
+  }
+
+  BlobHeader *header;
+
+  VALUE blobs = rb_ary_new();
+  rb_iv_set(obj, "@blobs", blobs);
+
+  long pos = 0, data_pos = 0;
+  int32_t datasize;
+
+  while ((header = read_blob_header(input)) != NULL) {
+
+    datasize = header->datasize;
+
+    if (0 == strcmp(header->type, "OSMData")) {
+      VALUE blob_info = rb_hash_new();
+      data_pos = ftell(input);
+
+      // This is designed to be user-friendly, so I have chosen
+      // to make header_pos the position of the protobuf stream
+      // itself, in line with data_pos. However, internally, we
+      // subtract 4 when calling parse_osm_data().
+      rb_hash_aset(blob_info, STR2SYM("header_pos"),
+		   LONG2NUM(pos + 4));
+      rb_hash_aset(blob_info, STR2SYM("header_size"),
+		   LONG2NUM(data_pos - pos - 4));
+      rb_hash_aset(blob_info, STR2SYM("data_pos"),
+		   LONG2NUM(data_pos));
+      rb_hash_aset(blob_info, STR2SYM("data_size"),
+		   UINT2NUM(datasize));
+
+      rb_ary_push(blobs, blob_info);
+    }
+
+    blob_header__free_unpacked(header, NULL);
+
+    if (0 != fseek(input, datasize, SEEK_CUR)) {
+      break; // cut losses
+    }
+    pos = ftell(input);
+  }
+
+  // restore old position
+  if (0 != fseek(input, old_pos, SEEK_SET)) {
+    rb_raise(rb_eIOError, "Unable to restore old file position");
+  }
+
+  return blobs;
+}
+
 static VALUE header_getter(VALUE obj)
 {
   return rb_iv_get(obj, "@header");
@@ -624,10 +685,63 @@ static VALUE relations_getter(VALUE obj)
   return rb_hash_aref(data, STR2SYM("relations"));
 }
 
+static VALUE blobs_getter(VALUE obj)
+{
+  VALUE blobs = rb_iv_get(obj, "@blobs");
+  if (blobs == Qnil) {
+      blobs = find_all_blobs(obj);
+  }
+  return blobs;
+}
+
+static VALUE size_getter(VALUE obj)
+{
+  VALUE blobs = blobs_getter(obj);
+  return rb_funcall(blobs, rb_intern("size"), 0);
+}
+
+static VALUE pos_getter(VALUE obj)
+{
+  return rb_iv_get(obj, "@pos");
+}
+
+static VALUE seek_to_osm_data(VALUE obj, VALUE index)
+{
+  FILE *input = DATA_PTR(obj);
+  VALUE blobs = blobs_getter(obj);
+  int index_raw = NUM2INT(index);
+
+  // Normalise the index, otherwise #pos returns the wrong value
+  if (index_raw < 0) {
+    int size = NUM2INT(size_getter(obj));
+    // Only normalise if valid; otherwise, allow rb_ary_entry() to fail.
+    if (index_raw + size >= 0) {
+        index_raw += size;
+    }
+  }
+
+  if (NUM2INT(rb_iv_get(obj, "@pos")) == index_raw) {
+    return Qtrue; // already there
+  }
+  VALUE blob_info = rb_ary_entry(blobs, index_raw);
+  if (!RTEST(blob_info)) {
+    return Qfalse; // no such blob entry
+  }
+  long pos = NUM2LONG(rb_hash_aref(blob_info, STR2SYM("header_pos"))) - 4;
+  if (0 != fseek(input, pos, SEEK_SET)) {
+    rb_raise(rb_eIOError, "Unable to seek to file position");
+  }
+  
+  // Set position - incremented by parse_osm_data
+  rb_iv_set(obj, "@pos", INT2NUM(index_raw - 1));
+
+  return parse_osm_data(obj);
+}
+
 static VALUE iterate(VALUE obj)
 {
   if (!rb_block_given_p())
-    rb_raise(rb_eArgError, "A block is expected");
+    return rb_funcall(obj, rb_intern("to_enum"), 0);
 
   do
   {
@@ -637,7 +751,7 @@ static VALUE iterate(VALUE obj)
 
     rb_yield_values(3, nodes, ways, relations);
 
-  } while(parse_osm_data(obj) != Qfalse);
+  } while(RTEST(parse_osm_data(obj)));
 
   return Qnil;
 }
@@ -658,6 +772,9 @@ static VALUE initialize(VALUE obj, VALUE filename)
   // Store the filename
   rb_iv_set(obj, "@filename", filename);
 
+  // Set initial position - incremented by parse_osm_data
+  rb_iv_set(obj, "@pos", INT2NUM(-1));
+
   // Every osm.pbf file must have an OSMHeader at the beginning.
   // Failing to find it means that the file is corrupt or invalid.
   parse_osm_header(obj, DATA_PTR(obj));
@@ -689,6 +806,8 @@ void Init_pbf_parser(void)
   rb_define_method(klass, "initialize", initialize, 1);
   rb_define_method(klass, "inspect", inspect, 0);
   rb_define_method(klass, "next", parse_osm_data, 0);
+  rb_define_method(klass, "seek", seek_to_osm_data, 1);
+  rb_define_method(klass, "pos=", seek_to_osm_data, 1);
   rb_define_method(klass, "each", iterate, 0);
 
   // Getters
@@ -697,4 +816,7 @@ void Init_pbf_parser(void)
   rb_define_method(klass, "nodes", nodes_getter, 0);
   rb_define_method(klass, "ways", ways_getter, 0);
   rb_define_method(klass, "relations", relations_getter, 0);
+  rb_define_method(klass, "blobs", blobs_getter, 0);
+  rb_define_method(klass, "size", size_getter, 0);
+  rb_define_method(klass, "pos", pos_getter, 0);
 }

metadata

@@ -1,45 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: pbf_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Adrià Planas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Parse Open Street Map PBF files with ease. Take a look at the readme
-  on GitHub for installation instructions.
+description: 
 email:
 - adriaplanas@liquidcodeworks.com
 executables: []
@@ -47,14 +46,13 @@ extensions:
 - ext/pbf_parser/extconf.rb
 extra_rdoc_files: []
 files:
-- lib/pbf_parser.rb
+- ext/pbf_parser/extconf.rb
 - ext/pbf_parser/fileformat.pb-c.c
-- ext/pbf_parser/osmformat.pb-c.c
-- ext/pbf_parser/pbf_parser.c
 - ext/pbf_parser/fileformat.pb-c.h
+- ext/pbf_parser/osmformat.pb-c.c
 - ext/pbf_parser/osmformat.pb-c.h
+- ext/pbf_parser/pbf_parser.c
 - ext/pbf_parser/pbf_parser.h
-- ext/pbf_parser/extconf.rb
 homepage: https://github.com/planas/pbf_parser
 licenses:
 - MIT
@@ -65,18 +63,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Just an Open Street Map PBF parser.
+summary: Parse Open Street Map PBF files with ease
 test_files: []

data/lib/pbf_parser.rb

@@ -1 +0,0 @@
-require 'pbf_parser/pbf_parser'