umap-project 1.5.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

umap/locale/ms/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ 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-08-21 15:24+0000\n"
 "PO-Revision-Date: 2013-11-22 14:00+0000\n"
 "Last-Translator: Yaya - Nurul Azeera Hidayah @ Muhammad Nur Hidayat Yasuyoshi (MNH48) <admin@mnh48.moe>, 2021,2023\n"
 "Language-Team: Malay (http://app.transifex.com/openstreetmap/umap/language/ms/)\n"
@@ -36,107 +36,107 @@ msgstr "Hanya boleh disunting dengan pautan rahsia"
 msgid "Site is readonly for maintenance"
 msgstr "Laman dalam mod baca sahaja untuk penyenggaraan"
 
-#: models.py:40
+#: models.py:48
 msgid "name"
 msgstr "nama"
 
-#: models.py:71
+#: models.py:79
 msgid "details"
 msgstr "perincian"
 
-#: models.py:72
+#: models.py:80
 msgid "Link to a page where the licence is detailed."
 msgstr "Pautan ke halaman yang menyatakan lesennya."
 
-#: models.py:82
+#: models.py:90
 msgid "URL template using OSM tile format"
 msgstr "Templat URL menggunakan format fail OSM"
 
-#: models.py:88
+#: models.py:96
 msgid "Order of the tilelayers in the edit box"
 msgstr "Kedudukan lapisan jubin dalam kotak suntingan"
 
-#: models.py:134
+#: models.py:142
 msgid "Everyone"
 msgstr "Semua orang"
 
-#: models.py:135 models.py:141
+#: models.py:143 models.py:149
 msgid "Editors only"
 msgstr "Penyunting sahaja"
 
-#: models.py:136
+#: models.py:144
 msgid "Owner only"
 msgstr "Pemilik sahaja"
 
-#: models.py:139
+#: models.py:147
 msgid "Everyone (public)"
 msgstr "Semua orang (umum)"
 
-#: models.py:140
+#: models.py:148
 msgid "Anyone with link"
 msgstr "Sesiapa yang ada pautan"
 
-#: models.py:142
+#: models.py:150
 msgid "Blocked"
 msgstr "Disekat"
 
-#: models.py:145 models.py:295
+#: models.py:153 models.py:307
 msgid "description"
 msgstr "keterangan"
 
-#: models.py:146
+#: models.py:154
 msgid "center"
 msgstr "pertengahkan"
 
-#: models.py:147
+#: models.py:155
 msgid "zoom"
 msgstr "zum"
 
-#: models.py:149
+#: models.py:157
 msgid "locate"
 msgstr "mengesan"
 
-#: models.py:149
+#: models.py:157
 msgid "Locate user on load?"
 msgstr "Kesan kedudukan pengguna semasa dimuatkan?"
 
-#: models.py:153
+#: models.py:161
 msgid "Choose the map licence."
 msgstr "Pilih lesen peta."
 
-#: models.py:154
+#: models.py:162
 msgid "licence"
 msgstr "lesen"
 
-#: models.py:164
+#: models.py:172
 msgid "owner"
 msgstr "pemilik"
 
-#: models.py:168
+#: models.py:176
 msgid "editors"
 msgstr "penyunting"
 
-#: models.py:171
+#: models.py:181
 msgid "edit status"
 msgstr "status suntingan"
 
-#: models.py:174
+#: models.py:186
 msgid "share status"
 msgstr "status perkongsian"
 
-#: models.py:177
+#: models.py:189 models.py:316
 msgid "settings"
 msgstr "tetapan"
 
-#: models.py:250
+#: models.py:262
 msgid "Clone of"
 msgstr "Klon bagi"
 
-#: models.py:299
+#: models.py:311
 msgid "display on load"
 msgstr "paparkan semasa dimuatkan"
 
-#: models.py:300
+#: models.py:312
 msgid "Display this layer on load."
 msgstr "Paparkan lapisan ini ketika dimuatkan."
 
@@ -154,6 +154,33 @@ msgstr "Layari peta %(current_user)s"
 msgid "%(current_user)s has no maps."
 msgstr "%(current_user)s tidak mempunyai peta."
 
+#: templates/auth/user_form.html:6 templates/umap/user_dashboard.html:4
+#: templates/umap/user_dashboard.html:10
+msgid "My dashboard"
+msgstr "Papan pemuka saya"
+
+#: templates/auth/user_form.html:6 templates/umap/user_dashboard.html:10
+msgid "My profile"
+msgstr "Profil saya"
+
+#: templates/auth/user_form.html:19
+msgid "Save"
+msgstr "Simpan"
+
+#: templates/auth/user_form.html:24
+msgid "Your current providers"
+msgstr "Penyedia semasa anda"
+
+#: templates/auth/user_form.html:30
+msgid "Connect to another provider"
+msgstr "Sambung ke penyedia lain"
+
+#: templates/auth/user_form.html:32
+msgid ""
+"It's a good habit to connect your account to more than one provider, in case"
+" one provider becomes unavailable, temporarily or even permanently."
+msgstr "Lebih baik anda sambung akaun anda ke beberapa penyedia berlainan, kalau-kalau satu penyedia tidak tersedia, secara sementara atau secara kekal."
+
 #: templates/auth/user_stars.html:5
 #, python-format
 msgid "Browse %(current_user)s's starred maps"
@@ -231,7 +258,7 @@ msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
 msgstr "Dan ia <a href=\"%(repo_url)s\">bersumber terbuka</a>!"
 
 #: templates/umap/about_summary.html:48 templates/umap/navigation.html:42
-#: templates/umap/user_dashboard.html:18
+#: templates/umap/user_dashboard.html:20
 msgid "Create a map"
 msgstr "Cipta peta"
 
@@ -266,7 +293,7 @@ msgstr "Dapatkan inspirasi, layari peta-peta"
 msgid "You are logged in. Continuing..."
 msgstr "Anda telah log masuk. Menyambung..."
 
-#: templates/umap/map_list.html:9 views.py:281
+#: templates/umap/map_list.html:9 views.py:300
 msgid "by"
 msgstr "oleh"
 
@@ -398,60 +425,56 @@ msgstr "Cari peta"
 msgid "Search"
 msgstr "Cari"
 
-#: templates/umap/user_dashboard.html:4 templates/umap/user_dashboard.html:9
-msgid "My dashboard"
-msgstr "Papan pemuka saya"
-
 #: templates/umap/user_dashboard.html:7
 msgid "Search my maps"
 msgstr "Gelintar peta saya"
 
-#: templates/umap/user_dashboard.html:18
+#: templates/umap/user_dashboard.html:20
 msgid "You have no map yet."
 msgstr "Anda belum ada peta."
 
-#: views.py:286
+#: views.py:305
 msgid "View the map"
 msgstr "Lihat peta"
 
-#: views.py:607
+#: views.py:628
 msgid "Map has been updated!"
 msgstr "Peta telah dikemas kini!"
 
-#: views.py:632
+#: views.py:653
 msgid "Map editors updated with success!"
 msgstr "Penyunting peta telah dikemas kini dengan jayanya!"
 
-#: views.py:670
+#: views.py:691
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr "Pautan suntingan uMap untuk peta anda: %(map_name)s"
 
-#: views.py:673
+#: views.py:694
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr "Ini pautan suntingan rahsia anda: %(link)s"
 
-#: views.py:679
+#: views.py:700
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr "E-mel telah dihantar ke %(email)s"
 
-#: views.py:690
+#: views.py:711
 msgid "Only its owner can delete the map."
 msgstr "Hanya pemiliknya sahaja mampu memadamkan peta."
 
-#: views.py:713
+#: views.py:734
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr "Peta anda telah diklon! Jika anda ingin menyunting peta ini dari komputer lain, sila gunakan pautan ini: %(anonymous_url)s"
 
-#: views.py:718
+#: views.py:739
 msgid "Congratulations, your map has been cloned!"
 msgstr "Tahniah, peta anda telah berjaya diklon!"
 
-#: views.py:884
+#: views.py:922
 msgid "Layer successfully deleted."
 msgstr "Lapisan telah berjaya dipadamkan."

umap/migrations/0012_datalayer_settings.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.2 on 2023-08-16 05:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("umap", "0011_alter_map_edit_status_alter_map_share_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="datalayer",
+            name="settings",
+            field=models.JSONField(
+                blank=True, default=dict, null=True, verbose_name="settings"
+            ),
+        ),
+    ]

umap/models.py

@@ -176,10 +176,14 @@ class Map(NamedModel):
         settings.AUTH_USER_MODEL, blank=True, verbose_name=_("editors")
     )
     edit_status = models.SmallIntegerField(
-        choices=EDIT_STATUS, default=get_default_edit_status, verbose_name=_("edit status")
+        choices=EDIT_STATUS,
+        default=get_default_edit_status,
+        verbose_name=_("edit status"),
     )
     share_status = models.SmallIntegerField(
-        choices=SHARE_STATUS, default=get_default_share_status, 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
@@ -308,6 +312,9 @@ class DataLayer(NamedModel):
         help_text=_("Display this layer on load."),
     )
     rank = models.SmallIntegerField(default=0)
+    settings = models.JSONField(
+        blank=True, null=True, verbose_name=_("settings"), default=dict
+    )
 
     class Meta:
         ordering = ("rank",)
@@ -340,7 +347,14 @@ class DataLayer(NamedModel):
 
     @property
     def metadata(self):
-        return {"name": self.name, "id": self.pk, "displayOnLoad": self.display_on_load}
+        # Retrocompat: minimal settings for maps not saved after settings property
+        # has been introduced
+        obj = self.settings or {
+            "name": self.name,
+            "displayOnLoad": self.display_on_load,
+        }
+        obj["id"] = self.pk
+        return obj
 
     def clone(self, map_inst=None):
         new = self.__class__.objects.get(pk=self.pk)

umap/settings/base.py

@@ -129,6 +129,8 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 FROM_EMAIL = None
+# https://docs.djangoproject.com/en/4.2/releases/4.1/#forms
+FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
 
 # =============================================================================
 # Calculation of directories relative to the project module location
@@ -262,8 +264,6 @@ LEAFLET_ZOOM = env.int('LEAFLET_ZOOM', default=6)
 COMPRESS_ENABLED = True
 COMPRESS_OFFLINE = True
 
-SOCIAL_AUTH_NO_DEFAULT_PROTECTED_USER_FIELDS = True
-SOCIAL_AUTH_PROTECTED_USER_FIELDS = ("id", )
 LOGIN_URL = "login"
 SOCIAL_AUTH_LOGIN_REDIRECT_URL = "/login/popup/end/"
 

umap/static/umap/base.css

@@ -194,6 +194,10 @@ select[multiple="multiple"] {
     font-size: 10px;
     border-radius: 0 2px;
 }
+.content .helptext {
+    background-color: #eee;
+    color: #000;
+}
 input + .help-text {
     margin-top: -14px;
 }
@@ -214,6 +218,9 @@ label {
     line-height: 21px;
     width: 100%;
 }
+.content label {
+    font-weight: bold;
+}
 input[type="checkbox"] + label {
     display: inline;
     padding: 0 14px;

umap/static/umap/content.css

@@ -133,6 +133,13 @@ h2.section {
     text-align: center;
     padding-top: 28px;
 }
+h2.tabs a {
+    font-weight: normal;
+    color: #666;
+}
+h2.tabs a:hover {
+    text-decoration: underline;
+}
 .showcase-map .map_fragment {
     height: 400px;
 }

umap/static/umap/js/umap.controls.js

@@ -663,7 +663,7 @@ L.U.DataLayer.include({
 L.U.DataLayer.addInitHook(function () {
   this.on('hide', this.propagateHide)
   this.on('show', this.propagateShow)
-  this.propagateShow()
+  if (this.isVisible()) this.propagateShow()
 })
 
 L.U.Map.include({
@@ -934,7 +934,7 @@ L.U.Map.include({
       L.DomUtil.create('i', 'umap-icon-16 umap-add', filter)
       const labelFilter = L.DomUtil.create('span', '', filter)
       labelFilter.textContent = labelFilter.title = L._('Facet search')
-      L.DomEvent.on(filter, 'click', this.openFilter, this)
+      L.DomEvent.on(filter, 'click', this.openFacet, this)
       actions.push(filter)
     }
     this.ui.openPanel({ data: { html: container }, actions: actions })
@@ -983,12 +983,15 @@ L.U.Map.include({
       name = L.DomUtil.create('a', 'map-name', container),
       share_status = L.DomUtil.create('a', 'share-status', container),
       update = () => {
+        const status = this.permissions.getShareStatusDisplay()
         name.textContent = this.getDisplayName()
-        share_status.textContent = L._('Visibility: {status}', {
-          status: this.permissions.getShareStatusDisplay(),
+        // status is not set until map is saved once
+        if (status) share_status.textContent = L._('Visibility: {status}', {
+          status: status,
         })
       }
     update()
+    this.once('saved', L.bind(update, this))
     name.href = '#'
     share_status.href = '#'
     logo.href = '/'
@@ -1269,6 +1272,7 @@ L.U.Search = L.PhotonSearch.extend({
   initialize: function (map, input, options) {
     L.PhotonSearch.prototype.initialize.call(this, map, input, options)
     this.options.url = map.options.urls.search
+    if (map.options.maxBounds) this.options.bbox = map.options.maxBounds.toBBoxString()
   },
 
   onBlur: function (e) {

umap/static/umap/js/umap.js

@@ -1,7 +1,7 @@
 L.Map.mergeOptions({
   overlay: null,
   datalayers: [],
-  center: [4, 50],
+  center: [50, 4],
   zoom: 6,
   hash: true,
   default_color: 'DarkBlue',
@@ -85,6 +85,10 @@ L.U.Map.include({
         : true
     geojson.properties.fullscreenControl = false
     L.Util.setBooleanFromQueryString(geojson.properties, 'scrollWheelZoom')
+
+    // Before calling parent initialize
+    if (geojson.geometry) this.options.center = this.latLng(geojson.geometry)
+
     L.Map.prototype.initialize.call(this, el, geojson.properties)
 
     this.ui = new L.U.UI(this._container)
@@ -96,7 +100,6 @@ L.U.Map.include({
     this.name = this.options.name
     this.description = this.options.description
     this.demoTileInfos = this.options.demoTileInfos
-    if (geojson.geometry) this.options.center = geojson.geometry
     this.options.zoomControl = zoomControl
     this.options.fullscreenControl = fullscreenControl
     L.Util.setBooleanFromQueryString(this.options, 'moreControl')
@@ -159,10 +162,12 @@ L.U.Map.include({
     this.facets = {}
 
     if (this.options.hash) this.addHash()
+    this.initTileLayers(this.options.tilelayers)
+    // Needs tilelayer to exist for minimap
     this.initControls()
+    // Needs locate control and hash to exist
     this.initCenter()
     this.handleLimitBounds()
-    this.initTileLayers(this.options.tilelayers)
     this.initDatalayers()
 
     if (this.options.displayCaptionOnLoad) {

umap/static/umap/js/umap.layer.js

@@ -248,11 +248,6 @@ L.U.DataLayer = L.Evented.extend({
     }
     this.setUmapId(data.id)
     this.setOptions(data)
-    this.backupOptions()
-    this.connectToMap()
-    if (this.displayedOnLoad()) this.show()
-    if (!this.umap_id) this.isDirty = true
-
     // Retrocompat
     if (this.options.remoteData && this.options.remoteData.from) {
       this.options.fromZoom = this.options.remoteData.from
@@ -260,11 +255,15 @@ L.U.DataLayer = L.Evented.extend({
     if (this.options.remoteData && this.options.remoteData.to) {
       this.options.toZoom = this.options.remoteData.to
     }
+    this.backupOptions()
+    this.connectToMap()
+    if (this.displayedOnLoad() && this.showAtZoom()) this.show()
+    if (!this.umap_id) this.isDirty = true
 
     this.onceLoaded(function () {
       this.map.on('moveend', this.onMoveEnd, this)
-      this.map.on('zoomend', this.onZoomEnd, this)
     })
+    this.map.on('zoomend', this.onZoomEnd, this)
   },
 
   onMoveEnd: function (e) {
@@ -313,7 +312,7 @@ L.U.DataLayer = L.Evented.extend({
     const Class = L.U.Layer[this.options.type] || L.U.Layer.Default
     this.layer = new Class(this)
     this.eachLayer((feature) => this.showFeature(feature))
-    if (visible) this.map.addLayer(this.layer)
+    if (visible) this.show()
     this.propagateRemote()
   },
 
@@ -335,12 +334,15 @@ L.U.DataLayer = L.Evented.extend({
 
   fetchData: function () {
     if (!this.umap_id) return
+    if (this._loading) return
+    this._loading = true
     this.map.get(this._dataUrl(), {
       callback: function (geojson, response) {
         this._last_modified = response.getResponseHeader('Last-Modified')
         this.fromUmapGeoJSON(geojson)
         this.backupOptions()
         this.fire('loaded')
+        this._loading = false
       },
       context: this,
     })
@@ -390,8 +392,7 @@ L.U.DataLayer = L.Evented.extend({
     const from = parseInt(this.options.fromZoom, 10),
       to = parseInt(this.options.toZoom, 10),
       zoom = this.map.getZoom()
-    if (isNaN(from) || isNaN(to)) return false
-    return (zoom >= from && zoom <= to)
+    return !((!isNaN(from) && zoom < from) || (!isNaN(to) && zoom > to))
   },
 
   fetchRemoteData: function () {
@@ -1183,6 +1184,7 @@ L.U.DataLayer = L.Evented.extend({
     formData.append('name', this.options.name)
     formData.append('display_on_load', !!this.options.displayOnLoad)
     formData.append('rank', this.getRank())
+    formData.append('settings', JSON.stringify(this.options))
     // Filename support is shaky, don't do it for now.
     const blob = new Blob([JSON.stringify(geojson)], { type: 'application/json' })
     formData.append('geojson', blob)

umap/static/umap/test/Map.js

@@ -289,7 +289,7 @@ describe('L.U.Map', function () {
     })
 
     it('should update title bar (umap format import)', function () {
-      var title = qs('#map div.umap-main-edit-toolbox h3 a.umap-click-to-edit')
+      var title = qs('#map div.umap-main-edit-toolbox a.map-name')
       assert.equal(title.innerHTML, 'Imported map')
     })
 

umap/static/umap/test/_pre.js

@@ -136,6 +136,11 @@ function initMap(options) {
       },
       default_iconUrl: '../src/img/marker.png',
       zoom: 6,
+      share_statuses: [
+        [1, 'Tout le monde (public)'],
+        [2, 'Quiconque a le lien'],
+        [3, 'Éditeurs uniquement'],
+      ],
       tilelayers: [
         {
           attribution: '\u00a9 OSM Contributors',