Changeset 176:4e7ecb7437a4

Timestamp:

08/30/08 12:33:19 (2 years ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:10edda23-d834-0410-9182-b00384516d49/trunk@188

Message:

[js/views][s]: (bugfix) fix mapview to work with factlets which do not have a location attribute and (concomitantly) draw these kind of factlets on other views (such as timeline).

• Details: Currently moovc.BaseView? was written so that only factlets with a location attribute were sent to drawFactlets. This meant factlets without location were not showing up on timeline. Removing this restriction directly broke mapview as it required location attribute.
• Fixed these issues by adding check in mapview, modifying moovc to send all factlet data to drawFactlets.
• Tests: added new factlet data (no location) to domain_data.js to test this.

Location:

microfacts/public

Files:

• behaviour/app/views/mapview.js (modified) (1 diff)
• behaviour/lib/moovc.js (modified) (2 diffs)
• test/spec/domain_data.js (modified) (2 diffs)

microfacts/public/behaviour/app/views/mapview.js

@@ -73 +73 @@
         };
         this.factletsData.each( function(factletData, index) {
-            var featureGeoJson = {
-                "type": "Feature",
-                "geometry": factletData.location,
-                "properties": {"factlet": factletData}
-            };
-            featureCollection.features.push(featureGeoJson);
+            if (factletData.location) {
+                var featureGeoJson = {
+                    "type": "Feature",
+                    "geometry": factletData.location,
+                    "properties": {"factlet": factletData}
+                };
+                featureCollection.features.push(featureGeoJson);
+            }
         }, this);
         return featureCollection;

microfacts/public/behaviour/lib/moovc.js

@@ -3 +3 @@
 
     log: function(message) {
-        console.log(message);
+    //    console.log(message);
     },
 
@@ -38 +38 @@
         }, this);
         var factletsData = [];
-        // what is this doing in here?
-        // why test for existence of location? May have date but not location
-        this.factlets.each(function (factletObject) {
-            if (factletObject.data.location) {
-                factletsData.push(factletObject.data);
-            }
+        var factletsData = this.factlets.map(function(item) {
+            return item.data;
         });
-        // this.log("Factlet data:");
-        // this.log(factletsData);
         this.drawFactlets(factletsData);
     },

microfacts/public/test/spec/domain_data.js

@@ -17 +17 @@
         },
         'start': "1870-01-01 00:00:00"
+    },
+    // factlet without location
+    {
+        'id': 103,
+        'title': 'Third Factlet',
+        'start': "1879-01-01 00:00:00"
     }
 ];
@@ -22 +28 @@
 var factletObjects = [
     {
+        'id'  : factletsData[0]['id'],
         'data': factletsData[0]
     },
     {
+        'id'  : factletsData[1]['id'],
         'data': factletsData[1]
+    },
+    {
+        'id'  : factletsData[2]['id'],
+        'data': factletsData[2]
     }
 ];