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

More Config Changes

Browse Source 
- Added project specific GitHub URL to config
- More changes to "Colouring Cities" where it seems appropriate
- More use of "Colouring {CityName}" across the site
This commit is contained in:
Mike Simpson 2022-11-30 15:20:00 +00:00
parent ba513d7935
commit f9999048ec
10 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/cc-config.json
View File

@ -1,7 +1,8 @@
{
"cityName": "London",
"projectBlurb": "Colouring London is also the prototype for the Colouring Cities Research Programme (CCRP)",
"githubURL": "https://github.com/colouring-london/colouring-london",
"initialMapPosition": [ 51.5245255, -0.1338422 ],
"initialZoomLevel": 16
}

2
app/src/cc-config.ts
View File

@ -2,6 +2,8 @@ export interface CCConfig
{
cityName: string;
projectBlurb: string;
githubURL: string;
initialMapPosition: [number, number];
initialZoomLevel: number;
}

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

@ -7,6 +7,8 @@ import { Logo } from './components/logo';
import { WithSeparator } from './components/with-separator';
import { useAuth } from './auth-context';
import { CCConfig } from '../cc-config';
let config: CCConfig = require('../cc-config.json')
interface MenuLink {
to: string;
@ -33,7 +35,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] {
text: "Download data"
},
{
to: "https://github.com/colouring-london/colouring-london",
to: config.githubURL,
text: "Access open code",
external: true
},

2
app/src/frontend/map/layers/city-base-map-layer.tsx
View File

