Support background hash parameter for iD
Fixes systemed/iD#1590 Fixes systemed/iD#1682
This commit is contained in:
parent
a45af012b4
commit
78d6bde485
2 changed files with 19 additions and 15 deletions
|
@ -22,8 +22,8 @@ OSM = {
|
|||
return url;
|
||||
},
|
||||
|
||||
mapParams: function (search) {
|
||||
var params = {}, mapParams = {}, bounds, loc;
|
||||
params: function(search) {
|
||||
var params = {};
|
||||
|
||||
search = (search || window.location.search).replace('?', '').split(/&|;/);
|
||||
|
||||
|
@ -35,6 +35,12 @@ OSM = {
|
|||
params[key] = decodeURIComponent(val);
|
||||
}
|
||||
|
||||
return params;
|
||||
},
|
||||
|
||||
mapParams: function (search) {
|
||||
var params = OSM.params(search), mapParams = {}, bounds, loc;
|
||||
|
||||
if (params.mlon && params.mlat) {
|
||||
mapParams.marker = true;
|
||||
mapParams.mlon = parseFloat(params.mlon);
|
||||
|
|
|
@ -3,23 +3,21 @@
|
|||
<iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
|
||||
</div>
|
||||
<script>
|
||||
var coord = {};
|
||||
<% if @lat && @lon && @zoom -%>
|
||||
coord.lat = <%= @lat %>;
|
||||
coord.lon = <%= @lon %>;
|
||||
coord.zoom = <%= @zoom %>;
|
||||
<% else -%>
|
||||
coord = OSM.mapParams();
|
||||
<% end -%>
|
||||
var params = {};
|
||||
|
||||
var hash;
|
||||
if (coord.object) {
|
||||
hash = '#id=' + coord.object.type[0] + coord.object.id;
|
||||
var mapParams = OSM.mapParams();
|
||||
if (mapParams.object) {
|
||||
params.id = mapParams.object.type[0] + mapParams.object.id;
|
||||
} else {
|
||||
hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat
|
||||
params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
|
||||
}
|
||||
|
||||
$('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>' + hash);
|
||||
var hashParams = OSM.params(location.hash.substring(1));
|
||||
if (hashParams.background) {
|
||||
params.background = hashParams.background;
|
||||
}
|
||||
|
||||
$('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
|
||||
</script>
|
||||
<% else %>
|
||||
<script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue