whatdidyoudo 0.1.13__py3-none-any.whl → 0.2.4__py3-none-any.whl

whatdidyoudo/app.py

@@ -5,12 +5,12 @@ from collections import defaultdict
 from dataclasses import dataclass
 import requests
 
-from flask import Flask, render_template
+from flask import Flask, render_template, request
 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.13"
+__version__ = "0.2.4"
 
 app = Flask(__name__)
 cache = Cache(app, config={"CACHE_TYPE": "SimpleCache",
@@ -32,20 +32,31 @@ 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, start_date: str, end_date: str | None = None,
+                start_time: str = "00:00", end_time: str = "23:59"):
+    """Return a ({app: Changes}, [changeset_ids]) tuple for a date/time range.
+
+    start_date, end_date are ISO date strings (YYYY-MM-DD). start_time and
+    end_time are HH:MM strings. The function builds ISO datetimes for the OSM
+    API (UTC, appended with Z).
+    """
     changes: defaultdict[str, Changes] = defaultdict(Changes)
-    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"
+    changeset_ids: list[str] = []
+    # Ensure end_date defaults to start_date when not provided
+    end_date = end_date or start_date
+    # Build ISO datetime strings expected by the OSM API
+    # e.g. 2025-10-24T00:00:00Z
+    start_time_iso = f"{start_date}T{start_time}:00Z"
+    end_time_iso = f"{end_date}T{end_time}:00Z"
 
     changeset_url = ("https://api.openstreetmap.org/api/0.6/changesets?"
-                     f"display_name={user}&time={start_time},{end_time}")
+                     f"display_name={user}&"
+                     f"time={start_time_iso},{end_time_iso}")
     root = get_etree_from_url(url=changeset_url)
 
     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,41 +71,70 @@ 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('/')
 @app.route('/<user>/')
 @app.route('/<user>')
-@app.route('/<user>/<date>')
-def whatdidyoudo(user: str | None = None, date: str | None = None) -> str:
-    """shows OSM tasks done by a user on a specific day."""
+@app.route('/<user>/<start_date>/')
+@app.route('/<user>/<start_date>')
+@app.route('/<user>/<start_date>/<end_date>')
+def whatdidyoudo(user: str | None = None, start_date: str | None = None,
+                 end_date: str | None = None) -> str:
+    """shows OSM tasks done by a user within a date/time range.
+
+    Expert mode allows finer-grained start/end times via query params:
+    expert=1, start_time=HH:MM, end_time=HH:MM
+    """
     changes: defaultdict[str, defaultdict[str, Changes]] = \
         defaultdict(lambda: defaultdict(Changes))
     changesets: dict[str, int] = {}
     errors: list[str] = []
+    # Read expert mode and time params from query string
+    expert = request.args.get('expert', '0') in ('1', 'true', 'True')
+    start_time = request.args.get('start_time', '00:00')
+    end_time = request.args.get('end_time', '23:59')
+
+    date_str = (f"between {start_date} {start_time} and {end_date} {end_time}"
+                if end_date or expert else f"on {start_date}")
     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:
+        cache_key = (f"changes_{name}_{start_date}_{end_date}_"
+                     f"{start_time}_{end_time}")
+        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)
-                if date != today:
-                    cache.set(cache_key, cur_changes)  # type: ignore
+                    cur_data = get_changes(user=name,
+                                           start_date=start_date or today,
+                                           end_date=end_date,
+                                           start_time=start_time,
+                                           end_time=end_time)
+                # Only cache results when the range does not include today
+                if ((start_date and start_date != today) or
+                        (end_date and end_date != today)):
+                    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:
+                    f"Can't determine changes for user {name} {date_str}.")
+            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
-
-    return render_template('form.html', user=user, date=date, changes=changes,
-                           changesets=changesets, errors=errors,
-                           version=__version__)
+            changeset_ids.extend(cur_ids)
+
+    return render_template('form.html', user=user, start_date=start_date,
+                           end_date=end_date, start_time=start_time,
+                           end_time=end_time, expert=expert,
+                           changes=changes, changesets=changesets,
+                           errors=errors, date_str=date_str,
+                           version=__version__, changeset_ids=changeset_ids)
 
 
 def main():

whatdidyoudo/static/style.css

@@ -16,7 +16,7 @@ body {
     box-shadow: 0 4px 24px rgba(0,0,0,0.3);
     padding: 2em 2.5em 1.5em 2.5em;
     margin-top: 2em;
-    max-width: 600px;
+    max-width: 800px;
     width: 95%;
 }
 
@@ -37,12 +37,61 @@ form {
     width: 100%;
 }
 
-label {
+.expert-toggle {
+    display: flex;
+    align-items: center; /* vertically center checkbox and label within the form's row */
+    margin-top: 0.5em;
+}
+
+@media (max-width: 600px) {
+    .expert-toggle {
+        margin-top: 0; /* in stacked layout keep normal spacing */
+    }
+}
+
+/* Expert rows: align labels and inputs into two columns so inputs stack vertically
+   and are perfectly aligned regardless of label width. */
+.expert-row {
+    /* allow the element to not introduce its own box so its children
+       participate in the parent's grid; keeps markup simple while
+       allowing a single shared grid column sizing for labels */
+    display: contents;
+}
+
+#expertControls {
+    display: grid;
+    grid-template-columns: auto 1fr; /* dynamic label column, flexible input column */
+    gap: 0.5em 1em;
+    align-items: center;
+}
+
+#expertControls label {
+    justify-self: end; /* right-align labels to create a neat gutter */
+}
+
+#expertControls input[type="datetime-local"] {
+    width: 100%;
+    min-width: 0; /* allow the input to shrink inside grid */
+}
+
+/* On small screens, stack label above input for readability */
+@media (max-width: 600px) {
+    #expertControls {
+        grid-template-columns: 1fr; /* single column: label above input */
+    }
+    #expertControls label {
+        justify-self: start;
+    }
+}
+
+label.hidden {
     display: none;
 }
 
 input[type="text"],
 input[type="date"],
+input[type="datetime-local"],
+input[type="checkbox"],
 button {
     border: none;
     border-radius: 8px;
@@ -61,15 +110,25 @@ input[type="text"] {
     color: #f3f3f3;
 }
 
+input[type="datetime-local"],
 input[type="date"] {
     /* flex: 1 1 120px; */
     padding: 0.7em 0.5em;
     background: #2c2f34;
     color: #f3f3f3;
+}
+
+input[type="date"] {
     min-width: 120px;
     max-width: 160px;
 }
 
+input[type="datetime-local"] {
+    min-width: 120px;
+    max-width: 260px;
+}
+
+
 button {
     padding: 0.7em 1.5em;
     background: #4f8cff;
@@ -124,7 +183,8 @@ a:hover {
         flex-direction: column;
         gap: 0.7em;
     }
-    input[type="date"] {
+    input[type="date"],
+    input[type="datetime-local"] {
         width: 100%;
         min-width: unset;
         max-width: unset;

whatdidyoudo/templates/form.html

@@ -7,31 +7,110 @@
     <link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='favicon.svg') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
     <script>
-    window.onload = function() {
-        var dateInput = document.getElementById('date');
-        if (!dateInput.value) {
-            var today = new Date();
-            var yyyy = today.getFullYear();
-            var mm = String(today.getMonth() + 1).padStart(2, '0');
-            var dd = String(today.getDate()).padStart(2, '0');
-            dateInput.value = yyyy + '-' + mm + '-' + dd;
+    function isoToday() {
+        const t = new Date();
+        const yyyy = t.getFullYear();
+        const mm = String(t.getMonth() + 1).padStart(2, '0');
+        const dd = String(t.getDate()).padStart(2, '0');
+        return `${yyyy}-${mm}-${dd}`;
+    }
+
+    function initForm() {
+        const expert = document.getElementById('expert');
+        const expertControls = document.getElementById('expertControls');
+        const simpleRow = document.getElementById('simpleDateRow');
+
+    // Initialize dates/time defaults
+    const single = document.getElementById('single_date');
+    const start_dt = document.getElementById('start_dt');
+    const end_dt = document.getElementById('end_dt');
+
+    if (single && !single.value) single.value = isoToday();
+    // default datetime-local values: YYYY-MM-DDTHH:MM
+    if (start_dt && !start_dt.value) start_dt.value = (single ? single.value : isoToday()) + 'T00:00';
+    if (end_dt && !end_dt.value) end_dt.value = (single ? single.value : isoToday()) + 'T23:59';
+
+        // If server rendered the expert checkbox checked, reflect that in UI
+        if (expert.checked) {
+            expertControls.style.display = '';
+            simpleRow.style.display = 'none';
+        }
+
+        expert.addEventListener('change', function() {
+            if (expert.checked) {
+                expertControls.style.display = '';
+                simpleRow.style.display = 'none';
+                // copy single date into start/end if empty
+                if (start_dt && !start_dt.value) start_dt.value = (single ? single.value : isoToday()) + 'T00:00';
+                if (end_dt && !end_dt.value) end_dt.value = (single ? single.value : isoToday()) + 'T23:59';
+            } else {
+                expertControls.style.display = 'none';
+                simpleRow.style.display = '';
+            }
+        });
+    }
+
+    function submitForm() {
+        const user = encodeURIComponent(document.getElementById('user').value);
+        const expert = document.getElementById('expert').checked;
+        if (!expert) {
+            const date = encodeURIComponent(document.getElementById('single_date').value);
+            // keep URL as /user/date
+            window.location.href = '/' + user + '/' + date;
+            return;
+        }
+        // expert mode: use datetime-local inputs. We will split them into date and time
+        const sd_raw = document.getElementById('start_dt').value; // YYYY-MM-DDTHH:MM
+        const ed_raw = document.getElementById('end_dt').value || sd_raw;
+        if (!sd_raw) {
+            alert('Please provide a start date/time.');
+            return;
         }
-    };
+        const [sd_date, sd_time] = sd_raw.split('T');
+        const [ed_date, ed_time] = ed_raw.split('T');
+        const qs = `?expert=1&start_time=${encodeURIComponent(sd_time)}&end_time=${encodeURIComponent(ed_time)}`;
+        window.location.href = '/' + user + '/' + encodeURIComponent(sd_date) + '/' + encodeURIComponent(ed_date) + qs;
+    }
+
+    window.addEventListener('DOMContentLoaded', initForm);
     </script>
 </head>
 <body>
     <div class="container">
         <h2><a href="/">What Did You Do?</a></h2>
-        <form method="get" action="" onsubmit="event.preventDefault(); window.location.href='/' + encodeURIComponent(document.getElementById('user').value) + '/' + encodeURIComponent(document.getElementById('date').value);">
-            <label for="user">User:</label>
+        <form id="mainForm" method="get" action="" onsubmit="event.preventDefault(); submitForm();">
+            <label for="user" class="hidden">User:</label>
             <input type="text" id="user" name="user" value="{{ user or '' }}" placeholder="insert OSM username" required>
 
-            <label for="date">Date:</label>
-            <input type="date" id="date" name="date" value="{{ date or '' }}" required>
+            <!-- Simple date (default) -->
+            <div id="simpleDateRow">
+                <label for="single_date" class="hidden">Date:</label>
+                <input type="date" id="single_date" name="single_date" value="{{ start_date or '' }}">
+            </div>
+
+            <!-- Expert controls (hidden by default) -->
+            <div id="expertControls" style="display: none; margin-top: 0.5em;">
+                <div class="expert-row">
+                    <label for="start_dt">Start:</label>
+                    <input type="datetime-local" id="start_dt" name="start_dt"
+                     value="{{ (start_date ~ 'T' ~ start_time) if start_date else '' }}">
+                </div>
+                <div class="expert-row">
+                    <label for="end_dt">End:</label>
+                    <input type="datetime-local" id="end_dt" name="end_dt"
+                     value="{{ ((end_date or start_date) ~ 'T' ~ (end_time or '23:59')) if (end_date or start_date) else '' }}">
+                </div>
+            </div>
+
+            <div class="expert-toggle">
+                <input type="checkbox" id="expert" name="expert"
+                 value="1" {{ 'checked' if expert else '' }}>
+                <label for="expert">Expert mode</label>
+            </div>
 
             <button type="submit">Show</button>
         </form>
-    {% if user and date %}
+    {% if user %}
         {% for error in errors %}
             <p class=error>{{ error }}</p>
         {% endfor %}
@@ -42,10 +121,10 @@
                 {% set ns.changesets = ns.changesets + Change.changesets %}
             {% endfor %}
             <ul>
-            <p><a href="https://www.openstreetmap.org/user/{{ user }}">{{ name }}</a>
-                 did {{ ns.changes }} change{{ "s" if ns.changes > 1 else ""  }}
+            <p><b><a href="https://www.openstreetmap.org/user/{{ name }}">{{ name }}</a></b>
+                 did <b>{{ ns.changes }} change{{ "s" if ns.changes > 1 else ""  }}</b>
                  in {{ ns.changesets }} changeset{{ "s" if ns.changesets > 1 else ""  }}
-                 on {{ date }}:</p>
+                 {{ date_str }}:</p>
             {% for app, Change in apps.items() %}
                 <li>{{ Change.changes }} change{{ "s" if Change.changes > 1 else ""  }} in
                     {{ Change.changesets }} changeset{{ "s" if Change.changesets > 1 else ""  }}
@@ -89,7 +168,46 @@
             </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 = JSON.parse('{{ changeset_ids|tojson|safe }}');
+        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>

{whatdidyoudo-0.1.13.dist-info → whatdidyoudo-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatdidyoudo
-Version: 0.1.13
+Version: 0.2.4
 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.2.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+whatdidyoudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+whatdidyoudo/app.py,sha256=Y3gOvH1AxDGJJnqNCdSO2Y7QqbHwb9GUpnrP1H1ua3U,5895
+whatdidyoudo/static/favicon.svg,sha256=I3-FiTtYeApxQ40hYyvtQfF38lbTSMA7C4BE-P4XpsY,421
+whatdidyoudo/static/style.css,sha256=I6FjoX_C0ZY9x9TYPW7qs01Ibzy8sEXScxqZyEbOi2M,4047
+whatdidyoudo/templates/form.html,sha256=o_wxJQ9vSFoKkita6Tn-fNviyWZezqpwwRpAPhtTXZs,10467
+whatdidyoudo-0.2.4.dist-info/METADATA,sha256=9mn0MHImaELSkI8lFC2GZ5xbufRgg0jvS36aD5VgkFI,2510
+whatdidyoudo-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+whatdidyoudo-0.2.4.dist-info/RECORD,,

whatdidyoudo-0.1.13.dist-info/RECORD

@@ -1,8 +0,0 @@
-whatdidyoudo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-whatdidyoudo/app.py,sha256=RSUGS75mXeEdcVK8rHm8Mqj_E7700Xbp4_1SzJ4j4N4,3722
-whatdidyoudo/static/favicon.svg,sha256=I3-FiTtYeApxQ40hYyvtQfF38lbTSMA7C4BE-P4XpsY,421
-whatdidyoudo/static/style.css,sha256=xXmwH9Rc9jhGSCWKI4i_-hNOoowzN6xW5B8ixOc9xhk,2436
-whatdidyoudo/templates/form.html,sha256=xplKUN4q7AH5ukhy9jnmd2W7vc7k5J0SBGkCP2rd3m8,4644
-whatdidyoudo-0.1.13.dist-info/METADATA,sha256=VMqu-8NnCtemgdNDrYU0gGb3vW_heWKKGTm2MwdTw98,2511
-whatdidyoudo-0.1.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-whatdidyoudo-0.1.13.dist-info/RECORD,,