CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make authenticated api calls if possible

Browse Source
This commit is contained in:
Bryan Housel
2016-10-24 01:21:38 -04:00
parent 282f9e4f69
commit 45d85e04c5
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@@ -30,12 +30,12 @@
.call(iD.uiSourceSwitch(id)
.keys([
{
'url': 'http://www.openstreetmap.org',
'urlroot': 'http://www.openstreetmap.org',
'oauth_consumer_key': '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
'oauth_secret': 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL'
},
{
'url': 'http://api06.dev.openstreetmap.org',
'urlroot': 'http://api06.dev.openstreetmap.org',
'oauth_consumer_key': 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
'oauth_secret': 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p'
}

49
modules/services/osm.js
View File

@@ -12,13 +12,12 @@ import { utilRebind } from '../util/rebind';
var dispatch = d3.dispatch('authenticating', 'authenticated', 'auth', 'loading', 'loaded'),
useHttps = window.location.protocol === 'https:',
protocol = useHttps ? 'https:' : 'http:',
apiroot = protocol + '//api.openstreetmap.org',
wwwroot = protocol + '//www.openstreetmap.org',
urlroot = protocol + '//www.openstreetmap.org',
inflight = {},
loadedTiles = {},
tileZoom = 16,
oauth = osmAuth({
url: apiroot,
url: urlroot,
oauth_consumer_key: '5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT',
oauth_secret: 'aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL',
loading: authenticating,
@@ -166,13 +165,13 @@ export default {
changesetURL: function(changesetId) {
return wwwroot + '/changeset/' + changesetId;
return urlroot + '/changeset/' + changesetId;
},
changesetsURL: function(center, zoom) {
var precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
return wwwroot + '/history#map=' +
return urlroot + '/history#map=' +
Math.floor(zoom) + '/' +
center[1].toFixed(precision) + '/' +
center[0].toFixed(precision);
@@ -180,12 +179,12 @@ export default {
entityURL: function(entity) {
return wwwroot + '/' + entity.type + '/' + entity.osmId();
return urlroot + '/' + entity.type + '/' + entity.osmId();
},
userURL: function(username) {
return wwwroot + '/user/' + username;
return urlroot + '/user/' + username;
},
@@ -195,8 +194,8 @@ export default {
}
if (this.authenticated()) {
return oauth.xhr({ method: 'GET', path: path }, done);
else {
var url = apiroot + path;
} else {
var url = urlroot + path;
return d3.xml(url).get(done);
}
},
@@ -379,18 +378,24 @@ export default {
userChangesets: function(callback) {
this.userDetails(function(err, user) {
if (err) return callback(err);
function done(changesets) {
callback(undefined, Array.prototype.map.call(changesets.getElementsByTagName('changeset'),
function (changeset) {
return { tags: getTags(changeset) };
}));
if (err) {
callback(err);
return;
}
d3.xml(apiroot + '/api/0.6/changesets?user=' + user.id).get()
.on('load', done)
.on('error', callback);
function done(err, changesets) {
if (err) {
callback(err);
} else {
callback(undefined, Array.prototype.map.call(changesets.getElementsByTagName('changeset'),
function (changeset) {
return { tags: getTags(changeset) };
}
));
}
}
oauth.xhr({ method: 'GET', path: '/api/0.6/changesets?user=' + user.id }, done);
});
},
@@ -400,7 +405,7 @@ export default {
var apiStatus = capabilities.getElementsByTagName('status');
callback(undefined, apiStatus[0].getAttribute('api'));
}
d3.xml(apiroot + '/api/capabilities').get()
d3.xml(urlroot + '/api/capabilities').get()
.on('load', done)
.on('error', callback);
},
@@ -478,8 +483,10 @@ export default {
switch: function(options) {
url = options.url;
urlroot = options.urlroot;
oauth.options(_.extend({
url: urlroot,
loading: authenticating,
done: authenticated
}, options));