From 61802674a40976e99e311c99ea4b90aa40e8aef7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 22 Apr 2013 14:45:54 -0700 Subject: [PATCH] Don't need keys in dist build --- build.js | 1 - data/data_dev.js | 16 +++++++--------- data/keys.json | 12 ------------ index.html | 13 ++++++++++++- 4 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 data/keys.json diff --git a/build.js b/build.js index 259a8aca5..f4d9cb63a 100644 --- a/build.js +++ b/build.js @@ -113,7 +113,6 @@ fs.writeFileSync('dist/locales/en.json', stringify(en.en)); fs.writeFileSync('data/data.js', 'iD.data = ' + stringify({ deprecated: r('deprecated.json'), discarded: r('discarded.json'), - keys: r('keys.json'), imagery: r('imagery.json'), wikipedia: r('wikipedia.json'), presets: { diff --git a/data/data_dev.js b/data/data_dev.js index 9f5099d0d..0446feab7 100644 --- a/data/data_dev.js +++ b/data/data_dev.js @@ -9,7 +9,6 @@ iD.data = { path + 'data/discarded.json', path + 'data/imagery.json', path + 'data/wikipedia.json', - path + 'data/keys.json', path + 'data/presets/presets.json', path + 'data/presets/defaults.json', path + 'data/presets/categories.json', @@ -24,16 +23,15 @@ iD.data = { discarded: data[1], imagery: data[2], wikipedia: data[3], - keys: data[4], presets: { - presets: data[5], - defaults: data[6], - categories: data[7], - fields: data[8] + presets: data[4], + defaults: data[5], + categories: data[6], + fields: data[7] }, - imperial: data[9], - maki: data[10], - en: data[11] + imperial: data[8], + maki: data[9], + en: data[10] }; callback(); diff --git a/data/keys.json b/data/keys.json deleted file mode 100644 index d14a3e542..000000000 --- a/data/keys.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "url": "http://www.openstreetmap.org", - "oauth_consumer_key": "5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT", - "oauth_secret": "aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL" - }, - { - "url": "http://api06.dev.openstreetmap.org", - "oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R", - "oauth_secret": "aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p" - } -] diff --git a/index.html b/index.html index 6e267d130..47c1fa6c2 100644 --- a/index.html +++ b/index.html @@ -218,7 +218,18 @@ d3.select('#about').insert('li', '.user-list') .attr('class', 'source-switch') .call(iD.ui.SourceSwitch(id) - .keys(iD.data.keys)); + .keys([ + { + "url": "http://www.openstreetmap.org", + "oauth_consumer_key": "5A043yRSEugj4DJ5TljuapfnrflWDte8jTOcWLlT", + "oauth_secret": "aB3jKq1TRsCOUrfOIZ6oQMEDmv2ptV76PA54NGLL" + }, + { + "url": "http://api06.dev.openstreetmap.org", + "oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R", + "oauth_secret": "aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p" + } + ])); });