Rework the translatable map key to be driven by a YAML file listing the

entries to show for each layer and zoom level.

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index daf8fead74ae0a62c4a1207848566938b2576211..2a826770d4144b2eafa680ebdd0f189f56de0b79 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,4 +1,6 @@
 class SiteController < ApplicationController
+  layout 'site',:except => [:key]
+
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
@@ -6,4 +8,8 @@ class SiteController < ApplicationController
   def export
     render :action => 'index'
   end
+
+  def key
+    expires_in 7.days, :public => true
+  end
 end

diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb
index 62ab2105ee5b64534ec99883e716000f693ab1c7..22261900d60ad3ba61ce94c8378c6d7a737c9463 100644 (file)
--- a/app/views/site/_key.html.erb
+++ b/app/views/site/_key.html.erb
@@ -1,190 +1,33 @@
-<% content_for :left_menu do %>
-<%= link_to_function t('site.key.map_key'), "showKey();", { :title => t('site.key.map_key_tooltip') } %>
-<% end %>
-
 <script type="text/javascript">
-<!--
-
-  function showKeyEntry(image, text) {
-    var ret = '';
-    ret += '<tr>';
-    ret += '  <td class="mapkey-table-key" align="center">';
-    ret += '    <img src="/images/mapkey/' + image + '" />';
-    ret += '  </td>';
-    ret += '  <td class="mapkey-table-value">';
-    ret +=      text;
-    ret += '  </td>';
-    ret += '</tr>';
-    return ret;
-  }
-  function showKey() {
-    var zoomlevel = map.getZoom();
-    var mapkey_values = new Array();
-    mapkey_values['heading']      = "<%= t'site.key.table.heading' %>";
-    mapkey_values['motorway']     = "<%= t'site.key.table.entry.motorway' %>";
-    mapkey_values['trunk']        = "<%= t'site.key.table.entry.trunk' %>";
-    mapkey_values['primary']      = "<%= t'site.key.table.entry.primary' %>";
-    mapkey_values['secondary']    = "<%= t'site.key.table.entry.secondary' %>";
-    mapkey_values['unclassified'] = "<%= t'site.key.table.entry.unclassified' %>";
-    mapkey_values['unsurfaced']   = "<%= t'site.key.table.entry.unsurfaced' %>";
-    mapkey_values['track']        = "<%= t'site.key.table.entry.track' %>";
-    mapkey_values['byway']        = "<%= t'site.key.table.entry.byway' %>";
-    mapkey_values['bridleway']    = "<%= t'site.key.table.entry.bridleway' %>";
-    mapkey_values['cycleway']     = "<%= t'site.key.table.entry.cycleway' %>";
-    mapkey_values['footway']      = "<%= t'site.key.table.entry.footway' %>";
-    mapkey_values['rail']         = "<%= t'site.key.table.entry.rail' %>";
-    mapkey_values['subway']       = "<%= t'site.key.table.entry.subway' %>";
-    mapkey_values['tram']         = "<%= t'site.key.table.entry.tram' %>";
-    mapkey_values['cable']        = "<%= t'site.key.table.entry.cable' %>";
-    mapkey_values['runway']       = "<%= t'site.key.table.entry.runway' %>";
-    mapkey_values['apron']        = "<%= t'site.key.table.entry.apron' %>";
-    mapkey_values['admin']        = "<%= t'site.key.table.entry.admin' %>";
-    mapkey_values['forest']       = "<%= t'site.key.table.entry.forest' %>";
-    mapkey_values['wood']         = "<%= t'site.key.table.entry.wood' %>";
-    mapkey_values['golf']         = "<%= t'site.key.table.entry.golf' %>";
-    mapkey_values['park']         = "<%= t'site.key.table.entry.park' %>";
-    mapkey_values['resident']     = "<%= t'site.key.table.entry.resident' %>";
-    mapkey_values['tourist']      = "<%= t'site.key.table.entry.tourist' %>";
-    mapkey_values['common']       = "<%= t'site.key.table.entry.common' %>";
-    mapkey_values['retail']       = "<%= t'site.key.table.entry.retail' %>";
-    mapkey_values['industrial']   = "<%= t'site.key.table.entry.industrial' %>";
-    mapkey_values['commercial']   = "<%= t'site.key.table.entry.commercial' %>";
-    mapkey_values['heathland']    = "<%= t'site.key.table.entry.heathland' %>";
-    mapkey_values['lake']         = "<%= t'site.key.table.entry.lake' %>";
-    mapkey_values['farm']         = "<%= t'site.key.table.entry.farm' %>";
-    mapkey_values['brownfield']   = "<%= t'site.key.table.entry.brownfield' %>";
-    mapkey_values['cemetery']     = "<%= t'site.key.table.entry.cemetery' %>";
-    mapkey_values['allotments']   = "<%= t'site.key.table.entry.allotments' %>";
-    mapkey_values['pitch']        = "<%= t'site.key.table.entry.pitch' %>";
-    mapkey_values['centre']       = "<%= t'site.key.table.entry.centre' %>";
-    mapkey_values['reserve']      = "<%= t'site.key.table.entry.reserve' %>";
-    mapkey_values['military']     = "<%= t'site.key.table.entry.military' %>";
-    mapkey_values['school']       = "<%= t'site.key.table.entry.school' %>";
-    mapkey_values['building']     = "<%= t'site.key.table.entry.building' %>";
-    mapkey_values['station']      = "<%= t'site.key.table.entry.station' %>";
-    mapkey_values['summit']       = "<%= t'site.key.table.entry.summit' %>";
-    mapkey_values['tunnel']       = "<%= t'site.key.table.entry.tunnel' %>";
-    mapkey_values['bridge']       = "<%= t'site.key.table.entry.bridge' %>";
-    mapkey_values['private']      = "<%= t'site.key.table.entry.private' %>";
-    mapkey_values['permissive']   = "<%= t'site.key.table.entry.permissive' %>";
-    mapkey_values['destination']  = "<%= t'site.key.table.entry.destination' %>";
-    mapkey_values['construction'] = "<%= t'site.key.table.entry.construction' %>";
+  function openMapKey() {
+    updateMapKey();
 
-    var out = '';
-    var suffix = '';
+    openSidebar({ 
+      title: "<%= t('site.key.map_key') %>",
+      onclose: closeMapKey
+    });
 
-    out += '<div id="mapkey">';
-    out += '<h3>' + i18n(mapkey_values['heading'], { zoom_level: zoomlevel }) + "</h3>";
-    out += '<table class="mapkey-table">';
-    out += showKeyEntry('motorway.png', mapkey_values['motorway']);
-    
-    if (zoomlevel >= 12) {
-        suffix = 12;
-    }
-    out += showKeyEntry('trunk' + suffix + '.png', mapkey_values['trunk']);
-    if (zoomlevel >= 7) {
-        out += showKeyEntry('primary' + suffix + '.png', mapkey_values['primary']);
-    }
-    if (zoomlevel >= 9) {
-        out += showKeyEntry('secondary' + suffix + '.png', mapkey_values['secondary']);
-    }
-    if (zoomlevel >= 10) {
-        suffix = '';
-        if (zoomlevel >= 13) { suffix="13"; }
-        out += showKeyEntry('unclassified' + suffix + '.png', mapkey_values['unclassified']);
-    }
-    if (zoomlevel >= 13) {
-        out += showKeyEntry('unsurfaced.png', mapkey_values['unsurfaced']);
-        out += showKeyEntry('track.png', mapkey_values['track']);
-        out += showKeyEntry('byway.png', mapkey_values['byway']);
-        out += showKeyEntry('bridleway.png', mapkey_values['bridleway']);
-        out += showKeyEntry('cycleway.png', mapkey_values['cycleway']);
-        out += showKeyEntry('footway.png', mapkey_values['footway']);
-    }
-    if (zoomlevel >= 8) {
-        suffix = '';
-        if (zoomlevel >= 13) { suffix = "13"; }
-        out += showKeyEntry('rail' + suffix + '.png', mapkey_values['rail']);
-    }
-    if (zoomlevel >= 13) {
-        out += showKeyEntry('subway.png', mapkey_values['subway']);
-        out += showKeyEntry('tram.png', mapkey_values['tram']);
-    }
-    if (zoomlevel >= 12) {
-        out += showKeyEntry('cable.png', mapkey_values['cable']);
-    }
-    if (zoomlevel >= 11) {
-        out += showKeyEntry('runway.png', mapkey_values['runway']);
-    }
-    if (zoomlevel >= 12) {
-        out += showKeyEntry('apron.png', mapkey_values['apron']);
-    }
-    out += showKeyEntry('admin.png', mapkey_values['admin']);
-    if (zoomlevel >= 9) {
-        out += showKeyEntry('forest.png', mapkey_values['forest']);
-    }
-    if (zoomlevel >= 10) {
-        out += showKeyEntry('wood.png', mapkey_values['wood']);
-        out += showKeyEntry('golf.png', mapkey_values['golf']);
-        out += showKeyEntry('park.png', mapkey_values['park']);
-    }
-    if (zoomlevel >= 8) {
-        out += showKeyEntry('resident.png', mapkey_values['resident']);
-    }
-    if (zoomlevel >= 10) {
-        out += showKeyEntry('tourist.png', mapkey_values['tourist']);
-        out += showKeyEntry('common.png', mapkey_values['common']);
-        out += showKeyEntry('retail.png', mapkey_values['retail']);
-        out += showKeyEntry('industrial.png', mapkey_values['industrial']);
-        out += showKeyEntry('commercial.png', mapkey_values['commercial']);
-        out += showKeyEntry('heathland.png', mapkey_values['heathland']);
-    }
-    if (zoomlevel >= 8) {
-        out += showKeyEntry('lake.png', mapkey_values['lake']);
-    }
-    if (zoomlevel >= 10) {
-        out += showKeyEntry('farm.png', mapkey_values['farm']);
-        out += showKeyEntry('brownfield.png', mapkey_values['brownfield']);
-    }
-    if (zoomlevel >= 11) {
-        out += showKeyEntry('cemetery.png', mapkey_values['cemetery']);
-        out += showKeyEntry('allotments.png', mapkey_values['allotments']);
-        out += showKeyEntry('pitch.png', mapkey_values['pitch']);
-        out += showKeyEntry('centre.png', mapkey_values['centre']);
-        out += showKeyEntry('reserve.png', mapkey_values['reserve']);
-        out += showKeyEntry('military.png', mapkey_values['military']);
-    }
-    if (zoomlevel >= 12) {
-        out += showKeyEntry('school.png', mapkey_values['school']);
-        out += showKeyEntry('building.png', mapkey_values['building']);
-        out += showKeyEntry('station.png', mapkey_values['station']);
-        out += showKeyEntry('summit.png', mapkey_values['summit']);
-        out += showKeyEntry('tunnel.png', mapkey_values['tunnel']);
-    }
-    if (zoomlevel >= 13) {
-        out += showKeyEntry('bridge.png', mapkey_values['bridge']);
-    }
-    if (zoomlevel >= 15) {
-        out += showKeyEntry('private.png', mapkey_values['private']);
-        out += showKeyEntry('permissive.png', mapkey_values['permissive']);
-        out += showKeyEntry('destination.png', mapkey_values['destination']);
-    }
-    if (zoomlevel >= 12) {
-        out += showKeyEntry('construction.png', mapkey_values['construction']);
-    }
-        
-    out += "</table>";
-    out += "</div>";
+    map.events.register("zoomend", map, updateMapKey);
+    map.events.register("changelayer", map, updateMapKey);
+  }
 
-    updateSidebar("<%= t('site.key.map_key') %>", out);
-    openSidebar({ width: "210px" });
+  function closeMapKey() {
+    map.events.unregister("zoomend", map, updateMapKey);
+    map.events.unregister("changelayer", map, updateMapKey);
   }
 
-  function updateKey() {
-    if (sidebarOpen("<%= t('site.key.map_key') %>")) 
-    {
-      showKey();
-    }
+  function updateMapKey() {
+    var layer = map.baseLayer.name.toLowerCase().replace(/\s+/g, "_");
+    var zoom = map.getZoom();
+
+    <%= remote_function :update => "sidebar_content",
+                        :url => { :action => "key" },
+                        :with => "'layer=' + layer + '&zoom=' + zoom",
+                        :method => :get
+    %>
   }
-// -->
 </script>
+
+<% content_for :left_menu do %>
+  <%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %>
+<% end %>

diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb
index dd15ef7ba64b2e00ac17de7da3066d3a11c38f0f..2dbcef432c9d11020a3ce390b38264ab6238d8e5 100644 (file)
--- a/app/views/site/_sidebar.html.erb
+++ b/app/views/site/_sidebar.html.erb
@@ -21,6 +21,8 @@
        onclose = null;
     }
 
+    if (options.title) { $("sidebar_title").innerHTML = options.title; }
+
     if (options.width) { $("sidebar").style.width = options.width; }
     else { $("sidebar").style.width = "30%"; }
 
@@ -46,10 +48,5 @@
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }
-
-  function sidebarOpen(title) {
-    return $("sidebar").style.display == "block" &&
-           $("sidebar_title").innerHTML == title;
-  }
 // -->
 </script>

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index a69a6b4ee15ec931417cbbba9cdd763f4cc85329..ecb732c9b198d5e74daeb4014e11c0773bdff2c5 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -139,8 +139,6 @@ end
     marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
     <% end %>
 
