cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to iD v2.0.0

Browse source
This commit is contained in:
Bryan Housel 2016-11-15 10:16:34 -05:00
parent 2ed5e97356
commit 6c3a31d06c
90 changed files with 255680 additions and 186321 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/site/_id.html.erb
View file

@ -10,13 +10,13 @@
params.id = mapParams.object.type[0] + mapParams.object.id;
mapParams = OSM.parseHash(location.hash);
if (mapParams.center) {
params.map = mapParams.zoom + '/' + mapParams.center.lng + '/' + mapParams.center.lat;
params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lon;
}
} else {
<% if @lat && @lon -%>
params.map = '16/<%= @lon %>/<%= @lat %>';
params.map = '16/<%= @lat %>/<%= @lng %>';
<% else -%>
params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
<% end -%>
}

14
app/views/site/id.html.erb
View file

@ -10,25 +10,22 @@
<body>
<div id='id-container'></div>
<script>
if (typeof iD == 'undefined' || !iD.detect().support) {
if (typeof iD == 'undefined' || !iD.Detect().support) {
document.getElementById('id-container').innerHTML = 'This editor is supported ' +
'in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. ' +
'in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. ' +
'Please upgrade your browser or use Potlatch 2 to edit the map.';
document.getElementById('id-container').className = 'unsupported';
} else {
<% locale = ID::LOCALES.preferred(preferred_languages).to_s %>
var id = iD()
.presets(iD.data.presets)
.imagery(iD.data.imagery)
.taginfo(iD.services.taginfo())
var id = iD.Context()
.embed(true)
.assetPath("iD/")
.assetMap(<%= assets("iD").to_json.html_safe %>)
.locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>")
.preauth({
<% token = @user.access_token(ID_KEY) %>
url: "<%= request.protocol + request.host_with_port %>",
urlroot: "<%= request.protocol + request.host_with_port %>",
oauth_consumer_key: "<%= token.client_application.key %>",
oauth_secret: "<%= token.client_application.secret %>",
oauth_token: "<%= token.token %>",
@ -64,8 +61,7 @@
}, 0);
});
d3.select('#id-container')
.call(id.ui());
id.ui()(document.getElementById("id-container"));
}
</script>
</body>