From d783366d9da3efd83a550e62962f9cd14b61630d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 2 Jan 2016 13:21:24 +0100 Subject: [PATCH] Configuration: new setting UMAP_EXCLUDE_DEFAULT_MAPS - This setting will exclude default maps (maps where the default center has not been updated) - until now, the default was to exclude default maps - new default: not exclude --- umap/settings/base.py | 1 + umap/settings/local.py.sample | 5 +++++ umap/views.py | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/umap/settings/base.py b/umap/settings/base.py index 2bc90cc2..3bb20b7c 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -147,6 +147,7 @@ LEAFLET_STORAGE_EXTRA_URLS = { } SITE_URL = "http://umap.org" UMAP_DEMO_SITE = False +UMAP_EXCLUDE_DEFAULT_MAPS = False MAP_SHORT_URL_NAME = "umap_short_url" UMAP_USE_UNACCENT = False UMAP_FEEDBACK_LINK = "http://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help" # noqa diff --git a/umap/settings/local.py.sample b/umap/settings/local.py.sample index 4f32b40e..fce8e8d7 100644 --- a/umap/settings/local.py.sample +++ b/umap/settings/local.py.sample @@ -64,6 +64,11 @@ SOCIAL_AUTH_BACKEND_ERROR_URL = "/" # UMAP_SHOWCASE_PK = 1156 LEAFLET_STORAGE_ALLOW_ANONYMOUS = True UMAP_DEMO_SITE = True + +# This setting will exclude empty maps (in fact, it will exclude all maps where +# the default center has not been updated) +UMAP_EXCLUDE_DEFAULT_MAPS = False + SITE_URL = "http://localhost:8019" SHORT_SITE_URL = "http://s.hort" diff --git a/umap/views.py b/umap/views.py index 6aacf319..93fe7e08 100644 --- a/umap/views.py +++ b/umap/views.py @@ -54,8 +54,9 @@ class Home(TemplateView, PaginatorMixin): def get_context_data(self, **kwargs): qs = Map.public - if 'spatialite' not in settings.DATABASES['default']['ENGINE']: - # Unsupported query type for sqlite. + if (settings.UMAP_EXCLUDE_DEFAULT_MAPS and + 'spatialite' not in settings.DATABASES['default']['ENGINE']): + # Unsupported query type for sqlite. qs = qs.filter(center__distance_gt=(DEFAULT_CENTER, D(km=1))) demo_map = None if hasattr(settings, "UMAP_DEMO_PK"):