-    map.events.register("zoomend", map, updateKey);
-
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
     updateLocation();

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
new file mode 100644 (file)
index 0000000..9754424
--- /dev/null
+++ b/app/views/site/key.html.erb
@@ -0,0 +1,21 @@
+<div id="mapkey">
+  <h3><%= t "site.key.table.heading", :zoom_level => params[:zoom] %></h3>
+  <table class="mapkey-table">
+    <% YAML.load_file("#{RAILS_ROOT}/config/key.yml").each do |name,data| %>
+      <% if params[:layer] == name %>
+        <% data.each do |entry| %>
+          <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %>
+            <tr>
+              <td class="mapkey-table-key" align="center">
+                <%= image_tag "key/#{name}/#{entry['image']}" %>
+              </td>
+              <td class="mapkey-table-value">
+                <%= t "site.key.table.entry.#{entry['name']}" %>
+              </td>
+            </tr>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </table>
+</div>

diff --git a/config/key.yml b/config/key.yml
new file mode 100644 (file)
index 0000000..bd775a1
--- /dev/null
+++ b/config/key.yml
@@ -0,0 +1,52 @@
+mapnik:
+  - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.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: 7, max_zoom: 11, name: primary, image: primary.png }
+  - { min_zoom: 12, max_zoom: 18, name: primary, image: primary12.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: 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: 8, 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 }

