X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/483854f411ce7106144883824adb7e49060424c2..a2cf9b5b9f568c614ad8bbf8a477326b01cefb57:/app/views/site/_potlatch2.html.erb?ds=inline diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index a7fa1bac6..3aeafa9cf 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -32,6 +32,8 @@ flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>"; flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>"; flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>"; + flashvars.intro_image = "<%= asset_path "help/introduction.jpg" %>"; + flashvars.intro_video = "<%= asset_path "help/introduction.mp4" %>"; <% if params['gpx'] %> flashvars.gpx = '<%= h(params['gpx']) %>'; <% end %> @@ -64,28 +66,23 @@ // 700,600 for fixed size, 100%,100% for resizable if (lat && lon) { - updatelinks({ lon: lon, lat: lat }, zoom); + updateLinks({ lon: lon, lat: lat }, zoom); } } - <% if @lat && @lon -%> - doSWF(<%= @lat %>,<%= @lon %>,16); - <% else -%> - var params = OSM.mapParams(); - doSWF(params.lat, params.lon, params.zoom || 17); - <% end -%> +<% if @lat && @lon -%> + doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>); +<% else -%> + var mapParams = OSM.mapParams(); + doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); +<% end -%> - $("body").on("click", "a.set_position", function (e) { - e.preventDefault(); + var mapMoved = $.throttle(250, function(lon, lat, zoom) { + updateLinks({ lon: lon, lat: lat }, zoom); - var data = $(this).data(); - - $("#potlatch").each(function () { - this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13)); - }); + var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom }); + if (hash !== location.hash) { + location.replace(hash); + } }); - - function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) { - updatelinks({ lon: lon, lat: lat }, zoom, null, minlon, minlat, maxlon, maxlat); - }