Upgraded config handling, added checkboxes and buttons

.gitignore

@@ -3,3 +3,4 @@ mapsme-state.txt
 mapsme-changes.db
 mapsme-process.log
 venv/
+config_local.py

mmwatch/config.py

@@ -1,7 +1,8 @@
-DEBUG = True
-
 import os
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
+
+DEBUG = True
+
 DATABASE_URI = 'sqlite:///' + os.path.join(BASE_DIR, 'server', 'mapsme-changes.db')
 # DATABASE_URI = 'postgresql://localhost/mmwatch'
 
@@ -12,3 +13,13 @@ TOP = 10
 # Example: 'http://localhost:5000/queryat/'
 QUERYAT_URL = None
 GEOCODE_BATCH = 20
+
+# Override these (and anything else) in config_local.py
+OAUTH_KEY = ''
+OAUTH_SECRET = ''
+SESSION_KEY = 'sdkjfhsfljhsadf'
+
+try:
+    from config_local import *
+except ImportError:
+    pass

mmwatch/run.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python
-from www import mmwatch
-mmwatch.app.run(debug=True)
+from www import app
+app.run(debug=True)

mmwatch/www/__init__.py

@@ -0,0 +1,14 @@
+from flask import Flask
+import config
+
+app = Flask(__name__)
+app.debug = config.DEBUG
+
+try:
+    from flask_compress import Compress
+    Compress(app)
+except ImportError:
+    pass
+
+import www.mmwatch
+import www.revert

mmwatch/www/mmwatch.py

@@ -1,19 +1,11 @@
+from www import app
 import os, json, peewee
-from flask import Flask, send_file, request, render_template, url_for, abort, jsonify, Response
+from flask import send_file, request, render_template, url_for, abort, jsonify, Response
 from datetime import datetime, timedelta
 from StringIO import StringIO
 import config
 from db import database, Change, User
 
-app = Flask(__name__)
-app.debug = config.DEBUG
-
-try:
-    from flask_compress import Compress
-    Compress(app)
-except ImportError:
-    pass
-
 
 @app.before_request
 def before_request():
@@ -49,9 +41,12 @@ def get_user_rating():
 
 def purl(params, **kwargs):
     p2 = params.copy()
+    found_page = False
     for k, v in kwargs.iteritems():
         p2[k] = v
-    if 'page' in p2 and p2['page'] <= 1:
+        if k == 'page':
+            found_page = True
+    if 'page' in p2 and (not found_page or p2['page'] <= 1):
         del p2['page']
     return url_for('the_one_and_only_page', **p2)
 

mmwatch/www/revert.py

@@ -0,0 +1,54 @@
+from www import app
+from flask import render_template, session, url_for, redirect
+from flask_oauthlib.client import OAuth, get_etree
+import config
+from db import database, Change
+
+API_ENDPOINT = 'https://api.openstreetmap.org/api/0.6/'
+
+oauth = OAuth()
+openstreetmap = oauth.remote_app('OpenStreetMap',
+                                 base_url=API_ENDPOINT,
+                                 request_token_url='https://www.openstreetmap.org/oauth/request_token',
+                                 access_token_url='https://www.openstreetmap.org/oauth/access_token',
+                                 authorize_url='https://www.openstreetmap.org/oauth/authorize',
+                                 consumer_key=config.OAUTH_KEY,
+                                 consumer_secret=config.OAUTH_SECRET
+                                 )
+
+
+@app.route('/revert')
+def revert():
+    if 'osm_token' not in session:
+        return openstreetmap.authorize(callback=url_for('oauth'))
+    return 'TODO'
+
+
+@app.route('/oauth')
+@openstreetmap.authorized_handler
+def oauth(resp):
+    if resp is None:
+        return 'Denied. <a href="' + url_for('revert') + '">Try again</a>.'
+    session['osm_token'] = (
+            resp['oauth_token'],
+            resp['oauth_token_secret']
+    )
+    user_details = openstreetmap.get('user/details').data
+    session['osm_username'] = user_details[0].get('display_name')
+    return redirect(url_for('revert'))
+
+
+@openstreetmap.tokengetter
+def get_token(token='user'):
+    if token == 'user' and 'osm_token' in session:
+        return session['osm_token']
+    return None
+
+
+@app.route('/logout')
+def logout():
+    if 'osm_token' in session:
+        del session['osm_token']
+    if 'osm_username' in session:
+        del session['osm_username']
+    return redirect(url_for('the_one_and_only_page'))