@ -24,7 +24,7 @@ export function CityBaseMapLayer({ theme }: { theme: MapTheme }) {
const theme_class = theme === 'light' ? "light-theme" : "night-theme";
const baseUrl = `https://api.os.uk/maps/raster/v1/zxy/${layer}/{z}/{x}/{y}.png?key=${apiKey}`;
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 attribution = `Building attribute data is © Colouring Cities contributors. Maps contain OS data © Crown copyright: OS Maps baselayers and building outlines. <a href=/ordnance-survey-licence.html>OS licence</a>`;
return <TileLayer
url={baseUrl}

5
app/src/frontend/pages/contact.tsx
View File

@ -1,5 +1,8 @@
import { config } from 'pg-format';
import React from 'react';
import { CCConfig } from '../../cc-config';
let ccconfig: CCConfig = require('../../cc-config.json')
const ContactPage = () => (
<article>
@ -13,7 +16,7 @@ const ContactPage = () => (
<p> You can send us comments or ask questions on our discussion threads at <a href="https://discuss.colouring.london/">https://discuss.colouring.london/</a>.</p>
<p> To view our technical site and platform code please visit Github at: <a href="https://github.com/colouring-london/colouring-london">https://github.com/colouring-london/colouring-london</a>.</p>
<p> To view our technical site and platform code please visit Github at: <a href={ccconfig.githubURL}>https://github.com/colouring-london/colouring-london</a>.</p>
<p>For press enquiries please contact <a href="https://www.turing.ac.uk/contact-us/press-office">The Alan Turing Institute press office</a></p>

9
app/src/frontend/pages/contributor-agreement.tsx
View File

@ -1,6 +1,9 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
const ContributorAgreementPage : React.SFC<any> = () => (
<article>
<section className='main-col'>
@ -34,7 +37,7 @@ const ContributorAgreementPage : React.SFC<any> = () => (
provide us with as little personal data as possible
</li>
<li>
take full responsibility for assessing the reliability of Colouring London data and its suitability for any intended use (see also our 'Data Accuracy Agreement')
take full responsibility for assessing the reliability of Colouring {config.cityName} data and its suitability for any intended use (see also our 'Data Accuracy Agreement')
</li>
<li>
provide feedback on actual or potential privacy and security concerns
@ -45,13 +48,13 @@ const ContributorAgreementPage : React.SFC<any> = () => (
<h3 className='h3'>Open data</h3>
<p>
Colouring London is an open data project. Open data are licensed under the Open Data Commons Open Database License (<a href="https://opendatacommons.org/licenses/odbl/">https://opendatacommons.org/licenses/odbl/</a>) by Colouring London contributors. Under this licence you are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring London and our contributors. If you alter or build upon our data, you may distribute the result only under the same licence. Our open platform code are available under a GNU, General Public Licence (<a href="https://www.gnu.org/licenses/gpl-3.0.en.html">https://www.gnu.org/licenses/gpl-3.0.en.html</a>).
Colouring {config.cityName} is an open data project. Open data are licensed under the Open Data Commons Open Database License (<a href="https://opendatacommons.org/licenses/odbl/">https://opendatacommons.org/licenses/odbl/</a>) by Colouring {config.cityName} contributors. Under this licence you are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring {config.cityName} and our contributors. If you alter or build upon our data, you may distribute the result only under the same licence. Our open platform code are available under a GNU, General Public Licence (<a href="https://www.gnu.org/licenses/gpl-3.0.en.html">https://www.gnu.org/licenses/gpl-3.0.en.html</a>).
</p>
<h3 className='h3'>What you are contributing to</h3>
<p>
Colouring London is a free knowledge exchange platform and open database designed for public use. It has been set up to support a whole-of-society approach to improving the sustainability, resilience and inclusivity of cities. Colouring London is also the prototype platform for the international Colouring Cities Research Programme (CCRP) run at the Alan Turing Institute. Its design is guided by principles set out in the United Nations New Urban Agenda, the Open Data Charter, the General Data Protection Regulation (GDPR), The Gemini Principles, the Open Data Institute's recommendations on personal data and data infrastructure, and specific Articles within the Declaration of Human rights. These are discussed on our <a href="https://github.com/colouring-london/colouring-london/issues/687">'Data ethics'</a> page, where we also use the Open Data Institute's data ethics canvas to answer questions on how we use and manage our data. We capture spatial statistics and do not collect text or images, though images may be integrated in the future. The type of spatial data we collect can be viewed by clicking on each data category, on 'Info' buttons and on the 'Building data categories' page. We are also planning a 'Showcase section' to enable platform users to share, and view, ways in which Colouring London data are used.
Colouring {config.cityName} is a free knowledge exchange platform and open database designed for public use. It has been set up to support a whole-of-society approach to improving the sustainability, resilience and inclusivity of cities. Colouring London is also the prototype platform for the international Colouring Cities Research Programme (CCRP) run at the Alan Turing Institute. Its design is guided by principles set out in the United Nations New Urban Agenda, the Open Data Charter, the General Data Protection Regulation (GDPR), The Gemini Principles, the Open Data Institute's recommendations on personal data and data infrastructure, and specific Articles within the Declaration of Human rights. These are discussed on our <a href="https://github.com/colouring-london/colouring-london/issues/687">'Data ethics'</a> page, where we also use the Open Data Institute's data ethics canvas to answer questions on how we use and manage our data. We capture spatial statistics and do not collect text or images, though images may be integrated in the future. The type of spatial data we collect can be viewed by clicking on each data category, on 'Info' buttons and on the 'Building data categories' page. We are also planning a 'Showcase section' to enable platform users to share, and view, ways in which Colouring {config.cityName} data are used.
</p>
<h3 className='h3'>Diversity and inclusivity</h3>

7
app/src/frontend/pages/data-accuracy.tsx
View File

@ -1,14 +1,17 @@
import React from 'react';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
const DataAccuracyPage = () => (
<article>
<section className="main-col">
<h1 className="h2">Data Accuracy Agreement</h1>
<p>
Colouring London data are provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, accuracy, fitness for a particular purpose and non-infringement. In no event shall the Alan Turing Institute be liable for any reliance that you place on or how you use the data nor any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the data or the use or other dealings in the data.
Colouring {config.cityName} data are provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, accuracy, fitness for a particular purpose and non-infringement. In no event shall the Alan Turing Institute be liable for any reliance that you place on or how you use the data nor any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the data or the use or other dealings in the data.
</p>
<p>
Colouring London data are crowdsourced from multiple sources and may contain errors. Though we cannot comment on data accuracy, we try to include as many features as possible to help users assess their reliability and suitability for specific types of use (be this a school project or scientific paper). As information on sources is very important, contributors are asked to add these, and to verify data, wherever possible.
Colouring {config.cityName} data are crowdsourced from multiple sources and may contain errors. Though we cannot comment on data accuracy, we try to include as many features as possible to help users assess their reliability and suitability for specific types of use (be this a school project or scientific paper). As information on sources is very important, contributors are asked to add these, and to verify data, wherever possible.
</p>
</section>
</article>

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

@ -42,16 +42,16 @@ 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
Choose one of the links below to download an archive containing the open data collected on the Colouring Cities platform
</p>
<p>
Colouring London contributions are open data, licensed under the <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) by Colouring London contributors.
Colouring Cities contributions are open data, licensed under the <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) by Colouring Cities contributors.
</p>
<p>
You are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring London and our contributors. If you alter or build upon our data, you may distribute the result only under the same licence.
You are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring Cities and our contributors. If you alter or build upon our data, you may distribute the result only under the same licence.
</p>
<p>
Choose one of the links below to download an archive containing the open data collected on the Colouring London platform.
Choose one of the links below to download an archive containing the open data collected on the Colouring Cities platform.
</p>
<p>
By downloading data extracts from this site, you agree to the <Link to="/data-accuracy.html">data accuracy agreement</Link> and the <Link to="/ordnance-survey-uprn.html">Ordnance Survey terms of UPRN usage</Link>.

7
app/src/frontend/user/login.tsx
View File

@ -7,6 +7,9 @@ import { SpinnerIcon } from '../components/icons';
import InfoBox from '../components/info-box';
import SupporterLogos from '../components/supporter-logos';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
export const Login: React.FC = () => {
const {isLoading, login } = useAuth();
@ -23,11 +26,13 @@ export const Login: React.FC = () => {
login({ username, password }, setError);
}, [username, password]);
const msgText = `Welcome to Colouring ${config.cityName}. You're one of the first people to use the site!`;
return (
<article>
<section className="main-col">
<h1 className="h2">Log in</h1>
<InfoBox msg="Welcome to Colouring London. You're one of the first people to use the site! ">
<InfoBox msg={msgText}>
<br/>Please <a href="https://discuss.colouring.london/">discuss
suggestions for improvements</a> and <a
href="https://github.com/colouring-london/colouring-london/issues">

7
app/src/frontend/user/signup.tsx
View File

@ -7,6 +7,9 @@ import { SpinnerIcon } from '../components/icons';
import InfoBox from '../components/info-box';
import SupporterLogos from '../components/supporter-logos';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
export const SignUp: React.FC = () => {
const { isLoading, signup } = useAuth();
const [error, setError] = useState(undefined);
@ -26,11 +29,13 @@ export const SignUp: React.FC = () => {
[username, email, confirmEmail, password, confirmConditions, signup]
);
const msgName = `Welcome to Colouring ${config.cityName}. You're one of the first people to sign up!`
return (
<article>
<section className="main-col">
<h1 className="h2">Sign up</h1>
<InfoBox msg="Welcome to Colouring London. You're one of the first people to sign up! ">
<InfoBox msg={msgName}>
<br/>Please <a href="https://discuss.colouring.london/">discuss
suggestions for improvements</a> and <a
href="https://github.com/colouring-london/colouring-london/issues">