geo_monitor 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa59e208f3d1d09a9756f3c478478fc5aa21bd2
-  data.tar.gz: 65df4b3d90e6c9df548f7ea539ffbd092e5c8704
+  metadata.gz: 5835f3c34e5de884e5df6a85e0f133d1f758fad2
+  data.tar.gz: 31f3016139b942dce0ef4470b6cb31965f9c2c18
 SHA512:
-  metadata.gz: 1034ba899f4974e949b2e027e55b070fff277d655e64010130832e5bb08e534880ed17e951391a64e41768ea2f7d358ee8eb53222a60b2b0f00dd34623897ae3
-  data.tar.gz: 3da4e76a03b327e3cc795954f636a28e194338dd639f58f95fab088081431958ce98d77ef44e2aa61823d54d0639a1eac02281f2feab038c62c8dfb28f2ace64
+  metadata.gz: 72457008a4a5ad667a99a5025ad2a7a47ab24193477713978287fa1f693dabbb164987bd2934f01d4ec5d6cba214134ac90342a5c64e452d5ef671e20f351030
+  data.tar.gz: 89bf2d4eafd89ab821a166e704969afe9e8ca10dde776e2dd0ee7de4aad6bd281dbde35857a8f5cb9c0fef37d5a0f7d60d68fbb7904624e581d3efd87b94524b

data/app/models/geo_monitor/layer.rb

@@ -8,10 +8,17 @@ module GeoMonitor
       schema = JSON.parse(schema_json)
       references = JSON.parse(schema['dct_references_s'])
       find_or_create_by(slug: schema['layer_slug_s']) do |layer|
-        layer.checktype = 'WMS'
+        layer.checktype = 
+          if references['http://www.opengis.net/def/serviceType/ogc/wms']
+            'WMS'
+          elsif references['http://iiif.io/api/image']
+            'IIIF'
+          end
+        layer.institution = schema['dct_provenance_s']
+        layer.rights = schema['dc_rights_s']
         layer.layername = schema['layer_id_s']
         layer.bbox = schema['solr_geom']
-        layer.url = references['http://www.opengis.net/def/serviceType/ogc/wms']
+        layer.url = references['http://www.opengis.net/def/serviceType/ogc/wms'] || references['http://iiif.io/api/image']
         layer.active = true
       end
     end
@@ -28,11 +35,11 @@ module GeoMonitor
           bbox: bounding_box, url: url, layers: layername
         ).tile
       end
-      GeoMonitor::Status.from_response(response, self, time.real.to_f)
+      ::GeoMonitor::Status.from_response(response, self, time.real.to_f)
     end
 
     def availability_score
-      statuses.where(res_code: '200').count.to_f / statuses.count
+      statuses.where(res_code: '200', content_type: 'image/png').count.to_f / statuses.count
     end
   end
 end

data/app/models/geo_monitor/status.rb

@@ -7,7 +7,7 @@ module GeoMonitor
     # Limits the number of statuses per layer to prevent a ballooing database
     def limit_by_layer
       statuses_by_layer = self.class.where(layer: layer).count
-      max = GeoMonitor::Engine.config.max_status_per_layer
+      max = ::GeoMonitor::Engine.config.max_status_per_layer
       self.class
           .where(layer: layer)
           .last(statuses_by_layer - max + 1)
@@ -15,7 +15,7 @@ module GeoMonitor
     end
 
     ##
-    # @param [Faraday::Resposne] response
+    # @param [Faraday::Response] response
     # @param [GeoMonitor::Layer] layer
     # @param [Float] time
     def self.from_response(response, layer, time)
@@ -24,7 +24,8 @@ module GeoMonitor
         res_code: response.status,
         submitted_query: response.env[:url].to_s,
         layer: layer,
-        res_headers: response.headers
+        res_headers: response.headers,
+        content_type: response.headers.try(:[], :content_type)
       )
     end
   end

data/db/migrate/20180112220603_add_content_type_to_status.rb

@@ -0,0 +1,5 @@
+class AddContentTypeToStatus < ActiveRecord::Migration[5.1]
+  def change
+    add_column :geo_monitor_statuses, :content_type, :string
+  end
+end

data/db/migrate/20180116150504_add_more_layer_fields.rb

@@ -0,0 +1,6 @@
+class AddMoreLayerFields < ActiveRecord::Migration[5.1]
+  def change
+    add_column :geo_monitor_layers, :rights, :string
+    add_column :geo_monitor_layers, :institution, :string
+  end
+end

data/lib/geo_monitor.rb

@@ -1,6 +1,9 @@
 require "geo_monitor/engine"
 
 module GeoMonitor
