diff --git a/.all-contributorsrc b/.all-contributorsrc index 879dd46a..fc2f366b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -69,6 +69,16 @@ "contributions": [ "code" ] + }, + { + "login": "mz8i", + "name": "mz8i", + "avatar_url": "https://avatars2.githubusercontent.com/u/36160844?v=4", + "profile": "https://github.com/mz8i", + "contributions": [ + "code", + "ideas" + ] } ], "contributorsPerLine": 7 diff --git a/README.md b/README.md index 1cd75122..2135c3c8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Colouring London -[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors) [![Build Status](https://travis-ci.com/tomalrussell/colouring-london.svg?branch=master)](https://travis-ci.com/tomalrussell/colouring-london) How many buildings are there in London? What are their characteristics? Where @@ -76,7 +76,17 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/all-contri -
polly64
polly64
🎨 πŸ€” πŸ–‹ πŸ”		Tom Russell
Tom Russell
🎨 πŸ€” πŸ’» πŸ“–		dominic
dominic
πŸ€” πŸ–‹		Adam Dennett
Adam Dennett
πŸ€”		Duncan Smith
Duncan Smith
πŸ€”		martin-dj
martin-dj
πŸ’»
+ + + + + + + + + + +
polly64
polly64
🎨 πŸ€” πŸ–‹ πŸ”		Tom Russell
Tom Russell
🎨 πŸ€” πŸ’» πŸ“–		dominic
dominic
πŸ€” πŸ–‹		Adam Dennett
Adam Dennett
πŸ€”		Duncan Smith
Duncan Smith
πŸ€”		martin-dj
martin-dj
πŸ’»		mz8i
mz8i
πŸ’» πŸ€”
diff --git a/app/public/images/logo-cl-square.png b/app/public/images/logo-cl-square.png new file mode 100644 index 00000000..53f6dba0 Binary files /dev/null and b/app/public/images/logo-cl-square.png differ diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx index c8b23d50..5e681574 100644 --- a/app/src/frontend/app.tsx +++ b/app/src/frontend/app.tsx @@ -20,6 +20,8 @@ import PasswordReset from './user/password-reset'; import MapApp from './map-app'; import ContactPage from './pages/contact'; import DataAccuracyPage from './pages/data-accuracy'; +import OrdnanceSurveyLicencePage from './pages/ordnance-survey-licence'; +import OrdnanceSurveyUprnPage from './pages/ordnance-survey-uprn'; interface AppProps { @@ -98,6 +100,8 @@ class App extends React.Component { // TODO: add proper types + + diff --git a/app/src/frontend/map/legend.css b/app/src/frontend/map/legend.css index 688a3c8c..f1fbbc7e 100644 --- a/app/src/frontend/map/legend.css +++ b/app/src/frontend/map/legend.css @@ -3,7 +3,7 @@ */ .map-legend { position: absolute; - bottom: 2.5rem; + bottom: 3.5rem; right: 10px; z-index: 1000; @@ -34,7 +34,12 @@ } /* Prevent legend from overlapping with attribution */ -@media (min-width: 706px){ +@media(min-width: 392px) { + .map-legend { + bottom: 2.5rem; + } +} +@media (min-width: 760px){ .map-legend { bottom: 1.5rem; } @@ -44,7 +49,7 @@ bottom: 2.5rem; } } -@media (min-width: 1072px){ +@media (min-width: 1129px){ .map-legend { bottom: 1.5rem; } diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx index ecb64c1a..84697c36 100644 --- a/app/src/frontend/map/map.tsx +++ b/app/src/frontend/map/map.tsx @@ -108,7 +108,7 @@ class ColouringMap extends Component { // const tilematrixSet = 'EPSG:3857'; const layer = (this.state.theme === 'light')? 'Light 3857' : 'Night 3857'; const baseUrl = `https://api2.ordnancesurvey.co.uk/mapping_api/v1/service/zxy/${tilematrixSet}/${layer}/{z}/{x}/{y}.png?key=${key}`; - const attribution = 'Building attribute data is Β© Colouring London contributors. Maps contain OS data Β© Crown copyright: OS Maps baselayers and building outlines.'; + const attribution = 'Building attribute data is Β© Colouring London contributors. Maps contain OS data Β© Crown copyright: OS Maps baselayers and building outlines. OS licence'; const baseLayer =

Open data extracts

Choose one of the links below to download an archive containing the open data collected on the Colouring London platform

-

By downloading data extracts from this site, you agree to the data accuracy agreement

+

By downloading data extracts from this site, you agree to the data accuracy agreement and the Ordnance Survey terms of UPRN usage.

{ this.state.extracts == undefined ?

Loading extracts...

: diff --git a/app/src/frontend/pages/ordnance-survey-licence.tsx b/app/src/frontend/pages/ordnance-survey-licence.tsx new file mode 100644 index 00000000..99a25109 --- /dev/null +++ b/app/src/frontend/pages/ordnance-survey-licence.tsx @@ -0,0 +1,22 @@ +import React from 'react'; + +const OrdnanceSurveyLicencePage = () => ( +
+
+

Ordnance Survey Data - Terms and Conditions

+
    +
  • + You are granted a non-exclusive, royalty free revocable licence solely to view the licensed mapping (and addressing) data for non-commercial purposes for the period during which we make it available; +
    • +
  • + You are not permitted to copy, sub-license, distribute, sell or otherwise make available such data to third parties in any form; and +
    • +
  • + Third party rights to enforce the terms of this licence shall be reserved to OS. +
    • +
+
+
+); + +export default OrdnanceSurveyLicencePage; diff --git a/app/src/frontend/pages/ordnance-survey-uprn.tsx b/app/src/frontend/pages/ordnance-survey-uprn.tsx new file mode 100644 index 00000000..bff79907 --- /dev/null +++ b/app/src/frontend/pages/ordnance-survey-uprn.tsx @@ -0,0 +1,14 @@ +import React from 'react'; + +const OrdnanceSurveyUprnPage = () => ( +
+
+

Ordnance Survey - UPRN Usage Terms

+

+ You may use the UPRN for personal, non-commercial use or for the internal administration and operation of your business, which does not permit using the UPRN for the purpose of creating or developing any product or service intended for sub-licensing, distribution or sale to third parties (notwithstanding that the UPRN themselves or any associated attribution or geometry that has been created with benefit of UPRN may not actually be supplied as part of such product or service). Therefore if you create any data which has benefited from, relied on or made use of the UPRN you are not permitted to sub-license, distribute or sell such data to third parties under the above terms. +

+
+
+); + +export default OrdnanceSurveyUprnPage; \ No newline at end of file diff --git a/app/src/frontendRoute.tsx b/app/src/frontendRoute.tsx index 444abcc7..8b3391eb 100644 --- a/app/src/frontendRoute.tsx +++ b/app/src/frontendRoute.tsx @@ -81,9 +81,9 @@ function renderHTML(context, data, req, res) { - + - + diff --git a/maintenance/extract_data/README.txt b/maintenance/extract_data/README.txt index 6e9cb75a..ba2c8e70 100644 --- a/maintenance/extract_data/README.txt +++ b/maintenance/extract_data/README.txt @@ -41,6 +41,7 @@ This is the main table, containing almost all data collected by Colouring London - `location_postcode`: postcode - `location_latitude`: latitude - `location_longitude`: longitude +- `building_attachment_form`: building attachment form - `date_year`: year built - `date_lower`: lower bound on year built - `date_upper`: upper bound on year built @@ -59,7 +60,9 @@ This is the main table, containing almost all data collected by Colouring London - `size_floor_area_ground`: ground floor floor area in square metres - `size_floor_area_total`: total floor area in square metres - `size_width_frontage`: width of frontage in metres -- `likes_total`: number of times the building has been liked by Colouring London users +- `sust_breeam_rating`: BREEAM rating +- `sust_dec`: DEC rating +- `sust_retrofit_date`: year of last significant retrofit - `planning_portal_link`: link to an entry on https://www.planningportal.co.uk/ - `planning_in_conservation_area`: in a conservation area? (True/False) - `planning_conservation_area_name`: conservation area name @@ -78,6 +81,7 @@ This is the main table, containing almost all data collected by Colouring London - `planning_local_list_url`: local list reference link - `planning_in_historic_area_assessment`: within a historic area assessment? (True/False) - `planning_historic_area_assessment_url`: historic area assessment reference link +- `likes_total`: number of times the building has been liked by Colouring London users ## Building UPRNs diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql index 7174a0d2..c8256e04 100644 --- a/maintenance/extract_data/export_attributes.sql +++ b/maintenance/extract_data/export_attributes.sql @@ -11,6 +11,7 @@ COPY (SELECT location_postcode, location_latitude, location_longitude, + building_attachment_form, date_year, date_lower, date_upper, @@ -29,7 +30,9 @@ COPY (SELECT size_floor_area_ground, size_floor_area_total, size_width_frontage, - likes_total, + sust_breeam_rating, + sust_dec, + sust_retrofit_date, planning_portal_link, planning_in_conservation_area, planning_conservation_area_name, @@ -47,7 +50,8 @@ COPY (SELECT planning_in_local_list, planning_local_list_url, planning_in_historic_area_assessment, - planning_historic_area_assessment_url + planning_historic_area_assessment_url, + likes_total FROM buildings) TO '/tmp/building_attributes.csv' WITH CSV HEADER