diff --git a/config/locales/de.yml b/config/locales/de.yml
index b2b02fe1fe4a7941d27ff337d26ee5573f54ed79..fb2804bef46fe011d84ec8cfe088b6171aee26e1 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -569,7 +569,7 @@ de:
       map_key: "Legende"
       map_key_tooltip: "Legende für die Mapnik-Karte bei diesem Zoom-Level"
       table:
-        heading: "Legende für Zoomstufe [[zoom_level]]"
+        heading: "Legende für Zoomstufe {{zoom_level}}"
         entry:
           motorway: "Autobahn"
           trunk: "Schnellstraße"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4b90f9c7f33ad23aa4dc206ebdc452c25d8bc55e..ad24fa16c88af381a7327347f16487a566fc10f3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -569,7 +569,7 @@ en:
       map_key: "Map key"
       map_key_tooltip: "Map key for the mapnik rendering at this zoom level"
       table:
-        heading: "Legend for z[[zoom_level]]"
+        heading: "Legend for z{{zoom_level}}"
         entry:
           motorway: "Motorway"
           trunk: "Trunk road"

diff --git a/public/images/mapkey/admin.png b/public/images/key/mapnik/admin.png
similarity index 100%
rename from public/images/mapkey/admin.png
rename to public/images/key/mapnik/admin.png

