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

Allow zoom level 19 with OS basemap interpolation

Browse Source
This commit is contained in:
Maciej Ziarkowski 2019-10-08 17:40:30 +01:00
parent 98a826179c
commit 0240e94adc
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

@ -112,10 +112,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}/>;
// colour-data tiles // colour-data tiles
const cat = this.props.category; const cat = this.props.category;
@ -136,6 +138,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;
@ -144,7 +147,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;
@ -157,7 +161,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

@ -34,7 +34,7 @@ const tileCache = new TileCache(
{ {
tilesets: ['date_year', 'size_storeys', 'location', 'likes', 'conservation_area', 'sust_dec', 'building_attachment_form'], tilesets: ['date_year', 'size_storeys', 'location', 'likes', 'conservation_area', 'sust_dec', 'building_attachment_form'],
minZoom: 9, minZoom: 9,
maxZoom: 18, maxZoom: 19,
scales: [1, 2] scales: [1, 2]
}, },
({ tileset, z }: TileParams) => (tileset === 'date_year' && z <= 16) || ({ tileset, z }: TileParams) => (tileset === 'date_year' && z <= 16) ||