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

Fix multi-edit shouldn't deselect building

Browse Source 
If a user is in multi-edit mode and clicks where there is no building,
this should be a no-op.

Previous behaviour would clear the building and incidentally the
URL query string, losing selected attributes to copy, and triggering
URL-parsing error (caught as of fa785a7).
This commit is contained in:
Tom Russell 2019-10-02 22:17:37 +01:00
parent fa785a726c
commit 7899588f87
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,11 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> { //
this.props.selectBuilding(undefined);
}
} else {
// deselect but keep/return to expected colour theme
this.props.selectBuilding(undefined);
if (mode !== 'multi-edit') {
// deselect but keep/return to expected colour theme
// except if in multi-edit (never select building, only colour on click)
this.props.selectBuilding(undefined);
}
}
}.bind(this)).catch(
(err) => console.error(err)
@ -106,7 +109,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> { //
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 baseLayer = <TileLayer
const baseLayer = <TileLayer
url={baseUrl}
attribution={attribution}
/>;