mmwatch/www/static/bulk.js

@@ -0,0 +1,28 @@
+function getCheckedObjects() {
+  var result = [];
+  var checks = document.getElementsByClassName('obj_check');
+  for (var i = 0; i < checks.length; i++) {
+    if (checks[i].checked)
+      result.push(checks[i].value);
+    checks[i].checked = false;
+  }
+  return result;
+}
+
+function btnClear() {
+  getCheckedObjects();
+  window.scrollTo(0, 0);
+}
+
+function btnLevel0() {
+  var checks = getCheckedObjects();
+  var param = checks.join(',');
+  var w = window.open('http://level0.osmz.ru/?url=' + param, '_blank');
+  w.focus();
+}
+
+function btnRevert(url) {
+  var checks = getCheckedObjects();
+  var param = checks.join(',');
+  window.location.assign(url + '?objects=' + param);
+}

mmwatch/www/static/style.css

@@ -8,7 +8,7 @@ body {
 }
 
 .change table {
-  margin-left: 2em;
+  margin-left: 3em;
   font-size: 10pt;
 }
 
@@ -45,6 +45,11 @@ h2 {
   font-size: 12pt;
 }
 
+h1 a {
+  text-decoration: none;
+  color: black;
+}
+
 .download {
   margin-top: 2em;
 }

mmwatch/www/templates/index.html

@@ -2,7 +2,7 @@
 <title>MAPS.ME OSM Changes Browser</title>
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
 <body>
-<h1>OSM Edits Made With MAPS.ME</h1>
+<h1><a href="{{ url_for('the_one_and_only_page') }}">OSM Edits Made With MAPS.ME</a></h1>
 <div id="filterbar">
 <div id="stats" class="filter">
   <h2>Statistics</h2>
@@ -106,6 +106,7 @@
   <h2>Changes</h2>
   {% for change in changes %}
   <div class="change">
+    <input type="checkbox" class="obj_check" value="{{ change.obj_type }}{{ change.obj_id }}">
     <a href="https://www.openstreetmap.org/user/{{ change.user }}">{{ change.user }}</a><sup><a href="{{ purl(params, user=change.user) }}">&#9875;</a></sup> at {{ change.timestamp.strftime('%d.%m.%Y %H:%M') }} in
     {% if change.action == 'n' %}
     <a href="https://www.openstreetmap.org/note/{{ change.changeset }}">{{ change.changeset }}</a>: {{ change.explain_action() }}
@@ -127,11 +128,19 @@
   </div>
   {% endfor %}
   <div class="navigation">
+    {% if params.page > 1 %}<a href="{{ purl(params, page=1) }}">&laquo; First</a>{% else %}&laquo; First{% endif %}
     {% if params.page > 1 %}<a href="{{ purl(params, page=params.page-1) }}">&laquo; Newer</a>{% else %}&laquo; Newer{% endif %}
     {% if params.page < stats.pages  %}<a href="{{ purl(params, page=params.page+1) }}">Older &raquo;</a>{% else %}Older &raquo;{% endif %}
   </div>
   <div class="download">
     <a href="{{ purl(params, export=1) }}">Download GeoJSON</a>
   </div>
+  <div id="selected">
+    With selected changes:
+    <button onclick="btnClear()">Clear</button>
+    <button onclick="btnLevel0()">Open in Level0</button>
+    <button onclick="btnRevert('{{ url_for('revert') }}')">Revert</button>
+  </div>
 </div>
 <iframe height="0" width="0" name="josmframe" style="visibility:hidden; display:none;" src="about:blank"></iframe>
+<script type="text/javascript" src="{{ url_for('static', filename='bulk.js') }}"></script>