Feature/openlayers integration