Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to iD v2.18.2 #2720

Merged
merged 6 commits into from
Jul 21, 2020
Merged

Update to iD v2.18.2 #2720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9310e1
Update to iD v2.18.0
quincylvania Jul 20, 2020
b7f022e
Update to iD v2.18.1
quincylvania Jul 20, 2020
de3ddaf
Update iD initialization for v2.18.1
quincylvania Jul 20, 2020
00bcd33
Properly include iD's external data files
quincylvania Jul 21, 2020
1c8fbe3
Use legacy build of iD
quincylvania Jul 21, 2020
32c3000
Update to iD v2.18.2
quincylvania Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Vendorfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ folder 'vendor/assets' do

folder 'iD' do
from 'git://github.com/openstreetmap/iD', :branch => 'release' do
folder 'iD/data', 'dist/data'
folder 'iD/img', 'dist/img'
folder 'iD/locales', 'dist/locales'
folder 'iD/mapillary-js', 'dist/mapillary-js'
Expand All @@ -58,7 +59,7 @@ folder 'vendor/assets' do
end
end

file 'iD.js', 'dist/iD.js'
file 'iD.js', 'dist/iD.legacy.js'
end
end

Expand Down
12 changes: 6 additions & 6 deletions app/assets/javascripts/id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,26 @@
document.addEventListener("DOMContentLoaded", function () {
var container = document.getElementById("id-container");

if (typeof iD === "undefined" || !iD.Detect().support) {
if (typeof iD === "undefined" || !iD.utilDetect().support) {
container.innerHTML = "This editor is supported " +
"in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " +
"Please upgrade your browser or use Potlatch 2 to edit the map.";
container.className = "unsupported";
} else {
var id = iD.Context()
var id = iD.coreContext()
.embed(true)
.assetPath("iD/")
.assetMap(JSON.parse(container.dataset.assetMap))
.locale(container.dataset.locale, container.dataset.localePath)
.locale(container.dataset.locale)
.preauth({
urlroot: location.protocol + "//" + location.host,
oauth_consumer_key: container.dataset.consumerKey,
oauth_secret: container.dataset.consumerSecret,
oauth_token: container.dataset.token,
oauth_token_secret: container.dataset.tokenSecret
});
})
.containerNode(container)
.init();

id.map().on("move.embed", parent.$.throttle(250, function () {
if (id.inIntro()) return;
Expand Down Expand Up @@ -52,7 +54,5 @@ document.addEventListener("DOMContentLoaded", function () {
Math.max(data.zoom || 15, 13));
}, 0);
});

id.ui()(container);
}
});
1 change: 0 additions & 1 deletion app/views/site/id.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<% data[:consumer_secret] = token.client_application.secret -%>
<% end %>
<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
<% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%>
<% data[:asset_map] = assets("iD").to_json -%>
<%= tag.div "", :id => "id-container", :data => data %>
</body>
Expand Down
Loading