package io.lithiumsheep.weatherlib;

import io.lithiumsheep.weatherlib.api.HttpClient;
import io.lithiumsheep.weatherlib.models.CurrentWeather;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import retrofit2.Call;

public class WeatherLib {

    public static Observable<CurrentWeather> getObservableCurrentWeather(String cityOrZip) {
        return HttpClient.getObservableService().getCurrentWeather(cityOrZip)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread());
    }

    public static Call<CurrentWeather> getCurrentWeather(String cityOrZip) {
        return HttpClient.getService().getCurrentWeather(cityOrZip);
    }

    public static Call<Void> getWeatherZip(String zip) {
        return HttpClient.getService().getWeatherByZip(zip);
    }
}

@@ -148,467 +148,50 @@
 ort 
-io.reactivex.Observable;%0Aimport io.reactivex.android.schedulers.AndroidSchedulers;%0Aimport io.reactivex.schedulers.Schedulers;%0Aimport retrofit2.Call;%0A%0Apublic class WeatherLib %7B%0A%0A    public static Observable%3CCurrentWeather%3E getObservableCurrentWeather(String cityOrZip) %7B%0A        return HttpClient.getObservableService().getCurrentWeather(cityOrZip)%0A                .subscribeOn(Schedulers.io())%0A                .observeOn(AndroidSchedulers.mainThread());%0A    %7D
+retrofit2.Call;%0A%0Apublic class WeatherLib %7B
 %0A%0A  

Remove observable service from facade