diff --git a/public/images/mapkey/allotments.png b/public/images/key/mapnik/allotments.png
similarity index 100%
rename from public/images/mapkey/allotments.png
rename to public/images/key/mapnik/allotments.png

diff --git a/public/images/mapkey/apron.png b/public/images/key/mapnik/apron.png
similarity index 100%
rename from public/images/mapkey/apron.png
rename to public/images/key/mapnik/apron.png

diff --git a/public/images/mapkey/bridge.png b/public/images/key/mapnik/bridge.png
similarity index 100%
rename from public/images/mapkey/bridge.png
rename to public/images/key/mapnik/bridge.png

diff --git a/public/images/mapkey/bridleway.png b/public/images/key/mapnik/bridleway.png
similarity index 100%
rename from public/images/mapkey/bridleway.png
rename to public/images/key/mapnik/bridleway.png

diff --git a/public/images/mapkey/brownfield.png b/public/images/key/mapnik/brownfield.png
similarity index 100%
rename from public/images/mapkey/brownfield.png
rename to public/images/key/mapnik/brownfield.png

diff --git a/public/images/mapkey/building.png b/public/images/key/mapnik/building.png
similarity index 100%
rename from public/images/mapkey/building.png
rename to public/images/key/mapnik/building.png

diff --git a/public/images/mapkey/byway.png b/public/images/key/mapnik/byway.png
similarity index 100%
rename from public/images/mapkey/byway.png
rename to public/images/key/mapnik/byway.png

