georeferencer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15bc8aa157ec51687a9c5d2d25028a670b17053e6749592d15b46a2dd943c89a
-  data.tar.gz: ea5e919ad649d0978d6e0c1739ebc06871754a0b00f8595edabdb125fe7e7a3e
+  metadata.gz: 7c36acb7c922b9cdde371dcd61b912997564086240eedcb9d1424760ce6411ab
+  data.tar.gz: c936576f11136ba034ee89c579927616ec3a39f9302220d1254c46d8832edac8
 SHA512:
-  metadata.gz: 8a947a421f1f15fe27c5e7dfd84d0c3bfe9ad54cff20925a6e17acad5a54831ce9938ee2833e9376f25ce83b21adc4a1d0d43dabc508c47bda545e01a28b57fa
-  data.tar.gz: dc01a5ba3ae66569b10bfdb383e26708783fdb6ebfa1f4a188a7596c21a75e86d35a17995922bfecb6f40d894e7b710d7f7e0c6477ea68919c69b6bc00e142f3
+  metadata.gz: 2bde55a400962aa06bf64b1c0e1a2177ceeb540f04f8b6883a22c16a2c87ce257a7a635b0c1c8e633275844bd3942b1245057c041eb15344f5c4283961f97a03
+  data.tar.gz: f55550f2005005905e6ca2249291c22520daad23fb33e6491d6ffb479517b59edcf891657929f73ec2f3320f37fa34c7fe9183e9a500d68e28d3f3be9a8bf66e

data/lib/georeferencer/middleware/headers.rb

@@ -4,9 +4,11 @@ module Georeferencer
       # Add custom UA String
       env[:request_headers]["User-Agent"] = Georeferencer.configuration.user_agent
 
+      query = Faraday::Utils.parse_query(env.url.query) || {}
+      query["format"] = 'json'
 
       # Fix url-encoded percent signs
-      env.url.query = env.url.query.gsub(/%25/,'%')
+      env.url.query = Faraday::Utils.build_query(query).gsub(/%25/,'%')
 
       @app.call(env)
     end

data/lib/georeferencer/models/contributor.rb

@@ -4,8 +4,5 @@ module Georeferencer
 
     collection_path "contributors"
 
-    default_scope -> {
-      where(format: 'json')
-    }
   end
 end

data/lib/georeferencer/models/image.rb

@@ -6,10 +6,6 @@ module Georeferencer
     collection_path "display"
     resource_path "maps/:id"
 
-    default_scope -> {
-      where(format: 'json')
-    }
-
     scope :unreferenced, -> {
       where(state: 'waiting')
     }
@@ -17,17 +13,14 @@ module Georeferencer
     def centroid
       # Data from the collection endpoint doesn't include the bounding box, so we need to check we have the full data,
       # or reload (which hits the resource endpoint) if not
-      if respond_to?(:bbox)
-        (wlng, slat, elng, nlat) = bbox
-      else
-        (wlng, slat, elng, nlat) = reload.bbox
-      end
+      (wlng, slat, elng, nlat) = respond_to?(:bbox) ? bbox : reload.bbox
+
       {lat: (slat+nlat)/2, lng: (wlng+elng)/2}
     end
 
     def url(width=200,height=nil)
       [image[:url],'full',"#{width},#{height}",0,'default.jpg'].join("/")
-
     end
+
   end
 end

data/lib/georeferencer/models/progress.rb

@@ -5,9 +5,6 @@ module Georeferencer
     collection_path "progress"
     resource_path "progress?collection=:id"
 
-    default_scope -> {
-      where(format: 'json')
-    }
 
     def self.all
       raise NoMethodError, "Use #find(project_name)"

data/lib/georeferencer/version.rb

@@ -1,3 +1,3 @@
 module Georeferencer
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georeferencer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ed Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler