From 9cba25405afd6d5758a90d2760dade3b22b59f82 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 16 Jan 2020 14:52:10 +0000
Subject: [PATCH 01/32] Activate height to apex colour map

---
 app/map_styles/polygon.xml      | 38 +++++++++++++++++++++++++++++++++
 app/src/frontend/map/legend.tsx | 16 ++++++++------
 app/src/frontend/map/map.tsx    |  2 +-
 app/src/tiles/dataDefinition.ts |  9 ++++++++
 4 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 6c819b37..963f5fd2 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -89,6 +89,44 @@
             <PolygonSymbolizer fill="#800026" />
         </Rule>
     </Style>
+    <Style name="size_height">
+        <Rule>
+            <Filter>[size_height] &lt; 5.55</Filter>
+            <PolygonSymbolizer fill="#f7f4f9" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 5.55 and [size_height] &lt; 7.73</Filter>
+            <PolygonSymbolizer fill="#e7e1ef" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 7.73 and [size_height] &lt; 1.138</Filter>
+            <PolygonSymbolizer fill="#d4b9da" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 1.138 and [size_height] &lt; 1.845</Filter>
+            <PolygonSymbolizer fill="#c994c7" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 1.845 and [size_height] &lt; 3.505</Filter>
+            <PolygonSymbolizer fill="#df65b0" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 3.505 and [size_height] &lt; 8.930</Filter>
+            <PolygonSymbolizer fill="#e7298a" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 8.930 and [size_height] &lt; 15.179</Filter>
+            <PolygonSymbolizer fill="#ce1256" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 15.179 and [size_height] &lt; 99.999</Filter>
+            <PolygonSymbolizer fill="#980043" />
+        </Rule>
+        <Rule>
+            <Filter>[size_height] &gt;= 99.999</Filter>
+            <PolygonSymbolizer fill="#67001f" />
+        </Rule>
+    </Style>
     <Style name="date_year">
         <Rule>
             <Filter>[date_year] &gt;= 2000</Filter>
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 161d484c..64712384 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -67,13 +67,17 @@ const LEGEND_CONFIG = {
         ]
     },
     size: {
-        title: 'Number of storeys',
+        title: 'Height to apex',
         elements: [
-            { color: '#ffffcc', text: '≥40' },
-            { color: '#fed976', text: '20–39' },
-            { color: '#fd8d3c', text: '10–19' },
-            { color: '#e31a1c', text: '6–9' },
-            { color: '#800026', text: '1–5' },
+            { color: '#f7f4f9', text: '0-5.55'},
+            { color: '#e7e1ef', text: '5.55-7.73'},
+            { color: '#d4b9da', text: '7.73-1.138'},
+            { color: '#c994c7', text: '1.138-1.845'},
+            { color: '#df65b0', text: '1.845-3.505'},
+            { color: '#e7298a', text: '3.505-8.930'},
+            { color: '#ce1256', text: '8.930-15.179'},
+            { color: '#980043', text: '15.179-99.999'},
+            { color: '#67001f', text: '≥99.999'}
         ]
     },
     construction: {
diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx
index 353b42b7..0bb53651 100644
--- a/app/src/frontend/map/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -133,7 +133,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
         const cat = this.props.category;
         const tilesetByCat = {
             age: 'date_year',
-            size: 'size_storeys',
+            size: 'size_height',
             location: 'location',
             like: 'likes',
             planning: 'conservation_area',
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 05e67042..e7589cf8 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -46,6 +46,15 @@ const BUILDING_LAYER_DEFINITIONS = {
         WHERE
             g.geometry_id = b.geometry_id
     ) as size_stories`,
+    size_height: `(
+        SELECT
+            b.size_height_apex,
+            g.geometry_geom
+        FROM
+            geometries as g,
+            buildings as b
+        WHERE g.geometry_id = b.geometry_id
+    ) as size_height`,
     location: `(
         SELECT
             (

From 68af41c16cc1ca9cfcf39818685ac55e12815771 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 16 Jan 2020 17:04:17 +0000
Subject: [PATCH 02/32] Fix query for height map activation

---
 app/src/tiles/dataDefinition.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index e7589cf8..6e557eaf 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -48,7 +48,7 @@ const BUILDING_LAYER_DEFINITIONS = {
     ) as size_stories`,
     size_height: `(
         SELECT
-            b.size_height_apex,
+            b.size_height_apex as size_height,
             g.geometry_geom
         FROM
             geometries as g,

From aa3a5934f37f2f4366c24e07ded308148d6f4850 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 16 Jan 2020 17:19:27 +0000
Subject: [PATCH 03/32] Collapse number of floors, expand height in size

---
 app/src/frontend/building/data-containers/size.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index 114d2c5d..1286fe21 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -13,7 +13,7 @@ import { CategoryViewProps } from './category-view-props';
 */
 const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntryGroup name="Storeys" collapsed={false}>
+        <DataEntryGroup name="Storeys">
 
             <NumericDataEntry
                 title={dataFields.size_storeys_core.title}
@@ -49,7 +49,7 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 min={0}
                 />
         </DataEntryGroup>
-        <DataEntryGroup name="Height">
+        <DataEntryGroup name="Height" collapsed={false}>
             <NumericDataEntry
                 title={dataFields.size_height_apex.title}
                 slug="size_height_apex"

From d85f515c89c11bd80e5c6e92be0440ed24081952 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 17 Jan 2020 17:26:15 +0000
Subject: [PATCH 04/32] Add help doc for adding a new building attribute

---
 docs/adding-new-fields.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 docs/adding-new-fields.md

diff --git a/docs/adding-new-fields.md b/docs/adding-new-fields.md
new file mode 100644
index 00000000..71ae56b8
--- /dev/null
+++ b/docs/adding-new-fields.md
@@ -0,0 +1,34 @@
+## Adding new building attribute fields
+
+This document is a checklist for adding a new building attribute to the system. It's split into two sections - actions that apply when adding any field, and additional steps to add a field that will be visualised on the map.
+The second section would be required when adding a new category or when changing which field should be visualised for a category.
+
+### Adding any attribute
+
+#### In database
+1. Add a column to the `buildings` table in the database.
+2. Add any check constraints or foreign key constraints on the column, if necessary (if the foreign key constraint is used to restrict the column to a set of values, the table with the values might need to be created from scratch)
+
+#### In API
+1. Add field name to `BUILDING_FIELD_WHITELIST` in the building service to allow saving changes to the field
+2. Add any special domain logic for processing updates to the field in the `processBuildingUpdate()` function
+
+#### In frontend
+1. Add the field description to the `dataFields` object in `data_fields.ts`
+2. Add the data entry React component of the appropriate type (text, numeric etc) to the appropriate category view component in the `building/data-containers` folder. Link to `dataFields` for static string values (field name, description etc)
+
+
+#### In data extracts
+1. Add the field to the select list in the COPY query in `maintenance/extract_data/export_attributes.sql` 
+
+### Adding an attribute which is used to colour the map
+
+All steps from the previous section need to be carried out first.
+
+#### In tileserver
+1. Add a SQL query for calculating the value to be visualised to `BUILDING_LAYER_DEFINITIONS` in `app/tiles/dataDefinition.ts`
+2. Add Mapnik rendering style in `app/map_styles/polygon.xml`
+
+#### In frontend
+1. Update the category to field name mapping in the `tilesetByCat` object inside the `ColouringMap` React component (`map.tsx` file)
+2. Add an entry for the field to the `LEGEND_CONFIG` object in `legend.tsx` file
\ No newline at end of file

From 8fb7d43c386f31ad2cd965e4d4c8b1cd34a794eb Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 19 Jan 2020 18:31:10 +0000
Subject: [PATCH 05/32] Add missed fields to bulk extract query, docs

---
 docs/adding-new-fields.md                      | 1 +
 maintenance/extract_data/README.txt            | 4 ++++
 maintenance/extract_data/export_attributes.sql | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/docs/adding-new-fields.md b/docs/adding-new-fields.md
index 71ae56b8..1995ad59 100644
--- a/docs/adding-new-fields.md
+++ b/docs/adding-new-fields.md
@@ -20,6 +20,7 @@ The second section would be required when adding a new category or when changing
 
 #### In data extracts
 1. Add the field to the select list in the COPY query in `maintenance/extract_data/export_attributes.sql` 
+2. Add a description of the field to the `README.txt` file
 
 ### Adding an attribute which is used to colour the map
 
diff --git a/maintenance/extract_data/README.txt b/maintenance/extract_data/README.txt
index ba2c8e70..54db7145 100644
--- a/maintenance/extract_data/README.txt
+++ b/maintenance/extract_data/README.txt
@@ -41,7 +41,11 @@ This is the main table, containing almost all data collected by Colouring London
 - `location_postcode`: postcode
 - `location_latitude`: latitude
 - `location_longitude`: longitude
+- `current_landuse_class`: current land use class
+- `current_landuse_group`: current land use group
+- `current_landuse_order`: current land use order
 - `building_attachment_form`: building attachment form
+- `date_change_building_use`: year of last building use change
 - `date_year`: year built
 - `date_lower`: lower bound on year built
 - `date_upper`: upper bound on year built
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index c8256e04..87159603 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -11,7 +11,11 @@ COPY (SELECT
     location_postcode,
     location_latitude,
     location_longitude,
+    current_landuse_class,
+    current_landuse_group,
+    current_landuse_order,
     building_attachment_form,
+    date_change_building_use,
     date_year,
     date_lower,
     date_upper,

From 25e61bb9cffebb26354af3533d55aa3316c7701a Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 20 Jan 2020 19:43:19 +0000
Subject: [PATCH 06/32] Make paths relative to source file in extract_data

---
 maintenance/extract_data/extract_data.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintenance/extract_data/extract_data.py b/maintenance/extract_data/extract_data.py
index e90f0397..7e63127a 100644
--- a/maintenance/extract_data/extract_data.py
+++ b/maintenance/extract_data/extract_data.py
@@ -64,9 +64,11 @@ def make_data_extract(current_time, connection, zip_file_path):
 
     zip_file_path.parent.mkdir(parents=True, exist_ok=True)
 
+    source_dir_path = Path(__file__).parent
+
     try:
         with zipfile.ZipFile(zip_file_path, mode='w') as newzip:
-            newzip.write('README.txt')
+            newzip.write(source_dir_path / 'README.txt')
             newzip.write('/tmp/building_attributes.csv', arcname='building_attributes.csv')
             newzip.write('/tmp/building_uprns.csv', arcname='building_uprns.csv')
             newzip.write('/tmp/edit_history.csv', arcname='edit_history.csv')

From 36741a0a69e1c7c4fdd0b5f6625080d0ce8d1153 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 20 Jan 2020 19:44:07 +0000
Subject: [PATCH 07/32] Remove cron file for data extracts

---
 maintenance/tasks.cron.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 maintenance/tasks.cron.txt

diff --git a/maintenance/tasks.cron.txt b/maintenance/tasks.cron.txt
deleted file mode 100644
index d63e8995..00000000
--- a/maintenance/tasks.cron.txt
+++ /dev/null
@@ -1 +0,0 @@
-0 5 * * * /var/www/colouringlondon/maintenance/extract_data/extract_data.py
\ No newline at end of file

From b711f8e55728b9a156784f660a7cc4d081243d6e Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 20 Jan 2020 20:40:31 +0000
Subject: [PATCH 08/32] Update production setup docs for data extracts

---
 docs/setup-production-environment.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/setup-production-environment.md b/docs/setup-production-environment.md
index b8608929..cb4a84d6 100644
--- a/docs/setup-production-environment.md
+++ b/docs/setup-production-environment.md
@@ -32,6 +32,10 @@ Install Postgres and associated tools
 
 `sudo apt-get install -y gdal-bin libspatialindex-dev libgeos-dev libproj-dev`
 
+Install Python 3 and pip
+
+`sudo apt-get install python3 python3-pip`
+
 
 Install Nginx
 
@@ -303,6 +307,21 @@ To stop the colouring-london app type:
 
 ***
 
+#### Set up data extracts
+
+Install requirements for the maintenance Python scripts
+
+`cd /var/www/colouring-london/maintenance`
+
+`sudo pip3 install -r requirements.txt`
+
+The maintenance scripts might need environment variables present at the time of execution, notably the database connection details.
+If running the scripts manually, the variables can be provided just before execution, for example
+
+`PGHOST=localhost PGPORT=5432 PGDATABASE=dbname PGUSER=username PGPASSWORD=secretpassword EXTRACTS_DIRECTORY=/var/www/colouring-london/downloads python3 maintenance/extract_data/extract_data.py`
+
+If the maintenance script is to be run on a schedule, the variables should be loaded before running the script, for example from a `.env` file.
+
 
 #### Set up SSL - TO DO
 

From 53c587b69e4a6385e75e3c958a6c17b6c14d64b6 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Tue, 21 Jan 2020 12:25:58 +0000
Subject: [PATCH 09/32] Fix README.txt path inside bulk extract

---
 maintenance/extract_data/extract_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance/extract_data/extract_data.py b/maintenance/extract_data/extract_data.py
index 7e63127a..07113562 100644
--- a/maintenance/extract_data/extract_data.py
+++ b/maintenance/extract_data/extract_data.py
@@ -68,7 +68,7 @@ def make_data_extract(current_time, connection, zip_file_path):
 
     try:
         with zipfile.ZipFile(zip_file_path, mode='w') as newzip:
-            newzip.write(source_dir_path / 'README.txt')
+            newzip.write(source_dir_path / 'README.txt', arcname='README.txt')
             newzip.write('/tmp/building_attributes.csv', arcname='building_attributes.csv')
             newzip.write('/tmp/building_uprns.csv', arcname='building_uprns.csv')
             newzip.write('/tmp/edit_history.csv', arcname='edit_history.csv')

From f0e791297ede855428d539e9628e2bd4fbe0d8b2 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Tue, 21 Jan 2020 12:37:14 +0000
Subject: [PATCH 10/32] Order bulk extracts in API by date descending

---
 app/src/api/services/dataExtract.ts      | 3 ++-
 app/src/frontend/pages/data-extracts.tsx | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/api/services/dataExtract.ts b/app/src/api/services/dataExtract.ts
index 063e9a7b..c7dc33d3 100644
--- a/app/src/api/services/dataExtract.ts
+++ b/app/src/api/services/dataExtract.ts
@@ -19,7 +19,8 @@ async function listDataExtracts(): Promise<DataExtract[]> {
         const extractRecords = await db.manyOrNone<DataExtractRow>(
             `SELECT
                 extract_id, extracted_on, extract_path
-            FROM bulk_extracts`
+            FROM bulk_extracts
+            ORDER BY extracted_on DESC`
         );
 
         return extractRecords.map(getDataExtractFromRow);
diff --git a/app/src/frontend/pages/data-extracts.tsx b/app/src/frontend/pages/data-extracts.tsx
index a5f84eb8..9c449d1e 100644
--- a/app/src/frontend/pages/data-extracts.tsx
+++ b/app/src/frontend/pages/data-extracts.tsx
@@ -30,10 +30,7 @@ export default class DataExtracts extends React.Component<{}, DataExtractsState>
 
     async componentDidMount() {
         let data = await apiGet('/api/extracts', { jsonReviver: dateReviver});
-        const extracts = (data.extracts as ExtractViewModel[])
-            .sort((a, b) => b.extracted_on.valueOf() - a.extracted_on.valueOf());
-
-
+        const extracts = (data.extracts as ExtractViewModel[]);
 
         this.setState({ extracts: extracts, latestExtract: extracts[0], previousExtracts: extracts.slice(1) });
     }

From fd787242031ac4d91cf2a7456dd894f1128dc286 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 23 Jan 2020 00:26:46 +0000
Subject: [PATCH 11/32] Add better error message to parseIntParam

---
 app/src/api/helpers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/api/helpers.ts b/app/src/api/helpers.ts
index 4028248c..bfdf6cf9 100644
--- a/app/src/api/helpers.ts
+++ b/app/src/api/helpers.ts
@@ -1,9 +1,10 @@
 import { strictParseInt } from '../parse';
 
-export function parseIntParam(param: string) {
+export function parseIntParam(param: string, paramName?: string) {
     const result = strictParseInt(param);
     if (isNaN(result)) {
-        throw new Error('Invalid parameter format: not an integer');
+        const paramNameString = paramName == undefined ? '' : paramName + ' ';
+        throw new Error(`Invalid parameter ${paramNameString}format: not an integer`);
     }
     return result;
 }

From 88d1032e13f3cd55fde07d489e210cd1da7f0154 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 23 Jan 2020 10:31:20 +0000
Subject: [PATCH 12/32] Rename field to revision_timestamp in edit history

---
 app/src/api/services/building.ts                                | 2 +-
 app/src/api/services/editHistory.ts                             | 2 +-
 .../frontend/building/edit-history/building-edit-summary.tsx    | 2 +-
 app/src/frontend/models/edit-history-entry.ts                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/api/services/building.ts b/app/src/api/services/building.ts
index 38bbc082..79511324 100644
--- a/app/src/api/services/building.ts
+++ b/app/src/api/services/building.ts
@@ -118,7 +118,7 @@ async function getBuildingById(id: number) {
 async function getBuildingEditHistory(id: number) {
     try {
         return await db.manyOrNone(
-            `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp), username
+            `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp) as revision_timestamp, username
             FROM logs, users
             WHERE building_id = $1 AND logs.user_id = users.user_id
             ORDER BY log_timestamp DESC`,
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index 92bf9ca7..e0891621 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -3,7 +3,7 @@ import db from '../../db';
 async function getGlobalEditHistory() {
     try {
         return await db.manyOrNone(
-            `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp), username, building_id
+            `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp) as revision_timestamp, username, building_id
             FROM logs, users
             WHERE logs.user_id = users.user_id
                 AND log_timestamp >= now() - interval '7 days'
diff --git a/app/src/frontend/building/edit-history/building-edit-summary.tsx b/app/src/frontend/building/edit-history/building-edit-summary.tsx
index 2ac230cd..e55399f9 100644
--- a/app/src/frontend/building/edit-history/building-edit-summary.tsx
+++ b/app/src/frontend/building/edit-history/building-edit-summary.tsx
@@ -54,7 +54,7 @@ const BuildingEditSummary: React.FunctionComponent<BuildingEditSummaryProps> = (
 
     return (
         <div className="edit-history-entry">
-            <h2 className="edit-history-timestamp">Edited on {formatDate(parseDate(historyEntry.date_trunc))}</h2>
+            <h2 className="edit-history-timestamp">Edited on {formatDate(parseDate(historyEntry.revision_timestamp))}</h2>
             <h3 className="edit-history-username">By {historyEntry.username}</h3>
             {
                 showBuildingId && historyEntry.building_id != undefined &&
diff --git a/app/src/frontend/models/edit-history-entry.ts b/app/src/frontend/models/edit-history-entry.ts
index e0f30d00..6abf13d4 100644
--- a/app/src/frontend/models/edit-history-entry.ts
+++ b/app/src/frontend/models/edit-history-entry.ts
@@ -1,5 +1,5 @@
 export interface EditHistoryEntry {
-    date_trunc: string;
+    revision_timestamp: string;
     username: string;
     revision_id: string;
     forward_patch: object;

From de855f08fe3af294d4a4c4c54a41975d247c4262 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 24 Jan 2020 15:44:19 +0000
Subject: [PATCH 13/32] Update node to v12.14.1

---
 .travis.yml                          | 2 +-
 app/package-lock.json                | 6 +++---
 app/package.json                     | 2 +-
 docs/setup-dev-environment.md        | 4 ++--
 docs/setup-production-environment.md | 6 +++---
 provision/vm_provision.sh            | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ceb64ee..7449d2ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 8
+  - 12
 cache: npm
 before_script:
   - cd $TRAVIS_BUILD_DIR/app && npm ci
diff --git a/app/package-lock.json b/app/package-lock.json
index 80debd79..dfa26891 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1189,9 +1189,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "8.10.59",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz",
-      "integrity": "sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==",
+      "version": "12.12.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.25.tgz",
+      "integrity": "sha512-nf1LMGZvgFX186geVZR1xMZKKblJiRfiASTHw85zED2kI1yDKHDwTKMdkaCbTlXoRKlGKaDfYywt+V0As30q3w==",
       "dev": true
     },
     "@types/nodemailer": {
diff --git a/app/package.json b/app/package.json
index 9794a47e..ba505943 100644
--- a/app/package.json
+++ b/app/package.json
@@ -44,7 +44,7 @@
     "@types/jest": "^24.0.23",
     "@types/lodash": "^4.14.149",
     "@types/mapbox__sphericalmercator": "^1.1.3",
-    "@types/node": "^8.10.59",
+    "@types/node": "^12.12.25",
     "@types/nodemailer": "^6.2.2",
     "@types/prop-types": "^15.7.3",
     "@types/react": "^16.9.16",
diff --git a/docs/setup-dev-environment.md b/docs/setup-dev-environment.md
index 8317b969..97a95c1e 100644
--- a/docs/setup-dev-environment.md
+++ b/docs/setup-dev-environment.md
@@ -37,7 +37,7 @@ Now clone the colouring london codebase.
 Now install Node. It is helpful to define some local variables.
 
 ```
-NODE_VERSION=v8.11.3
+NODE_VERSION=v12.14.1
 DISTRO=linux-x64
 wget -nc https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$DISTRO.tar.xz
 sudo mkdir /usr/local/lib/node
@@ -137,7 +137,7 @@ root user profile. Don't forget to exit from root at the end.
 
 ```
 sudo su root
-export NODEJS_HOME=/usr/local/lib/node/node-v8.11.3/bin/`
+export NODEJS_HOME=/usr/local/lib/node/node-v12.14.1/bin/`
 export PATH=$NODEJS_HOME:$PATH`
 npm install -g npm@next`
 exit
diff --git a/docs/setup-production-environment.md b/docs/setup-production-environment.md
index b8608929..d5c72220 100644
--- a/docs/setup-production-environment.md
+++ b/docs/setup-production-environment.md
@@ -68,7 +68,7 @@ Now set appropriate permissions on the `colouring-london` directory
 
 First define a couple of convenience variables:
 
-`NODE_VERSION=v8.11.3`
+`NODE_VERSION=v12.14.1`
 
 `DISTRO=linux-x64`
 
@@ -107,7 +107,7 @@ Now upgrade the `npm` package manager to the most recent release with global pri
 
 `sudo su root`
 
-`export NODEJS_HOME=/usr/local/lib/node/node-v8.11.3/bin/`
+`export NODEJS_HOME=/usr/local/lib/node/node-v12.14.1/bin/`
 
 `export PATH=$NODEJS_HOME:$PATH`
 
@@ -240,7 +240,7 @@ Perform a global install of PM2
 
 `sudo su root`
 
-`export NODEJS_HOME=/usr/local/lib/node/node-v8.11.3/bin/`
+`export NODEJS_HOME=/usr/local/lib/node/node-v12.14.1/bin/`
 
 `export PATH=$NODEJS_HOME:$PATH`
 
diff --git a/provision/vm_provision.sh b/provision/vm_provision.sh
index 4d6428ab..1ac221b6 100644
--- a/provision/vm_provision.sh
+++ b/provision/vm_provision.sh
@@ -40,7 +40,7 @@ apt-get install -y \
 #
 
 # node version and platform
-NODE_VERSION=v8.11.3
+NODE_VERSION=v12.14.1
 DISTRO=linux-x64
 
 # download

From 52ad759c4dcc832a65c456b53cf789d0fcb091af Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 27 Jan 2020 00:57:14 +0000
Subject: [PATCH 14/32] Add edit history data access

---
 app/src/api/dataAccess/editHistory.ts | 64 +++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 app/src/api/dataAccess/editHistory.ts

diff --git a/app/src/api/dataAccess/editHistory.ts b/app/src/api/dataAccess/editHistory.ts
new file mode 100644
index 00000000..828263f7
--- /dev/null
+++ b/app/src/api/dataAccess/editHistory.ts
@@ -0,0 +1,64 @@
+import db from '../../db';
+import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
+
+const baseQuery = `
+        SELECT
+            log_id as revision_id,
+            forward_patch,
+            reverse_patch,
+            date_trunc('minute', log_timestamp) as revision_timestamp,
+            username,
+            building_id
+        FROM logs
+        JOIN users ON logs.user_id = users.user_id`;
+
+export function getHistoryAfterId(id: string, count: number): Promise<EditHistoryEntry[]> {
+    /** 
+     * SQL with lower time bound specified (records after ID).
+     * The outer SELECT is so that final results are sorted by descending ID
+     * (like the other queries). The inner select is sorted in ascending order
+     * so that the right rows are returned when limiting the result set.
+     */
+    return db.manyOrNone(`
+        SELECT * FROM (
+            ${baseQuery}
+            WHERE log_id > $1
+            ORDER BY log_id ASC
+            LIMIT $2
+        ) AS result_asc ORDER BY log_id DESC`,
+        [id, count]
+    );
+}
+
+export function getHistoryBeforeId(id: string, count: number): Promise<EditHistoryEntry[]> {
+    return db.manyOrNone(`
+        ${baseQuery}
+        WHERE log_id < $1
+        ORDER BY log_id DESC
+        LIMIT $2
+    `, [id, count]);
+}
+
+export async function getLatestHistory(count: number) : Promise<EditHistoryEntry[]> {
+    return await db.manyOrNone(`
+        ${baseQuery}
+        ORDER BY log_id DESC
+        LIMIT $1
+    `, [count]);
+}
+
+export async function getIdOlderThan(id: string): Promise<string> {
+    return await db.oneOrNone(`
+        SELECT MAX(log_id) as log_id
+        FROM logs
+        WHERE log_id < $1
+    `, [id]);
+}
+
+export async function getIdNewerThan(id: string): Promise<string> {
+    return await db.oneOrNone(`
+        SELECT MIN(log_id) as log_id
+        FROM logs
+        WHERE log_id > $1
+    `, [id]);
+}

From 196c7b7873c19e5f9907458772d34009ff00cd27 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 27 Jan 2020 01:01:18 +0000
Subject: [PATCH 15/32] Add sorting helpers

---
 app/src/helpers.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/helpers.ts b/app/src/helpers.ts
index 372001e1..6f156561 100644
--- a/app/src/helpers.ts
+++ b/app/src/helpers.ts
@@ -34,3 +34,15 @@ export function isNullishOrEmpty(obj: any) {
 export function isEmptyArray(obj: any) {
     return Array.isArray(obj) && obj.length === 0;
 }
+
+type AccessorFunction<T, V> = (obj: T) => V;
+
+type CompareFunction<T> = (a: T, b: T) => number;
+
+export function numAsc<T, V extends number | bigint>(accessor: AccessorFunction<T, V>): CompareFunction<T>{
+    return (a: T, b: T) => Number(accessor(a) - accessor(b));
+}
+
+export function numDesc<T, V extends number | bigint>(accessor: AccessorFunction<T, V>): CompareFunction<T> {
+    return (a: T, b: T) => Number(accessor(b) - accessor(a));
+}

From e682cfa0746d2010f80bfb6fd51264242802f0e6 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 27 Jan 2020 01:06:58 +0000
Subject: [PATCH 16/32] Add edit history data access mock

---
 .../api/dataAccess/__mocks__/editHistory.ts   | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 app/src/api/dataAccess/__mocks__/editHistory.ts

diff --git a/app/src/api/dataAccess/__mocks__/editHistory.ts b/app/src/api/dataAccess/__mocks__/editHistory.ts
new file mode 100644
index 00000000..ad84e63b
--- /dev/null
+++ b/app/src/api/dataAccess/__mocks__/editHistory.ts
@@ -0,0 +1,67 @@
+import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
+import { numDesc } from '../../../helpers';
+
+const mockEditHistory =
+    jest.genMockFromModule('../editHistory') as typeof import('../editHistory') & {
+        __setHistory: (mockHistoryData: EditHistoryEntry[]) => void
+    };
+
+let mockData: EditHistoryEntry[] = [];
+
+mockEditHistory.__setHistory = function(mockHistoryData: EditHistoryEntry[]) {
+    mockData = mockHistoryData;
+};
+
+mockEditHistory.getHistoryAfterId = function(id: string, count: number): Promise<EditHistoryEntry[]> {
+    return Promise.resolve(
+        mockData
+            .filter(x => BigInt(x.revision_id) > BigInt(id))
+            .sort(numDesc(x => BigInt(x.revision_id)))
+            .slice(0, count)
+    );
+};
+
+mockEditHistory.getHistoryBeforeId = function(id: string, count: number): Promise<EditHistoryEntry[]> {
+    return Promise.resolve(
+        mockData
+            .filter(x => BigInt(x.revision_id) < BigInt(id))
+            .sort(numDesc(x => BigInt(x.revision_id)))
+            .slice(0, count)
+    );
+};
+
+mockEditHistory.getLatestHistory = function(count: number): Promise<EditHistoryEntry[]> {
+    return Promise.resolve(
+        mockData
+            .slice(mockData.length - count, mockData.length)
+            .sort(numDesc(x => BigInt(x.revision_id)))
+    );
+};
+
+mockEditHistory.getIdNewerThan = async function(id: string): Promise<string> {
+    const historyAfterId = await mockEditHistory.getHistoryAfterId(id, 1);
+    return historyAfterId[historyAfterId.length - 1]?.revision_id;
+};
+
+mockEditHistory.getIdOlderThan = async function(id: string): Promise<string> {
+    const historyBeforeId = await mockEditHistory.getHistoryBeforeId(id, 1);
+    return historyBeforeId[0]?.revision_id;
+};
+
+const {
+    __setHistory,
+    getHistoryAfterId,
+    getHistoryBeforeId,
+    getLatestHistory,
+    getIdNewerThan,
+    getIdOlderThan
+} = mockEditHistory;
+
+export {
+    __setHistory,
+    getHistoryAfterId,
+    getHistoryBeforeId,
+    getLatestHistory,
+    getIdNewerThan,
+    getIdOlderThan
+};

From 4ff64cda79158c88e9b09863dcbecb3043453493 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 27 Jan 2020 01:08:32 +0000
Subject: [PATCH 17/32] Rework edit history service, add unit tests

---
 .../services/__tests__/editHistory.test.ts    | 43 +++++++++++++++++++
 app/src/api/services/editHistory.ts           | 36 ++++++++++------
 2 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 app/src/api/services/__tests__/editHistory.test.ts

diff --git a/app/src/api/services/__tests__/editHistory.test.ts b/app/src/api/services/__tests__/editHistory.test.ts
new file mode 100644
index 00000000..5db92f5b
--- /dev/null
+++ b/app/src/api/services/__tests__/editHistory.test.ts
@@ -0,0 +1,43 @@
+import { mocked } from 'ts-jest/utils';
+
+import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
+import * as editHistoryData from '../../dataAccess/editHistory'; // manually mocked
+import { getGlobalEditHistory } from '../editHistory';
+
+jest.mock('../../dataAccess/editHistory');
+
+const mockedEditHistoryData = editHistoryData as typeof import('../../dataAccess/__mocks__/editHistory');
+
+describe('getGlobalEditHistory()', () => {
+    mockedEditHistoryData.__setHistory(
+        [...Array(20).keys()].map<EditHistoryEntry>(i => ({
+            revision_id: (100 + i) + '',
+            revision_timestamp: new Date(2019, 10, 1, 17, 20 + i).toISOString(),
+            username: 'testuser',
+            building_id: 1234567,
+            forward_patch: {},
+            reverse_patch: {}
+        }))
+    );
+
+    describe('without before/after parameters', () => {
+        it.each(
+            [
+                [0, []],
+                [3, ['119', '118', '117']],
+                [6, ['119', '118', '117', '116', '115', '114']]
+            ]
+        )('should return the N latest records in descending order', async (count: number, ids: string[]) => {
+            const historyResult = await getGlobalEditHistory(null, null, count);
+
+            expect(historyResult.history.map(h => h.revision_id)).toEqual(ids);
+        });
+    });
+
+    describe('with after ID parameter', () => {
+    });
+
+    describe('with before ID parameter', () => {
+
+    });
+});
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index e0891621..33c00698 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -1,20 +1,28 @@
-import db from '../../db';
+import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
+import { getHistoryAfterId, getHistoryBeforeId, getIdNewerThan, getIdOlderThan, getLatestHistory } from '../dataAccess/editHistory';
 
-async function getGlobalEditHistory() {
-    try {
-        return await db.manyOrNone(
-            `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp) as revision_timestamp, username, building_id
-            FROM logs, users
-            WHERE logs.user_id = users.user_id
-                AND log_timestamp >= now() - interval '7 days'
-            ORDER BY log_timestamp DESC`
-        );
-    } catch (error) {
-        console.error(error);
-        return [];
+async function getGlobalEditHistory(beforeId?: string, afterId?: string, count: number = 100) {
+    // limited set of records. Expected to be already ordered from newest to oldest
+    let editHistoryRecords: EditHistoryEntry[];
+
+    if(afterId != undefined) {
+        editHistoryRecords = await getHistoryAfterId(afterId, count);
+    } else if (beforeId != undefined) {
+        editHistoryRecords = await getHistoryBeforeId(beforeId, count);
+    } else {
+        editHistoryRecords = await getLatestHistory(count);
     }
-}
 
+    const newer = getIdNewerThan(editHistoryRecords[0]?.revision_id);
+    const older = getIdOlderThan(editHistoryRecords[editHistoryRecords.length-1]?.revision_id);
+    return {
+        history: editHistoryRecords,
+        paging: {
+            has_newer: newer != undefined,
+            has_older: older != undefined
+        }
+    };
+}
 
 export {
     getGlobalEditHistory

From 92ff5d71721e4c5160e959f492e31d36febe759e Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Wed, 29 Jan 2020 15:59:44 +0000
Subject: [PATCH 18/32] Add API error classes, parameter parsing functions

---
 app/src/api/api.ts                            | 18 ++++++++-
 app/src/api/controllers/buildingController.ts | 14 +++----
 app/src/api/controllers/extractController.ts  |  5 ++-
 app/src/api/errors.ts                         | 38 ++++++++++++++++++
 app/src/api/helpers.ts                        | 10 -----
 app/src/api/parameters.ts                     | 40 +++++++++++++++++++
 6 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 app/src/api/errors.ts
 delete mode 100644 app/src/api/helpers.ts
 create mode 100644 app/src/api/parameters.ts

diff --git a/app/src/api/api.ts b/app/src/api/api.ts
index 59471b6b..cb6a95e9 100644
--- a/app/src/api/api.ts
+++ b/app/src/api/api.ts
@@ -93,14 +93,28 @@ server.get('/search', function (req, res) {
     });
 });
 
-server.use((err, req, res, next) => {
+server.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
     if (res.headersSent) {
         return next(err);
     }
 
     if (err != undefined) {
         console.log('Global error handler: ', err);
-        res.status(500).send({ error: 'Server error' });
+        
+        if (err instanceof UserInputError) {
+            let errorMessage: string;
+
+            if(err instanceof RequestParameterError) {
+                errorMessage = `Problem with parameter ${err.paramName}: ${err.message}`;
+            } else {
+                errorMessage = err.message;
+            }
+
+            res.status(400).send({ error: errorMessage });
+        } else {
+            res.status(500).send({ error: 'Server error' });
+        }
+        
     }
 });
 
diff --git a/app/src/api/controllers/buildingController.ts b/app/src/api/controllers/buildingController.ts
index 3993b619..41d53b01 100644
--- a/app/src/api/controllers/buildingController.ts
+++ b/app/src/api/controllers/buildingController.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 
-import { parseIntParam } from '../helpers';
+import { parseIntParam, processParam } from '../parameters';
 import asyncController from '../routes/asyncController';
 import * as buildingService from '../services/building';
 import * as userService from '../services/user';
@@ -35,7 +35,7 @@ const getBuildingsByReference = asyncController(async (req: express.Request, res
 
 // GET individual building, POST building updates
 const getBuildingById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
 
     try {
         const result = await buildingService.getBuildingById(buildingId);
@@ -63,7 +63,7 @@ const updateBuildingById = asyncController(async (req: express.Request, res: exp
 });
 
 async function updateBuilding(req: express.Request, res: express.Response, userId: string) {
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
 
     const buildingUpdate = req.body;
 
@@ -84,7 +84,7 @@ async function updateBuilding(req: express.Request, res: express.Response, userI
 
 // GET building UPRNs
 const getBuildingUPRNsById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
 
     try {
         const result = await buildingService.getBuildingUPRNsById(buildingId);
@@ -105,7 +105,7 @@ const getBuildingLikeById = asyncController(async (req: express.Request, res: ex
         return res.send({ like: false });  // not logged in, so cannot have liked
     }
 
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
     
     try {
         const like = await buildingService.getBuildingLikeById(buildingId, req.session.user_id);
@@ -118,7 +118,7 @@ const getBuildingLikeById = asyncController(async (req: express.Request, res: ex
 });
 
 const getBuildingEditHistoryById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
 
     try {
         const editHistory = await buildingService.getBuildingEditHistory(buildingId);
@@ -134,7 +134,7 @@ const updateBuildingLikeById = asyncController(async (req: express.Request, res:
         return res.send({ error: 'Must be logged in' });
     }
 
-    const buildingId = parseIntParam(req.params.building_id);
+    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
     const { like } = req.body;
 
     try {
diff --git a/app/src/api/controllers/extractController.ts b/app/src/api/controllers/extractController.ts
index 369459be..29d041ae 100644
--- a/app/src/api/controllers/extractController.ts
+++ b/app/src/api/controllers/extractController.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 
-import { parseIntParam } from '../helpers';
+import { parseIntParam, processParam } from '../parameters';
 import asyncController from '../routes/asyncController';
 import * as dataExtractService from '../services/dataExtract';
 
@@ -15,8 +15,9 @@ const getAllDataExtracts = asyncController(async function(req: express.Request,
 });
 
 const getDataExtract = asyncController(async function(req: express.Request, res: express.Response) {
+    const extractId = processParam(req.params, 'extract_id', parseIntParam, true);
+    
     try {
-        const extractId = parseIntParam(req.params.extract_id);
         const extract = await dataExtractService.getDataExtractById(extractId);
         res.send({ extract: extract });
     } catch (err) {
diff --git a/app/src/api/errors.ts b/app/src/api/errors.ts
new file mode 100644
index 00000000..5d3eb475
--- /dev/null
+++ b/app/src/api/errors.ts
@@ -0,0 +1,38 @@
+/**
+ * Note that custom errors and the instanceof operator in TS work together
+ * only when transpiling to ES2015 and up.
+ * For earier target versions (ES5), a workaround is required:
+ * https://stackoverflow.com/questions/41102060/typescript-extending-error-class
+ */
+
+class UserInputError extends Error {
+    constructor(message?: string) {
+        super(message);
+    }
+}
+
+class RequestParameterError extends UserInputError {
+    public paramName: string;
+
+    constructor(message?: string) {
+        super(message);
+    }
+}
+
+class ParamRequiredError extends RequestParameterError {
+    constructor(message?: string) {
+        super(message);
+    }
+}
+
+class ParamOutOfBoundsError extends RequestParameterError {
+    constructor(message?: string) {
+        super(message);
+    }
+}
+
+class ParamInvalidFormatError extends RequestParameterError {
+    constructor(message?: string) {
+        super(message);
+    }
+}
diff --git a/app/src/api/helpers.ts b/app/src/api/helpers.ts
deleted file mode 100644
index bfdf6cf9..00000000
--- a/app/src/api/helpers.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { strictParseInt } from '../parse';
-
-export function parseIntParam(param: string, paramName?: string) {
-    const result = strictParseInt(param);
-    if (isNaN(result)) {
-        const paramNameString = paramName == undefined ? '' : paramName + ' ';
-        throw new Error(`Invalid parameter ${paramNameString}format: not an integer`);
-    }
-    return result;
-}
diff --git a/app/src/api/parameters.ts b/app/src/api/parameters.ts
new file mode 100644
index 00000000..612eef82
--- /dev/null
+++ b/app/src/api/parameters.ts
@@ -0,0 +1,40 @@
+import { strictParseInt } from '../parse';
+
+
+export function processParam<T>(params: object, paramName: string, processingFn: (x: string) => T, required: boolean = false) {
+    const stringValue = params[paramName];
+
+    if(stringValue == undefined && required) {
+        const err = new ParamRequiredError('Parameter required but not supplied');
+        err.paramName = paramName;
+        throw err;
+    }
+
+    try {
+        return processingFn(stringValue);
+    } catch(error) {
+        if(error instanceof RequestParameterError) {
+            error.paramName = paramName;
+        }
+        
+        throw error;
+    }
+}
+
+export function parseIntParam(param: string) {
+    if(param == undefined) return undefined;
+    
+    const result = strictParseInt(param);
+    if (isNaN(result)) {
+        throw new ParamInvalidFormatError('Invalid format: not an integer');
+    }
+    return result;
+}
+
+export function checkRegexParam(param: string, regex: RegExp): string {
+    if(param == undefined) return undefined;
+
+    if(param.match(regex) == undefined) {
+        throw new ParamInvalidFormatError(`Invalid format: does not match regular expression ${regex}`);
+    }
+}

From 899e450edae6d85e01ef693dca70aab2e7a8eb28 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Wed, 29 Jan 2020 17:24:04 +0000
Subject: [PATCH 19/32] Add missing API error class exports/imports

---
 app/src/api/api.ts        |  1 +
 app/src/api/errors.ts     | 10 +++++-----
 app/src/api/parameters.ts |  4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/api/api.ts b/app/src/api/api.ts
index cb6a95e9..79458ee5 100644
--- a/app/src/api/api.ts
+++ b/app/src/api/api.ts
@@ -2,6 +2,7 @@ import bodyParser from 'body-parser';
 import express from 'express';
 
 import * as editHistoryController from './controllers/editHistoryController';
+import { RequestParameterError, UserInputError } from './errors'; 
 import buildingsRouter from './routes/buildingsRouter';
 import extractsRouter from './routes/extractsRouter';
 import usersRouter from './routes/usersRouter';
diff --git a/app/src/api/errors.ts b/app/src/api/errors.ts
index 5d3eb475..e1d1bd35 100644
--- a/app/src/api/errors.ts
+++ b/app/src/api/errors.ts
@@ -5,13 +5,13 @@
  * https://stackoverflow.com/questions/41102060/typescript-extending-error-class
  */
 
-class UserInputError extends Error {
+export class UserInputError extends Error {
     constructor(message?: string) {
         super(message);
     }
 }
 
-class RequestParameterError extends UserInputError {
+export class RequestParameterError extends UserInputError {
     public paramName: string;
 
     constructor(message?: string) {
@@ -19,19 +19,19 @@ class RequestParameterError extends UserInputError {
     }
 }
 
-class ParamRequiredError extends RequestParameterError {
+export class ParamRequiredError extends RequestParameterError {
     constructor(message?: string) {
         super(message);
     }
 }
 
-class ParamOutOfBoundsError extends RequestParameterError {
+export class ParamOutOfBoundsError extends RequestParameterError {
     constructor(message?: string) {
         super(message);
     }
 }
 
-class ParamInvalidFormatError extends RequestParameterError {
+export class ParamInvalidFormatError extends RequestParameterError {
     constructor(message?: string) {
         super(message);
     }
diff --git a/app/src/api/parameters.ts b/app/src/api/parameters.ts
index 612eef82..0146dc97 100644
--- a/app/src/api/parameters.ts
+++ b/app/src/api/parameters.ts
@@ -1,5 +1,7 @@
 import { strictParseInt } from '../parse';
 
+import { ParamInvalidFormatError, ParamRequiredError, RequestParameterError } from './errors';
+
 
 export function processParam<T>(params: object, paramName: string, processingFn: (x: string) => T, required: boolean = false) {
     const stringValue = params[paramName];
@@ -37,4 +39,6 @@ export function checkRegexParam(param: string, regex: RegExp): string {
     if(param.match(regex) == undefined) {
         throw new ParamInvalidFormatError(`Invalid format: does not match regular expression ${regex}`);
     }
+    
+    return param;
 }

From 2d4682685b382335e5f50f5e7e01aad82d5c7c6a Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Wed, 29 Jan 2020 17:24:44 +0000
Subject: [PATCH 20/32] Fix edit history data access queries/usage

---
 app/src/api/dataAccess/editHistory.ts | 20 ++++++++++++--------
 app/src/api/services/editHistory.ts   |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/api/dataAccess/editHistory.ts b/app/src/api/dataAccess/editHistory.ts
index 828263f7..b14933cb 100644
--- a/app/src/api/dataAccess/editHistory.ts
+++ b/app/src/api/dataAccess/editHistory.ts
@@ -23,9 +23,9 @@ export function getHistoryAfterId(id: string, count: number): Promise<EditHistor
         SELECT * FROM (
             ${baseQuery}
             WHERE log_id > $1
-            ORDER BY log_id ASC
+            ORDER BY revision_id ASC
             LIMIT $2
-        ) AS result_asc ORDER BY log_id DESC`,
+        ) AS result_asc ORDER BY revision_id DESC`,
         [id, count]
     );
 }
@@ -34,7 +34,7 @@ export function getHistoryBeforeId(id: string, count: number): Promise<EditHisto
     return db.manyOrNone(`
         ${baseQuery}
         WHERE log_id < $1
-        ORDER BY log_id DESC
+        ORDER BY revision_id DESC
         LIMIT $2
     `, [id, count]);
 }
@@ -42,23 +42,27 @@ export function getHistoryBeforeId(id: string, count: number): Promise<EditHisto
 export async function getLatestHistory(count: number) : Promise<EditHistoryEntry[]> {
     return await db.manyOrNone(`
         ${baseQuery}
-        ORDER BY log_id DESC
+        ORDER BY revision_id DESC
         LIMIT $1
     `, [count]);
 }
 
 export async function getIdOlderThan(id: string): Promise<string> {
-    return await db.oneOrNone(`
-        SELECT MAX(log_id) as log_id
+    const result = await db.oneOrNone<{revision_id:string}>(`
+        SELECT MAX(log_id) as revision_id
         FROM logs
         WHERE log_id < $1
     `, [id]);
+
+    return result?.revision_id;
 }
 
 export async function getIdNewerThan(id: string): Promise<string> {
-    return await db.oneOrNone(`
-        SELECT MIN(log_id) as log_id
+    const result = await db.oneOrNone<{revision_id:string}>(`
+        SELECT MIN(log_id) as revision_id
         FROM logs
         WHERE log_id > $1
     `, [id]);
+
+    return result?.revision_id;
 }
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index 33c00698..5e0f53fe 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -13,8 +13,8 @@ async function getGlobalEditHistory(beforeId?: string, afterId?: string, count:
         editHistoryRecords = await getLatestHistory(count);
     }
 
-    const newer = getIdNewerThan(editHistoryRecords[0]?.revision_id);
-    const older = getIdOlderThan(editHistoryRecords[editHistoryRecords.length-1]?.revision_id);
+    const newer = await getIdNewerThan(editHistoryRecords[0]?.revision_id);
+    const older = await getIdOlderThan(editHistoryRecords[editHistoryRecords.length-1]?.revision_id);
     return {
         history: editHistoryRecords,
         paging: {

From 60d087c4245549315d2ee0b99efaeecf95dfaee8 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 30 Jan 2020 15:27:48 +0000
Subject: [PATCH 21/32] Fix mock edit history data access

---
 app/src/api/dataAccess/__mocks__/editHistory.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/api/dataAccess/__mocks__/editHistory.ts b/app/src/api/dataAccess/__mocks__/editHistory.ts
index ad84e63b..2e069301 100644
--- a/app/src/api/dataAccess/__mocks__/editHistory.ts
+++ b/app/src/api/dataAccess/__mocks__/editHistory.ts
@@ -9,14 +9,13 @@ const mockEditHistory =
 let mockData: EditHistoryEntry[] = [];
 
 mockEditHistory.__setHistory = function(mockHistoryData: EditHistoryEntry[]) {
-    mockData = mockHistoryData;
+    mockData = mockHistoryData.sort(numDesc(x => BigInt(x.revision_id)));
 };
 
 mockEditHistory.getHistoryAfterId = function(id: string, count: number): Promise<EditHistoryEntry[]> {
     return Promise.resolve(
         mockData
             .filter(x => BigInt(x.revision_id) > BigInt(id))
-            .sort(numDesc(x => BigInt(x.revision_id)))
             .slice(0, count)
     );
 };
@@ -25,16 +24,15 @@ mockEditHistory.getHistoryBeforeId = function(id: string, count: number): Promis
     return Promise.resolve(
         mockData
             .filter(x => BigInt(x.revision_id) < BigInt(id))
-            .sort(numDesc(x => BigInt(x.revision_id)))
             .slice(0, count)
     );
 };
 
 mockEditHistory.getLatestHistory = function(count: number): Promise<EditHistoryEntry[]> {
+    
     return Promise.resolve(
         mockData
-            .slice(mockData.length - count, mockData.length)
-            .sort(numDesc(x => BigInt(x.revision_id)))
+            .slice(0, count)
     );
 };
 

From 297f7ccf5ff006d39a60599cc568b92a48b23007 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Thu, 30 Jan 2020 18:23:59 +0000
Subject: [PATCH 22/32] Update edit history service tests and implementation

---
 .../api/dataAccess/__mocks__/editHistory.ts   |  16 +--
 app/src/api/dataAccess/editHistory.ts         |  31 +++--
 .../services/__tests__/editHistory.test.ts    | 123 ++++++++++++++----
 app/src/api/services/editHistory.ts           |  25 ++--
 4 files changed, 139 insertions(+), 56 deletions(-)

diff --git a/app/src/api/dataAccess/__mocks__/editHistory.ts b/app/src/api/dataAccess/__mocks__/editHistory.ts
index 2e069301..50d01a79 100644
--- a/app/src/api/dataAccess/__mocks__/editHistory.ts
+++ b/app/src/api/dataAccess/__mocks__/editHistory.ts
@@ -1,5 +1,5 @@
 import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
-import { numDesc } from '../../../helpers';
+import { numAsc, numDesc } from '../../../helpers';
 
 const mockEditHistory =
     jest.genMockFromModule('../editHistory') as typeof import('../editHistory') & {
@@ -16,22 +16,16 @@ mockEditHistory.getHistoryAfterId = function(id: string, count: number): Promise
     return Promise.resolve(
         mockData
             .filter(x => BigInt(x.revision_id) > BigInt(id))
+            .sort(numAsc(x => BigInt(x.revision_id)))
             .slice(0, count)
+            .sort(numDesc(x => BigInt(x.revision_id)))
     );
 };
 
 mockEditHistory.getHistoryBeforeId = function(id: string, count: number): Promise<EditHistoryEntry[]> {
+    let filteredData = id == undefined ? mockData : mockData.filter(x => BigInt(x.revision_id) < BigInt(id));
     return Promise.resolve(
-        mockData
-            .filter(x => BigInt(x.revision_id) < BigInt(id))
-            .slice(0, count)
-    );
-};
-
-mockEditHistory.getLatestHistory = function(count: number): Promise<EditHistoryEntry[]> {
-    
-    return Promise.resolve(
-        mockData
+        filteredData
             .slice(0, count)
     );
 };
diff --git a/app/src/api/dataAccess/editHistory.ts b/app/src/api/dataAccess/editHistory.ts
index b14933cb..b16c097c 100644
--- a/app/src/api/dataAccess/editHistory.ts
+++ b/app/src/api/dataAccess/editHistory.ts
@@ -31,20 +31,23 @@ export function getHistoryAfterId(id: string, count: number): Promise<EditHistor
 }
 
 export function getHistoryBeforeId(id: string, count: number): Promise<EditHistoryEntry[]> {
-    return db.manyOrNone(`
-        ${baseQuery}
-        WHERE log_id < $1
-        ORDER BY revision_id DESC
-        LIMIT $2
-    `, [id, count]);
-}
-
-export async function getLatestHistory(count: number) : Promise<EditHistoryEntry[]> {
-    return await db.manyOrNone(`
-        ${baseQuery}
-        ORDER BY revision_id DESC
-        LIMIT $1
-    `, [count]);
+    if(id == undefined) {
+        
+        return db.any(`
+            ${baseQuery}
+            ORDER BY revision_id DESC
+            LIMIT $1
+        `, [count]);
+        
+    } else {
+        
+        return db.any(`
+            ${baseQuery}
+            WHERE log_id < $1
+            ORDER BY revision_id DESC
+            LIMIT $2
+        `, [id, count]);
+    }
 }
 
 export async function getIdOlderThan(id: string): Promise<string> {
diff --git a/app/src/api/services/__tests__/editHistory.test.ts b/app/src/api/services/__tests__/editHistory.test.ts
index 5db92f5b..45963ea2 100644
--- a/app/src/api/services/__tests__/editHistory.test.ts
+++ b/app/src/api/services/__tests__/editHistory.test.ts
@@ -1,5 +1,3 @@
-import { mocked } from 'ts-jest/utils';
-
 import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
 import * as editHistoryData from '../../dataAccess/editHistory'; // manually mocked
 import { getGlobalEditHistory } from '../editHistory';
@@ -8,36 +6,115 @@ jest.mock('../../dataAccess/editHistory');
 
 const mockedEditHistoryData = editHistoryData as typeof import('../../dataAccess/__mocks__/editHistory');
 
-describe('getGlobalEditHistory()', () => {
-    mockedEditHistoryData.__setHistory(
-        [...Array(20).keys()].map<EditHistoryEntry>(i => ({
-            revision_id: (100 + i) + '',
-            revision_timestamp: new Date(2019, 10, 1, 17, 20 + i).toISOString(),
-            username: 'testuser',
-            building_id: 1234567,
-            forward_patch: {},
-            reverse_patch: {}
-        }))
-    );
+function generateHistory(n: number, firstId: number = 100) {
+    return [...Array(n).keys()].map<EditHistoryEntry>(i => ({
+        revision_id: (firstId + i) + '',
+        revision_timestamp: new Date(2019, 10, 1, 17, 20 + i).toISOString(),
+        username: 'testuser',
+        building_id: 1234567,
+        forward_patch: {},
+        reverse_patch: {}
+    }));
+}
+
+describe('getGlobalEditHistory()', () => {
+    
+    beforeEach(() => {
+        mockedEditHistoryData.__setHistory(
+            generateHistory(20)
+        );
+    });
+    
+    describe('getting history before a point', () => {
+
+        it('should return latest history if no ID specified', async () => {
+            const result = await getGlobalEditHistory(null, null, 5);
+
+            expect(result.history.map(x => x.revision_id)).toEqual(['119', '118', '117', '116', '115']);
+        });
 
-    describe('without before/after parameters', () => {
         it.each(
             [
-                [0, []],
-                [3, ['119', '118', '117']],
-                [6, ['119', '118', '117', '116', '115', '114']]
+                [null, 3, ['119', '118', '117']],
+                [null, 6, ['119', '118', '117', '116', '115', '114']],
+                ['118', 0, []],
             ]
-        )('should return the N latest records in descending order', async (count: number, ids: string[]) => {
-            const historyResult = await getGlobalEditHistory(null, null, count);
+        )('should return the N records before the specified ID in descending order [beforeId: %p, count: %p]', async (
+            beforeId: string, count: number, ids: string[]
+        ) => {
+            const result = await getGlobalEditHistory(beforeId, null, count);
 
-            expect(historyResult.history.map(h => h.revision_id)).toEqual(ids);
+            expect(result.history.map(h => h.revision_id)).toEqual(ids);
+        });
+
+        it.each([
+            [null, 4, true, false],
+            [null, 10, true, false],
+            [null, 20, false, false],
+            [null, 30, false, false],
+            ['50', 10, false, true],
+            ['100', 10, false, true],
+            ['105', 2, true, true],
+        ])('should indicate if there are any newer or older records [beforeId: %p, count: %p]', async (
+            beforeId: string, count: number, hasOlder: boolean, hasNewer: boolean
+        ) => {
+            const result = await getGlobalEditHistory(beforeId, null, count);
+
+            expect(result.paging.has_older).toBe(hasOlder);
+            expect(result.paging.has_newer).toBe(hasNewer);
+        });
+
+
+        it('should not return more than 100 entries', async () => {
+            mockedEditHistoryData.__setHistory(
+                generateHistory(200)
+            );
+
+            const result = await getGlobalEditHistory(null, null, 200);
+
+            expect(result.paging.has_older).toBeTruthy();
+            expect(result.history.length).toBe(100);
+        });
+
+        it('should default to 100 entries', async () => {
+            mockedEditHistoryData.__setHistory(
+                generateHistory(200)
+            );
+
+            const result = await getGlobalEditHistory(null, null, 200);
+
+            expect(result.paging.has_older).toBeTruthy();
+            expect(result.history.length).toBe(100);
         });
     });
 
-    describe('with after ID parameter', () => {
-    });
 
-    describe('with before ID parameter', () => {
+    describe('getting history after a point', () => {
 
+        it.each([
+            ['100', 7, ['107', '106', '105', '104', '103', '102', '101']],
+            ['115', 3, ['118', '117', '116']],
+            ['120', 10, []]
+        ])('should return N records after requested ID in descending order [afterId: %p, count: %p]', async (
+            afterId: string, count: number, expected: string[]
+        ) => {
+            const result = await getGlobalEditHistory(null, afterId, count);
+
+            expect(result.history.map(x => x.revision_id)).toEqual(expected);
+        });
+
+        it.each([
+            ['99', 10, false, true],
+            ['110', 5, true, true],
+            ['119', 20, true, false],
+            ['99', 20, false, false]
+        ])('should indicate if there are any newer or older records [afterId: %p, count: %p]', async (
+            afterId: string, count: number, hasOlder:boolean, hasNewer: boolean
+        ) => {
+            const result = await getGlobalEditHistory(null, afterId, count);
+
+            expect(result.paging.has_older).toBe(hasOlder);
+            expect(result.paging.has_newer).toBe(hasNewer);
+        });
     });
 });
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index 5e0f53fe..58edae16 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -1,25 +1,34 @@
 import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
-import { getHistoryAfterId, getHistoryBeforeId, getIdNewerThan, getIdOlderThan, getLatestHistory } from '../dataAccess/editHistory';
+import { getHistoryAfterId, getHistoryBeforeId, getIdNewerThan, getIdOlderThan } from '../dataAccess/editHistory';
 
 async function getGlobalEditHistory(beforeId?: string, afterId?: string, count: number = 100) {
+    if(count > 100) count = 100;
+
     // limited set of records. Expected to be already ordered from newest to oldest
     let editHistoryRecords: EditHistoryEntry[];
 
     if(afterId != undefined) {
         editHistoryRecords = await getHistoryAfterId(afterId, count);
-    } else if (beforeId != undefined) {
-        editHistoryRecords = await getHistoryBeforeId(beforeId, count);
     } else {
-        editHistoryRecords = await getLatestHistory(count);
+        editHistoryRecords = await getHistoryBeforeId(beforeId, count);
     }
 
-    const newer = await getIdNewerThan(editHistoryRecords[0]?.revision_id);
-    const older = await getIdOlderThan(editHistoryRecords[editHistoryRecords.length-1]?.revision_id);
+    const currentBatchNewerBound = editHistoryRecords[0]?.revision_id ?? beforeId;
+    const newer = currentBatchNewerBound && await getIdNewerThan(currentBatchNewerBound);
+
+    const currentBatchOlderBound = editHistoryRecords[editHistoryRecords.length-1]?.revision_id ?? afterId;
+    const older = currentBatchOlderBound && await getIdOlderThan(currentBatchOlderBound);
+    
+    const hasNewer = newer != undefined;
+    const hasOlder = older != undefined;
+
     return {
         history: editHistoryRecords,
         paging: {
-            has_newer: newer != undefined,
-            has_older: older != undefined
+            has_newer: hasNewer,
+            id_for_newer_query: null,
+            has_older: hasOlder,
+            id_for_older_query: null
         }
     };
 }

From 928eed6671b71ba2ea04710b62e97e1e232d1c73 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 15:35:34 +0000
Subject: [PATCH 23/32] Clarify param parser handling positive integers

---
 app/src/api/controllers/buildingController.ts   | 14 +++++++-------
 app/src/api/controllers/extractController.ts    |  4 ++--
 app/src/api/dataAccess/__mocks__/editHistory.ts |  7 +++++--
 app/src/api/parameters.ts                       |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/api/controllers/buildingController.ts b/app/src/api/controllers/buildingController.ts
index 41d53b01..0bb6ad23 100644
--- a/app/src/api/controllers/buildingController.ts
+++ b/app/src/api/controllers/buildingController.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 
-import { parseIntParam, processParam } from '../parameters';
+import { parsePositiveIntParam, processParam } from '../parameters';
 import asyncController from '../routes/asyncController';
 import * as buildingService from '../services/building';
 import * as userService from '../services/user';
@@ -35,7 +35,7 @@ const getBuildingsByReference = asyncController(async (req: express.Request, res
 
 // GET individual building, POST building updates
 const getBuildingById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
 
     try {
         const result = await buildingService.getBuildingById(buildingId);
@@ -63,7 +63,7 @@ const updateBuildingById = asyncController(async (req: express.Request, res: exp
 });
 
 async function updateBuilding(req: express.Request, res: express.Response, userId: string) {
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
 
     const buildingUpdate = req.body;
 
@@ -84,7 +84,7 @@ async function updateBuilding(req: express.Request, res: express.Response, userI
 
 // GET building UPRNs
 const getBuildingUPRNsById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
 
     try {
         const result = await buildingService.getBuildingUPRNsById(buildingId);
@@ -105,7 +105,7 @@ const getBuildingLikeById = asyncController(async (req: express.Request, res: ex
         return res.send({ like: false });  // not logged in, so cannot have liked
     }
 
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
     
     try {
         const like = await buildingService.getBuildingLikeById(buildingId, req.session.user_id);
@@ -118,7 +118,7 @@ const getBuildingLikeById = asyncController(async (req: express.Request, res: ex
 });
 
 const getBuildingEditHistoryById = asyncController(async (req: express.Request, res: express.Response) => {
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
 
     try {
         const editHistory = await buildingService.getBuildingEditHistory(buildingId);
@@ -134,7 +134,7 @@ const updateBuildingLikeById = asyncController(async (req: express.Request, res:
         return res.send({ error: 'Must be logged in' });
     }
 
-    const buildingId = processParam(req.params, 'building_id', parseIntParam, true);
+    const buildingId = processParam(req.params, 'building_id', parsePositiveIntParam, true);
     const { like } = req.body;
 
     try {
diff --git a/app/src/api/controllers/extractController.ts b/app/src/api/controllers/extractController.ts
index 29d041ae..077d69c5 100644
--- a/app/src/api/controllers/extractController.ts
+++ b/app/src/api/controllers/extractController.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 
-import { parseIntParam, processParam } from '../parameters';
+import { parsePositiveIntParam, processParam } from '../parameters';
 import asyncController from '../routes/asyncController';
 import * as dataExtractService from '../services/dataExtract';
 
@@ -15,7 +15,7 @@ const getAllDataExtracts = asyncController(async function(req: express.Request,
 });
 
 const getDataExtract = asyncController(async function(req: express.Request, res: express.Response) {
-    const extractId = processParam(req.params, 'extract_id', parseIntParam, true);
+    const extractId = processParam(req.params, 'extract_id', parsePositiveIntParam, true);
     
     try {
         const extract = await dataExtractService.getDataExtractById(extractId);
diff --git a/app/src/api/dataAccess/__mocks__/editHistory.ts b/app/src/api/dataAccess/__mocks__/editHistory.ts
index 50d01a79..b4636864 100644
--- a/app/src/api/dataAccess/__mocks__/editHistory.ts
+++ b/app/src/api/dataAccess/__mocks__/editHistory.ts
@@ -1,6 +1,11 @@
 import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
 import { numAsc, numDesc } from '../../../helpers';
 
+/**
+ * Create an object mocking all method of editHistory dataAccess
+ * The type is set to reflect the type of that module, with added methods
+ * used when testing
+ */
 const mockEditHistory =
     jest.genMockFromModule('../editHistory') as typeof import('../editHistory') & {
         __setHistory: (mockHistoryData: EditHistoryEntry[]) => void
@@ -44,7 +49,6 @@ const {
     __setHistory,
     getHistoryAfterId,
     getHistoryBeforeId,
-    getLatestHistory,
     getIdNewerThan,
     getIdOlderThan
 } = mockEditHistory;
@@ -53,7 +57,6 @@ export {
     __setHistory,
     getHistoryAfterId,
     getHistoryBeforeId,
-    getLatestHistory,
     getIdNewerThan,
     getIdOlderThan
 };
diff --git a/app/src/api/parameters.ts b/app/src/api/parameters.ts
index 0146dc97..19c84fcb 100644
--- a/app/src/api/parameters.ts
+++ b/app/src/api/parameters.ts
@@ -23,12 +23,12 @@ export function processParam<T>(params: object, paramName: string, processingFn:
     }
 }
 
-export function parseIntParam(param: string) {
+export function parsePositiveIntParam(param: string) {
     if(param == undefined) return undefined;
     
     const result = strictParseInt(param);
     if (isNaN(result)) {
-        throw new ParamInvalidFormatError('Invalid format: not an integer');
+        throw new ParamInvalidFormatError('Invalid format: not a positive integer');
     }
     return result;
 }

From 908f3181e670d1ae53a2f6ea9c371a2cf10f07b2 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 15:36:37 +0000
Subject: [PATCH 24/32] Remove babel loader from build pipeline

---
 app/.babelrc         | 13 -------------
 app/razzle.config.js | 11 -----------
 2 files changed, 24 deletions(-)
 delete mode 100644 app/.babelrc

diff --git a/app/.babelrc b/app/.babelrc
deleted file mode 100644
index 1578f26a..00000000
--- a/app/.babelrc
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "plugins": [
-        "@babel/plugin-syntax-jsx",
-        "@babel/plugin-syntax-typescript",
-        [
-            "babel-plugin-typescript-to-proptypes",
-            {
-                "implicitChildren": true,
-                "typeCheck": true
-            }
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/app/razzle.config.js b/app/razzle.config.js
index 42bd60aa..aa6348cd 100644
--- a/app/razzle.config.js
+++ b/app/razzle.config.js
@@ -9,17 +9,6 @@ module.exports = {
         })
         config.module.rules = rules;
 
-        // find module rule that runs ts-loader for TS(X) files
-        const tsRule = config.module.rules.find(r => 
-            new RegExp(r.test).test('test.tsx') && Array.isArray(r.use) && r.use.some(u => u.loader.includes('ts-loader')));
-
-        // run babel-loader before ts-loader to generate propTypes
-        tsRule.use.push({
-            loader: 'babel-loader',
-            options: {
-                babelrc: true
-            }
-        })
         return config;
     },
 };

From 753c84acb7c9686cc5251fc55b25c00c88a31359 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 15:39:47 +0000
Subject: [PATCH 25/32] Update edit history tests and implementation

---
 .../services/__tests__/editHistory.test.ts    | 142 ++++++++++++------
 app/src/api/services/editHistory.ts           |  23 +--
 app/src/helpers.ts                            |  12 ++
 3 files changed, 122 insertions(+), 55 deletions(-)

diff --git a/app/src/api/services/__tests__/editHistory.test.ts b/app/src/api/services/__tests__/editHistory.test.ts
index 45963ea2..9876d5ac 100644
--- a/app/src/api/services/__tests__/editHistory.test.ts
+++ b/app/src/api/services/__tests__/editHistory.test.ts
@@ -1,5 +1,6 @@
 import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
 import * as editHistoryData from '../../dataAccess/editHistory'; // manually mocked
+import { UserInputError } from '../../errors';
 import { getGlobalEditHistory } from '../editHistory';
 
 jest.mock('../../dataAccess/editHistory');
@@ -19,10 +20,16 @@ function generateHistory(n: number, firstId: number = 100) {
 
 describe('getGlobalEditHistory()', () => {
     
-    beforeEach(() => {
-        mockedEditHistoryData.__setHistory(
-            generateHistory(20)
-        );
+    beforeEach(() => mockedEditHistoryData.__setHistory(generateHistory(20)));
+
+    afterEach(() => jest.clearAllMocks());
+
+    it.each([
+        [null, null],
+        ['100', null],
+        [null, '100']
+    ])('Should error when requesting non-positive number of records', (beforeId: string, afterId: string) => {
+        expect(getGlobalEditHistory(beforeId, afterId, 0)).rejects.toBeInstanceOf(UserInputError);
     });
     
     describe('getting history before a point', () => {
@@ -37,7 +44,9 @@ describe('getGlobalEditHistory()', () => {
             [
                 [null, 3, ['119', '118', '117']],
                 [null, 6, ['119', '118', '117', '116', '115', '114']],
-                ['118', 0, []],
+                ['118', 1, ['117']],
+                ['104', 10, ['103', '102','101', '100']],
+                ['100', 2, []]
             ]
         )('should return the N records before the specified ID in descending order [beforeId: %p, count: %p]', async (
             beforeId: string, count: number, ids: string[]
@@ -48,43 +57,39 @@ describe('getGlobalEditHistory()', () => {
         });
 
         it.each([
-            [null, 4, true, false],
-            [null, 10, true, false],
-            [null, 20, false, false],
-            [null, 30, false, false],
-            ['50', 10, false, true],
-            ['100', 10, false, true],
-            ['105', 2, true, true],
-        ])('should indicate if there are any newer or older records [beforeId: %p, count: %p]', async (
-            beforeId: string, count: number, hasOlder: boolean, hasNewer: boolean
+            [null, 4, null],
+            [null, 10, null],
+            [null, 20, null],
+            [null, 30, null],
+            ['50', 10, '99'],
+            ['100', 10, '99'],
+            ['130', 10, null],
+            ['105', 2, '104'],
+            ['120', 20, null],
+        ])('should detect if there are any newer records left [beforeId: %p, count: %p]', async (
+            beforeId: string, count: number, idForNewerQuery: string
         ) => {
             const result = await getGlobalEditHistory(beforeId, null, count);
 
-            expect(result.paging.has_older).toBe(hasOlder);
-            expect(result.paging.has_newer).toBe(hasNewer);
+            expect(result.paging.id_for_newer_query).toBe(idForNewerQuery);
         });
 
+        it.each([
+            [null, 4, '116'],
+            [null, 10, '110'],
+            [null, 20, null],
+            [null, 30, null],
+            ['50', 10, null],
+            ['100', 10, null],
+            ['130', 10, '110'],
+            ['105', 2, '103'],
+            ['120', 20, null],
+        ])('should detect if there are any older records left [beforeId: %p, count: %p]', async (
+            beforeId: string, count: number, idForOlderQuery: string
+        ) => {
+            const result = await getGlobalEditHistory(beforeId, null, count);
 
-        it('should not return more than 100 entries', async () => {
-            mockedEditHistoryData.__setHistory(
-                generateHistory(200)
-            );
-
-            const result = await getGlobalEditHistory(null, null, 200);
-
-            expect(result.paging.has_older).toBeTruthy();
-            expect(result.history.length).toBe(100);
-        });
-
-        it('should default to 100 entries', async () => {
-            mockedEditHistoryData.__setHistory(
-                generateHistory(200)
-            );
-
-            const result = await getGlobalEditHistory(null, null, 200);
-
-            expect(result.paging.has_older).toBeTruthy();
-            expect(result.history.length).toBe(100);
+            expect(result.paging.id_for_older_query).toBe(idForOlderQuery);
         });
     });
 
@@ -104,17 +109,66 @@ describe('getGlobalEditHistory()', () => {
         });
 
         it.each([
-            ['99', 10, false, true],
-            ['110', 5, true, true],
-            ['119', 20, true, false],
-            ['99', 20, false, false]
-        ])('should indicate if there are any newer or older records [afterId: %p, count: %p]', async (
-            afterId: string, count: number, hasOlder:boolean, hasNewer: boolean
+            ['99', 10, '109'],
+            ['110', 5, '115'],
+            ['119', 20, null],
+            ['99', 20, null],
+        ])('should detect if there are any newer records left [afterId: %p, count: %p]', async (
+            afterId: string, count: number, idForNewerQuery: string
         ) => {
             const result = await getGlobalEditHistory(null, afterId, count);
 
-            expect(result.paging.has_older).toBe(hasOlder);
-            expect(result.paging.has_newer).toBe(hasNewer);
+            expect(result.paging.id_for_newer_query).toBe(idForNewerQuery);
         });
+
+        it.each([
+            ['99', 10, null],
+            ['110', 5, '111'],
+            ['119', 20, '120'],
+            ['99', 20, null],
+        ])('should detect if there are any older records left [afterId: %p, count: %p]', async (
+            afterId: string, count: number, idForOlderQuery: string
+        ) => {
+            const result = await getGlobalEditHistory(null, afterId, count);
+
+            expect(result.paging.id_for_older_query).toBe(idForOlderQuery);
+        });
+        
+    });
+
+    describe('result count limit', () => {
+
+        it.each([
+            [null, null],
+            [null, '100'],
+            ['300', null]
+        ])('should not return more than 100 entries (beforeId: %p, afterId: %p)', async (
+            beforeId: string, afterId: string
+        ) => {
+            mockedEditHistoryData.__setHistory(
+                generateHistory(200)
+            );
+
+            const result = await getGlobalEditHistory(beforeId, afterId, 200);
+
+            expect(result.history.length).toBe(100);
+        });
+
+        it.each([
+            [null, null],
+            [null, '100'],
+            ['300', null]
+        ])('should default to 100 entries', async (
+            beforeId: string, afterId: string
+        ) => {
+            mockedEditHistoryData.__setHistory(
+                generateHistory(200)
+            );
+
+            const result = await getGlobalEditHistory(beforeId, afterId);
+
+            expect(result.history.length).toBe(100);
+        });
+
     });
 });
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index 58edae16..40299fe1 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -1,7 +1,10 @@
 import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
+import { decBigInt, incBigInt } from '../../helpers';
 import { getHistoryAfterId, getHistoryBeforeId, getIdNewerThan, getIdOlderThan } from '../dataAccess/editHistory';
+import { UserInputError } from '../errors';
 
 async function getGlobalEditHistory(beforeId?: string, afterId?: string, count: number = 100) {
+    if(count <= 0) throw new UserInputError('cannot request less than 1 history record');
     if(count > 100) count = 100;
 
     // limited set of records. Expected to be already ordered from newest to oldest
@@ -13,22 +16,20 @@ async function getGlobalEditHistory(beforeId?: string, afterId?: string, count:
         editHistoryRecords = await getHistoryBeforeId(beforeId, count);
     }
 
-    const currentBatchNewerBound = editHistoryRecords[0]?.revision_id ?? beforeId;
-    const newer = currentBatchNewerBound && await getIdNewerThan(currentBatchNewerBound);
+    const currentBatchMaxId = editHistoryRecords[0]?.revision_id ?? decBigInt(beforeId);
+    const newer = currentBatchMaxId && await getIdNewerThan(currentBatchMaxId);
 
-    const currentBatchOlderBound = editHistoryRecords[editHistoryRecords.length-1]?.revision_id ?? afterId;
-    const older = currentBatchOlderBound && await getIdOlderThan(currentBatchOlderBound);
-    
-    const hasNewer = newer != undefined;
-    const hasOlder = older != undefined;
+    const currentBatchMinId = editHistoryRecords[editHistoryRecords.length-1]?.revision_id ?? incBigInt(afterId);
+    const older = currentBatchMinId && await getIdOlderThan(currentBatchMinId);
+
+    const idForOlderQuery = older != undefined ? incBigInt(older) : null;
+    const idForNewerQuery = newer != undefined ? decBigInt(newer) : null;
 
     return {
         history: editHistoryRecords,
         paging: {
-            has_newer: hasNewer,
-            id_for_newer_query: null,
-            has_older: hasOlder,
-            id_for_older_query: null
+            id_for_newer_query: idForNewerQuery,
+            id_for_older_query: idForOlderQuery
         }
     };
 }
diff --git a/app/src/helpers.ts b/app/src/helpers.ts
index 6f156561..905b59d9 100644
--- a/app/src/helpers.ts
+++ b/app/src/helpers.ts
@@ -46,3 +46,15 @@ export function numAsc<T, V extends number | bigint>(accessor: AccessorFunction<
 export function numDesc<T, V extends number | bigint>(accessor: AccessorFunction<T, V>): CompareFunction<T> {
     return (a: T, b: T) => Number(accessor(b) - accessor(a));
 }
+
+/** 
+ * As of Jan 2020, bigint literals e.g. 1n can only be used with TS target esnext
+ * which then doesn't transpile the null conditional/coalescing operators and breaks on Node 12
+ * So BigInt(1) needs to be used here
+ * */ 
+export function incBigInt(bigStr: string): string {
+    return bigStr == undefined ? bigStr : String(BigInt(bigStr) + BigInt(1));
+}
+export function decBigInt(bigStr: string): string {
+    return bigStr == undefined ? bigStr : String(BigInt(bigStr) - BigInt(1));
+}

From 72cc7e62d2ea2ee0a9d32f8357f7350336eb15eb Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 15:45:12 +0000
Subject: [PATCH 26/32] Add param parsing to edit history controller

---
 .../api/controllers/editHistoryController.ts   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/api/controllers/editHistoryController.ts b/app/src/api/controllers/editHistoryController.ts
index c266e7f5..b6897c28 100644
--- a/app/src/api/controllers/editHistoryController.ts
+++ b/app/src/api/controllers/editHistoryController.ts
@@ -1,14 +1,24 @@
 import express from 'express';
 
+import { UserInputError } from '../errors';
+import { checkRegexParam, parsePositiveIntParam, processParam } from '../parameters';
 import asyncController from "../routes/asyncController";
 import * as editHistoryService from '../services/editHistory';
 
 const getGlobalEditHistory = asyncController(async (req: express.Request, res: express.Response) => {
+
+    const revisionIdRegex = /^[1-9]\d*$/;
+    const afterId: string = processParam(req.query, 'after_id', x => checkRegexParam(x, revisionIdRegex));
+    const beforeId: string = processParam(req.query, 'before_id', x => checkRegexParam(x, revisionIdRegex));
+    const count: number = processParam(req.query, 'count', parsePositiveIntParam);
+
+    if(afterId != undefined && beforeId != undefined) {
+        throw new UserInputError('Cannot specify both after_id and before_id parameters');
+    }
+
     try {
-        const result = await editHistoryService.getGlobalEditHistory();
-        res.send({
-            history: result
-        });
+        const result = await editHistoryService.getGlobalEditHistory(beforeId, afterId, count);
+        res.send(result);
     } catch(error) {
         console.error(error);
         res.send({ error: 'Database error' });

From fac4c8b35b7d2be7322564678ff7a663b5413e02 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 18:02:24 +0000
Subject: [PATCH 27/32] Split errors into api and general

---
 app/src/api/api.ts                            |  9 +-
 .../api/controllers/editHistoryController.ts  | 13 ++-
 app/src/api/dataAccess/editHistory.ts         | 91 +++++++++++--------
 app/src/api/{errors.ts => errors/api.ts}      | 18 ++--
 app/src/api/errors/general.ts                 | 17 ++++
 app/src/api/parameters.ts                     | 10 +-
 .../services/__tests__/editHistory.test.ts    |  8 +-
 app/src/api/services/editHistory.ts           |  4 +-
 8 files changed, 110 insertions(+), 60 deletions(-)
 rename app/src/api/{errors.ts => errors/api.ts} (51%)
 create mode 100644 app/src/api/errors/general.ts

diff --git a/app/src/api/api.ts b/app/src/api/api.ts
index 79458ee5..efa2bc14 100644
--- a/app/src/api/api.ts
+++ b/app/src/api/api.ts
@@ -2,7 +2,8 @@ import bodyParser from 'body-parser';
 import express from 'express';
 
 import * as editHistoryController from './controllers/editHistoryController';
-import { RequestParameterError, UserInputError } from './errors'; 
+import { ApiParamError, ApiUserError } from './errors/api'; 
+import { DatabaseError } from './errors/general';
 import buildingsRouter from './routes/buildingsRouter';
 import extractsRouter from './routes/extractsRouter';
 import usersRouter from './routes/usersRouter';
@@ -102,16 +103,18 @@ server.use((err: any, req: express.Request, res: express.Response, next: express
     if (err != undefined) {
         console.log('Global error handler: ', err);
         
-        if (err instanceof UserInputError) {
+        if (err instanceof ApiUserError) {
             let errorMessage: string;
 
-            if(err instanceof RequestParameterError) {
+            if(err instanceof ApiParamError) {
                 errorMessage = `Problem with parameter ${err.paramName}: ${err.message}`;
             } else {
                 errorMessage = err.message;
             }
 
             res.status(400).send({ error: errorMessage });
+        } else if(err instanceof DatabaseError){
+            res.status(500).send({ error: 'Database error' });
         } else {
             res.status(500).send({ error: 'Server error' });
         }
diff --git a/app/src/api/controllers/editHistoryController.ts b/app/src/api/controllers/editHistoryController.ts
index b6897c28..2c8dcc8d 100644
--- a/app/src/api/controllers/editHistoryController.ts
+++ b/app/src/api/controllers/editHistoryController.ts
@@ -1,6 +1,7 @@
 import express from 'express';
 
-import { UserInputError } from '../errors';
+import { ApiParamError, ApiUserError } from '../errors/api';
+import { ArgumentError } from '../errors/general';
 import { checkRegexParam, parsePositiveIntParam, processParam } from '../parameters';
 import asyncController from "../routes/asyncController";
 import * as editHistoryService from '../services/editHistory';
@@ -13,15 +14,19 @@ const getGlobalEditHistory = asyncController(async (req: express.Request, res: e
     const count: number = processParam(req.query, 'count', parsePositiveIntParam);
 
     if(afterId != undefined && beforeId != undefined) {
-        throw new UserInputError('Cannot specify both after_id and before_id parameters');
+        throw new ApiUserError('Cannot specify both after_id and before_id parameters');
     }
 
     try {
         const result = await editHistoryService.getGlobalEditHistory(beforeId, afterId, count);
         res.send(result);
     } catch(error) {
-        console.error(error);
-        res.send({ error: 'Database error' });
+        if(error instanceof ArgumentError && error.argumentName === 'count') {
+            const apiErr = new ApiParamError(error.message, 'count');
+            throw apiErr;
+        }
+
+        throw error;
     }
 });
 
diff --git a/app/src/api/dataAccess/editHistory.ts b/app/src/api/dataAccess/editHistory.ts
index b16c097c..c500f293 100644
--- a/app/src/api/dataAccess/editHistory.ts
+++ b/app/src/api/dataAccess/editHistory.ts
@@ -1,5 +1,6 @@
 import db from '../../db';
 import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
+import { DatabaseError } from '../errors/general';
 
 const baseQuery = `
         SELECT
@@ -19,53 +20,69 @@ export function getHistoryAfterId(id: string, count: number): Promise<EditHistor
      * (like the other queries). The inner select is sorted in ascending order
      * so that the right rows are returned when limiting the result set.
      */
-    return db.manyOrNone(`
-        SELECT * FROM (
-            ${baseQuery}
-            WHERE log_id > $1
-            ORDER BY revision_id ASC
-            LIMIT $2
-        ) AS result_asc ORDER BY revision_id DESC`,
-        [id, count]
-    );
+    try {
+        return db.any(`
+            SELECT * FROM (
+                ${baseQuery}
+                WHERE log_id > $1
+                ORDER BY revision_id ASC
+                LIMIT $2
+            ) AS result_asc ORDER BY revision_id DESC`,
+            [id, count]
+        );
+    } catch(err) {
+        throw new DatabaseError(err);
+    }
 }
 
 export function getHistoryBeforeId(id: string, count: number): Promise<EditHistoryEntry[]> {
-    if(id == undefined) {
-        
-        return db.any(`
-            ${baseQuery}
-            ORDER BY revision_id DESC
-            LIMIT $1
-        `, [count]);
-        
-    } else {
-        
-        return db.any(`
-            ${baseQuery}
-            WHERE log_id < $1
-            ORDER BY revision_id DESC
-            LIMIT $2
-        `, [id, count]);
+    try {
+        if(id == undefined) {
+            
+            return db.any(`
+                ${baseQuery}
+                ORDER BY revision_id DESC
+                LIMIT $1
+            `, [count]);
+            
+        } else {
+            
+            return db.any(`
+                ${baseQuery}
+                WHERE log_id < $1
+                ORDER BY revision_id DESC
+                LIMIT $2
+            `, [id, count]);
+        }
+    } catch(err) {
+        throw new DatabaseError(err);
     }
 }
 
 export async function getIdOlderThan(id: string): Promise<string> {
-    const result = await db.oneOrNone<{revision_id:string}>(`
-        SELECT MAX(log_id) as revision_id
-        FROM logs
-        WHERE log_id < $1
-    `, [id]);
+    try {
+        const result = await db.oneOrNone<{revision_id:string}>(`
+            SELECT MAX(log_id) as revision_id
+            FROM logs
+            WHERE log_id < $1
+        `, [id]);
 
-    return result?.revision_id;
+        return result?.revision_id;
+    } catch(err) {
+        throw new DatabaseError(err);
+    }
 }
 
 export async function getIdNewerThan(id: string): Promise<string> {
-    const result = await db.oneOrNone<{revision_id:string}>(`
-        SELECT MIN(log_id) as revision_id
-        FROM logs
-        WHERE log_id > $1
-    `, [id]);
+    try {
+        const result = await db.oneOrNone<{revision_id:string}>(`
+            SELECT MIN(log_id) as revision_id
+            FROM logs
+            WHERE log_id > $1
+        `, [id]);
 
-    return result?.revision_id;
+        return result?.revision_id;
+    } catch(err) {
+        throw new DatabaseError(err);
+    }
 }
diff --git a/app/src/api/errors.ts b/app/src/api/errors/api.ts
similarity index 51%
rename from app/src/api/errors.ts
rename to app/src/api/errors/api.ts
index e1d1bd35..cbc4ba2f 100644
--- a/app/src/api/errors.ts
+++ b/app/src/api/errors/api.ts
@@ -5,34 +5,40 @@
  * https://stackoverflow.com/questions/41102060/typescript-extending-error-class
  */
 
-export class UserInputError extends Error {
+export class ApiUserError extends Error {
     constructor(message?: string) {
         super(message);
+        this.name = 'ApiUserError';
     }
 }
 
-export class RequestParameterError extends UserInputError {
+export class ApiParamError extends ApiUserError {
     public paramName: string;
 
-    constructor(message?: string) {
+    constructor(message?: string, paramName?: string) {
         super(message);
+        this.name = 'ApiParamError';
+        this.paramName = paramName;
     }
 }
 
-export class ParamRequiredError extends RequestParameterError {
+export class ApiParamRequiredError extends ApiParamError {
     constructor(message?: string) {
         super(message);
+        this.name = 'ApiParamRequiredError';
     }
 }
 
-export class ParamOutOfBoundsError extends RequestParameterError {
+export class ApiParamOutOfBoundsError extends ApiParamError {
     constructor(message?: string) {
         super(message);
+        this.name = 'ApiParamOutOfBoundsError';
     }
 }
 
-export class ParamInvalidFormatError extends RequestParameterError {
+export class ApiParamInvalidFormatError extends ApiParamError {
     constructor(message?: string) {
         super(message);
+        this.name = 'ApiParamInvalidFormatError';
     }
 }
diff --git a/app/src/api/errors/general.ts b/app/src/api/errors/general.ts
new file mode 100644
index 00000000..faacdb41
--- /dev/null
+++ b/app/src/api/errors/general.ts
@@ -0,0 +1,17 @@
+export class ArgumentError extends Error {
+    public argumentName: string;
+    constructor(message?: string, argumentName?: string) {
+        super(message);
+        this.name = 'ArgumentError';
+        this.argumentName = argumentName;
+    }
+}
+
+export class DatabaseError extends Error {
+    public detail: any;
+    constructor(detail?: string) {
+        super();
+        this.name = 'DatabaseError';
+        this.detail = detail;
+    }
+}
diff --git a/app/src/api/parameters.ts b/app/src/api/parameters.ts
index 19c84fcb..865c0947 100644
--- a/app/src/api/parameters.ts
+++ b/app/src/api/parameters.ts
@@ -1,13 +1,13 @@
 import { strictParseInt } from '../parse';
 
-import { ParamInvalidFormatError, ParamRequiredError, RequestParameterError } from './errors';
+import { ApiParamError, ApiParamInvalidFormatError, ApiParamRequiredError } from './errors/api';
 
 
 export function processParam<T>(params: object, paramName: string, processingFn: (x: string) => T, required: boolean = false) {
     const stringValue = params[paramName];
 
     if(stringValue == undefined && required) {
-        const err = new ParamRequiredError('Parameter required but not supplied');
+        const err = new ApiParamRequiredError('Parameter required but not supplied');
         err.paramName = paramName;
         throw err;
     }
@@ -15,7 +15,7 @@ export function processParam<T>(params: object, paramName: string, processingFn:
     try {
         return processingFn(stringValue);
     } catch(error) {
-        if(error instanceof RequestParameterError) {
+        if(error instanceof ApiParamError) {
             error.paramName = paramName;
         }
         
@@ -28,7 +28,7 @@ export function parsePositiveIntParam(param: string) {
     
     const result = strictParseInt(param);
     if (isNaN(result)) {
-        throw new ParamInvalidFormatError('Invalid format: not a positive integer');
+        throw new ApiParamInvalidFormatError('Invalid format: not a positive integer');
     }
     return result;
 }
@@ -37,7 +37,7 @@ export function checkRegexParam(param: string, regex: RegExp): string {
     if(param == undefined) return undefined;
 
     if(param.match(regex) == undefined) {
-        throw new ParamInvalidFormatError(`Invalid format: does not match regular expression ${regex}`);
+        throw new ApiParamInvalidFormatError(`Invalid format: does not match regular expression ${regex}`);
     }
     
     return param;
diff --git a/app/src/api/services/__tests__/editHistory.test.ts b/app/src/api/services/__tests__/editHistory.test.ts
index 9876d5ac..e8fd2c6e 100644
--- a/app/src/api/services/__tests__/editHistory.test.ts
+++ b/app/src/api/services/__tests__/editHistory.test.ts
@@ -1,6 +1,6 @@
 import { EditHistoryEntry } from '../../../frontend/models/edit-history-entry';
 import * as editHistoryData from '../../dataAccess/editHistory'; // manually mocked
-import { UserInputError } from '../../errors';
+import { ArgumentError } from '../../errors/general';
 import { getGlobalEditHistory } from '../editHistory';
 
 jest.mock('../../dataAccess/editHistory');
@@ -28,8 +28,10 @@ describe('getGlobalEditHistory()', () => {
         [null, null],
         ['100', null],
         [null, '100']
-    ])('Should error when requesting non-positive number of records', (beforeId: string, afterId: string) => {
-        expect(getGlobalEditHistory(beforeId, afterId, 0)).rejects.toBeInstanceOf(UserInputError);
+    ])('Should error when requesting non-positive number of records', async (beforeId: string, afterId: string) => {
+        let resultPromise = getGlobalEditHistory(beforeId, afterId, 0);
+        await expect(resultPromise).rejects.toBeInstanceOf(ArgumentError);
+        await expect(resultPromise).rejects.toHaveProperty('argumentName', 'count');
     });
     
     describe('getting history before a point', () => {
diff --git a/app/src/api/services/editHistory.ts b/app/src/api/services/editHistory.ts
index 40299fe1..81b4c899 100644
--- a/app/src/api/services/editHistory.ts
+++ b/app/src/api/services/editHistory.ts
@@ -1,10 +1,10 @@
 import { EditHistoryEntry } from '../../frontend/models/edit-history-entry';
 import { decBigInt, incBigInt } from '../../helpers';
 import { getHistoryAfterId, getHistoryBeforeId, getIdNewerThan, getIdOlderThan } from '../dataAccess/editHistory';
-import { UserInputError } from '../errors';
+import { ArgumentError } from '../errors/general';
 
 async function getGlobalEditHistory(beforeId?: string, afterId?: string, count: number = 100) {
-    if(count <= 0) throw new UserInputError('cannot request less than 1 history record');
+    if(count <= 0) throw new ArgumentError('cannot request less than 1 history record', 'count');
     if(count > 100) count = 100;
 
     // limited set of records. Expected to be already ordered from newest to oldest

From e3be0a2869f65f04ca590b9176de01411804da7d Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 31 Jan 2020 18:34:27 +0000
Subject: [PATCH 28/32] Remove prop types generation, babel from build

---
 app/.babelrc          | 13 -------------
 app/package-lock.json | 20 --------------------
 app/package.json      |  5 -----
 app/razzle.config.js  | 11 -----------
 4 files changed, 49 deletions(-)
 delete mode 100644 app/.babelrc

diff --git a/app/.babelrc b/app/.babelrc
deleted file mode 100644
index 1578f26a..00000000
--- a/app/.babelrc
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "plugins": [
-        "@babel/plugin-syntax-jsx",
-        "@babel/plugin-syntax-typescript",
-        [
-            "babel-plugin-typescript-to-proptypes",
-            {
-                "implicitChildren": true,
-                "typeCheck": true
-            }
-        ]
-    ]
-}
\ No newline at end of file
diff --git a/app/package-lock.json b/app/package-lock.json
index dfa26891..d886d083 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -425,15 +425,6 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz",
-      "integrity": "sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
     "@babel/plugin-transform-arrow-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
@@ -2420,17 +2411,6 @@
       "integrity": "sha512-f49NsaohQ1ByY20nUrpc30QFdbeT4ntV4PAL2vSZe6uCB5nqAcqXS/qzU+aI6ZfYhWASx5eIsTFvFrs1B2ffGg==",
       "dev": true
     },
-    "babel-plugin-typescript-to-proptypes": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-typescript-to-proptypes/-/babel-plugin-typescript-to-proptypes-0.17.1.tgz",
-      "integrity": "sha512-yREUfvDlmn6QjM0QbywXUkXBQMD/iFfLVTl+jig4X7ZLUg9lq8ZLuex8HIM2SQ4X3vcjGnWPFowodlMcXhwxdQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-typescript": "^7.2.0"
-      }
-    },
     "babel-preset-jest": {
       "version": "23.2.0",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
diff --git a/app/package.json b/app/package.json
index ba505943..9c9915f5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -26,7 +26,6 @@
     "node-fs": "^0.1.7",
     "nodemailer": "^6.3.0",
     "pg-promise": "^8.7.5",
-    "prop-types": "^15.7.2",
     "query-string": "^6.8.2",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
@@ -37,8 +36,6 @@
     "sharp": "^0.22.1"
   },
   "devDependencies": {
-    "@babel/plugin-syntax-jsx": "^7.7.4",
-    "@babel/plugin-syntax-typescript": "^7.7.4",
     "@types/express": "^4.17.2",
     "@types/express-session": "^1.15.16",
     "@types/jest": "^24.0.23",
@@ -46,7 +43,6 @@
     "@types/mapbox__sphericalmercator": "^1.1.3",
     "@types/node": "^12.12.25",
     "@types/nodemailer": "^6.2.2",
-    "@types/prop-types": "^15.7.3",
     "@types/react": "^16.9.16",
     "@types/react-dom": "^16.9.4",
     "@types/react-leaflet": "^2.5.0",
@@ -54,7 +50,6 @@
     "@types/sharp": "^0.22.3",
     "@types/webpack-env": "^1.14.1",
     "babel-eslint": "^10.0.3",
-    "babel-plugin-typescript-to-proptypes": "^0.17.1",
     "eslint": "^5.16.0",
     "eslint-plugin-jest": "^22.21.0",
     "eslint-plugin-react": "^7.17.0",
diff --git a/app/razzle.config.js b/app/razzle.config.js
index 42bd60aa..aa6348cd 100644
--- a/app/razzle.config.js
+++ b/app/razzle.config.js
@@ -9,17 +9,6 @@ module.exports = {
         })
         config.module.rules = rules;
 
-        // find module rule that runs ts-loader for TS(X) files
-        const tsRule = config.module.rules.find(r => 
-            new RegExp(r.test).test('test.tsx') && Array.isArray(r.use) && r.use.some(u => u.loader.includes('ts-loader')));
-
-        // run babel-loader before ts-loader to generate propTypes
-        tsRule.use.push({
-            loader: 'babel-loader',
-            options: {
-                babelrc: true
-            }
-        })
         return config;
     },
 };

From 4719dea2d46edded36013fb5d0b7f6654706f601 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Mon, 3 Feb 2020 12:40:36 +0000
Subject: [PATCH 29/32] Update edit history frontend

---
 app/src/frontend/pages/changes.css |  7 +++
 app/src/frontend/pages/changes.tsx | 75 +++++++++++++++++++++++++++---
 app/src/frontend/styles/layout.css |  5 ++
 3 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 app/src/frontend/pages/changes.css

diff --git a/app/src/frontend/pages/changes.css b/app/src/frontend/pages/changes.css
new file mode 100644
index 00000000..9ee45613
--- /dev/null
+++ b/app/src/frontend/pages/changes.css
@@ -0,0 +1,7 @@
+.edit-history-link {
+    margin-top: 4em;
+}
+
+.edit-history-latest-link {
+    float: right;
+}
\ No newline at end of file
diff --git a/app/src/frontend/pages/changes.tsx b/app/src/frontend/pages/changes.tsx
index 6f0d7cc5..01af54d5 100644
--- a/app/src/frontend/pages/changes.tsx
+++ b/app/src/frontend/pages/changes.tsx
@@ -1,31 +1,88 @@
+import { parse } from 'query-string';
 import React, { useEffect, useState } from 'react';
+import { Link, RouteComponentProps } from 'react-router-dom';
+
+import './changes.css';
 
 import { apiGet } from '../apiHelpers';
 import { BuildingEditSummary } from '../building/edit-history/building-edit-summary';
+import ErrorBox from '../components/error-box';
 import InfoBox from '../components/info-box';
 import { EditHistoryEntry } from '../models/edit-history-entry';
 
-const ChangesPage = () => {
-    const [history, setHistory] = useState<EditHistoryEntry[]>(undefined);
+interface PagingInfo {
+    id_for_older_query: string;
+    id_for_newer_query: string;
+}
+
+const recordsPerPage = 20;
+
+const ChangesPage = (props: RouteComponentProps) => {
+    const { after_id, before_id } = parse(props.location.search);
+
+    const [history, setHistory] = useState<EditHistoryEntry[]>();
+    const [paging, setPaging] = useState<PagingInfo>();
+    const [error, setError] = useState();
 
     useEffect(() => {
         const fetchData = async () => {
-            const {history} = await apiGet(`/api/history`);
+            setHistory(null);
+            setPaging(null);
+
+            let url = `/api/history?count=${recordsPerPage}`;
+            if(after_id) {
+                url = `${url}&after_id=${after_id}`;
+            }
+            
+            if (before_id) {
+                url = `${url}&before_id=${before_id}`;
+            }
+            try {
+                const {history, paging, error} = await apiGet(url);
+
+                if(error) {
+                    setError(error);
+                } else {
+                    setHistory(history);
+                    setPaging(paging);
+                }
+            } catch (err) {
+                setError('Connection problem. Please try again later...');
+            }
 
-            setHistory(history);
         };
 
         fetchData();
-    }, []);
+    }, [props.location.search]);
     
     return (
         <article>
             <section className="main-col">
                 <h1>Global edit history</h1>
 
+                {
+                    paging?.id_for_newer_query &&
+                        <Link className='edit-history-link' to={`?after_id=${paging.id_for_newer_query}`}>Show more recent changes</Link>
+                }
+                {
+                    (after_id || before_id) &&
+                        <Link className='edit-history-latest-link' to='?'>Show latest changes</Link>
+                }
                 <ul className="edit-history-list">
-                    {(history == undefined || history.length == 0) ?
-                        <InfoBox msg="No changes in the last week"></InfoBox> :
+                    {
+                        error &&
+                            <ErrorBox msg={error}></ErrorBox>
+                    }
+                    {
+                        error == undefined && history == undefined &&
+                            <InfoBox msg="Loading history..."></InfoBox>
+                    }
+                    {
+                        (history?.length === 0) &&
+                            <InfoBox msg="No changes so far"></InfoBox>
+                    }
+                    {   
+                        (history != undefined && history.length > 0) &&
                         history.map(entry => (
                             <li key={`${entry.revision_id}`} className="edit-history-list-element">
                                 <BuildingEditSummary
@@ -37,6 +94,10 @@ const ChangesPage = () => {
                         ))
                     }
                 </ul>
+                {
+                    paging?.id_for_older_query &&
+                        <Link to={`?before_id=${paging.id_for_older_query}`}>Show older changes</Link>
+                }
             </section>
         </article>
     );
diff --git a/app/src/frontend/styles/layout.css b/app/src/frontend/styles/layout.css
index bf7951ba..f1624c6b 100644
--- a/app/src/frontend/styles/layout.css
+++ b/app/src/frontend/styles/layout.css
@@ -49,6 +49,11 @@ article .color-block {
     padding-left: 1em;
     padding-right: 1em;
 }
+@media(min-width: 768px) {
+    .main-col {
+        min-width: 48em;
+    }
+}
 hr {
     display: block;
     height: 1px;

From 0c9177d4feec04d8393ec33193eb3ad411ea1b66 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 7 Feb 2020 14:21:18 +0000
Subject: [PATCH 30/32] Add OpenAPI doc for extracts and history

---
 app/public/openapi.yml | 155 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 155 insertions(+)
 create mode 100644 app/public/openapi.yml

diff --git a/app/public/openapi.yml b/app/public/openapi.yml
new file mode 100644
index 00000000..079ac355
--- /dev/null
+++ b/app/public/openapi.yml
@@ -0,0 +1,155 @@
+openapi: 3.0.0
+info:
+  title: Colouring London API
+  version: 1.0.0
+
+servers:
+  - url: https://colouring.london/api
+    description: Production server (uses live data)
+
+paths:
+
+  /extracts:
+    get:
+      summary: Returns a list of bulk data extracts
+      responses:
+        '200':
+          description: A list of bulk extracts, from newest to oldest
+          content:
+            application/json:
+              schema:
+                properties:
+                  extracts:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/BulkExtract'
+              example:
+                extracts:
+                  - extract_id: 1
+                    extracted_on: 2019-10-03T05:33:00.000Z
+                    download_path: /downloads/data-extract-2019-10-03-06_33_00.zip
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/ServerError'
+
+  /history:
+    get:
+      summary: Returns a paginated list of edits (latest edits if no relevant parameters specified)
+      parameters:
+        - name: before_id
+          description: Returned edits will be ones made directly before the specified revision ID
+          in: query
+          schema:
+            $ref: '#/components/schemas/RevisionId'
+          required: false
+        - name: after_id
+          description: Returned edits will be ones made directly after the specified revision ID
+          in: query
+          schema:
+            $ref: '#/components/schemas/RevisionId'
+          required: false
+        - name: count
+          description: The desired number of records to return
+          in: query
+          schema:
+            type: number
+            minimum: 1
+            maximum: 100
+            default: 100
+          required: false
+      responses:
+        '200':
+          description: A list of edit history records
+          content:
+            application/json:
+              schema:
+                properties:
+                  history:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/BuildingEditHistoryEntry'
+                  paging:
+                    type: object
+                    properties:
+                      id_for_older_query:
+                        allOf:
+                          - $ref: '#/components/schemas/RevisionId'
+                          - description: If older records exist - ID to use for querying them (use as before_id param), otherwise null
+                            nullable: true
+                      id_for_newer_query:
+                        allOf:
+                          - $ref: '#/components/schemas/RevisionId'
+                          - description: If newer records exist - ID to use for querying them (use as after_id param), otherwise null
+                            nullable: true
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/ServerError'
+
+components:
+  responses:
+    BadRequest:
+      description: Invalid request submitted by user
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+
+    ServerError:
+      description: Unexpected server error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            error: Database error
+
+  schemas:
+    Error:
+      type: object
+      properties:
+        error:
+          type: string
+          description: Error message
+
+    BulkExtract:
+      type: object
+      properties:
+        extract_id:
+          type: integer
+          description: Unique sequential ID for the extract
+        extracted_on:
+          type: string
+          format: date-time
+          description: UTC timestamp at which the extract was generated
+        download_path:
+          type: string
+          description: Download path for the extract. Contains only URL path (should be used with the same hostname as the API).
+
+    RevisionId:
+      description: Unique sequential ID for an edit history entry (positive big integer)
+      type: string
+      pattern: ^[1-9]\d*&
+
+    BuildingEditHistoryEntry:
+      type: object
+      properties:
+        revision_id:
+          $ref: '#/components/schemas/RevisionId'
+        forward_patch:
+          type: object
+          description: Forward diff of the building attribute data
+        reverse_patch:
+          type: object
+          description: Reverse diff of the building attribute data
+        revision_timestamp:
+          type: string
+          format: date-time
+          description: UTC timestamp at which the building data was edited
+        username:
+          type: string
+          description: Username of the editor
+        building_id:
+          type: number
+          description: Unique ID of the edited building
\ No newline at end of file

From 7f4086f5ad8f1f536c9b40b94ff8288b502aabd5 Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Fri, 7 Feb 2020 16:07:18 +0000
Subject: [PATCH 31/32] Fix colour scale for height to apex

---
 app/map_styles/polygon.xml      | 16 ++++++----------
 app/src/frontend/map/legend.tsx | 13 ++++++-------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 963f5fd2..da299b0d 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -99,33 +99,29 @@
             <PolygonSymbolizer fill="#e7e1ef" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 7.73 and [size_height] &lt; 1.138</Filter>
+            <Filter>[size_height] &gt;= 7.73 and [size_height] &lt; 11.38</Filter>
             <PolygonSymbolizer fill="#d4b9da" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 1.138 and [size_height] &lt; 1.845</Filter>
+            <Filter>[size_height] &gt;= 11.38 and [size_height] &lt; 18.45</Filter>
             <PolygonSymbolizer fill="#c994c7" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 1.845 and [size_height] &lt; 3.505</Filter>
+            <Filter>[size_height] &gt;= 18.45 and [size_height] &lt; 35.05</Filter>
             <PolygonSymbolizer fill="#df65b0" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 3.505 and [size_height] &lt; 8.930</Filter>
+            <Filter>[size_height] &gt;= 35.05 and [size_height] &lt; 89.30</Filter>
             <PolygonSymbolizer fill="#e7298a" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 8.930 and [size_height] &lt; 15.179</Filter>
+            <Filter>[size_height] &gt;= 89.30 and [size_height] &lt; 152</Filter>
             <PolygonSymbolizer fill="#ce1256" />
         </Rule>
         <Rule>
-            <Filter>[size_height] &gt;= 15.179 and [size_height] &lt; 99.999</Filter>
+            <Filter>[size_height] &gt;= 152</Filter>
             <PolygonSymbolizer fill="#980043" />
         </Rule>
-        <Rule>
-            <Filter>[size_height] &gt;= 99.999</Filter>
-            <PolygonSymbolizer fill="#67001f" />
-        </Rule>
     </Style>
     <Style name="date_year">
         <Rule>
diff --git a/app/src/frontend/map/legend.tsx b/app/src/frontend/map/legend.tsx
index 64712384..52eb01db 100644
--- a/app/src/frontend/map/legend.tsx
+++ b/app/src/frontend/map/legend.tsx
@@ -71,13 +71,12 @@ const LEGEND_CONFIG = {
         elements: [
             { color: '#f7f4f9', text: '0-5.55'},
             { color: '#e7e1ef', text: '5.55-7.73'},
-            { color: '#d4b9da', text: '7.73-1.138'},
-            { color: '#c994c7', text: '1.138-1.845'},
-            { color: '#df65b0', text: '1.845-3.505'},
-            { color: '#e7298a', text: '3.505-8.930'},
-            { color: '#ce1256', text: '8.930-15.179'},
-            { color: '#980043', text: '15.179-99.999'},
-            { color: '#67001f', text: '≥99.999'}
+            { color: '#d4b9da', text: '7.73-11.38'},
+            { color: '#c994c7', text: '11.38-18.45'},
+            { color: '#df65b0', text: '18.45-35.05'},
+            { color: '#e7298a', text: '35.05-89.30'},
+            { color: '#ce1256', text: '89.30-152'},
+            { color: '#980043', text: '≥152'}
         ]
     },
     construction: {

From 9826ba784c24e59fb72340c74a8c8b3b10f061fb Mon Sep 17 00:00:00 2001
From: Maciej Ziarkowski <maciej.ziarkowski@gmail.com>
Date: Sun, 8 Mar 2020 15:08:26 +0000
Subject: [PATCH 32/32] Point tsconfig to client and server TS files only

Previous config defined a glob for all TS files. But only the files
required from the client or server root files need to be transpiled.
This prevents the whole project build failinig due to one corrupt source
file that might not be committed to the repository, and isn't actually
used anywhere.
---
 app/tsconfig.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/tsconfig.json b/app/tsconfig.json
index d3e060be..9b4ebd04 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -10,7 +10,8 @@
         "esModuleInterop": true,
         "noImplicitAny": false
     },
-    "include": [
-        "./src/**/*"
+    "files": [
+        "./src/index.ts",
+        "./src/client.tsx"
     ]
 }
\ No newline at end of file