[
    {
       name: 'water_ocean',
       data: function (json) { return json['water']; }
    },
    {
        name: 'land_usages',
        data: function (json) {
          return {
              type: 'FeatureCollection',
              features: ((json['landuse']||{}).features||[]).filter(function (feature) {
                  feature.properties.kind = feature.properties.class;
                  return feature;
              })
          };
        }
    },
    {
       name: 'water_areas',
       data: function (json) { return json['waterway']; }
    },
    {
        name: 'roads',
        data: function (json) {
            return {
                type: 'FeatureCollection',
                features: (((json['road']||{}).features)||[]).concat(((json['bridge']||{}).features)||[]).filter(function (feature) {
                    if (['motorway', 'motorway_link'].indexOf(feature.properties.class) > 0) {
                        feature.properties.kind = 'highway';
                    }
                    else if (feature.properties.class == 'main') {
                        feature.properties.kind = 'major_road';
                    }
                    else if (['street', 'street_limited'].indexOf(feature.properties.class) > 0) {
                        feature.properties.kind = 'minor_road';
                    }
                    else {
                        feature.properties.kind = feature.properties.type;
                    }
                    return feature;
                })
            };
        }
    },
    {
        name: 'buildings',
        data: function (json) { return json['building']; }
    }
]

@@ -120,15 +120,11 @@
 land
-_
 us
-ages
+e
 ',%0A 
@@ -1627,20 +1627,382 @@
 ilding'%5D; %7D%0A
+    %7D,%0A    %7B%0A        name: 'pois',%0A        data: function (json) %7B%0A          return %7B%0A              type: 'FeatureCollection',%0A              features: ((json%5B'poi_labels'%5D%7C%7C%7B%7D).features%7C%7C%5B%5D).filter(function (feature) %7B%0A                  feature.properties.kind = feature.properties.type;%0A                  return feature;%0A              %7D)%0A          %7D;%0A        %7D%0A
     %7D%0A%5D%0A

fix layer name references to use new names