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

Merge pull request #466 from mz8i/feature/72-increase-max-zoom

Browse Source 
Allow zoom level 19 with OS basemap interpolation
This commit is contained in:
Tom Russell 2019-11-12 10:43:40 +00:00 committed by GitHub
commit ba501dfc3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,12 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
const baseLayer = <TileLayer const baseLayer = <TileLayer
url={baseUrl} url={baseUrl}
attribution={attribution} attribution={attribution}
maxNativeZoom={18}
maxZoom={19}
/>; />;
const buildingsBaseUrl = `/tiles/base_${this.state.theme}/{z}/{x}/{y}{r}.png`; const buildingsBaseUrl = `/tiles/base_${this.state.theme}/{z}/{x}/{y}{r}.png`;
const buildingBaseLayer = <TileLayer url={buildingsBaseUrl} minZoom={14} />; const buildingBaseLayer = <TileLayer url={buildingsBaseUrl} minZoom={14} maxZoom={19}/>;
const boundaryStyleFn = () => ({color: '#bbb', fill: false}); const boundaryStyleFn = () => ({color: '#bbb', fill: false});
@ -145,6 +147,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
key={tileset} key={tileset}
url={`/tiles/${tileset}/{z}/{x}/{y}{r}.png?rev=${rev}`} url={`/tiles/${tileset}/{z}/{x}/{y}{r}.png?rev=${rev}`}
minZoom={9} minZoom={9}
maxZoom={19}
/> />
: null; : null;
@ -153,7 +156,8 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
<TileLayer <TileLayer
key={this.props.building.building_id} key={this.props.building.building_id}
url={`/tiles/highlight/{z}/{x}/{y}{r}.png?highlight=${this.props.building.geometry_id}&base=${tileset}`} url={`/tiles/highlight/{z}/{x}/{y}{r}.png?highlight=${this.props.building.geometry_id}&base=${tileset}`}
minZoom={14} minZoom={13}
maxZoom={19}
zIndex={100} zIndex={100}
/> />
: null; : null;
@ -166,7 +170,7 @@ class ColouringMap extends Component<ColouringMapProps, ColouringMapState> {
center={position} center={position}
zoom={this.state.zoom} zoom={this.state.zoom}
minZoom={9} minZoom={9}
maxZoom={18} maxZoom={19}
doubleClickZoom={false} doubleClickZoom={false}
zoomControl={false} zoomControl={false}
attributionControl={false} attributionControl={false}

2
app/src/tiles/rendererDefinition.ts
View File

@ -29,7 +29,7 @@ const tileCache = new TileCache(
{ {
tilesets: getBuildingLayerNames(), tilesets: getBuildingLayerNames(),
minZoom: 9, minZoom: 9,
maxZoom: 18, maxZoom: 19,
scales: [1, 2] scales: [1, 2]
}, },