Tweak layer levels

diff --git a/config/key.yml b/config/key.yml
index 69b883c0f5b4946bad8ff37249978937e01eef84..f1bfde91ffeea8fbfd8babf928a7a05b2c405d46 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,52 +1,52 @@
 mapnik:
 mapnik:

-  - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png }
+  - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.png }

   - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png }
   - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png }

-  - { min_zoom: 12, max_zoom: 18, name: trunk, image: trunk12.png }
+  - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png }

   - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png }
   - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png }

-  - { min_zoom: 12, max_zoom: 18, name: primary, image: primary12.png }
+  - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }

   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }

-  - { min_zoom: 12, max_zoom: 18, name: secondary, image: secondary12.png }
-  - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png }
-  - { min_zoom: 13, max_zoom: 18, name: track, image: track.png }
-  - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png }
-  - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png }
+  - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }
+  - { min_zoom: 13, max_zoom: 19, name: unsurfaced, image: unsurfaced.png }
+  - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
+  - { min_zoom: 13, max_zoom: 19, name: byway, image: byway.png }
+  - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
+  - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }

   - { min_zoom: 8, max_zoom: 12, name: rail, image: rail.png }
   - { min_zoom: 8, max_zoom: 12, name: rail, image: rail.png }

-  - { min_zoom: 13, max_zoom: 18, name: rail, image: rail13.png }
-  - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png }
-  - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png }
-  - { min_zoom: 12, max_zoom: 18, name: cable, image: cable.png }
-  - { min_zoom: 11, max_zoom: 18, name: runway, image: runway.png }
-  - { min_zoom: 12, max_zoom: 18, name: apron, image: apron.png }
-  - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png }
-  - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png }
-  - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png }
-  - { min_zoom: 10, max_zoom: 18, name: golf, image: golf.png }
-  - { min_zoom: 10, max_zoom: 18, name: park, image: park.png }
-  - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png }
-  - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png }
-  - { min_zoom: 10, max_zoom: 18, name: common, image: common.png }
-  - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png }
-  - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png }
-  - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png }
-  - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png }
-  - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png }
-  - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png }
-  - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png }
-  - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png }
-  - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png }
-  - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png }
-  - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png }
-  - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png }
-  - { min_zoom: 11, max_zoom: 18, name: military, image: military.png }
-  - { min_zoom: 12, max_zoom: 18, name: school, image: school.png }
-  - { min_zoom: 12, max_zoom: 18, name: building, image: building.png }
-  - { min_zoom: 12, max_zoom: 18, name: station, image: station.png }
-  - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.png }
-  - { min_zoom: 12, max_zoom: 18, name: tunnel, image: tunnel.png }
-  - { min_zoom: 13, max_zoom: 18, name: bridge, image: bridge.png }
-  - { min_zoom: 15, max_zoom: 18, name: private, image: private.png }
-  - { min_zoom: 15, max_zoom: 18, name: permissive, image: permissive.png }
-  - { min_zoom: 15, max_zoom: 18, name: destination, image: destination.png }
-  - { min_zoom: 12, max_zoom: 18, name: construction, image: construction.png }
+  - { min_zoom: 13, max_zoom: 19, name: rail, image: rail13.png }
+  - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png }
+  - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png }
+  - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
+  - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
+  - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
+  - { min_zoom: 0, max_zoom: 19, name: admin, image: admin.png }
+  - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png }
+  - { min_zoom: 10, max_zoom: 19, name: wood, image: wood.png }
+  - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
+  - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
+  - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
+  - { min_zoom: 10, max_zoom: 19, name: tourist, image: tourist.png }
+  - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
+  - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
+  - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
+  - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
+  - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
+  - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png }
+  - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
+  - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
+  - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }
+  - { min_zoom: 11, max_zoom: 19, name: allotments, image: allotments.png }
+  - { min_zoom: 11, max_zoom: 19, name: pitch, image: pitch.png }
+  - { min_zoom: 11, max_zoom: 19, name: centre, image: centre.png }
+  - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
+  - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
+  - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
+  - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
+  - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
+  - { min_zoom: 12, max_zoom: 19, name: summit, image: summit.png }
+  - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
+  - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
+  - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }
+  - { min_zoom: 15, max_zoom: 19, name: permissive, image: permissive.png }
+  - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
+  - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }

diff --git a/vendor/assets/leaflet/leaflet.osm.js b/vendor/assets/leaflet/leaflet.osm.js
index 207f5792020f98407248793be28ce6cfcdd551fb..dcb1e984a695e7fb7277a34f4eb950d83d95cf8f 100644 (file)
--- a/vendor/assets/leaflet/leaflet.osm.js
+++ b/vendor/assets/leaflet/leaflet.osm.js
@@ -14,7 +14,8 @@ L.OSM.TileLayer = L.TileLayer.extend({
 
 L.OSM.Mapnik = L.OSM.TileLayer.extend({
   options: {
 
 L.OSM.Mapnik = L.OSM.TileLayer.extend({
   options: {

-    url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+    url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+    maxZoom: 19

   }
 });
 
   }
 });
 

diff --git a/vendor/assets/openlayers/OpenStreetMap.js b/vendor/assets/openlayers/OpenStreetMap.js
index b09b14ef5205598b7b73d55b859183f3afb9ba42..e722c3a2fb668f0203e05e4ef2d6120819e5c902 100644 (file)
--- a/vendor/assets/openlayers/OpenStreetMap.js
+++ b/vendor/assets/openlayers/OpenStreetMap.js
@@ -19,7 +19,7 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
             "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
         ];
         options = OpenLayers.Util.extend({
             "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
         ];
         options = OpenLayers.Util.extend({

-            numZoomLevels: 19,
+            numZoomLevels: 20,

             attribution: "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
             buffer: 0,
             transitionEffect: "resize"
             attribution: "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
             buffer: 0,
             transitionEffect: "resize"