use one model

Author: pigr2

app/app.component.ts

@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
 import {Store, provideStore} from '@ngrx/store';
 import {Observable} from 'rxjs/Rx';
-import {CurrentSearch} from './models/current-search.model';
 import {ProximitySelector} from './components/proximity-selector.component';
 import {SearchBox} from './components/search-box.component';
 import {SearchReducer} from './reducers/search.reducer';
+import {SearchQuery} from "./models/search-query.model";
 
 const storeManager = provideStore({ currentSearch: SearchReducer });
 
@@ -34,18 +34,18 @@ export class AppComponent implements OnInit {
 
     title = 'One Source of Truth for Angular 2';
 
-    private state: CurrentSearch;
+    private state: SearchQuery;
 
-    private currentSearch: Observable<CurrentSearch>;
+    private currentSearch: Observable<SearchQuery>;
 
     constructor(
-        private store: Store<CurrentSearch>
+        private store: Store<SearchQuery>
     ) {
-        this.currentSearch = this.store.select<CurrentSearch>('currentSearch');
+        this.currentSearch = this.store.select<SearchQuery>('currentSearch');
     }
 
     ngOnInit() {
-        this.currentSearch.subscribe((state: CurrentSearch) => {
+        this.currentSearch.subscribe((state: SearchQuery) => {
             this.state = state;
         });
     }

app/components/proximity-selector.component.ts

@@ -1,6 +1,5 @@
 import {Component, Input} from '@angular/core';
 import {Store} from '@ngrx/store';
-import {CurrentSearch} from '../models/current-search.model';
 
 @Component({
     selector: 'proximity-selector',
@@ -30,7 +29,7 @@ export class ProximitySelector {
     };
 
     @Input()
-    store: Store<CurrentSearch>;
+    store: Store<any>;
 
     active = false;
 

app/models/current-search.model.ts

@@ -1,9 +1,9 @@
 import { ActionReducer, Action } from '@ngrx/store';
-import {CurrentSearch} from '../models/current-search.model';
 import {SearchBox} from '../components/search-box.component';
 import {ProximitySelector} from '../components/proximity-selector.component';
+import {SearchQuery} from "../models/search-query.model";
 
-export const SearchReducer: ActionReducer<CurrentSearch> = (state: CurrentSearch, action: Action) => {
+export const SearchReducer: ActionReducer<SearchQuery> = (state: SearchQuery, action: Action) => {
     switch (action.type) {
         case SearchBox.StoreEvents.text:
             return Object.assign({}, state, {
@@ -18,12 +18,13 @@ export const SearchReducer: ActionReducer<CurrentSearch> = (state: CurrentSearch
             });
         case ProximitySelector.StoreEvents.radius:
             return Object.assign({}, state, {
-                radius: action.payload.radius
+                position: {
+                    radius: action.payload.radius
+                }
             });
         case ProximitySelector.StoreEvents.off:
             return Object.assign({}, state, {
-                position: null,
-                radius: null
+                position: null
             });
         default:
             return state;