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

Move keys to separate file, not working on osm.org yet.

Browse Source
This commit is contained in:
Tom MacWright
2013-01-23 16:56:48 -05:00
parent 64e8e85187
commit 1a916ff506
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
index.html
View File

@@ -117,8 +117,12 @@
</head>
<body>
<div id="iD"></div><script>
var id = iD();
id.connection().url('http://api06.dev.openstreetmap.org');
d3.select("#iD").call(id);
d3.json('keys.json', function(err, keys) {
var id = iD();
id.connection()
.keys(keys)
.url('http://api06.dev.openstreetmap.org');
d3.select("#iD").call(id);
});
</script></body>
</html>

10
js/id/connection.js
View File

@@ -5,9 +5,10 @@ iD.Connection = function() {
connection = {},
refNodes = {},
user = {},
keys,
inflight = {},
loadedTiles = {},
oauth = iD.OAuth();
oauth = iD.OAuth().url(url);
function bboxUrl(b) {
return url + '/api/0.6/map?bbox=' + [b[0][0],b[1][1],b[1][0],b[0][1]];
@@ -259,6 +260,13 @@ iD.Connection = function() {
return connection;
};
connection.keys = function(_) {
if (!arguments.length) return keys;
keys = _;
oauth.keys(keys);
return connection;
};
connection.authenticate = function(callback) {
function done(err, res) {
event.auth();

16
js/id/oauth.js
View File

@@ -1,13 +1,9 @@
iD.OAuth = function() {
var baseurl = 'https://www.openstreetmap.org',
var baseurl = 'http://www.openstreetmap.org',
oauth_secret = 'aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p',
o, keys,
oauth = {};
var o = {
oauth_consumer_key: 'zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R',
oauth_signature_method: 'HMAC-SHA1'
};
function keyclean(x) { return x.replace(/\W/g, ''); }
if (token('oauth_token')) {
@@ -135,6 +131,14 @@ iD.OAuth = function() {
oauth.url = function(_) {
if (!arguments.length) return baseurl;
baseurl = _;
if (keys && keys[baseurl]) o = keys[baseurl];
return oauth;
};
oauth.keys = function(_) {
if (!arguments.length) return keys;
keys = _;
if (baseurl && keys[baseurl]) o = keys[baseurl];
return oauth;
};

10
keys.json Normal file
View File

@@ -0,0 +1,10 @@
{
"http://api06.dev.openstreetmap.org": {
"oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R",
"oauth_signature_method": "HMAC-SHA1"
},
"http://www.openstreetmap.org": {
"oauth_consumer_key": "5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT",
"oauth_signature_method": "HMAC-SHA1"
}
}