Merge branch 'master' of gitorious.org:fg/fgdata

Nasal/canvas/gui/widgets/ScrollArea.nas

@@ -45,6 +45,11 @@ gui.widgets.ScrollArea = {
   {
     # TODO only update on content resize
     var bb = me.getContent().getTransformedBounds();
+
+    if( bb[2] < bb[0] or bb[3] < bb[1] )
+      # Do nothing with invalid bounding box (probably no content yet)
+      return me;
+
     var w = bb[2] - bb[0];
     var h = bb[3] - bb[1];
 

webgui/map/index.html

@@ -192,6 +192,16 @@ L.RotatedMarker = L.Marker.extend({
             weight: 1,
           };
         }
+        if( feature.properties.type == "airport" ) {
+          return {
+            color: 'black',
+            weight: 3,
+            fill: 'true',
+            fillColor: '#606060',
+            fillOpacity: 1.0,
+            lineJoin: 'bevel',
+          };
+        }
       }
     });