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

Add OS map data and UPRN licencing

Browse Source
This commit is contained in:
Maciej Ziarkowski 2019-10-03 14:55:54 +01:00
parent 2a395d5f2e
commit dd7d66e5fc
6 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/frontend/app.tsx
View File

@ -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<AppProps, any> { // TODO: add proper types
</Route>
<Route exact path="/privacy-policy.html" component={PrivacyPolicyPage} />
<Route exact path="/contributor-agreement.html" component={ContributorAgreementPage} />
<Route exact path="/ordnance-survey-licence.html" component={OrdnanceSurveyLicencePage} />
<Route exact path="/ordnance-survey-uprn.html" component={OrdnanceSurveyUprnPage} />
<Route exact path="/data-accuracy.html" component={DataAccuracyPage} />
<Route exact path="/data-extracts.html" component={DataExtracts} />
<Route exact path="/contact.html" component={ContactPage} />

11
app/src/frontend/map/legend.css
View File

@ -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;
}

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

@ -105,7 +105,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> { //
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. <a href=/ordnance-survey-licence.html>OS licence</a>';
const baseLayer = <TileLayer
url={baseUrl}
attribution={attribution}

2
app/src/frontend/pages/data-extracts.tsx
View File

@ -45,7 +45,7 @@ export default class DataExtracts extends React.Component<{}, DataExtractsState>
<section className="main-col">
<h1 className="h2">Open data extracts</h1>
<p>Choose one of the links below to download an archive containing the open data collected on the Colouring London platform</p>
<p>By downloading data extracts from this site, you agree to the <NavLink to="/data-accuracy.html">data accuracy agreement </NavLink></p>
<p>By downloading data extracts from this site, you agree to the <NavLink to="/data-accuracy.html">data accuracy agreement </NavLink> and the <NavLink to="/ordnance-survey-uprn.html">Ordnance Survey terms of UPRN usage</NavLink>.</p>
{
this.state.extracts == undefined ?
<p>Loading extracts...</p> :

22
app/src/frontend/pages/ordnance-survey-licence.tsx Normal file
View File

@ -0,0 +1,22 @@
import React from 'react';
const OrdnanceSurveyLicencePage = () => (
<article className="main-col">
<section>
<h1 className="h2">Ordnance Survey Data - Terms and Conditions</h1>
<ul>
<li>
You are granted a non-exclusive, royalty free revocable licence solely to <strong>view</strong> the licensed mapping (and addressing) data for non-commercial purposes for the period during which we make it available;
</li>
<li>
You are not permitted to copy, sub-license, distribute, sell or otherwise make available such data to third parties in any form; and
</li>
<li>
Third party rights to enforce the terms of this licence shall be reserved to OS.
</li>
</ul>
</section>
</article>
);
export default OrdnanceSurveyLicencePage;

14
app/src/frontend/pages/ordnance-survey-uprn.tsx Normal file
View File

@ -0,0 +1,14 @@
import React from 'react';
const OrdnanceSurveyUprnPage = () => (
<article className="main-col">
<section>
<h1 className="h2">Ordnance Survey - UPRN Usage Terms</h1>
<p>
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.
</p>
</section>
</article>
);
export default OrdnanceSurveyUprnPage;