+  extend ActiveSupport::Autoload
+
+  
   # A simple structure to conform to Faraday::Response
   FailedResponse = Struct.new(:env, :status, :headers)
 end

data/lib/geo_monitor/bounding_box.rb

@@ -38,10 +38,10 @@ module GeoMonitor
       lng_diff = east - west
       max_diff = [lat_diff, lng_diff].max
 
-      if max_diff < ::GeoMonitor::DEGREES_IN_CIRCLE / 2**20
+      if max_diff < ::GeoMonitor::Constants::DEGREES_IN_CIRCLE / 2**20
         zoom = 21
       else
-        zoom = -1 * ((Math.log(max_diff) / Math.log(2)) - (Math.log(::GeoMonitor::DEGREES_IN_CIRCLE) / Math.log(2)))
+        zoom = -1 * ((Math.log(max_diff) / Math.log(2)) - (Math.log(::GeoMonitor::Constants::DEGREES_IN_CIRCLE) / Math.log(2)))
         zoom = 1 if zoom < 1
       end
       zoom.ceil
@@ -52,7 +52,7 @@ module GeoMonitor
     def tile_number
       lat_rad = south / 180 * Math::PI
       n = 2.0**zoom_level
-      x = ((west + 180.0) / ::GeoMonitor::DEGREES_IN_CIRCLE * n).to_i
+      x = ((west + 180.0) / ::GeoMonitor::Constants::DEGREES_IN_CIRCLE * n).to_i
       y = ((1.0 - Math.log(Math.tan(lat_rad) + (1 / Math.cos(lat_rad))) / Math::PI) / 2.0 * n)
       y = if y.infinite?.nil?
             y.to_i

data/lib/geo_monitor/constants.rb

@@ -0,0 +1,6 @@
+module GeoMonitor
+  module Constants
+    R = 6_378_137 # Radius of Earth in meters
+    DEGREES_IN_CIRCLE = 360.0
+  end
+end

data/lib/geo_monitor/engine.rb

@@ -1,16 +1,15 @@
 require 'rails/all'
 require 'faraday'
-require 'geo_monitor/bounding_box'
-require 'geo_monitor/lat_lng_point'
-require 'geo_monitor/requests/wms'
 
 module GeoMonitor
-  R = 6_378_137 # Radius of Earth in meters
-  DEGREES_IN_CIRCLE = 360.0
-
   ##
   # Top level Rails Engine class
   class Engine < ::Rails::Engine
+    require 'geo_monitor/constants'
+    require 'geo_monitor/bounding_box'
+    require 'geo_monitor/lat_lng_point'
+    require 'geo_monitor/requests/wms'
+
     isolate_namespace GeoMonitor
 
     GeoMonitor::Engine.config.max_status_per_layer = 5

data/lib/geo_monitor/lat_lng_point.rb

@@ -14,8 +14,8 @@ module GeoMonitor
       max = 1 - 1E-15
       sin = [[Math.sin(lng * d), max].min, -max].max
       self.class.new(
-        lat: GeoMonitor::R * lat * d,
-        lng: GeoMonitor::R * Math.log((1 + sin) / (1 - sin)) / 2
+        lat: ::GeoMonitor::Constants::R * lat * d,
+        lng: ::GeoMonitor::Constants::R * Math.log((1 + sin) / (1 - sin)) / 2
       )
     end
 

data/lib/geo_monitor/requests/wms.rb

@@ -34,7 +34,7 @@ module GeoMonitor
       # Request the tile.
       def tile
         unless url.present?
-          return GeoMonitor::FailedResponse.new(
+          return ::GeoMonitor::FailedResponse.new(
             { url: url }, 'No URL provided', {}
           )
         end
@@ -46,7 +46,7 @@ module GeoMonitor
             request.options.open_timeout = 10
           end
         rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
-          GeoMonitor::FailedResponse.new(
+          ::GeoMonitor::FailedResponse.new(
             { url: conn.url_prefix.to_s },
             e.class,
             nil

data/lib/geo_monitor/version.rb

@@ -1,3 +1,3 @@
 module GeoMonitor
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,9 +119,12 @@ files:
 - config/routes.rb
 - db/migrate/20171212180244_create_geo_monitor_layers.rb
 - db/migrate/20171212181423_create_geo_monitor_statuses.rb
+- db/migrate/20180112220603_add_content_type_to_status.rb
+- db/migrate/20180116150504_add_more_layer_fields.rb
 - lib/generators/geo_monitor/install_generator.rb
 - lib/geo_monitor.rb
 - lib/geo_monitor/bounding_box.rb
+- lib/geo_monitor/constants.rb
 - lib/geo_monitor/engine.rb
 - lib/geo_monitor/lat_lng_point.rb
 - lib/geo_monitor/requests/wms.rb