Update calls to DataChunk* with new :date keyword for #152.

wri · Jul 20, 2012 · b07a0d9 · b07a0d9
1 parent 840760b
commit b07a0d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/clj/forma/hadoop/predicate.clj b/src/clj/forma/hadoop/predicate.clj
@@ -154,7 +154,7 @@
   [size]
   (<- [?name !date ?s-res ?t-res ?h ?v ?id ?val :> ?tile-chunk]
       (thrift/ModisChunkLocation* ?s-res ?h ?v ?id size :> ?tile-loc)
-      (thrift/DataChunk* ?name ?tile-loc ?val ?t-res !date :> ?tile-chunk)))
+      (thrift/DataChunk* ?name ?tile-loc ?val ?t-res :date !date :> ?tile-chunk)))
 
 (def break
   "Takes a source of textlines representing rows of a gridded

diff --git a/src/clj/forma/source/fire.clj b/src/clj/forma/source/fire.clj
@@ -187,4 +187,4 @@
       (src ?dataset ?date ?t-res ?lat ?lon ?tuple)
       (r/latlon->modis ?m-res ?lat ?lon :> ?h ?v ?sample ?line)
       (thrift/ModisPixelLocation* ?m-res ?h ?v ?sample ?line :> ?pixel-loc)
-      (thrift/DataChunk* ?dataset ?pixel-loc ?tuple ?t-res ?date  :> ?pixel-chunk)))
+      (thrift/DataChunk* ?dataset ?pixel-loc ?tuple ?t-res :date ?date  :> ?pixel-chunk)))
diff --git a/test/forma/source/fire_test.clj b/test/forma/source/fire_test.clj
@@ -13,7 +13,7 @@
 
 (defn fire-datachunk
   [date mh mv sample line val]
-  (thrift/DataChunk* "fire" (thrift/ModisPixelLocation* "1000" mh mv sample line) val "01" date))
+  (thrift/DataChunk* "fire" (thrift/ModisPixelLocation* "1000" mh mv sample line) val "01" :date date))
 
 (fact?- "Projecting fires into 1000m resolution."
         [[(fire-datachunk "2011-03-15" 31 11 181 1087 (thrift/FireValue* 1 1 1 1))]