From ce7f432608a2185d3927ecbcd2ae0c61ab2f5a56 Mon Sep 17 00:00:00 2001
From: raffazizzi <raffaeleviglianti@gmail.com>
Date: Thu, 6 Oct 2016 11:38:39 -0400
Subject: [PATCH 1/3] Fixes bug with resource and service generation

---
 src/annotation.js | 6 +++---
 src/resource.js   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/annotation.js b/src/annotation.js
index 08a20b6..ed78b05 100644
--- a/src/annotation.js
+++ b/src/annotation.js
@@ -1,5 +1,5 @@
 import Model from 'ampersand-model'
-import ResourceCollection from './resource-collection'
+import Resource from './resource'
 
 export default Model.extend({
   idAttribute: '@id',
@@ -16,8 +16,8 @@ export default Model.extend({
     about: 'string'
   },
 
-  collections: {
-    resource: ResourceCollection
+  children: {
+    resource: Resource
   },
 
   parse: function (response) {
diff --git a/src/resource.js b/src/resource.js
index 378d7d0..d01f88f 100644
--- a/src/resource.js
+++ b/src/resource.js
@@ -1,5 +1,5 @@
 import Model from 'ampersand-model'
-import ServiceCollection from './service-collection'
+import Service from './service'
 
 export default Model.extend({
   idAttribute: '@id',
@@ -12,8 +12,8 @@ export default Model.extend({
     width: 'number'
   },
 
-  collections: {
-    service: ServiceCollection
+  children: {
+    service: Service
   },
 
   parse: function (response) {

From 5647fa4921f56b40fe9ce12827d151d37943c327 Mon Sep 17 00:00:00 2001
From: raffazizzi <raffaeleviglianti@gmail.com>
Date: Thu, 6 Oct 2016 11:38:55 -0400
Subject: [PATCH 2/3] Added optional thumbnail property

---
 src/canvas.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/canvas.js b/src/canvas.js
index 222e112..e5f7643 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -1,6 +1,7 @@
 import Model from 'ampersand-model'
 import ImageCollection from './annotation-collection'
 import AnnotationListCollection from './annotationlist-collection'
+import Thumbnail from './thumbnail'
 
 export default Model.extend({
   idAttribute: '@id',
@@ -15,7 +16,8 @@ export default Model.extend({
     },
     label: 'string',
     height: 'number',
-    width: 'number'
+    width: 'number',
+    thumbnail: 'string'
   },
 
   collections: {

From 4ebc8945909d887a3de626a2def5eaad6686df3e Mon Sep 17 00:00:00 2001
From: raffazizzi <raffaeleviglianti@gmail.com>
Date: Thu, 6 Oct 2016 13:28:45 -0400
Subject: [PATCH 3/3] Removed erroneous reference to non-existing module

---
 src/canvas.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/canvas.js b/src/canvas.js
index e5f7643..6a046bf 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -1,7 +1,6 @@
 import Model from 'ampersand-model'
 import ImageCollection from './annotation-collection'
 import AnnotationListCollection from './annotationlist-collection'
-import Thumbnail from './thumbnail'
 
 export default Model.extend({
   idAttribute: '@id',