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

Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data

Browse Source
This commit is contained in:
Mateusz Konieczny 2022-11-23 10:11:55 +01:00
commit c66038c036
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/frontend/building/data-containers/planning.tsx
View File

@ -95,7 +95,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
placeholder="If yes, add ID"
placeholder="If yes, add ID here"
linkTargetFunction={(id: String) => { return "https://historicengland.org.uk/listing/the-list/list-entry/" + id + "?section=official-list-entry" } }
linkDescriptionFunction={(id: String) => { return "ID Link" } }
/>
@ -155,7 +155,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
placeholder="If yes, add ID"
placeholder="If yes, add ID here"
linkTargetFunction={(id: String) => { return "https://whc.unesco.org/en/list/" + id } }
linkDescriptionFunction={(id: String) => { return "ID Link" } }
/>

8
app/src/tiles/tileserver.ts
View File

@ -38,16 +38,16 @@ router.get('/:tileset/:z/:x/:y(\\d+):scale(@\\dx)?.png', handleTileRequest);
function parseTileParams(params: any): TileParams {
const { tileset, z, x, y, scale } = params;
if (!allTilesets.includes(tileset)) throw new Error('Invalid value for tileset');
if (!allTilesets.includes(tileset)) throw new Error('Invalid value for tileset: ' + tileset);
const intZ = strictParseInt(z);
if (isNaN(intZ)) throw new Error('Invalid value for z');
if (isNaN(intZ)) throw new Error('Invalid value for z: ' + intZ);
const intX = strictParseInt(x);
if (isNaN(intX)) throw new Error('Invalid value for x');
if (isNaN(intX)) throw new Error('Invalid value for x: ' + intX);
const intY = strictParseInt(y);
if (isNaN(intY)) throw new Error('Invalid value for y');
if (isNaN(intY)) throw new Error('Invalid value for y: ' + intY);
let intScale: number;
if (scale === '@2x') {

12
docs/setup-dev-environment.md
View File

@ -265,6 +265,11 @@ In your Ubuntu installation where you have been running these setup steps (e.g.
```bash
psql < <dumpfile>
```
Alternatively, if you get errors using the above command, use pg_restore:
```bash
pg_restore -d <colouringlondondb> <dumpfile>
```
#### Run migrations
@ -275,7 +280,12 @@ do this are located in the `migrations` folder of your local repository.
```bash
ls ~/colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql < $migration; done;
```
Again, if you get errors, you may need to manually specify the database name
```bash
ls ~/colouring-london/migrations/*.up.sql 2>/dev/null | while read -r migration; do psql -d <colouringlondondb> < $migration; done;
```
</details>
<details>