Add 'hide areas' button to data view

[rails.git] / app / views / site / index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 31834bf7cde2469bd430496bd30f9b66a38e40ed..0a0b7c1da5e873a9e2a9a450dee08e963773d77a 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -66,18 +66,17 @@ if params['node'] or params['way'] or params['relation']
     end
 end
 
     end
 end
 

+# Decide on a lat lon to initialise the map with. Various ways of doing this

 if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
     bbox = true
     minlon = h(params['minlon'])
     minlat = h(params['minlat'])
     maxlon = h(params['maxlon'])
     maxlat = h(params['maxlat'])
 if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
     bbox = true
     minlon = h(params['minlon'])
     minlat = h(params['minlat'])
     maxlon = h(params['maxlon'])
     maxlat = h(params['maxlat'])

+    layers = h(params['layers'])

     box = true if params['box']=="yes"
     object_zoom = false
     box = true if params['box']=="yes"
     object_zoom = false

-end
-
-# Decide on a lat lon to initialise the map with. Various ways of doing this
-if params['lon'] and params['lat']
+elsif params['lon'] and params['lat']

     lon =  h(params['lon'])
     lat =  h(params['lat'])
     zoom =  h(params['zoom'] || '5')
     lon =  h(params['lon'])
     lat =  h(params['lat'])
     zoom =  h(params['zoom'] || '5')


@@ -278,7 +277,7 @@ end
     $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
 
     setTimeout(function () {
     $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
 
     setTimeout(function () {

-      if (!loaded) alert("<%= t('site.index.remote_failed') %>");
+      if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");

     }, 1000);
 
     event.stop();
     }, 1000);
 
     event.stop();