diff --git a/g3w-admin/mapproxy/README.md b/g3w-admin/qmapproxy/README.md similarity index 100% rename from g3w-admin/mapproxy/README.md rename to g3w-admin/qmapproxy/README.md diff --git a/g3w-admin/mapproxy/__init__.py b/g3w-admin/qmapproxy/__init__.py similarity index 100% rename from g3w-admin/mapproxy/__init__.py rename to g3w-admin/qmapproxy/__init__.py diff --git a/g3w-admin/mapproxy/admin.py b/g3w-admin/qmapproxy/admin.py similarity index 100% rename from g3w-admin/mapproxy/admin.py rename to g3w-admin/qmapproxy/admin.py diff --git a/g3w-admin/mapproxy/apps.py b/g3w-admin/qmapproxy/apps.py similarity index 93% rename from g3w-admin/mapproxy/apps.py rename to g3w-admin/qmapproxy/apps.py index b28c8bd97..cdbdb6c2b 100644 --- a/g3w-admin/mapproxy/apps.py +++ b/g3w-admin/qmapproxy/apps.py @@ -19,13 +19,13 @@ class MapproxyConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'mapproxy' - verbose_name = 'Mapproxy Caching' + name = 'qmapproxy' + verbose_name = 'Mapproxy Caching Integration' def ready(self): # import signal handlers - import mapproxy.receivers + import qmapproxy.receivers from django.conf import settings @@ -50,7 +50,7 @@ def ready(self): if not os.access(settings.MAPPROXY_BRIDGE_SHARED_FOLDER_PATH, os.R_OK | os.W_OK): raise ImproperlyConfigured('MAPPROXY_BRIDGE_SHARED_FOLDER_PATH setting is not readable and writeable') - spec = importlib.util.spec_from_file_location(module_name, "mapproxy/bridges/%s.py" % module_name) + spec = importlib.util.spec_from_file_location(module_name, "qmapproxy/bridges/%s.py" % module_name) module = importlib.util.module_from_spec(spec) sys.modules[module_name] = module spec.loader.exec_module(module) diff --git a/g3w-admin/mapproxy/bridges/__init__.py b/g3w-admin/qmapproxy/bridges/__init__.py similarity index 100% rename from g3w-admin/mapproxy/bridges/__init__.py rename to g3w-admin/qmapproxy/bridges/__init__.py diff --git a/g3w-admin/mapproxy/bridges/shared_folder.py b/g3w-admin/qmapproxy/bridges/shared_folder.py similarity index 100% rename from g3w-admin/mapproxy/bridges/shared_folder.py rename to g3w-admin/qmapproxy/bridges/shared_folder.py diff --git a/g3w-admin/mapproxy/forms.py b/g3w-admin/qmapproxy/forms.py similarity index 100% rename from g3w-admin/mapproxy/forms.py rename to g3w-admin/qmapproxy/forms.py diff --git a/g3w-admin/mapproxy/migrations/0001_initial.py b/g3w-admin/qmapproxy/migrations/0001_initial.py similarity index 100% rename from g3w-admin/mapproxy/migrations/0001_initial.py rename to g3w-admin/qmapproxy/migrations/0001_initial.py diff --git a/g3w-admin/mapproxy/migrations/0002_auto_20231221_1147.py b/g3w-admin/qmapproxy/migrations/0002_auto_20231221_1147.py similarity index 94% rename from g3w-admin/mapproxy/migrations/0002_auto_20231221_1147.py rename to g3w-admin/qmapproxy/migrations/0002_auto_20231221_1147.py index 806818d49..e35368e4c 100644 --- a/g3w-admin/mapproxy/migrations/0002_auto_20231221_1147.py +++ b/g3w-admin/qmapproxy/migrations/0002_auto_20231221_1147.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('qdjango', '0115_project_geocoding_providers'), - ('mapproxy', '0001_initial'), + ('qmapproxy', '0001_initial'), ] operations = [ diff --git a/g3w-admin/mapproxy/migrations/__init__.py b/g3w-admin/qmapproxy/migrations/__init__.py similarity index 100% rename from g3w-admin/mapproxy/migrations/__init__.py rename to g3w-admin/qmapproxy/migrations/__init__.py diff --git a/g3w-admin/mapproxy/models.py b/g3w-admin/qmapproxy/models.py similarity index 90% rename from g3w-admin/mapproxy/models.py rename to g3w-admin/qmapproxy/models.py index eabba6322..96fdc376a 100644 --- a/g3w-admin/mapproxy/models.py +++ b/g3w-admin/qmapproxy/models.py @@ -53,12 +53,12 @@ def base_layer_attr(self): def invalidate_cache(self): - bridge_implementation = apps.get_app_config('mapproxy').bridge_implementation + bridge_implementation = apps.get_app_config('qmapproxy').bridge_implementation bridge_implementation.invalidate_cache(self) def delete_cache(self): - bridge_implementation = apps.get_app_config('mapproxy').bridge_implementation + bridge_implementation = apps.get_app_config('qmapproxy').bridge_implementation bridge_implementation.delete_cache(self) diff --git a/g3w-admin/mapproxy/receivers.py b/g3w-admin/qmapproxy/receivers.py similarity index 98% rename from g3w-admin/mapproxy/receivers.py rename to g3w-admin/qmapproxy/receivers.py index 9cd6cf44c..5c3ecc999 100644 --- a/g3w-admin/mapproxy/receivers.py +++ b/g3w-admin/qmapproxy/receivers.py @@ -18,7 +18,7 @@ from core.signals import load_layer_actions, after_serialized_project_layer from qdjango.signals import reading_layer_model from qdjango.models import Layer -from mapproxy.models import G3WMapproxyLayer +from qmapproxy.models import G3WMapproxyLayer import logging diff --git a/g3w-admin/mapproxy/static/mapproxy/js/ui.js b/g3w-admin/qmapproxy/static/qmapproxy/js/ui.js similarity index 100% rename from g3w-admin/mapproxy/static/mapproxy/js/ui.js rename to g3w-admin/qmapproxy/static/qmapproxy/js/ui.js diff --git a/g3w-admin/mapproxy/templates/mapproxy/layer_action.html b/g3w-admin/qmapproxy/templates/mapproxy/layer_action.html similarity index 100% rename from g3w-admin/mapproxy/templates/mapproxy/layer_action.html rename to g3w-admin/qmapproxy/templates/mapproxy/layer_action.html diff --git a/g3w-admin/mapproxy/templates/mapproxy/mapproxy_conf.yaml b/g3w-admin/qmapproxy/templates/mapproxy/mapproxy_conf.yaml similarity index 100% rename from g3w-admin/mapproxy/templates/mapproxy/mapproxy_conf.yaml rename to g3w-admin/qmapproxy/templates/mapproxy/mapproxy_conf.yaml diff --git a/g3w-admin/mapproxy/templates/mapproxy/mapproxy_layer_active_form.html b/g3w-admin/qmapproxy/templates/mapproxy/mapproxy_layer_active_form.html similarity index 100% rename from g3w-admin/mapproxy/templates/mapproxy/mapproxy_layer_active_form.html rename to g3w-admin/qmapproxy/templates/mapproxy/mapproxy_layer_active_form.html diff --git a/g3w-admin/mapproxy/tests.py b/g3w-admin/qmapproxy/tests.py similarity index 100% rename from g3w-admin/mapproxy/tests.py rename to g3w-admin/qmapproxy/tests.py diff --git a/g3w-admin/mapproxy/urls.py b/g3w-admin/qmapproxy/urls.py similarity index 100% rename from g3w-admin/mapproxy/urls.py rename to g3w-admin/qmapproxy/urls.py diff --git a/g3w-admin/mapproxy/views.py b/g3w-admin/qmapproxy/views.py similarity index 100% rename from g3w-admin/mapproxy/views.py rename to g3w-admin/qmapproxy/views.py