whatdidyoudo 0.1.12__tar.gz → 0.2.0__tar.gz

{whatdidyoudo-0.1.12 → whatdidyoudo-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatdidyoudo
-Version: 0.1.12
+Version: 0.2.0
 Summary: A minimal Flask app that shows the amount of OpenStreetMap changes made by a user on a day.
 Project-URL: Homepage, https://github.com/rompe/whatdidyoudo
 Project-URL: Issues, https://github.com/rompe/whatdidyoudo/issues

{whatdidyoudo-0.1.12 → whatdidyoudo-0.2.0}/whatdidyoudo/app.py

@@ -7,10 +7,10 @@ import requests
 
 from flask import Flask, render_template
 from flask_caching import Cache
-from flask_limiter import Limiter
+from flask_limiter import Limiter, RateLimitExceeded
 from flask_limiter.util import get_remote_address
 
-__version__ = "0.1.12"
+__version__ = "0.2.0"
 
 app = Flask(__name__)
 cache = Cache(app, config={"CACHE_TYPE": "SimpleCache",
@@ -32,10 +32,10 @@ def get_etree_from_url(url: str) -> ET.Element:
     return ET.fromstring(response.content)
 
 
-def get_changes(user: str, date: str) -> defaultdict[str, Changes]:
-    """Return a {app: Changes} dictionary."""
-    # {user: {app: Changes}}
+def get_changes(user: str, date: str):
+    """Return a ({app: Changes} dictionary, [changeset_ids]) tuple."""
     changes: defaultdict[str, Changes] = defaultdict(Changes)
+    changeset_ids: list[str] = []
     datetime_date = datetime.date.fromisoformat(date)
     start_time = f"{datetime_date}T00:00:00Z"
     end_time = f"{datetime_date + datetime.timedelta(days=1)}T00:00:00Z"
@@ -46,6 +46,7 @@ def get_changes(user: str, date: str) -> defaultdict[str, Changes]:
 
     for cs in root.findall("changeset"):
         cs_id = cs.attrib["id"]
+        changeset_ids.append(cs_id)
 
         tags = {tag.attrib["k"]: tag.attrib["v"] for tag in cs.findall("tag")}
         editor = tags.get("created_by", "")
@@ -60,7 +61,7 @@ def get_changes(user: str, date: str) -> defaultdict[str, Changes]:
 
         for action in root:
             changes[editor].changes += len(action)
-    return changes
+    return changes, changeset_ids
 
 
 @app.route('/')
@@ -76,25 +77,32 @@ def whatdidyoudo(user: str | None = None, date: str | None = None) -> str:
     today = datetime.date.today().isoformat()
     if not date:
         date = today
+
+    changeset_ids: list[str] = []
     for name in [item.strip() for item in (user or "").split(",")
                  if item.strip()]:
         cache_key = f"changes_{name}_{date}"
-        cur_changes = cache.get(cache_key)  # type: ignore
-        if not cur_changes:
+        cur_data = cache.get(cache_key)  # type: ignore
+        if not cur_data:
             try:
                 with limiter.limit("10 per minute"):
-                    cur_changes = get_changes(name, date)
+                    cur_data = get_changes(name, date)
                 if date != today:
-                    cache.set(cache_key, cur_changes)  # type: ignore
+                    cache.set(cache_key, cur_data)  # type: ignore
             except requests.HTTPError:
                 errors.append(
                     f"Can't determine changes for user {name} on {date}.")
-        if cur_changes:
+            except RateLimitExceeded as msg:
+                errors.append("Rate limit exceeded while processing user "
+                              f"{name}: {msg}")
+        if cur_data:
+            cur_changes, cur_ids = cur_data
             changes[name] = cur_changes
+            changeset_ids.extend(cur_ids)
 
     return render_template('form.html', user=user, date=date, changes=changes,
                            changesets=changesets, errors=errors,
-                           version=__version__)
+                           version=__version__, changeset_ids=changeset_ids)
 
 
 def main():

{whatdidyoudo-0.1.12 → whatdidyoudo-0.2.0}/whatdidyoudo/templates/form.html

@@ -64,23 +64,71 @@
             <h4>Tips</h4>
             <ul>
                 <li>Do you want to have a bookmark that always shows your numbers for the current day?
-                    Just use <code>/YOUR_USERNAME</code> as URL and omit the date!</li>
+                    Just use <code>/YOUR_USERNAME</code> as URL and omit the date!
+                </li>
                 <li>You can enter multiple usernames separated by commas to see their contributions at once.
-                    Try this after a mapwalk with friends!</li>
+                    Try this after a mapwalk with friends!
+                </li>
             </ul>
         </div>
         <div class="disclaimer">
             <h4>Disclaimers</h4>
             <ul>
-                <li>This is a very simple service. It does exactly one job and tries to do it good.</li>
                 <li>Quality beats quantity. While it's nice to see big numbers here, please remember
-                    that just one high-effort change will help more that any amount of mediocre changes.</li>
+                    that just one high-effort change will help more that any amount of mediocre changes.
+                </li>
                 <li>This service is rate-limited to 10 OSM API requests per minute and caches results
-                     for 1 hour to reduce load on the API.</li>
+                    for 1 hour (except for the current day) to reduce load on the API.
+                    Too restrictive? Tell me!
+                </li>
+                <li>This is a very simple service. It does exactly one job and tries to do it good.
+                    The data displayed here is shown by many other services, but I didn't find one
+                    that answers my question in this way with just a simple bookmark.
+                    Suggestions are welcome! Get in touch via the issue tracker on the project page.
+                </li>
             </ul>
         </div>
     {% endif %}
-    <p class="footer">Powered by <a href="https://github.com/rompe/whatdidyoudo">whatdidyoudo {{ version }}</a></p>
+        {% if changeset_ids and changeset_ids|length > 0 %}
+        <div id="map" style="height: 300px; margin-top: 2em; border-radius: 12px; overflow: hidden;"></div>
+        <link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
+        <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
+        <script>
+        const changesetIds = {{ changeset_ids|tojson }};
+        if (changesetIds.length > 0) {
+            const bounds = [];
+            Promise.all(
+                changesetIds.map(id =>
+                    fetch(`https://api.openstreetmap.org/api/0.6/changeset/${id}`)
+                        .then(r => r.text())
+                        .then(xml => {
+                            const parser = new DOMParser();
+                            const doc = parser.parseFromString(xml, 'application/xml');
+                            const cs = doc.querySelector('changeset');
+                            if (cs) {
+                                bounds.push([
+                                    [parseFloat(cs.getAttribute('min_lat')), parseFloat(cs.getAttribute('min_lon'))],
+                                    [parseFloat(cs.getAttribute('max_lat')), parseFloat(cs.getAttribute('max_lon'))]
+                                ]);
+                            }
+                        })
+                )
+            ).then(() => {
+                if (bounds.length > 0) {
+                    const map = L.map('map').setView([0, 0], 2);
+                    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                        maxZoom: 19,
+                        attribution: '© OpenStreetMap contributors'
+                    }).addTo(map);
+                    const allBounds = L.latLngBounds(bounds.flat());
+                    map.fitBounds(allBounds);
+                    bounds.forEach(b => L.rectangle(b, {color: '#4f8cff', weight: 2}).addTo(map));
+                }
+            });
+        }
+        </script>
+        {% endif %}
+        <p class="footer">Powered by <a href="https://github.com/rompe/whatdidyoudo">whatdidyoudo {{ version }}</a></p>
     </div>
 </body>
 </html>