Upgrade to OpenLayers 3