diff --git a/public/images/mapkey/cable.png b/public/images/key/mapnik/cable.png
similarity index 100%
rename from public/images/mapkey/cable.png
rename to public/images/key/mapnik/cable.png

diff --git a/public/images/mapkey/cemetery.png b/public/images/key/mapnik/cemetery.png
similarity index 100%
rename from public/images/mapkey/cemetery.png
rename to public/images/key/mapnik/cemetery.png

diff --git a/public/images/mapkey/centre.png b/public/images/key/mapnik/centre.png
similarity index 100%
rename from public/images/mapkey/centre.png
rename to public/images/key/mapnik/centre.png

diff --git a/public/images/mapkey/commercial.png b/public/images/key/mapnik/commercial.png
similarity index 100%
rename from public/images/mapkey/commercial.png
rename to public/images/key/mapnik/commercial.png

diff --git a/public/images/mapkey/common.png b/public/images/key/mapnik/common.png
similarity index 100%
rename from public/images/mapkey/common.png
rename to public/images/key/mapnik/common.png

diff --git a/public/images/mapkey/construction.png b/public/images/key/mapnik/construction.png
similarity index 100%
rename from public/images/mapkey/construction.png
rename to public/images/key/mapnik/construction.png

diff --git a/public/images/mapkey/cycleway.png b/public/images/key/mapnik/cycleway.png
similarity index 100%
rename from public/images/mapkey/cycleway.png
rename to public/images/key/mapnik/cycleway.png

diff --git a/public/images/mapkey/destination.png b/public/images/key/mapnik/destination.png
similarity index 100%
rename from public/images/mapkey/destination.png
rename to public/images/key/mapnik/destination.png

