iiif-presentation 1.4.2 → 1.5.0

data/lib/iiif/v3/presentation/nav_place.rb

@@ -1,4 +1,6 @@
-require 'geo/coord'
+require "geo/coord"
+require "json"
+require "uri"
 
 module IIIF
   module V3
@@ -6,8 +8,35 @@ module IIIF
       class NavPlace < IIIF::V3::AbstractResource
         Rect = Struct.new(:coord1, :coord2)
 
-        COORD_REGEX = /(?:(?<hemisphere>[NSEW])\s*)?(?<degrees>\d+)[°⁰*](?:\s*(?<minutes>\d+)[\'ʹ′])?(?:\s*(?<seconds>\d+)["ʺ″])?(?:\s*(?<hemisphere>[NSEW]))?/
-        def initialize(coordinate_texts:, base_uri:)
+        DECIMAL = /\d+(?:\.\d+)?/
+
+        # Matches one coordinate, in either of two forms:
+        # - degrees with a degree sign, optionally followed by minutes and seconds,
+        #   any of which may be decimal, with the hemisphere before or after
+        #   ("W 23°54'00\"", "23°54′00″W", "E 138.5°", "N 37°26ʹ30.5″");
+        # - decimal degrees with no degree sign, which need the hemisphere first
+        #   ("E 138.0").
+        COORD_REGEX = /
+          (?:(?<hemisphere>[NSEW])\s*)?(?<![\d.])(?<degrees>#{DECIMAL})[°⁰*]
+          (?:\s*(?<minutes>#{DECIMAL})['ʹ′])?
+          (?:\s*(?<seconds>#{DECIMAL})["ʺ″])?
+          (?:\s*(?<hemisphere>[NSEW]))?
+        |
+          (?<hemisphere>[NSEW])\s*(?<degrees>\d+\.\d+)(?![\d.°⁰*'ʹ′"ʺ″])
+        /x
+
+        # WKT versions of points and boxes (polygon/multipolygon).
+        # See: https://en.wikipedia.org/wiki/Well-known_text_representation_of_geometry
+        WKT_REGEX = /\A\s*(?<type>POINT|POLYGON|MULTIPOLYGON)\s*(?<body>\(.*\))\s*\z/im
+        WKT_NUMBER = /[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[-+]?\d+)?/i
+
+        # @param [Array<String>] coordinate_texts points or boxes, either as text
+        #   ("E 103°48ʹ/S 3°46ʹ", "W 23°54ʹ--E 53°36ʹ/N 71°19ʹ--N 33°30ʹ") or as a WKT
+        #   POINT, POLYGON or MULTIPOLYGON; any that can't be read are skipped
+        # @param [String, nil] base_uri optional prefix for the Feature Collection and Feature ids
+        def initialize(coordinate_texts:, base_uri: nil)
+          raise ArgumentError, "base_uri must be an absolute HTTP(S) URI, got #{base_uri.inspect}" unless base_uri.nil? || base_uri.start_with?(/https?:\/\//)
+
           @coordinate_texts = coordinate_texts
           @base_uri = base_uri
         end
@@ -18,13 +47,11 @@ module IIIF
         end
 
         def build
-          raise ArgumentError.new('invalid coordinates') unless valid?
+          raise ArgumentError.new("invalid coordinates") unless valid?
 
-          {
-            id: "#{base_uri}/feature-collection/1",
-            type: 'FeatureCollection',
-            features: features
-          }
+          with_id("#{base_uri}/feature-collection/1",
+            type: "FeatureCollection",
+            features: features)
         end
 
         private
@@ -33,6 +60,8 @@ module IIIF
 
         def coordinates
           @coordinates ||= coordinate_texts.map do |coordinate_text|
+            next wkt_geometry(coordinate_text) if coordinate_text.match?(WKT_REGEX)
+
             coordinate_parts = coordinate_text.split(%r{ ?--|/})
             case coordinate_parts.length
             when 2
@@ -49,7 +78,9 @@ module IIIF
           return unless long_matcher && lat_matcher
 
           Geo::Coord.new(latd: lat_matcher[:degrees], latm: lat_matcher[:minutes], lats: lat_matcher[:seconds], lath: lat_matcher[:hemisphere],
-                        lngd: long_matcher[:degrees], lngm: long_matcher[:minutes], lngs: long_matcher[:seconds], lngh: long_matcher[:hemisphere])
+            lngd: long_matcher[:degrees], lngm: long_matcher[:minutes], lngs: long_matcher[:seconds], lngh: long_matcher[:hemisphere])
+        rescue ArgumentError
+          nil
         end
 
         def rect_for(coordinate_parts)
@@ -60,47 +91,112 @@ module IIIF
           Rect.new(coord1, coord2)
         end
 
+        # Turn WKT strings into GeoJSON geometry.
+        # @return [Hash, nil] the GeoJSON geometry, or nil if the WKT isn't one we can use
+        def wkt_geometry(text)
+          match = text.match(WKT_REGEX)
+          body = match[:body].gsub(/(#{WKT_NUMBER})\s+(#{WKT_NUMBER})/o) { "[#{Float($1).round(6)},#{Float($2).round(6)}]" }
+          coordinates = JSON.parse(body.tr("()", "[]"))
+
+          case match[:type].upcase
+          when "POINT"
+            {type: "Point", coordinates: coordinates.first} if coordinates.length == 1 && point?(coordinates.first)
+          when "POLYGON"
+            {type: "Polygon", coordinates: oriented(coordinates)} if polygon?(coordinates)
+          when "MULTIPOLYGON"
+            {type: "MultiPolygon", coordinates: coordinates.map { |polygon| oriented(polygon) }} if coordinates.any? && coordinates.all? { |polygon| polygon?(polygon) }
+          end
+        rescue JSON::ParserError, ArgumentError
+          nil
+        end
+
+        def point?(value)
+          value.is_a?(Array) && value.length == 2 && value.all?(Numeric) && value[0].between?(-180, 180) && value[1].between?(-90, 90)
+        end
+
+        def polygon?(value)
+          value.is_a?(Array) && value.any? && value.all? do |ring|
+            ring.is_a?(Array) && ring.length >= 4 && ring.all? { |position| point?(position) } && ring.first == ring.last
+          end
+        end
+
+        # WKT doesn't fix which way rings run, so turn the exterior counterclockwise
+        # and any holes clockwise (RFC 7946, section 3.1.6).
+        def oriented(polygon)
+          polygon.each_with_index.map do |ring, index|
+            area = ring.each_cons(2).sum { |(x1, y1), (x2, y2)| x1 * y2 - x2 * y1 }
+            ((area > 0) == index.zero?) ? ring : ring.reverse
+          end
+        end
+
         def features
           coordinates.map.with_index(1) do |coordinate, index|
-            {
-              id: "#{base_uri}/iiif/feature/#{index}",
-              type: 'Feature',
+            with_id("#{base_uri}/iiif/feature/#{index}",
+              type: "Feature",
               properties: {},
-              geometry: coordinate.is_a?(Rect) ? polygon_geometry(coordinate) : point_geometry(coordinate)
-            }
+              geometry: geometry_for(coordinate))
           end
         end
 
+        def geometry_for(coordinate)
+          case coordinate
+          when Rect then polygon_geometry(coordinate)
+          when Geo::Coord then point_geometry(coordinate)
+          else coordinate # already a GeoJSON geometry, read from WKT
+          end
+        end
+
+        # The navPlace extension makes ids optional, so leave them out without a base_uri.
+        def with_id(id, resource)
+          base_uri ? {id: id}.merge(resource) : resource
+        end
+
         def point_geometry(coord)
           {
-            type: 'Point',
+            type: "Point",
             coordinates: [format(coord.lng), format(coord.lat)]
           }
         end
 
         def polygon_geometry(rect)
+          west = edge(format(rect.coord1.lng), from: 180.0, to: -180.0)
+          east = edge(format(rect.coord2.lng), from: -180.0, to: 180.0)
+          south, north = [format(rect.coord1.lat), format(rect.coord2.lat)].minmax
+
+          return {type: "Polygon", coordinates: [ring(west, east, south, north)]} unless west > east
+
+          # A box reads west to east, so a west edge greater than its east edge means
+          # the box crosses the antimeridian. GeoJSON has no wrapping boxes, so such a
+          # box is split there into two polygons (RFC 7946, section 3.1.9).
           {
-            type: 'Polygon',
+            type: "MultiPolygon",
             coordinates: [
-              [
-                [format(rect.coord1.lng), format(rect.coord1.lat)],
-                [format(rect.coord2.lng), format(rect.coord1.lat)],
-                [format(rect.coord2.lng), format(rect.coord2.lat)],
-                [format(rect.coord1.lng), format(rect.coord2.lat)],
-                [format(rect.coord1.lng), format(rect.coord1.lat)]
-              ]
+              [ring(west, 180.0, south, north)],
+              [ring(-180.0, east, south, north)]
             ]
           }
         end
 
+        # If a box edge sits right on the antimeridian it could be counted as
+        # 180 or -180; we pick whichever one won't require splitting (see above).
+        def edge(lng, from:, to:)
+          (lng == from) ? to : lng
+        end
+
+        # Exterior rings run counterclockwise (RFC 7946, section 3.1.6).
+        def ring(west, east, south, north)
+          [[west, south], [east, south], [east, north], [west, north], [west, south]]
+        end
+
+        # GeoJSON positions are arrays of numbers (RFC 7946, section 3.1.1), so
+        # coordinates are emitted as Floats rather than strings.
         # @param [BigDecimal] coordinate value from geocoord gem
-        # @return [String] string formatted with max 6 digits after the decimal point
-        # The to_f ensures removal of scientific notation of BigDecimal before converting to a string.
+        # @return [Float] value rounded to at most 6 digits after the decimal point
         # examples:
-        # input value is BigDecimal("-23.9") or "0.239e2", output value is "-23.9" as string
-        # input value is BigDecimal("23.9424213434") or "0.239424213434e2", output value is "23.942421" as string
+        # input value is BigDecimal("-23.9") or "0.239e2", output value is -23.9
+        # input value is BigDecimal("23.9424216434") or "0.239424216434e2", output value is 23.942422
         def format(decimal)
-          decimal.truncate(6).to_f.to_s
+          decimal.round(6).to_f
         end
       end
     end

data/lib/iiif/v3/presentation/range.rb

@@ -3,33 +3,33 @@ module IIIF
     module Presentation
       # Ranges are linked or embedded within the manifest in a structures field
       class Range < Sequence
-        TYPE = 'Range'.freeze
+        TYPE = "Range".freeze
         VALID_ITEM_TYPES = [IIIF::V3::Presentation::Canvas, IIIF::V3::Presentation::Range]
 
         def required_keys
-          super + %w{ id label }
+          super + %w[id label]
         end
 
         # TODO: contentAnnotations: links to AnnotationCollection
         # TODO: startCanvas: A link from a Sequence or Range to a Canvas that is contained within it
 
         def array_only_keys
-          super + %w{ members }
+          super + %w[members]
         end
 
         def legal_viewing_hint_values
-          super + %w{ top }
+          super + %w[top]
         end
 
-        def initialize(hsh={})
-          hsh['type'] = TYPE unless hsh.has_key? 'type'
-          super(hsh)
+        def initialize(hsh = {})
+          hsh["type"] = TYPE unless hsh.has_key? "type"
+          super
         end
 
         def validate
           super
-          validate_list(self['items']) if self['items']
-          validate_list(self['canvases']) if self['canvases']
+          validate_list(self["items"]) if self["items"]
+          validate_list(self["canvases"]) if self["canvases"]
           # TODO: Ranges must have URIs and they should be http(s) URIs.
           # TODO: contentAnnotations: links to AnnotationCollection
           # TODO: startCanvas: A link from a Sequence or Range to a Canvas that is contained within it
@@ -40,7 +40,7 @@ module IIIF
         def validate_list(canvas_array)
           return if canvas_array.all? { |entry| VALID_ITEM_TYPES.include?(entry.class) }
 
-          m = "All entries in the (items or canvases) array must be one of #{VALID_ITEM_TYPES.join(', ')}"
+          m = "All entries in the (items or canvases) array must be one of #{VALID_ITEM_TYPES.join(", ")}"
           raise IIIF::V3::Presentation::IllegalValueError, m
         end
       end

data/lib/iiif/v3/presentation/resource.rb

@@ -3,23 +3,22 @@ module IIIF
     module Presentation
       # class for generic content resource
       class Resource < IIIF::V3::AbstractResource
-
         def required_keys
-          super + %w{ id }
+          super + %w[id]
         end
 
         def prohibited_keys
-          super + PAGING_PROPERTIES + %w{ nav_date viewing_direction start_canvas content_annotations}
+          super + PAGING_PROPERTIES + %w[nav_date viewing_direction start_canvas content_annotations]
         end
 
         def uri_only_keys
-          super + %w{ id }
+          super + %w[id]
         end
 
         def validate
           super
 
-          unless self['id'] =~ /^https?:/
+          unless /^https?:/.match?(self["id"])
             err_msg = "id must be an http(s) URI for #{self.class}"
             raise IIIF::V3::Presentation::IllegalValueError, err_msg
           end

data/lib/iiif/v3/presentation/sequence.rb

@@ -2,8 +2,7 @@ module IIIF
   module V3
     module Presentation
       class Sequence < IIIF::V3::AbstractResource
-
-        TYPE = 'Sequence'.freeze
+        TYPE = "Sequence".freeze
 
         # NOTE:  relaxing requirement for items as Universal Viewer currently only accepts canvases
         #  see https://github.com/sul-dlss/osullivan/issues/27, sul-dlss/purl/issues/167
@@ -12,22 +11,22 @@ module IIIF
         # end
 
         def prohibited_keys
-          super + CONTENT_RESOURCE_PROPERTIES + PAGING_PROPERTIES + %w{ nav_date content_annotations }
+          super + CONTENT_RESOURCE_PROPERTIES + PAGING_PROPERTIES + %w[nav_date content_annotations]
         end
 
         # NOTE: allowing 'items' or 'canvases' as Universal Viewer currently only accepts canvases
         #  see https://github.com/sul-dlss/osullivan/issues/27, sul-dlss/purl/issues/167
         def array_only_keys
-          super + %w{ canvases }
+          super + %w[canvases]
         end
 
         def legal_viewing_hint_values
-          %w{ individuals paged continuous auto-advance }
+          %w[individuals paged continuous auto-advance]
         end
 
-        def initialize(hsh={})
-          hsh['type'] = TYPE unless hsh.has_key? 'type'
-          super(hsh)
+        def initialize(hsh = {})
+          hsh["type"] = TYPE unless hsh.has_key? "type"
+          super
         end
 
         def validate
@@ -36,9 +35,9 @@ module IIIF
           # Canvas object list
           # NOTE: allowing 'items' or 'canvases' as Universal Viewer currently only accepts canvases
           #  see https://github.com/sul-dlss/osullivan/issues/27, sul-dlss/purl/issues/167
-          unless (self['items'] && self['items'].any?) ||
-                 (self['canvases'] && self['canvases'].any?)
-            m = 'The (items or canvases) list must have at least one entry.'
+          unless self["items"]&.any? ||
+              self["canvases"]&.any?
+            m = "The (items or canvases) list must have at least one entry."
             raise IIIF::V3::Presentation::MissingRequiredKeyError, m
           end
           # TODO: startCanvas: A link from a Sequence or Range to a Canvas that is contained within it

data/lib/iiif/v3/presentation/service.rb

@@ -3,43 +3,42 @@ module IIIF
     module Presentation
       # See http://prezi3.iiif.io/api/annex/services for more info
       class Service < AbstractResource
-
         # constants included here for convenience
-        IIIF_IMAGE_V2_TYPE = 'ImageService2'.freeze
-        IIIF_IMAGE_V2_LEVEL1_PROFILE = 'http://iiif.io/api/image/2/level1.json'.freeze
-        IIIF_AUTHENTICATION_V1_LOGIN_PROFILE = 'http://iiif.io/api/auth/1/login'.freeze
-        IIIF_AUTHENTICATION_V1_TOKEN_PROFILE = 'http://iiif.io/api/auth/1/token'.freeze
+        IIIF_IMAGE_V2_TYPE = "ImageService2".freeze
+        IIIF_IMAGE_V2_LEVEL1_PROFILE = "http://iiif.io/api/image/2/level1.json".freeze
+        IIIF_AUTHENTICATION_V1_LOGIN_PROFILE = "http://iiif.io/api/auth/1/login".freeze
+        IIIF_AUTHENTICATION_V1_TOKEN_PROFILE = "http://iiif.io/api/auth/1/token".freeze
 
         # service class doesn't require type
         def required_keys
-          super.reject {|el| el == 'type' }
+          super.reject { |el| el == "type" }
         end
 
         def prohibited_keys
           super + CONTENT_RESOURCE_PROPERTIES + PAGING_PROPERTIES +
-            %w{ nav_date viewing_direction start_canvas content_annotations }
+            %w[nav_date viewing_direction start_canvas content_annotations]
         end
 
         def uri_only_keys
-          super + %w{ @context id @id }
+          super + %w[@context id @id]
         end
 
         def any_type_keys
-          super + %w{ profile }
+          super + %w[profile]
         end
 
         def validate
           super
-          if IIIF_IMAGE_V2_TYPE == self['type'] || IIIF_IMAGE_V2_TYPE == self['@type']
-            unless self.has_key?('id') || self.has_key?('@id')
+          if self["type"] == IIIF_IMAGE_V2_TYPE || self["@type"] == IIIF_IMAGE_V2_TYPE
+            unless has_key?("id") || has_key?("@id")
               m = "id or @id values are required for IIIF::V3::Presentation::Service with type or @type #{IIIF_IMAGE_V2_TYPE}"
               raise IIIF::V3::Presentation::MissingRequiredKeyError, m
             end
-            if self.has_key?('id') && self.has_key?('@id') && (self['@id'] != self['id'])
+            if has_key?("id") && has_key?("@id") && (self["@id"] != self["id"])
               m = "id and @id values must match for IIIF::V3::Presentation::Service with type or @type #{IIIF_IMAGE_V2_TYPE}"
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
-            unless self.has_key?('profile')
+            unless has_key?("profile")
               m = "profile should be present for IIIF::V3::Presentation::Service with type or @type #{IIIF_IMAGE_V2_TYPE}"
               raise IIIF::V3::Presentation::MissingRequiredKeyError, m
             end

data/lib/iiif/v3/presentation.rb

@@ -1,9 +1,9 @@
-require_relative 'abstract_resource'
-require_relative '../ordered_hash'
+require_relative "abstract_resource"
+require_relative "../ordered_hash"
 
 # NOTE: image_resource must follow resource due to inheritance
 # NOTE: range must follow sequence due to inheritance
-%w{
+%w[
   annotation
   annotation_collection
   annotation_page
@@ -17,16 +17,16 @@ require_relative '../ordered_hash'
   sequence
   range
   service
-}.each do |f|
-  require File.join(File.dirname(__FILE__), 'presentation', f)
+].each do |f|
+  require File.join(File.dirname(__FILE__), "presentation", f)
 end
 
 module IIIF
   module V3
     module Presentation
-      CONTEXT ||= [
-       'http://www.w3.org/ns/anno.jsonld',
-       'http://iiif.io/api/presentation/3/context.json'
+      CONTEXT = [
+        "http://www.w3.org/ns/anno.jsonld",
+        "http://iiif.io/api/presentation/3/context.json"
       ]
 
       class MissingRequiredKeyError < StandardError; end

data/spec/integration/iiif/presentation/image_resource_spec.rb

@@ -1,122 +1,118 @@
 describe IIIF::Presentation::ImageResource do
   vcr_options = {
-    cassette_name: 'pul_loris_cassette',
+    cassette_name: "pul_loris_cassette",
     record: :new_episodes,
     serialize_with: :json
   }
 
-  describe 'self#create_image_api_image_resource', vcr: vcr_options do
-
-    let(:image_server) { 'https://libimages.princeton.edu/loris' }
+  describe "self#create_image_api_image_resource", vcr: vcr_options do
+    let(:image_server) { "https://libimages.princeton.edu/loris" }
 
     let(:valid_service_id) {
-      id = 'pudl0001%2F4612422%2F00000001.jp2'
+      id = "pudl0001%2F4612422%2F00000001.jp2"
       "#{image_server}/#{id}"
     }
 
     let(:invalid_service_id) {
-      id = 'xxxx%2F4612422%2F00000001.jp2'
+      id = "xxxx%2F4612422%2F00000001.jp2"
       "#{image_server}/#{id}"
     }
 
-    it 'returns an ImageResource' do
+    it "returns an ImageResource" do
       instance = described_class.create_image_api_image_resource(service_id: valid_service_id)
       expect(instance.class).to be described_class
     end
 
-
-    describe 'has expected values from our fixture' do
-      it 'when copy_info is false' do
-        opts = { service_id: valid_service_id }
+    describe "has expected values from our fixture" do
+      it "when copy_info is false" do
+        opts = {service_id: valid_service_id}
         resource = described_class.create_image_api_image_resource(opts)
         # expect(resource['@context']).to eq 'http://iiif.io/api/presentation/2/context.json'
         # @context is only added when we call to_json...
-        expect(resource['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
-        expect(resource['@type']).to eq 'dctypes:Image'
+        expect(resource["@id"]).to eq "https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg"
+        expect(resource["@type"]).to eq "dctypes:Image"
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
-        expect(resource.service['@context']).to eq 'http://iiif.io/api/image/2/context.json'
-        expect(resource.service['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2'
-        expect(resource.service['profile']).to eq 'http://iiif.io/api/image/2/level2.json'
+        expect(resource.service["@context"]).to eq "http://iiif.io/api/image/2/context.json"
+        expect(resource.service["@id"]).to eq "https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2"
+        expect(resource.service["profile"]).to eq "http://iiif.io/api/image/2/level2.json"
       end
-      it 'copies over all the info (when copy_info is true)' do
-        opts = { service_id: valid_service_id, copy_info: true }
+      it "copies over all the info (when copy_info is true)" do
+        opts = {service_id: valid_service_id, copy_info: true}
         resource = described_class.create_image_api_image_resource(opts)
-        expect(resource['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
-        expect(resource['@type']).to eq 'dctypes:Image'
+        expect(resource["@id"]).to eq "https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg"
+        expect(resource["@type"]).to eq "dctypes:Image"
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
-        expect(resource.service['@context']).to eq 'http://iiif.io/api/image/2/context.json'
-        expect(resource.service['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2'
-        expect(resource.service['profile']).to eq [
-          'http://iiif.io/api/image/2/level2.json',
+        expect(resource.service["@context"]).to eq "http://iiif.io/api/image/2/context.json"
+        expect(resource.service["@id"]).to eq "https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2"
+        expect(resource.service["profile"]).to eq [
+          "http://iiif.io/api/image/2/level2.json",
           {
-            'supports' => [
-              'canonicalLinkHeader', 'profileLinkHeader', 'mirroring',
-              'rotationArbitrary', 'regionSquare', 'sizeAboveFull'
+            "supports" => [
+              "canonicalLinkHeader", "profileLinkHeader", "mirroring",
+              "rotationArbitrary", "regionSquare", "sizeAboveFull"
             ],
-            'qualities' => ['default', 'bitonal', 'gray', 'color'],
-            'formats'=>['jpg', 'png', 'gif', 'webp']
+            "qualities" => ["default", "bitonal", "gray", "color"],
+            "formats" => ["jpg", "png", "gif", "webp"]
           }
         ]
-        expect(resource.service['tiles']).to eq [ {
-          'width' =>  1024,
-          'scaleFactors' =>  [ 1, 2, 4, 8, 16, 32 ] 
-        } ]
-        expect(resource.service['sizes']).to eq [
-          {'width' => 96, 'height' =>  225 },
-          {'width' => 191, 'height' =>  450 },
-          {'width' => 381, 'height' =>  900 },
-          {'width' => 762, 'height' => 1800 },
-          {'width' => 1524, 'height' => 3600 },
-          {'width' => 3047, 'height' =>  7200 }
+        expect(resource.service["tiles"]).to eq [{
+          "width" => 1024,
+          "scaleFactors" => [1, 2, 4, 8, 16, 32]
+        }]
+        expect(resource.service["sizes"]).to eq [
+          {"width" => 96, "height" => 225},
+          {"width" => 191, "height" => 450},
+          {"width" => 381, "height" => 900},
+          {"width" => 762, "height" => 1800},
+          {"width" => 1524, "height" => 3600},
+          {"width" => 3047, "height" => 7200}
         ]
       end
     end
 
-    describe 'respects the params we supply' do
-      it ':resource_id' do
-        r_id = 'http://example.edu/images/some.jpg' 
+    describe "respects the params we supply" do
+      it ":resource_id" do
+        r_id = "http://example.edu/images/some.jpg"
 
-        opts = { service_id: valid_service_id, resource_id: r_id}
+        opts = {service_id: valid_service_id, resource_id: r_id}
         resource = described_class.create_image_api_image_resource(opts)
-        expect(resource['@id']).to eq r_id
+        expect(resource["@id"]).to eq r_id
       end
-      it ':width' do
+      it ":width" do
         width = 42
-        opts = { service_id: valid_service_id, width: width}
+        opts = {service_id: valid_service_id, width: width}
         resource = described_class.create_image_api_image_resource(opts)
         expect(resource.width).to eq width
       end
-      it ':height' do
+      it ":height" do
         height = 42
-        opts = { service_id: valid_service_id, height: height}
+        opts = {service_id: valid_service_id, height: height}
         resource = described_class.create_image_api_image_resource(opts)
         expect(resource.height).to eq height
       end
-      it ':profile (service[\'profile\'])' do
-        profile = 'http://iiif.io/api/image/2/level1.json'
-        opts = { service_id: valid_service_id, profile: profile}
+      it ":profile (service['profile'])" do
+        profile = "http://iiif.io/api/image/2/level1.json"
+        opts = {service_id: valid_service_id, profile: profile}
         resource = described_class.create_image_api_image_resource(opts)
-        expect(resource.service['profile']).to eq profile
+        expect(resource.service["profile"]).to eq profile
       end
     end
 
-    describe 'errors' do
-      it 'raises if :service_id is not included' do
+    describe "errors" do
+      it "raises if :service_id is not included" do
         expect {
           described_class.create_image_api_image_resource
         }.to raise_error
       end
-      it 'raises if the info can\'t be pulled in' do
+      it "raises if the info can't be pulled in" do
         expect {
           described_class.create_image_api_image_resource(service_id: invalid_service_id)
         }.to raise_error
       end
     end
-
-
   end
 end