Skip to content

Commit

Permalink
Rename OpenAQ locations models to match naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
jackkoppa committed Nov 29, 2017
1 parent e1b3e4a commit 2903ce7
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { CoordinatesModel } from '../coordinates.model';
import { Parameter } from '../parameter.model';

export interface LocationsIndividualResponseModel {
export interface LocationsIndividualResponse {
location: string;
country: string;
city: string;
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/api/openaq/locations/locations-response.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://docs.openaq.org/#api-Locations
import { LocationsIndividualResponseModel } from './locations-individual-response.model';
import { LocationsIndividualResponse } from './locations-individual-response.model';

export interface LocationsResponseModel extends Array<LocationsIndividualResponseModel> {}
export interface LocationsResponse extends Array<LocationsIndividualResponse> {}
4 changes: 2 additions & 2 deletions src/app/core/api/openaq/locations/locations.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Injectable } from '@angular/core';
import { Http, RequestOptionsArgs, BaseRequestOptions } from '@angular/http';
import { LocationsRequest } from './locations-request.model';
import { LocationsResponseModel } from './locations-response.model';
import { LocationsResponse } from './locations-response.model';
import { ApiService } from '../../api.service';
import { environment } from '../../../../../environments/environment';
import 'rxjs/add/operator/map';
Expand All @@ -16,7 +16,7 @@ export class LocationsApi {
private apiService: ApiService
) {}

public getLocations(request?: LocationsRequest): Observable<LocationsResponseModel> {
public getLocations(request?: LocationsRequest): Observable<LocationsResponse> {
return this.http.get(environment.openaqApiUrl + 'locations?' + this.apiService.buildOpenAQQueryString(request))
.map(res => res.json().results);
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/handlers/locations-handler.service.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Injectable } from '@angular/core';
import { LocationsApi } from '../api/openaq/locations/locations.api';
import { LocationsRequest } from '../api/openaq/locations/locations-request.model';
import { LocationsResponseModel } from '../api/openaq/locations/locations-response.model';
import { LocationsResponse } from '../api/openaq/locations/locations-response.model';
import { Observable } from 'rxjs/Observable';

@Injectable()
export class LocationsHandlerService {
constructor(private locationsApi: LocationsApi) {};

getLocationsByCityAndCountry(cityName: string, country: string): Observable<LocationsResponseModel> {
getLocationsByCityAndCountry(cityName: string, country: string): Observable<LocationsResponse> {
let request: LocationsRequest = {
city: cityName,
country: country
Expand Down
4 changes: 2 additions & 2 deletions src/app/search/search.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'rxjs/add/operator/catch';
import { CitiesIndividualResponse } from '../core/api/openaq/cities/cities-individual-response.model';
import { CitiesResponse } from '../core/api/openaq/cities/cities-response.model';
import { LatestResponse } from '../core/api/openaq/latest/latest-response.model';
import { LocationsResponseModel } from '../core/api/openaq/locations/locations-response.model';
import { LocationsResponse } from '../core/api/openaq/locations/locations-response.model';
import { CityCardsListComponent } from '../city/city-cards-list.component';
import { LocationsHandlerService } from '../core/handlers/locations-handler.service';
import { MessagingService } from '../shared/messaging/messaging.service';
Expand Down Expand Up @@ -91,7 +91,7 @@ export class SearchComponent implements OnInit {
});
}

private outputSearchedCity(city: CitiesIndividualResponse, locations: LocationsResponseModel): void {
private outputSearchedCity(city: CitiesIndividualResponse, locations: LocationsResponse): void {
this.searching = false;
this.clearSearchInput();
const searchedCity: SearchedCity = city;
Expand Down
2 changes: 1 addition & 1 deletion src/app/search/search.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { FormControl } from '@angular/forms';
import { CitiesResponse } from '../core/api/openaq/cities/cities-response.model';
import { LocationsResponseModel } from '../core/api/openaq/locations/locations-response.model';
import { LocationsResponse } from '../core/api/openaq/locations/locations-response.model';
import { Observable } from 'rxjs/Observable';
import { CitiesRequest } from '../core/api/openaq/cities/cities-request.model';

Expand Down
4 changes: 2 additions & 2 deletions src/app/search/searched-city.model.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CitiesIndividualResponse } from '../core/api/openaq/cities/cities-individual-response.model';
import { LocationsResponseModel } from '../core/api/openaq/locations/locations-response.model';
import { LocationsResponse } from '../core/api/openaq/locations/locations-response.model';

export interface SearchedCity extends CitiesIndividualResponse {
locationsResponse?: LocationsResponseModel;
locationsResponse?: LocationsResponse;
}

0 comments on commit 2903ce7

Please sign in to comment.