diff --git a/public/images/mapkey/farm.png b/public/images/key/mapnik/farm.png
similarity index 100%
rename from public/images/mapkey/farm.png
rename to public/images/key/mapnik/farm.png

diff --git a/public/images/mapkey/footway.png b/public/images/key/mapnik/footway.png
similarity index 100%
rename from public/images/mapkey/footway.png
rename to public/images/key/mapnik/footway.png

diff --git a/public/images/mapkey/forest.png b/public/images/key/mapnik/forest.png
similarity index 100%
rename from public/images/mapkey/forest.png
rename to public/images/key/mapnik/forest.png

diff --git a/public/images/mapkey/golf.png b/public/images/key/mapnik/golf.png
similarity index 100%
rename from public/images/mapkey/golf.png
rename to public/images/key/mapnik/golf.png

diff --git a/public/images/mapkey/heathland.png b/public/images/key/mapnik/heathland.png
similarity index 100%
rename from public/images/mapkey/heathland.png
rename to public/images/key/mapnik/heathland.png

diff --git a/public/images/mapkey/industrial.png b/public/images/key/mapnik/industrial.png
similarity index 100%
rename from public/images/mapkey/industrial.png
rename to public/images/key/mapnik/industrial.png

diff --git a/public/images/mapkey/lake.png b/public/images/key/mapnik/lake.png
similarity index 100%
rename from public/images/mapkey/lake.png
rename to public/images/key/mapnik/lake.png

diff --git a/public/images/mapkey/military.png b/public/images/key/mapnik/military.png
similarity index 100%
rename from public/images/mapkey/military.png
rename to public/images/key/mapnik/military.png

diff --git a/public/images/mapkey/motorway.png b/public/images/key/mapnik/motorway.png
similarity index 100%
rename from public/images/mapkey/motorway.png
rename to public/images/key/mapnik/motorway.png

diff --git a/public/images/mapkey/park.png b/public/images/key/mapnik/park.png
similarity index 100%
rename from public/images/mapkey/park.png
rename to public/images/key/mapnik/park.png

diff --git a/public/images/mapkey/permissive.png b/public/images/key/mapnik/permissive.png
similarity index 100%
rename from public/images/mapkey/permissive.png
rename to public/images/key/mapnik/permissive.png

diff --git a/public/images/mapkey/pitch.png b/public/images/key/mapnik/pitch.png
similarity index 100%
rename from public/images/mapkey/pitch.png
rename to public/images/key/mapnik/pitch.png

diff --git a/public/images/mapkey/primary.png b/public/images/key/mapnik/primary.png
similarity index 100%
rename from public/images/mapkey/primary.png
rename to public/images/key/mapnik/primary.png

diff --git a/public/images/mapkey/primary12.png b/public/images/key/mapnik/primary12.png
similarity index 100%
rename from public/images/mapkey/primary12.png
rename to public/images/key/mapnik/primary12.png

diff --git a/public/images/mapkey/private.png b/public/images/key/mapnik/private.png
similarity index 100%
rename from public/images/mapkey/private.png
rename to public/images/key/mapnik/private.png

diff --git a/public/images/mapkey/rail.png b/public/images/key/mapnik/rail.png
similarity index 100%
rename from public/images/mapkey/rail.png
rename to public/images/key/mapnik/rail.png

diff --git a/public/images/mapkey/rail13.png b/public/images/key/mapnik/rail13.png
similarity index 100%
rename from public/images/mapkey/rail13.png
rename to public/images/key/mapnik/rail13.png

diff --git a/public/images/mapkey/reserve.png b/public/images/key/mapnik/reserve.png
similarity index 100%
rename from public/images/mapkey/reserve.png
rename to public/images/key/mapnik/reserve.png

diff --git a/public/images/mapkey/resident.png b/public/images/key/mapnik/resident.png
similarity index 100%
rename from public/images/mapkey/resident.png
rename to public/images/key/mapnik/resident.png

