diff options
| author | Dave Whiteland <dave@mysociety.org> | 2013-02-06 15:08:23 +0000 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2013-02-06 15:08:23 +0000 |
| commit | 0f24a44cd6e8b056db482cb91c85768b6d1e7d1d (patch) | |
| tree | 09a90f38574ee62754f3c8ac077152ed99a38296 /perllib/FixMyStreet/Map/Zurich.pm | |
| parent | c061769ba72f420e2f2c6064fa526648e57339f1 (diff) | |
| parent | 5b2e18389734751165d2eeb21a3b3f2e8d2e8755 (diff) | |
Merge remote branch 'origin/master' into oxfordshire-header
Diffstat (limited to 'perllib/FixMyStreet/Map/Zurich.pm')
| -rw-r--r-- | perllib/FixMyStreet/Map/Zurich.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm index d2f7a35af..262b6e229 100644 --- a/perllib/FixMyStreet/Map/Zurich.pm +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -13,8 +13,8 @@ use Geo::Coordinates::CH1903; use Math::Trig; use Utils; -use constant ZOOM_LEVELS => 10; -use constant DEFAULT_ZOOM => 7; +use constant ZOOM_LEVELS => 7; +use constant DEFAULT_ZOOM => 5; use constant MIN_ZOOM_LEVEL => 0; sub map_tiles { @@ -30,7 +30,7 @@ sub map_tiles { } sub base_tile_url { - return 'http://www.wmts.stadt-zuerich.ch/Luftbild/MapServer/WMTS/tile/1.0.0/Luftbild/default/nativeTileMatrixSet'; + return 'http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/1.0.0/Hybrid/default/nativeTileMatrixSet'; } sub copyright { @@ -90,10 +90,10 @@ sub latlon_to_tile($$$) { my ($x, $y) = Geo::Coordinates::CH1903::from_latlon($lat, $lon); - my $matrix_id = $zoom - 1; + my $matrix_id = $zoom; $matrix_id = 0 if $matrix_id < 0; - my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500' ); + my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000' ); my $tileOrigin = { lat => 30814423, lon => -29386322 }; my $tileSize = 256; my $res = $scales[$zoom] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH |