umap-project 1.4.3__tar.gz → 1.5.0__tar.gz

{umap_project-1.4.3 → umap_project-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.4.3
+Version: 1.5.0
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -30,10 +30,10 @@ Requires-Dist: requests==2.30.0
 Requires-Dist: social-auth-app-django==5.2.0
 Requires-Dist: social-auth-core==4.4.2
 Provides-Extra: dev
-Requires-Dist: black==21.10b0; extra == 'dev'
+Requires-Dist: black==23.3.0; extra == 'dev'
 Requires-Dist: djlint==1.31.0; extra == 'dev'
 Requires-Dist: hatch==1.7.0; extra == 'dev'
-Requires-Dist: mkdocs==1.2.3; extra == 'dev'
+Requires-Dist: mkdocs==1.5.2; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.21; extra == 'docker'
 Provides-Extra: test

{umap_project-1.4.3 → umap_project-1.5.0}/pyproject.toml

@@ -46,9 +46,9 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
   "hatch==1.7.0",
-  "black==21.10b0",
+  "black==23.3.0",
   "djlint==1.31.0",
-  "mkdocs==1.2.3",
+  "mkdocs==1.5.2",
 ]
 test = [
   "factory-boy==3.2.1",

umap_project-1.5.0/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "1.5.0"

{umap_project-1.4.3 → umap_project-1.5.0}/umap/locale/br/LC_MESSAGES/django.po

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dren Ar Frankig <hadrienlouque@gmail.com>, 2023
-# Dren Ar Frankig <hadrienlouque@gmail.com>, 2023
+# Dren ar Frankig <hadrienlouque@gmail.com>, 2023
+# Dren ar Frankig <hadrienlouque@gmail.com>, 2023
+# Dren ar Frankig <hadrienlouque@gmail.com>, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-19 13:43+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Dren Ar Frankig <hadrienlouque@gmail.com>, 2023\n"
+"Last-Translator: Dren ar Frankig <hadrienlouque@gmail.com>, 2023\n"
 "Language-Team: Breton (http://app.transifex.com/openstreetmap/umap/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: forms.py:43
 #, python-format
 msgid "Secret edit link is %s"
-msgstr ""
+msgstr "Liamm aozañ kuzh: %s"
 
 #: forms.py:47
 msgid "Everyone can edit"
@@ -30,11 +31,11 @@ msgstr "An holl a c'hall kemmañ"
 
 #: forms.py:48
 msgid "Only editable with secret edit link"
-msgstr ""
+msgstr "N'haller he c'hemmañ nemet gant ul liamm aozañ kuzh"
 
 #: middleware.py:14
 msgid "Site is readonly for maintenance"
-msgstr ""
+msgstr "Al lec'hienn zo da lenn hepken rak emeur ouzh he c'hempenn"
 
 #: models.py:40
 msgid "name"
@@ -46,11 +47,11 @@ msgstr "munudoù"
 
 #: models.py:72
 msgid "Link to a page where the licence is detailed."
-msgstr ""
+msgstr "Liamm war-zu ur bajenn a zispleg an aotre-implijout."
 
 #: models.py:82
 msgid "URL template using OSM tile format"
-msgstr ""
+msgstr "Patrom URL a implij furmad teol OSM"
 
 #: models.py:88
 msgid "Order of the tilelayers in the edit box"
@@ -66,7 +67,7 @@ msgstr "Aozerien nemetken"
 
 #: models.py:136
 msgid "Owner only"
-msgstr "Perc'henner nemetken"
+msgstr "Ar perc'henner hepken"
 
 #: models.py:139
 msgid "Everyone (public)"
@@ -98,7 +99,7 @@ msgstr "lec'hiañ"
 
 #: models.py:149
 msgid "Locate user on load?"
-msgstr ""
+msgstr "Lec'hiañ an implijer en ur gargañ?"
 
 #: models.py:153
 msgid "Choose the map licence."
@@ -118,11 +119,11 @@ msgstr "aozerien"
 
 #: models.py:171
 msgid "edit status"
-msgstr ""
+msgstr "statud aozañ"
 
 #: models.py:174
 msgid "share status"
-msgstr ""
+msgstr "digor da biv?"
 
 #: models.py:177
 msgid "settings"
@@ -130,15 +131,15 @@ msgstr "arventennoù"
 
 #: models.py:250
 msgid "Clone of"
-msgstr ""
+msgstr "Eilenn eus"
 
 #: models.py:299
 msgid "display on load"
-msgstr ""
+msgstr "diskwel pa vez karget"
 
 #: models.py:300
 msgid "Display this layer on load."
-msgstr ""
+msgstr "Diskwel ar gwiskad-mañ pa vez karget"
 
 #: templates/404.html:6
 msgid "Take me to the home page"
@@ -168,7 +169,7 @@ msgstr "%(current_user)s n'en/he deus kartenn spilhennet ebet."
 msgid ""
 "uMap lets you create maps with OpenStreetMap layers in a minute and embed "
 "them in your site."
-msgstr ""
+msgstr "uMap a ro tro deoc'h da grouiñ kartennoù en ur serr-lagad gant foñsoù OpenStreetMap ha d'o enframmañ e-barzh ho lec'hienn."
 
 #: templates/registration/login.html:3
 msgid "Please log in with your account"
@@ -207,11 +208,11 @@ msgstr "Ouzhpennañ \"poentoù heverk\": balizennoù, linennoù, lieskornoù..."
 
 #: templates/umap/about_summary.html:23
 msgid "Manage POIs colours and icons"
-msgstr "Dibab livioù an ikonoù hag ar poentoù heverk"
+msgstr "Dibab livioù hag ikonoù ar poentoù heverk"
 
 #: templates/umap/about_summary.html:24
 msgid "Manage map options: display a minimap, locate user on load…"
-msgstr ""
+msgstr "Merañ dibarzhioù ar gartenn: diskwel ar gartennig, lec'hiañ an implijer..."
 
 #: templates/umap/about_summary.html:25
 msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
@@ -219,7 +220,7 @@ msgstr "Enporzhiañ roadennoù geografek a-vern (geojson, gpx, kml, osm...)"
 
 #: templates/umap/about_summary.html:26
 msgid "Choose the license for your data"
-msgstr "Dibab aotre-implijout ho roadennoù"
+msgstr "Diuzañ aotre-implijout ho roadennoù"
 
 #: templates/umap/about_summary.html:27
 msgid "Embed and share your map"
@@ -237,13 +238,13 @@ msgstr "Krouiñ ur gartenn"
 
 #: templates/umap/about_summary.html:51
 msgid "Play with the demo"
-msgstr "Amprouiñ an demo!"
+msgstr "Amprouiñ an tañva!"
 
 #: templates/umap/content.html:23
 msgid ""
 "This instance of uMap is currently in read only mode, no creation/edit is "
 "allowed."
-msgstr ""
+msgstr "uMap zo da lenn hepken evit ar mare, n'haller ket krouiñ/aozañ."
 
 #: templates/umap/content.html:31
 #, python-format
@@ -256,11 +257,11 @@ msgstr ""
 
 #: templates/umap/home.html:8
 msgid "Map of the uMaps"
-msgstr ""
+msgstr "Kartenn an uMapoù"
 
 #: templates/umap/home.html:13
 msgid "Get inspired, browse maps"
-msgstr "Bezit awenet en ur furchal ar c'hartennoù"
+msgstr "Bezit awenet en ur furchal kartennoù"
 
 #: templates/umap/login_popup_end.html:2
 msgid "You are logged in. Continuing..."
@@ -350,7 +351,7 @@ msgstr "Cheñch ar ger-tremen"
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
-msgstr ""
+msgstr "Enankit ho ker-tremen kozh ha div wezh ho ker-tremen nevez war-lerc'h mar plij."
 
 #: templates/umap/password_change.html:13
 msgid "Old password"
@@ -408,7 +409,7 @@ msgstr "Ma zaolenn-vourzh"
 
 #: templates/umap/user_dashboard.html:7
 msgid "Search my maps"
-msgstr ""
+msgstr "Klask em c'hartennoù"
 
 #: templates/umap/user_dashboard.html:18
 msgid "You have no map yet."
@@ -429,12 +430,12 @@ msgstr "Aozerien ar gartenn bet hizivaet gant berzh!"
 #: views.py:670
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
-msgstr ""
+msgstr "Al liamm uMap evit aozañ ho kartenn: %(map_name)s"
 
 #: views.py:673
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
-msgstr ""
+msgstr "Setu ho liamm aozañ kuzh: %(link)s"
 
 #: views.py:679
 #, python-format
@@ -450,7 +451,7 @@ msgstr "N'eus nemet perc'henner ar gartenn a c'hall he dilemel."
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
-msgstr ""
+msgstr "Eilet eo bet ho kartenn! M'ho peus c'hoant d'he c'hemmañ diwar un urzhiataer all, implijit al liamm-mañ: %(anonymous_url)s"
 
 #: views.py:718
 msgid "Congratulations, your map has been cloned!"

{umap_project-1.4.3 → umap_project-1.5.0}/umap/locale/cs_CZ/LC_MESSAGES/django.po

@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uMap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-17 13:14+0000\n"
+"POT-Creation-Date: 2023-07-19 13:43+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
-"Last-Translator: Jiří Podhorecký, 2018-2019\n"
+"Last-Translator: Aleš Fiala <f.ales1@seznam.cz>, 2023\n"
 "Language-Team: Czech (Czech Republic) (http://app.transifex.com/openstreetmap/umap/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,27 +64,27 @@ msgstr "Pořadí vrstev při editaci"
 
 #: models.py:134
 msgid "Everyone"
-msgstr ""
+msgstr "Kdokoli"
 
 #: models.py:135 models.py:141
 msgid "Editors only"
-msgstr ""
+msgstr "Jen přispěvatelé"
 
 #: models.py:136
 msgid "Owner only"
-msgstr ""
+msgstr "Jen vlastník"
 
 #: models.py:139
 msgid "Everyone (public)"
-msgstr ""
+msgstr "Kdokoli (veřejná)"
 
 #: models.py:140
 msgid "Anyone with link"
-msgstr ""
+msgstr "Kdokoli kdo má odkaz"
 
 #: models.py:142
 msgid "Blocked"
-msgstr ""
+msgstr "Blokováno"
 
 #: models.py:145 models.py:295
 msgid "description"
@@ -163,18 +163,18 @@ msgstr "%(current_user)s nemá mapy."
 #: templates/auth/user_stars.html:5
 #, python-format
 msgid "Browse %(current_user)s's starred maps"
-msgstr ""
+msgstr "Prohlížet mapy označené hvězdičkou uživatele %(current_user)s"
 
 #: templates/auth/user_stars.html:12
 #, python-format
 msgid "%(current_user)s has no starred maps yet."
-msgstr ""
+msgstr "%(current_user)s nemá zatím žádné mapy označené hvězdičkou."
 
 #: templates/base.html:12
 msgid ""
 "uMap lets you create maps with OpenStreetMap layers in a minute and embed "
 "them in your site."
-msgstr ""
+msgstr "uMap umožňuje vytvářet mapy s vrstvami OpenStreetMap za okamžik a vložit je do svých stránek."
 
 #: templates/registration/login.html:3
 msgid "Please log in with your account"
@@ -249,7 +249,7 @@ msgstr "Vyzkoušejte si to hned"
 msgid ""
 "This instance of uMap is currently in read only mode, no creation/edit is "
 "allowed."
-msgstr ""
+msgstr "Tato instance uMap je aktuálně v režimu pouze pro čtení, není povoleno žádné vytváření/úpravy."
 
 #: templates/umap/content.html:31
 #, python-format
@@ -282,39 +282,39 @@ msgstr "Více"
 
 #: templates/umap/map_table.html:6
 msgid "Map"
-msgstr ""
+msgstr "Mapa"
 
 #: templates/umap/map_table.html:7
 msgid "Name"
-msgstr ""
+msgstr "Název"
 
 #: templates/umap/map_table.html:8
 msgid "Who can see / edit"
-msgstr ""
+msgstr "Kdo může zobrazit / upravit"
 
 #: templates/umap/map_table.html:9
 msgid "Last save"
-msgstr ""
+msgstr "Poslední uložení"
 
 #: templates/umap/map_table.html:10
 msgid "Owner"
-msgstr ""
+msgstr "Vlastník"
 
 #: templates/umap/map_table.html:11
 msgid "Actions"
-msgstr ""
+msgstr "Akce"
 
 #: templates/umap/map_table.html:28
 msgid "Share"
-msgstr ""
+msgstr "Sdílet"
 
 #: templates/umap/map_table.html:29
 msgid "Edit"
-msgstr ""
+msgstr "Upravit"
 
 #: templates/umap/map_table.html:30
 msgid "Download"
-msgstr ""
+msgstr "Stažení"
 
 #: templates/umap/navigation.html:12
 msgid "My maps"
@@ -322,7 +322,7 @@ msgstr "Moje mapy"
 
 #: templates/umap/navigation.html:15
 msgid "Starred maps"
-msgstr ""
+msgstr "Mapy označené hvězdičkou"
 
 #: templates/umap/navigation.html:19
 msgid "Log in"
@@ -386,18 +386,18 @@ msgstr "Vaše heslo bylo změněno."
 #, python-format
 msgid "%(count)s map found:"
 msgid_plural "%(count)s maps found:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%(count)s nalezená mapa:"
+msgstr[1] "%(count)s nalezené mapy:"
+msgstr[2] "%(count)s nalezené mapy:"
+msgstr[3] "%(count)s nalezených map:"
 
 #: templates/umap/search.html:18
 msgid "No map found."
-msgstr ""
+msgstr "Mapa nenalezena."
 
 #: templates/umap/search.html:21
 msgid "Latest created maps"
-msgstr ""
+msgstr "Nedávno vytvořené mapy"
 
 #: templates/umap/search_bar.html:3
 msgid "Search maps"
@@ -409,15 +409,15 @@ msgstr "Hledej"
 
 #: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:9
 msgid "My dashboard"
-msgstr ""
+msgstr "Můj ovládací panel"
 
 #: templates/umap/user_dashboard.html:7
 msgid "Search my maps"
-msgstr ""
+msgstr "Prohledávat moje mapy"
 
 #: templates/umap/user_dashboard.html:18
 msgid "You have no map yet."
-msgstr ""
+msgstr "Zatím nemáte žádnou mapu."
 
 #: views.py:286
 msgid "View the map"
@@ -434,17 +434,17 @@ msgstr "Seznam přispěvovatelů byl úspěšně upraven!"
 #: views.py:670
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
-msgstr ""
+msgstr "Odkaz na úpravu uMap pro vaši mapu: %(map_name)s"
 
 #: views.py:673
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
-msgstr ""
+msgstr "Zde je váš tajný odkaz na úpravu: %(link)s"
 
 #: views.py:679
 #, python-format
 msgid "Email sent to %(email)s"
-msgstr ""
+msgstr "E-mail odeslán na %(email)s"
 
 #: views.py:690
 msgid "Only its owner can delete the map."
@@ -461,6 +461,6 @@ msgstr "Byla vytvořena kopie mapy! Pokud chcete upravovat tuto mapu z jiného p
 msgid "Congratulations, your map has been cloned!"
 msgstr "Gratulujeme, byla vytvořena kopie mapy!"
 
-#: views.py:884
+#: views.py:897
 msgid "Layer successfully deleted."
 msgstr "Vrstva úspěšně vymazána."

{umap_project-1.4.3 → umap_project-1.5.0}/umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-19 13:43+0000\n"
+"POT-Creation-Date: 2023-08-15 14:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,107 +34,107 @@ msgstr ""
 msgid "Site is readonly for maintenance"
 msgstr ""
 
-#: models.py:40
+#: models.py:48
 msgid "name"
 msgstr ""
 
-#: models.py:71
+#: models.py:79
 msgid "details"
 msgstr ""
 
-#: models.py:72
+#: models.py:80
 msgid "Link to a page where the licence is detailed."
 msgstr ""
 
-#: models.py:82
+#: models.py:90
 msgid "URL template using OSM tile format"
 msgstr ""
 
-#: models.py:88
+#: models.py:96
 msgid "Order of the tilelayers in the edit box"
 msgstr ""
 
-#: models.py:134
+#: models.py:142
 msgid "Everyone"
 msgstr ""
 
-#: models.py:135 models.py:141
+#: models.py:143 models.py:149
 msgid "Editors only"
 msgstr ""
 
-#: models.py:136
+#: models.py:144
 msgid "Owner only"
 msgstr ""
 
-#: models.py:139
+#: models.py:147
 msgid "Everyone (public)"
 msgstr ""
 
-#: models.py:140
+#: models.py:148
 msgid "Anyone with link"
 msgstr ""
 
-#: models.py:142
+#: models.py:150
 msgid "Blocked"
 msgstr ""
 
-#: models.py:145 models.py:295
+#: models.py:153 models.py:303
 msgid "description"
 msgstr ""
 
-#: models.py:146
+#: models.py:154
 msgid "center"
 msgstr ""
 
-#: models.py:147
+#: models.py:155
 msgid "zoom"
 msgstr ""
 
-#: models.py:149
+#: models.py:157
 msgid "locate"
 msgstr ""
 
-#: models.py:149
+#: models.py:157
 msgid "Locate user on load?"
 msgstr ""
 
-#: models.py:153
+#: models.py:161
 msgid "Choose the map licence."
 msgstr ""
 
-#: models.py:154
+#: models.py:162
 msgid "licence"
 msgstr ""
 
-#: models.py:164
+#: models.py:172
 msgid "owner"
 msgstr ""
 
-#: models.py:168
+#: models.py:176
 msgid "editors"
 msgstr ""
 
-#: models.py:171
+#: models.py:179
 msgid "edit status"
 msgstr ""
 
-#: models.py:174
+#: models.py:182
 msgid "share status"
 msgstr ""
 
-#: models.py:177
+#: models.py:185
 msgid "settings"
 msgstr ""
 
-#: models.py:250
+#: models.py:258
 msgid "Clone of"
 msgstr ""
 
-#: models.py:299
+#: models.py:307
 msgid "display on load"
 msgstr ""
 
-#: models.py:300
+#: models.py:308
 msgid "Display this layer on load."
 msgstr ""
 
@@ -451,6 +451,6 @@ msgstr ""
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:897
+#: views.py:901
 msgid "Layer successfully deleted."
 msgstr ""

umap_project-1.5.0/umap/migrations/0010_alter_map_edit_status_alter_map_share_status.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.2 on 2023-07-20 09:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('umap', '0009_star'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='map',
+            name='edit_status',
+            field=models.SmallIntegerField(choices=[(1, 'Everyone'), (2, 'Editors only'), (3, 'Owner only')], default=3, verbose_name='edit status'),
+        ),
+        migrations.AlterField(
+            model_name='map',
+            name='share_status',
+            field=models.SmallIntegerField(choices=[(1, 'Everyone (public)'), (2, 'Anyone with link'), (3, 'Editors only'), (9, 'Blocked')], default=1, verbose_name='share status'),
+        ),
+    ]

umap_project-1.5.0/umap/migrations/0011_alter_map_edit_status_alter_map_share_status.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.2 on 2023-08-07 06:07
+
+from django.db import migrations, models
+import umap.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('umap', '0010_alter_map_edit_status_alter_map_share_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='map',
+            name='edit_status',
+            field=models.SmallIntegerField(choices=[(1, 'Everyone'), (2, 'Editors only'), (3, 'Owner only')], default=umap.models.get_default_edit_status, verbose_name='edit status'),
+        ),
+        migrations.AlterField(
+            model_name='map',
+            name='share_status',
+            field=models.SmallIntegerField(choices=[(1, 'Everyone (public)'), (2, 'Anyone with link'), (3, 'Editors only'), (9, 'Blocked')], default=umap.models.get_default_share_status, verbose_name='share status'),
+        ),
+    ]

{umap_project-1.4.3 → umap_project-1.5.0}/umap/models.py

@@ -36,6 +36,14 @@ User.add_to_class("get_url", get_user_url)
 User.add_to_class("get_stars_url", get_user_stars_url)
 
 
+def get_default_share_status():
+    return settings.UMAP_DEFAULT_SHARE_STATUS or Map.PUBLIC
+
+
+def get_default_edit_status():
+    return settings.UMAP_DEFAULT_EDIT_STATUS or Map.OWNER
+
+
 class NamedModel(models.Model):
     name = models.CharField(max_length=200, verbose_name=_("name"))
 
@@ -168,10 +176,10 @@ class Map(NamedModel):
         settings.AUTH_USER_MODEL, blank=True, verbose_name=_("editors")
     )
     edit_status = models.SmallIntegerField(
-        choices=EDIT_STATUS, default=OWNER, verbose_name=_("edit status")
+        choices=EDIT_STATUS, default=get_default_edit_status, verbose_name=_("edit status")
     )
     share_status = models.SmallIntegerField(
-        choices=SHARE_STATUS, default=PUBLIC, verbose_name=_("share status")
+        choices=SHARE_STATUS, default=get_default_share_status, verbose_name=_("share status")
     )
     settings = models.JSONField(
         blank=True, null=True, verbose_name=_("settings"), default=dict