pretix-map 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

pretix_map-0.1.5.dist-info/METADATA

@@ -0,0 +1,88 @@
+Metadata-Version: 2.4
+Name: pretix-map
+Version: 0.1.5
+Summary: An overview map of the catchment area of previous orders. Measured by postcode
+Author-email: MarkenJaden <jjsch1410@gmail.com>
+Maintainer-email: MarkenJaden <jjsch1410@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: homepage, https://github.com/MarkenJaden/pretix-map
+Project-URL: repository, https://github.com/MarkenJaden/pretix-map
+Keywords: pretix
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: geopy
+Dynamic: license-file
+
+# Pretix Sales Map Plugin
+
+A powerful geographic analytics and visualization plugin for [pretix](https://github.com/pretix/pretix). This plugin allows you to visualize where your attendees are coming from, track sales growth over time, and analyze regional market penetration.
+
+## ✨ Features
+
+- **📍 Automatic Geocoding:** Automatically converts attendee addresses to map coordinates upon payment.
+- **🗺️ Interactive Map:** Switch between **Pin View** (with clustering), **Heatmap**, and **Density Grid**.
+- **📈 Sales Analytics:** Track total revenue, average travel distance, and top regions (cities/items).
+- **⏱️ Timeline Animation:** Play back the history of your sales to see geographic growth over time.
+- **★ Marketing Milestones:** Define important dates (e.g., newsletters) in the UI to see their impact on the timeline.
+- **🔄 Event Comparison:** Overlay data from previous events to compare reach and performance.
+- **⚠️ Quality Control:** Dedicated view for orders with failed geocoding to manage data issues.
+- **🌙 Nightly Sync:** Automated background task to retry failed geocoding attempts.
+- **🔘 Manual Trigger:** Admin button to re-run geocoding for all orders of an event.
+
+## 🚀 Installation & Setup
+
+To use this plugin with your local pretix instance (`C:\Users\SCJA03\Desktop\Programmieren\pretix`):
+
+### 1. Register the Plugin
+Open your terminal, navigate to this directory, and ensure your pretix virtual environment is active.
+```bash
+python setup.py develop
+```
+
+### 2. Run Migrations
+Apply the database changes for geodata and milestones:
+```bash
+# From your pretix/src directory
+python manage.py migrate
+```
+
+### 3. Configuration
+Add a User-Agent for the geocoding service in your `pretix.cfg`:
+```ini
+[pretix_mapplugin]
+nominatim_user_agent = YourProjectName/1.0 (contact@yourdomain.com)
+```
+
+### 4. Enable the Plugin
+1. Log in to your Pretix Control Panel.
+2. Go to **Organizer Settings > Plugins** and enable **Map-Plugin**.
+3. In your specific **Event > Settings > Plugins**, also enable **Map-Plugin**.
+
+## 🛠️ Usage
+
+- **Map View:** Navigate to **Sales Map > Map View** in the event sidebar.
+- **Milestones:** Go to **Sales Map > Milestones** to add marketing dates.
+- **Revenue Weighting:** Use the toggle button on the map to see "where the money comes from" instead of just "where the people are".
+
+## 🚀 Starting the Application (Development)
+
+1. **Pretix Server:**
+   ```bash
+   cd C:\Users\SCJA03\Desktop\Programmieren\pretix\src
+   python manage.py runserver
+   ```
+2. **Celery Worker:**
+   ```bash
+   cd C:\Users\SCJA03\Desktop\Programmieren\pretix\src
+   celery -A pretix.celery_app worker -l info
+   ```
+   *Note: If you don't have a broker like Redis or RabbitMQ running, the plugin will automatically fall back to synchronous geocoding (eager mode) if configured in `pretix.cfg`.*
+
+## 🛡️ Requirements
+
+- pretix >= 2.7
+- geopy
+- A running Celery worker (essential for background geocoding)
+
+---
+Developed by MarkenJaden. Released under the Apache License 2.0.

{pretix_map-0.1.4.dist-info → pretix_map-0.1.5.dist-info}/RECORD

@@ -1,37 +1,38 @@
-pretix_map-0.1.4.dist-info/licenses/LICENSE,sha256=RhQ89ePNDClBzEROahhwjDrBSEb5Zpx6XewZfGlY4Ss,569
-pretix_mapplugin/__init__.py,sha256=wQL21SKqJmZ-NSboyC8tgIR3EmyN1XDjwrN7CAHZpGQ,23
-pretix_mapplugin/apps.py,sha256=AnThwyRw2AAz5f-kmXZ8hm85OmKnlDkRosVoQOBgPzE,830
-pretix_mapplugin/geocoding.py,sha256=lBmwMvmE_cPyOHxWE8H3Se2P-2Eq0UjDTCv9gUs97Fo,4018
-pretix_mapplugin/models.py,sha256=klKrgMu1bmiPBwucTdOAZGWtv4WAEKcnoeqPlZgFR1A,2091
-pretix_mapplugin/signals.py,sha256=pSkucUPU6XgR0KLw4bKYEUW2Bqs5vfQXhO5YILQ2wps,3928
-pretix_mapplugin/tasks.py,sha256=F_c36RwyTQzUJ9kBBos_-2zth1UXw_kpcQpUcE90BNM,5428
-pretix_mapplugin/urls.py,sha256=o5407vULF4S-bUihU7AeRxUcMyazg2lPjbvqRflsGxE,838
-pretix_mapplugin/views.py,sha256=7WgmNZeqwmOesT6PrkAIRC8fNfAcWGm-j9-2YqF5egI,7146
+pretix_map-0.1.5.dist-info/licenses/LICENSE,sha256=MNMHjIJIjeQzQboYGsgFSRTBUHctF603DDa8MgCNyAg,554
+pretix_mapplugin/__init__.py,sha256=rPSfWgIeq2YWVPyESOAwCBt8vftsTpIkuLAGDEzyRQc,22
+pretix_mapplugin/apps.py,sha256=QOo53Z6zX0yB-Rz6I92tAu051sP38hM2iJlP9sk2JEg,802
+pretix_mapplugin/geocoding.py,sha256=N_JyjYU_JBouwE3oaL3G1wI5jAyezZzS5IBMgI_GdWQ,6053
+pretix_mapplugin/models.py,sha256=Ofx8S1UlpQVFt-pC9-_LKecF-Hv2uI2rDq5zJ5S_UJQ,2494
+pretix_mapplugin/signals.py,sha256=_SRT-3TllYzD9kUf0JG3PnuWa6cPHkFFSWInCDGm_j0,3155
+pretix_mapplugin/tasks.py,sha256=HKDFC-U1TtYDNrN26QVx133hn0K0BdBUm4qCCYHcgOY,6367
+pretix_mapplugin/urls.py,sha256=gZC74OUSZI2ZUWQXm1pbz8taIV8jA9D2h7FvojRX9Ws,1458
+pretix_mapplugin/views.py,sha256=MByLWX2_U7gqs1AV59ZICIZDcEi2nIPPOfFxZgUhCvI,11591
 pretix_mapplugin/locale/de/LC_MESSAGES/django.mo,sha256=6VVRAqa0ixL-lDA1QwoVvG0wd5ZBwYjaR4P8T73hxhU,269
-pretix_mapplugin/locale/de/LC_MESSAGES/django.po,sha256=tIFKw9KOdGTjGq8bHV6tquRZe_MOn8TT4MJjdTRhId8,323
+pretix_mapplugin/locale/de/LC_MESSAGES/django.po,sha256=-HtJt_qb8k7C30pVXRuYeh5CIB_ISVt2HEAXGn2rVnw,311
 pretix_mapplugin/locale/de_Informal/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pretix_mapplugin/locale/de_Informal/LC_MESSAGES/django.mo,sha256=6VVRAqa0ixL-lDA1QwoVvG0wd5ZBwYjaR4P8T73hxhU,269
-pretix_mapplugin/locale/de_Informal/LC_MESSAGES/django.po,sha256=tIFKw9KOdGTjGq8bHV6tquRZe_MOn8TT4MJjdTRhId8,323
+pretix_mapplugin/locale/de_Informal/LC_MESSAGES/django.po,sha256=-HtJt_qb8k7C30pVXRuYeh5CIB_ISVt2HEAXGn2rVnw,311
 pretix_mapplugin/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pretix_mapplugin/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pretix_mapplugin/management/commands/geocode_existing_orders.py,sha256=zD8OD7c1ZXPCR1KNOc-gWY8ZlIk_IbMKtagFinG6qf0,14099
-pretix_mapplugin/migrations/0001_initial.py,sha256=KAl1Egxptv1bpregGbsh8wUbr4Yh5A_zazVSAQdmoHM,1020
-pretix_mapplugin/migrations/0002_remove_ordergeocodedata_geocoded_timestamp_and_more.py,sha256=dXmZRdqrND0pxiPRuitlDdg-Q2JBqYG-sRPJxr6Urpk,889
+pretix_mapplugin/management/commands/geocode_existing_orders.py,sha256=ACDCH17WdNY6cQLVNj8oW0vlqfzlM3-oqA-sKDPtnFg,13828
+pretix_mapplugin/migrations/0001_initial.py,sha256=i33QeU7ioVpk5HpSShdF-ievDUHsjTzKf2OWO9oSkl8,993
+pretix_mapplugin/migrations/0002_remove_ordergeocodedata_geocoded_timestamp_and_more.py,sha256=U0xDF4KcLqb1QTuDJvilr9NEECVorM7W8ll86RDWi-4,857
+pretix_mapplugin/migrations/0003_mapmilestone.py,sha256=2fcuMOSWcyF-wReVuGs53_a8pLpYLfNoCIIAekdRSUQ,991
 pretix_mapplugin/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pretix_mapplugin/static/pretix_mapplugin/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pretix_mapplugin/static/pretix_mapplugin/css/salesmap.css,sha256=9t2grYB2nWk90Q8h7XjDrlMw9UvcwYS4lcXM1KFidqI,964
-pretix_mapplugin/static/pretix_mapplugin/js/salesmap.js,sha256=ObXC0E0UOJMIiS5DobuGkTVjNzxDjODs8WgxbKaryWE,18591
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.Default.css,sha256=LWhzWaQGZRsWFrrJxg-6Zn8TT84k0_trtiHBc6qcGpY,1346
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.css,sha256=-bdWuWOXMFkX0v9Cvr3OWClPiYefDQz9GGZP_7xZxdc,886
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-heat.js,sha256=aPb_2lnWKnXsUc1_-aT9-kbtr4CV3c85jH9xC1e5QDI,5168
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.esm.js,sha256=i7N_sDD-OoSdbNWYx4paYveaHkkprfXimr67-kGDy_M,430058
+pretix_mapplugin/static/pretix_mapplugin/css/salesmap.css,sha256=l-PfqoW8pGYAI30l6KYkmdxRDQdtz84vN_6Qbvo3kNU,913
+pretix_mapplugin/static/pretix_mapplugin/js/salesmap.js,sha256=1zJKkHL1WnB8u3MkUJOR_33dGkaiz5ylpJbNg4Tr-Iw,19897
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.Default.css,sha256=YSWCMtmNZNwqex4CEw1nQhvFub2lmU7vcCKP-XVwwXA,1287
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/MarkerCluster.css,sha256=YU3qCpj_P06tdPBJGPax0bm6Q1wltfwjsho5TR4-TYc,872
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-heat.js,sha256=65UqrlgGoRAnKfKRuriH3eeDrOhZgZo1SCenduc-SGo,5158
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.esm.js,sha256=Ffst8WrY9mwnR_UnN1iW4n9cHbbYDtWt9_3psXENFCY,415639
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.esm.js.map,sha256=lxY34ye1PfsolFQ8pTsEtlgBJ4tW7panCBRsm35HNbs,866200
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.js,sha256=Y0Ki5d8X0X1H2YiS590G4GgQTUnf6kP26s5XsJ2w76Q,455791
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.js,sha256=IV8Omcuoc8Y1mhT0Sv-yu2T-CxccDjkT2w8Qdb7SJ6Y,441279
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet-src.js.map,sha256=l7cBxd_w6YZOXEWKixXC7DN4ejJsXed7kI-eoTvi1Wo,866292
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.css,sha256=p4NxAoJBhIIN-hmNHrzRCf9tD_miZyoHS5obTRR9BMY,14806
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.js,sha256=MQS1JlBNDWH9MJmkUh6H9zLMwxdN7FTgjea6i94-Ff8,147557
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.css,sha256=M3v8pcq9A7OYFbJwD-vis7ft9VkhxZzUn4jssyghIwM,14145
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.js,sha256=20nQCchB9co0qIjJZRGuk2_Z9VM-kNiyxNV1lvTlZBo,147552
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.js.map,sha256=YAoQ3FzREN4GmVENMir8vgHHypC0xfSK3CAxTHCqx1M,225544
-pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.markercluster.js,sha256=WxJnsgS9OQGt16B_czxdDIl7Am9bwYkpj0eYwRE-Cy4,33726
+pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.markercluster.js,sha256=WL6HHfYfbFEkZOFdsJQeY7lJG_E5airjvqbznghUzRw,33724
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/leaflet.markercluster.js.map,sha256=R8juz3AGnE2aOl3MIx1ram0tNMMiec7EPYwDbqb2ycc,27636
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/layers-2x.png,sha256=Bm2sqFDY_77wB68AsG6sABVyje4nnFHzy2xxbffELt8,1259
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/layers.png,sha256=Hbvp0CjikvNvy6j4s6KNXokydU_CIVuaxp5M3s9RB8Y,696
@@ -39,9 +40,10 @@ pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/marker-ic
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/marker-icon.png,sha256=V0w6XMqF9BFAhbaEFZbWLwDXyJLHsD8oy_owHesdxDc,1466
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/marker-shadow.png,sha256=Jk9cZAM58ELdcpBiz8BMF_jqDymIK1OOOEjtjxDttNo,618
 pretix_mapplugin/templates/pretix_mapplugin/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pretix_mapplugin/templates/pretix_mapplugin/map_page.html,sha256=wrUFxvtlmBhgADoRqB7sL3QsGETNC_DgYjWboHvDYFw,4827
-pretix_map-0.1.4.dist-info/METADATA,sha256=BkU4P9Kyz6cXKpmquqrTwkVXTd3ng0ygN_kmbP3YBuU,9518
-pretix_map-0.1.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pretix_map-0.1.4.dist-info/entry_points.txt,sha256=C3NAjeZHoCekafkLMCJynPcABRTK8AUprtQv7sUNDZs,137
-pretix_map-0.1.4.dist-info/top_level.txt,sha256=CAtEnkgA73zE9Gadm5mjt1SpXHBPOS-QWP0dQVoNToE,17
-pretix_map-0.1.4.dist-info/RECORD,,
+pretix_mapplugin/templates/pretix_mapplugin/map_page.html,sha256=_lUjaaRNf9bBc4aepek4Sp2w7QE1coRLPSF9mdfIFiw,9824
+pretix_mapplugin/templates/pretix_mapplugin/milestones.html,sha256=2cdcmuA9XxDC3BFZuVL9tO-Nsz7whKasqLM9en3x5cw,2032
+pretix_map-0.1.5.dist-info/METADATA,sha256=ls_bUm29Qxk256wtUPHplJOrWxywvFN8J7LPecu2HN0,3575
+pretix_map-0.1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pretix_map-0.1.5.dist-info/entry_points.txt,sha256=C3NAjeZHoCekafkLMCJynPcABRTK8AUprtQv7sUNDZs,137
+pretix_map-0.1.5.dist-info/top_level.txt,sha256=CAtEnkgA73zE9Gadm5mjt1SpXHBPOS-QWP0dQVoNToE,17
+pretix_map-0.1.5.dist-info/RECORD,,

{pretix_map-0.1.4.dist-info → pretix_map-0.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{pretix_map-0.1.4.dist-info → pretix_map-0.1.5.dist-info}/licenses/LICENSE

@@ -1,15 +1,15 @@
-
-Copyright 2025 MarkenJaden
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
+
+Copyright 2025 MarkenJaden
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

pretix_mapplugin/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"

pretix_mapplugin/apps.py

@@ -1,28 +1,28 @@
-from django.utils.translation import gettext_lazy
-
-from . import __version__
-
-try:
-    from pretix.base.plugins import PluginConfig
-except ImportError:
-    raise RuntimeError("Please use pretix 2.7 or above to run this plugin!")
-
-
-class PluginApp(PluginConfig):
-    default = True
-    name = "pretix_mapplugin"
-    verbose_name = "Map-Plugin"
-
-    class PretixPluginMeta:
-        name = gettext_lazy("Map-Plugin")
-        author = "MarkenJaden"
-        description = gettext_lazy("An overview map of the catchment area of previous orders. Measured by postcode")
-        visible = True
-        version = __version__
-        category = "FEATURE"
-        compatibility = "pretix>=2.7.0"
-        settings_links = []
-        navigation_links = []
-
-    def ready(self):
-        from . import signals  # NOQA
+from django.utils.translation import gettext_lazy
+
+from . import __version__
+
+try:
+    from pretix.base.plugins import PluginConfig
+except ImportError:
+    raise RuntimeError("Please use pretix 2.7 or above to run this plugin!")
+
+
+class PluginApp(PluginConfig):
+    default = True
+    name = "pretix_mapplugin"
+    verbose_name = "Map-Plugin"
+
+    class PretixPluginMeta:
+        name = gettext_lazy("Map-Plugin")
+        author = "MarkenJaden"
+        description = gettext_lazy("An overview map of the catchment area of previous orders. Measured by postcode")
+        visible = True
+        version = __version__
+        category = "FEATURE"
+        compatibility = "pretix>=2.7.0"
+        settings_links = []
+        navigation_links = []
+
+    def ready(self):
+        from . import signals  # NOQA

pretix_mapplugin/geocoding.py

@@ -1,102 +1,162 @@
-import logging
-from geopy.geocoders import Nominatim
-from geopy.exc import GeocoderTimedOut, GeocoderServiceError
-from time import sleep
-
-# DO NOT import settings here, as it won't work reliably in Celery
-
-logger = logging.getLogger(__name__)
-
-# Define a default/fallback User-Agent. Users *should* override this in pretix.cfg.
-DEFAULT_NOMINATIM_USER_AGENT = "pretix-map-plugin/unknown (Please configure nominatim_user_agent in pretix.cfg)"
-
-
-# --- Geocoding Function (Accepts user_agent) ---
-def geocode_address(address_string: str, nominatim_user_agent: str | None = None) -> tuple[float, float] | None:
-    """
-    Tries to geocode a given address string using Nominatim, using the
-    provided User-Agent string.
-
-    Args:
-        address_string: A single string representing the address.
-        nominatim_user_agent: The User-Agent string to use for Nominatim.
-
-    Returns:
-        A tuple (latitude, longitude) if successful, otherwise None.
-    """
-    # Use the provided User-Agent or the default
-    user_agent = nominatim_user_agent or DEFAULT_NOMINATIM_USER_AGENT
-
-    if user_agent == DEFAULT_NOMINATIM_USER_AGENT:
-        # Log warning if default is used - admins should configure this
-        logger.warning(
-            "Using default Nominatim User-Agent. Please set a specific "
-            "'nominatim_user_agent' under [pretix_mapplugin] in your "
-            "pretix.cfg according to Nominatim's usage policy."
-        )
-
-    # Initialize the geolocator with the determined user_agent
-    geolocator = Nominatim(user_agent=user_agent)
-
-    try:
-        # Add a 1-second delay to respect Nominatim's usage policy (1 req/sec)
-        sleep(1)
-
-        # Perform geocoding
-        location = geolocator.geocode(address_string, timeout=10)  # 10-second timeout
-
-        if location:
-            logger.debug(
-                f"Geocoded '{address_string}' to ({location.latitude}, {location.longitude}) using User-Agent: {user_agent}"
-            )
-            return (location.latitude, location.longitude)
-        else:
-            logger.warning(f"Could not geocode address: {address_string} (Address not found by Nominatim)")
-            return None
-
-    except GeocoderTimedOut:
-        logger.error(f"Geocoding timed out for address: {address_string}")
-        return None
-    except GeocoderServiceError as e:
-        # Log specific service errors (e.g., API limits, server issues)
-        logger.error(f"Geocoding service error for address '{address_string}': {e}")
-        return None
-    except Exception as e:
-        # Catch any other unexpected exceptions during geocoding
-        logger.exception(f"An unexpected error occurred during geocoding for address '{address_string}': {e}")
-        return None
-
-
-# --- Helper to Format Address from Pretix Order ---
-def get_formatted_address_from_order(order) -> str | None:
-    """
-    Creates a formatted address string from a Pretix order's invoice address.
-
-    Args:
-        order: A Pretix `Order` object.
-
-    Returns:
-        A formatted address string suitable for geocoding, or None if no address.
-    """
-    # Ensure order and invoice_address exist
-    if not order or not order.invoice_address:
-        return None
-
-    parts = []
-    addr = order.invoice_address  # Shortcut
-
-    # Add components in a likely useful order for geocoding
-    if addr.street: parts.append(addr.street)
-    if addr.city: parts.append(addr.city)
-    if addr.zipcode: parts.append(addr.zipcode)
-    if addr.state: parts.append(addr.state)
-    # Use the full country name if possible, geocoders often prefer it
-    if addr.country: parts.append(str(addr.country.name))
-
-    # Only return an address if we have useful parts
-    if not parts:
-        return None
-
-    # Join parts with commas. Geocoders are usually good at parsing this.
-    full_address = ", ".join(filter(None, parts))  # filter(None,...) removes empty strings
-    return full_address
+import logging
+from geopy.geocoders import Nominatim
+from geopy.exc import GeocoderTimedOut, GeocoderServiceError
+from geopy.distance import distance as geopy_distance
+from time import sleep
+
+# DO NOT import settings here, as it won't work reliably in Celery
+
+logger = logging.getLogger(__name__)
+
+# Define a default/fallback User-Agent. Users *should* override this in pretix.cfg.
+DEFAULT_NOMINATIM_USER_AGENT = "pretix-map-plugin/unknown (Please configure nominatim_user_agent in pretix.cfg)"
+
+
+# --- Geocoding Function (Accepts user_agent) ---
+def geocode_address(address_string: str, nominatim_user_agent: str | None = None) -> tuple[float, float] | None:
+    """
+    Tries to geocode a given address string using Nominatim, using the
+    provided User-Agent string.
+
+    Args:
+        address_string: A single string representing the address.
+        nominatim_user_agent: The User-Agent string to use for Nominatim.
+
+    Returns:
+        A tuple (latitude, longitude) if successful, otherwise None.
+    """
+    # Use the provided User-Agent or the default
+    user_agent = nominatim_user_agent or DEFAULT_NOMINATIM_USER_AGENT
+
+    if user_agent == DEFAULT_NOMINATIM_USER_AGENT:
+        # Log warning if default is used - admins should configure this
+        logger.warning(
+            "Using default Nominatim User-Agent. Please set a specific "
+            "'nominatim_user_agent' under [pretix_mapplugin] in your "
+            "pretix.cfg according to Nominatim's usage policy."
+        )
+
+    # Initialize the geolocator with the determined user_agent
+    geolocator = Nominatim(user_agent=user_agent)
+
+    try:
+        # Add a 1-second delay to respect Nominatim's usage policy (1 req/sec)
+        sleep(1)
+
+        # Perform geocoding
+        location = geolocator.geocode(address_string, timeout=10)  # 10-second timeout
+
+        if location:
+            logger.debug(
+                f"Geocoded '{address_string}' to ({location.latitude}, {location.longitude}) using User-Agent: {user_agent}"
+            )
+            return (location.latitude, location.longitude)
+        else:
+            logger.warning(f"Could not geocode address: {address_string} (Address not found by Nominatim)")
+            return None
+
+    except GeocoderTimedOut:
+        logger.error(f"Geocoding timed out for address: {address_string}")
+        return None
+    except GeocoderServiceError as e:
+        # Log specific service errors (e.g., API limits, server issues)
+        logger.error(f"Geocoding service error for address '{address_string}': {e}")
+        return None
+    except Exception as e:
+        # Catch any other unexpected exceptions during geocoding
+        logger.exception(f"An unexpected error occurred during geocoding for address '{address_string}': {e}")
+        return None
+
+
+# --- Helper to Format Address Candidates from Pretix Order ---
+def get_address_candidates_from_order(order) -> list[str]:
+    """
+    Creates a list of formatted address strings from a Pretix order's invoice address,
+    ordered from most specific to least specific (fallback).
+
+    Args:
+        order: A Pretix `Order` object.
+
+    Returns:
+        A list of address strings (e.g., ["Street, City, Zip, Country", "Zip City, Country"]).
+    """
+    # Ensure order and invoice_address exist
+    if not order or not order.invoice_address:
+        return []
+
+    candidates = []
+    addr = order.invoice_address  # Shortcut
+    country_name = str(addr.country.name) if addr.country else ""
+
+    # Strategy 1: Full Address (Street, Zip City, State, Country)
+    parts_full = []
+    if addr.street: parts_full.append(addr.street)
+    if addr.zipcode and addr.city:
+        parts_full.append(f"{addr.zipcode} {addr.city}")
+    elif addr.city:
+        parts_full.append(addr.city)
+    elif addr.zipcode:
+        parts_full.append(addr.zipcode)
+    
+    if addr.state: parts_full.append(addr.state)
+    if country_name: parts_full.append(country_name)
+    
+    full_address = ", ".join(filter(None, parts_full))
+    if full_address:
+        candidates.append(full_address)
+
+    # Strategy 2: Zip + City + Country (No Street) - Good for privacy or if street is weird
+    parts_zip_city = []
+    if addr.zipcode and addr.city:
+        parts_zip_city.append(f"{addr.zipcode} {addr.city}")
+    elif addr.city: # Fallback if only city
+        parts_zip_city.append(addr.city)
+    
+    if country_name: parts_zip_city.append(country_name)
+
+    zip_city_address = ", ".join(filter(None, parts_zip_city))
+    if zip_city_address and zip_city_address not in candidates:
+        candidates.append(zip_city_address)
+
+    # Strategy 3: Just Zip + Country (Coarse location)
+    parts_zip = []
+    if addr.zipcode: parts_zip.append(addr.zipcode)
+    if country_name: parts_zip.append(country_name)
+    
+    zip_address = ", ".join(filter(None, parts_zip))
+    if zip_address and zip_address not in candidates:
+        candidates.append(zip_address)
+
+    return candidates
+
+
+def get_best_address_string(order) -> str | None:
+    """Returns the most specific address string for an order."""
+    candidates = get_address_candidates_from_order(order)
+    return candidates[0] if candidates else None
+
+
+def geocode_event_location(event, nominatim_user_agent: str | None = None) -> tuple[float, float] | None:
+    """
+    Tries to geocode the event's location field.
+    """
+    if not event or not event.location:
+        return None
+    
+    location_str = str(event.location)
+    logger.info(f"Geocoding event location: {location_str}")
+    return geocode_address(location_str, nominatim_user_agent=nominatim_user_agent)
+
+
+def calculate_distance(coord1: tuple[float, float], coord2: tuple[float, float]) -> float | None:
+    """
+    Calculates the distance in kilometers between two coordinates (lat, lon).
+    Returns None if coordinates are invalid.
+    """
+    try:
+        if not coord1 or not coord2:
+            return None
+        return geopy_distance(coord1, coord2).km
+    except Exception as e:
+        logger.warning(f"Error calculating distance: {e}")
+        return None

pretix_mapplugin/locale/de/LC_MESSAGES/django.po

@@ -1,12 +1,12 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 19:01+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: MarkenJaden\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-07 19:01+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: MarkenJaden\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"

pretix_mapplugin/locale/de_Informal/LC_MESSAGES/django.po

@@ -1,12 +1,12 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 19:01+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: MarkenJaden\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-07 19:01+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: MarkenJaden\n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"