diff --git a/public/images/mapkey/retail.png b/public/images/key/mapnik/retail.png
similarity index 100%
rename from public/images/mapkey/retail.png
rename to public/images/key/mapnik/retail.png

diff --git a/public/images/mapkey/runway.png b/public/images/key/mapnik/runway.png
similarity index 100%
rename from public/images/mapkey/runway.png
rename to public/images/key/mapnik/runway.png

diff --git a/public/images/mapkey/school.png b/public/images/key/mapnik/school.png
similarity index 100%
rename from public/images/mapkey/school.png
rename to public/images/key/mapnik/school.png

diff --git a/public/images/mapkey/secondary.png b/public/images/key/mapnik/secondary.png
similarity index 100%
rename from public/images/mapkey/secondary.png
rename to public/images/key/mapnik/secondary.png

diff --git a/public/images/mapkey/secondary12.png b/public/images/key/mapnik/secondary12.png
similarity index 100%
rename from public/images/mapkey/secondary12.png
rename to public/images/key/mapnik/secondary12.png

diff --git a/public/images/mapkey/station.png b/public/images/key/mapnik/station.png
similarity index 100%
rename from public/images/mapkey/station.png
rename to public/images/key/mapnik/station.png

diff --git a/public/images/mapkey/subway.png b/public/images/key/mapnik/subway.png
similarity index 100%
rename from public/images/mapkey/subway.png
rename to public/images/key/mapnik/subway.png

diff --git a/public/images/mapkey/summit.png b/public/images/key/mapnik/summit.png
similarity index 100%
rename from public/images/mapkey/summit.png
rename to public/images/key/mapnik/summit.png

diff --git a/public/images/mapkey/tourist.png b/public/images/key/mapnik/tourist.png
similarity index 100%
rename from public/images/mapkey/tourist.png
rename to public/images/key/mapnik/tourist.png

diff --git a/public/images/mapkey/track.png b/public/images/key/mapnik/track.png
similarity index 100%
rename from public/images/mapkey/track.png
rename to public/images/key/mapnik/track.png

diff --git a/public/images/mapkey/tram.png b/public/images/key/mapnik/tram.png
similarity index 100%
rename from public/images/mapkey/tram.png
rename to public/images/key/mapnik/tram.png

diff --git a/public/images/mapkey/trunk.png b/public/images/key/mapnik/trunk.png
similarity index 100%
rename from public/images/mapkey/trunk.png
rename to public/images/key/mapnik/trunk.png

diff --git a/public/images/mapkey/trunk12.png b/public/images/key/mapnik/trunk12.png
similarity index 100%
rename from public/images/mapkey/trunk12.png
rename to public/images/key/mapnik/trunk12.png

diff --git a/public/images/mapkey/tunnel.png b/public/images/key/mapnik/tunnel.png
similarity index 100%
rename from public/images/mapkey/tunnel.png
rename to public/images/key/mapnik/tunnel.png

diff --git a/public/images/mapkey/unclassified.png b/public/images/key/mapnik/unclassified.png
similarity index 100%
rename from public/images/mapkey/unclassified.png
rename to public/images/key/mapnik/unclassified.png

diff --git a/public/images/mapkey/unclassified13.png b/public/images/key/mapnik/unclassified13.png
similarity index 100%
rename from public/images/mapkey/unclassified13.png
rename to public/images/key/mapnik/unclassified13.png

diff --git a/public/images/mapkey/unsurfaced.png b/public/images/key/mapnik/unsurfaced.png
similarity index 100%
rename from public/images/mapkey/unsurfaced.png
rename to public/images/key/mapnik/unsurfaced.png

diff --git a/public/images/mapkey/wood.png b/public/images/key/mapnik/wood.png
similarity index 100%
rename from public/images/mapkey/wood.png
rename to public/images/key/mapnik/wood.png