overpass-api-ruby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 869f0f15d223e2dba7f50b5aee38f229afecff1f
-  data.tar.gz: a51e2aa6cfc9c4cd9eb9ace840d9c48eabbbacb1
+  metadata.gz: 2091fa63150f111ab3fe5c3aae154971a5ad0574
+  data.tar.gz: 5c202dc9277040b0d4daa2b572d01b195d597362
 SHA512:
-  metadata.gz: dd3a55ea3765c2c07b842a420eae89edbcd3111338e4ad9b878a2f42b39a6de0cebb92bc4d3749d1303ffd96e351a6c9571e7ff0bf53781a60c7d733400acacb
-  data.tar.gz: 63ea5915cbd930c273759d3da28bd87a868b57af31e6aa5af2f9ecf23fe0fa5734b43391f1cd20836b06bb30af762a069748df96d0ab10211ea8010bb0565e94
+  metadata.gz: 2b55bc705c1a9ea9d0cc822441bd04196f7c74d3f5d2353e37fadb5e0ff557b615e256dfa88dbf21f613851be044fa006fe27cfeb1c5a53c2ea1e78f2018ff79
+  data.tar.gz: 125738c5d7bd1f9cbc1bd01b4866d656d452e42be62dc7e8bbcefcd4568d3845f54bfbff800d13e7eaa80672fb5cbead190395eab07bda1e8b32f61e60250bb8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    overpass-api-ruby (0.2)
+    overpass-api-ruby (0.2.2)
       httpi (~> 2.4.0)
 
 GEM

data/README.md

@@ -23,7 +23,7 @@ require 'overpass_api_ruby'
 options={:bbox => {:s => -34.705448, :n => -34.526562,
                    :w => -58.531471, :e => -58.335159},
          :timeout => 900,
-         :maxsize => 1073741824}
+         :element_limit => 1073741824}
 
 overpass = OverpassAPI::XML.new(options)
 
@@ -50,15 +50,27 @@ query = "rel['route'='subway'];(._;>;);out body;"
 response = overpass.query(query)
 ```
 
-Options on instantiation
+Common options on instantiation
 ------------------------
 ```
 bbox                    Hash. Global bounding box.
 endpoint                String.
                         Defaults to http://overpass-api.de/api/interpreter
 timeout                 Integer.
+```
+
+Specific options on instantiation
+------------------------
+QL
+```
 maxsize                 Integer.
 ```
+
+XML
+```
+element_limit           Integer.
+```
+
 See [Overpass API](http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide)
 
 Public methods

data/lib/base.rb

@@ -12,7 +12,6 @@ module OverpassAPI
 
       @endpoint = args[:endpoint] || DEFAULT_ENDPOINT
       @timeout = args[:timeout]
-      @maxsize = args[:maxsize]
     end
 
     def bounding_box(s,n,w,e)

data/lib/overpass_api_ruby.rb

@@ -1,2 +1,3 @@
+require_relative "version"
 require_relative "xml"
 require_relative "ql"

data/lib/ql.rb

@@ -2,6 +2,12 @@ require_relative "base"
 
 module OverpassAPI
   class QL < Base
+    def initialize(args={})
+      super
+
+      @maxsize = args[:maxsize]
+    end
+
     def build_query(q)
       header = ""
       header << "[bbox:#{@bbox}]" if @bbox

data/lib/version.rb

@@ -1,3 +1,3 @@
 module OverpassAPI
-  VERSION='0.2.1'
+  VERSION='0.2.2'
 end

data/lib/xml.rb

@@ -2,11 +2,17 @@ require_relative 'base'
 
 module OverpassAPI
   class XML < Base
+    def initialize(args={})
+      super
+
+      @element_limit = args[:element_limit]
+    end
+
     def build_query(q)
       bbox = @bbox ? "bbox='#{@bbox}'" : ''
       timeout = @timeout ? "timeout='#{@timeout}'" : ''
-      maxsize = @maxsize ? "maxsize='#{@maxsize}'" : ''
-      "<osm-script #{bbox} #{timeout} #{maxsize} output='json'>#{q}<print/></osm-script>"
+      element_limit = @element_limit ? "element-limit='#{@element_limit}'" : ''
+      "<osm-script #{bbox} #{timeout} #{element_limit} output='json'>#{q}<print/></osm-script>"
     end
   end
 end

data/spec/integration/ql_spec.rb

@@ -5,7 +5,8 @@ describe OverpassAPI::QL do
   it "should return the right elements" do
     options={:bbox => {:s => -34.705448, :n => -34.526562,
                        :w => -58.531471, :e => -58.335159},
-                       :timeout => 900}
+                       :timeout => 900,
+                       :maxsize => 10000}
 
     overpass = OverpassAPI::QL.new(options)
 

data/spec/integration/xml_spec.rb

@@ -5,7 +5,8 @@ describe OverpassAPI::XML do
   it "should return the requested elements" do
     options={:bbox => {:s => -34.705448, :n => -34.526562,
                        :w => -58.531471, :e => -58.335159},
-                       :timeout => 900}
+                       :timeout => 900,
+                       :element_limit => 100000}
 
     overpass = OverpassAPI::XML.new(options)
 

data/spec/unit/base_spec.rb

@@ -12,15 +12,13 @@ describe OverpassAPI::Base do
   it "should set the right args" do
     opts = {bbox: {s: 1, n: 2, w: 3, e: 4},
             endpoint: "a.endpoint.com",
-            timeout: 1000,
-            maxsize: 333}
+            timeout: 1000}
 
     base = OverpassAPI::Base.new(opts)
 
     expect(base.instance_variable_get("@bbox")).to eq "1,3,2,4"
     expect(base.instance_variable_get("@endpoint")).to eq "a.endpoint.com"
     expect(base.instance_variable_get("@timeout")).to eq 1000
-    expect(base.instance_variable_get("@maxsize")).to eq 333
   end
 
   it "should set the bounding box" do

data/spec/unit/xml_spec.rb

@@ -12,12 +12,12 @@ describe OverpassAPI::XML do
   it "should set the right opts" do
     opts = {bbox: {s: 1, n: 2, w: 3, e: 4},
             timeout: 1000,
-            maxsize: 333}
+            element_limit: 333}
 
     overpass = OverpassAPI::XML.new(opts)
     built_query = overpass.build_query("a query")
 
-    expected_built_query = "<osm-script bbox='1,3,2,4' timeout='1000' maxsize='333' output='json'>" <<
+    expected_built_query = "<osm-script bbox='1,3,2,4' timeout='1000' element-limit='333' output='json'>" <<
                            "a query<print/></osm-script>"
     expect(built_query).to eq expected_built_query
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overpass-api-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Bruno Salerno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi