a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve types for Building across app

Browse Source
This commit is contained in:
Maciej Ziarkowski 2019-10-17 17:38:44 +01:00
parent c2396e8881
commit f54fcf0cc4
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/frontend/building/data-components/data-entry.tsx
View File

@ -8,9 +8,9 @@ interface BaseDataEntryProps {
title: string; title: string;
tooltip?: string; tooltip?: string;
disabled?: boolean; disabled?: boolean;
copy: any; // CopyProps clashes with propTypes copy?: any; // CopyProps clashes with propTypes
mode: 'view' | 'edit' | 'multi-edit'; mode?: 'view' | 'edit' | 'multi-edit';
onChange: (key: string, value: any) => void; onChange?: (key: string, value: any) => void;
} }
interface DataEntryProps extends BaseDataEntryProps { interface DataEntryProps extends BaseDataEntryProps {

7
app/src/frontend/map-app.tsx
View File

@ -9,6 +9,7 @@ import MultiEdit from './building/multi-edit';
import BuildingView from './building/building-view'; import BuildingView from './building/building-view';
import ColouringMap from './map/map'; import ColouringMap from './map/map';
import { parse } from 'query-string'; import { parse } from 'query-string';
import { Building } from './models/building';
interface MapAppRouteParams { interface MapAppRouteParams {
mode: 'view' | 'edit' | 'multi-edit'; mode: 'view' | 'edit' | 'multi-edit';
@ -17,7 +18,7 @@ interface MapAppRouteParams {
} }
interface MapAppProps extends RouteComponentProps<MapAppRouteParams> { interface MapAppProps extends RouteComponentProps<MapAppRouteParams> {
building: any; building: Building;
building_like: boolean; building_like: boolean;
user: any; user: any;
} }
@ -25,7 +26,7 @@ interface MapAppProps extends RouteComponentProps<MapAppRouteParams> {
interface MapAppState { interface MapAppState {
category: string; category: string;
revision_id: number; revision_id: number;
building: any; building: Building;
building_like: boolean; building_like: boolean;
} }
@ -76,7 +77,7 @@ class MapApp extends React.Component<MapAppProps, MapAppState> {
} }
} }
selectBuilding(building) { selectBuilding(building: Building) {
const mode = this.props.match.params.mode || 'view'; const mode = this.props.match.params.mode || 'view';
const category = this.props.match.params.category || 'age'; const category = this.props.match.params.category || 'age';

3
app/src/frontend/map/map.tsx
View File

@ -11,11 +11,12 @@ import Legend from './legend';
import { parseCategoryURL } from '../../parse'; import { parseCategoryURL } from '../../parse';
import SearchBox from './search-box'; import SearchBox from './search-box';
import ThemeSwitcher from './theme-switcher'; import ThemeSwitcher from './theme-switcher';
import { Building } from '../models/building';
const OS_API_KEY = 'NVUxtY5r8eA6eIfwrPTAGKrAAsoeI9E9'; const OS_API_KEY = 'NVUxtY5r8eA6eIfwrPTAGKrAAsoeI9E9';
interface ColouringMapProps { interface ColouringMapProps {
building: any; building: Building;
mode: 'basic' | 'view' | 'edit' | 'multi-edit'; mode: 'basic' | 'view' | 'edit' | 'multi-edit';
category: string; category: string;
revision_id: number; revision_id: number;

4
app/src/frontend/models/building.ts
View File

@ -1,5 +1,9 @@
interface Building { interface Building {
building_id: number; building_id: number;
geometry_id: number;
revision_id: number;
uprns: string[];
// TODO: add other fields as needed // TODO: add other fields as needed
} }