diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-08-17 17:22:59 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-08-17 17:22:59 +0100 |
| commit | a9be1c52445e4281311f7420ea514f1e7485b50d (patch) | |
| tree | a692fa349ab9abbd505935d5b917db767bac2801 /perllib/FixMyStreet/Map/WMTSBase.pm | |
| parent | 5a8a8d05355295c185de55ec1bdddb6ca69b33e5 (diff) | |
| parent | 3f21a9fa625c72dd756b66e385cf2f817d42200f (diff) | |
Merge branch 'harrogate-zurich-fixes'
Diffstat (limited to 'perllib/FixMyStreet/Map/WMTSBase.pm')
| -rw-r--r-- | perllib/FixMyStreet/Map/WMTSBase.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/Map/WMTSBase.pm b/perllib/FixMyStreet/Map/WMTSBase.pm index e35ae13c9..909ada1d6 100644 --- a/perllib/FixMyStreet/Map/WMTSBase.pm +++ b/perllib/FixMyStreet/Map/WMTSBase.pm @@ -202,9 +202,9 @@ sub get_map_hash { map_type => 'OpenLayers.Layer.WMTS', tiles => $self->map_tiles( %params ), copyright => $self->copyright(), - zoom => $params{zoom},, + zoom => $params{zoom}, zoomOffset => $self->zoom_parameters->{min_zoom_level}, - numZoomLevels => $self->zoom_parameters->{default_zoom}, + numZoomLevels => $self->zoom_parameters->{zoom_levels}, tile_size => $self->tile_parameters->{size}, tile_dpi => $self->tile_parameters->{dpi}, tile_urls => encode_json $self->tile_parameters->{urls}, @@ -241,7 +241,7 @@ sub latlon_to_tile($$$$) { lon => $tile_params->{origin_x}, lat => $tile_params->{origin_y} }; - my $res = $scales[$matrix_id] / + my $res = $scales[$zoom] / ($tile_params->{inches_per_unit} * $tile_params->{dpi}); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH @@ -282,13 +282,12 @@ sub tile_to_latlon { my ($self, $fx, $fy, $zoom) = @_; my $tile_params = $self->tile_parameters; - my $matrix_id = $zoom + $self->zoom_parameters->{id_offset}; my @scales = $self->scales; my $tileOrigin = { lon => $tile_params->{origin_x}, lat => $tile_params->{origin_y} }; - my $res = $scales[$matrix_id] / + my $res = $scales[$zoom] / ($tile_params->{inches_per_unit} * $tile_params->{dpi}); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH |