Download GeoJSON and GeoPackage

publications/templates/data.html

@@ -39,6 +39,7 @@ <h2 class="py-2">OpenAPI UI</h2>
 
     <h2 class="py-2">Download Publication Data</h2>
     <ul class="list-unstyled mb-4">
+      {% if geojson_size %}
       <li class="mb-3">
         <div class="d-flex align-items-center">
           <a class="btn btn-primary btn-sm" href="{% url 'optimap:download_geojson' %}">
@@ -47,22 +48,25 @@ <h2 class="py-2">Download Publication Data</h2>
           (<a href="https://geojson.org/" target="_blank" class="ms-2 small">GeoJSON spec</a>)
         </div>
         <div class="small text-muted mt-1">
-          File size: {{ geojson_size|filesizeformat }}
+          File size: {{ geojson_size }}
         </div>
       </li>
+      {% endif %}
+
+      {% if geopackage_size %}
       <li>
         <div class="d-flex align-items-center">
           <a class="btn btn-primary btn-sm" href="{% url 'optimap:download_geopackage' %}">
             Download GeoPackage
-          </a>
+         </a>
           (<a href="https://www.geopackage.org/" target="_blank" class="ms-2 small">GeoPackage spec</a>)
         </div>
         <div class="small text-muted mt-1">
-          File size: {{ geopackage_size|filesizeformat }}
+         File size: {{ geopackage_size }}
         </div>
       </li>
+      {% endif %}
     </ul>
-
     <p class="small text-muted text-center mb-0">
       Data dumps run every {{ interval }} hour{{ interval|pluralize }}.<br>
       Last updated: {{ last_updated|naturaltime }}

publications/views.py

@@ -20,34 +20,24 @@
 import imaplib
 import time
 from math import floor
-from django.utils.timezone import make_aware, get_default_timezone, localtime
-from datetime import datetime
 from urllib.parse import unquote
-from django.core.serializers import serialize
 from django.conf import settings
+from django.core.serializers import serialize
 from publications.models import BlockedEmail, BlockedDomain, Subscription, UserProfile, Publication
 from django.contrib.auth import get_user_model
 User = get_user_model()
 import tempfile, os
 from publications.tasks import regenerate_geojson_cache, regenerate_geopackage_cache
 from osgeo import ogr, osr
 ogr.UseExceptions()
-#osr.UseExceptions()
+import humanize
 
 LOGIN_TOKEN_LENGTH  = 32
 LOGIN_TOKEN_TIMEOUT_SECONDS = 10 * 60
 EMAIL_CONFIRMATION_TIMEOUT_SECONDS = 10 * 60
 ACCOUNT_DELETE_TOKEN_TIMEOUT_SECONDS = 10 * 60
 USER_DELETE_TOKEN_PREFIX = "user_delete_token"
 
-def format_file_size(num_bytes):
-    if num_bytes < 1024:
-        return f"{num_bytes} B"
-    elif num_bytes < 1024 * 1024:
-        return f"{num_bytes / 1024:.2f} KB"
-    else:
-        return f"{num_bytes / (1024 * 1024):.2f} MB"
-
 # ------------------------------
 # Download Endpoints
 # ------------------------------
@@ -86,47 +76,37 @@ def generate_geopackage():
     os.makedirs(cache_dir, exist_ok=True)
     gpkg_path = os.path.join(cache_dir, "publications.gpkg")
 
-    # Delete old file so driver can re-create it
     driver = ogr.GetDriverByName("GPKG")
     if os.path.exists(gpkg_path):
         driver.DeleteDataSource(gpkg_path)
-
-    # Create data source & layer
     ds = driver.CreateDataSource(gpkg_path)
     srs = osr.SpatialReference()
     srs.ImportFromEPSG(4326)
     layer = ds.CreateLayer("publications", srs, ogr.wkbUnknown)
 
-    # Define fields
     for name in ("title", "abstract", "doi", "source"):
         field_defn = ogr.FieldDefn(name, ogr.OFTString)
         field_defn.SetWidth(255)
         layer.CreateField(field_defn)
 
-    # Populate features
     layer_defn = layer.GetLayerDefn()
     for pub in Publication.objects.all():
         feat = ogr.Feature(layer_defn)
         feat.SetField("title", pub.title or "")
         feat.SetField("abstract", pub.abstract or "")
         feat.SetField("doi", pub.doi or "")
         feat.SetField("source", pub.source or "")
-
         if pub.geometry:
-            # Use the GEOSGeometry WKB directly
             wkb = pub.geometry.wkb  # bytes
             geom = ogr.CreateGeometryFromWkb(wkb)
             geom.AssignSpatialReference(srs)
             feat.SetGeometry(geom)
-
         layer.CreateFeature(feat)
         feat = None
 
-    # Clean up
     ds = None
     return gpkg_path
 
-
 @require_GET
 def download_geopackage(request):
     """
@@ -142,9 +122,11 @@ def download_geopackage(request):
         filename="publications.gpkg"
     )
 
+
 def main(request):
     return render(request, "main.html")
 
+
 def loginres(request):
     email = request.POST.get('email', False)
     if is_email_blocked(email):
@@ -199,9 +181,11 @@ def loginres(request):
             }
         })
 
+
 def privacy(request):
     return render(request, 'privacy.html')
 
+
 @never_cache
 def data(request):
     cache_dir = os.path.join(tempfile.gettempdir(), "optimap_cache")
@@ -212,13 +196,19 @@ def data(request):
     if not os.path.exists(json_path) or not os.path.exists(gpkg_path):
         regenerate_geopackage_cache()
 
-    geojson_size = os.path.getsize(json_path)
-    geopackage_size = os.path.getsize(gpkg_path)
+    if os.path.exists(json_path):
+        geojson_size = humanize.naturalsize(os.path.getsize(json_path), binary=True)
+    else:
+        geojson_size = None
+
+    if os.path.exists(gpkg_path):
+        geopackage_size = humanize.naturalsize(os.path.getsize(gpkg_path), binary=True)
+    else:
+        geopackage_size = None
     ts = os.path.getmtime(json_path)
     tz = get_default_timezone()
     last_updated = datetime.fromtimestamp(ts, tz)
 
-
     return render(request, 'data.html', {
         'geojson_size': geojson_size,
         'geopackage_size': geopackage_size,
@@ -229,6 +219,7 @@ def data(request):
 def Confirmationlogin(request):
     return render(request, 'confirmation_login.html')
 
+
 def login_user(request, user):
     login(request, user, backend='django.contrib.auth.backends.ModelBackend')
     user.save()

requirements.txt

@@ -35,3 +35,4 @@ whitenoise==6.8.2
 psycopg2-binary==2.9.10
 packaging==21.3
 pycryptodome==3.21.0
+humanize==4.10.0

tests/test_geo_data.py

@@ -160,3 +160,21 @@ def test_download_geopackage(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response['Content-Type'], 'application/geopackage+sqlite3')
         self.assertIn('publications.gpkg', response['Content-Disposition'])
+
+def test_data_page_hides_links_when_missing_cache(self):
+    # Ensure cache is cleared
+    cache_dir = os.path.join(tempfile.gettempdir(), 'optimap_cache')
+    for fname in ('geojson_cache.json', 'publications.gpkg'):
+        path = os.path.join(cache_dir, fname)
+        if os.path.exists(path):
+            os.remove(path)
+
+    response = self.client.get(reverse('optimap:data'))
+    content = response.content.decode()
+    self.assertNotIn('Download GeoJSON', content)
+    self.assertNotIn('Download GeoPackage', content)
+    regenerate_geojson_cache()
+    response = self.client.get(reverse('optimap:data'))
+    content = response.content.decode()
+    self.assertIn('Download GeoJSON', content)
+    self.assertNotIn('Download GeoPackage', content)