umap-project 3.3.5__py3-none-any.whl → 3.3.6__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.3.5"
+VERSION = "3.3.6"

umap/static/umap/js/modules/browser.js

@@ -252,7 +252,7 @@ export default class Browser {
       if (datalayer.isVisible()) allHidden = false
     })
     this._umap.datalayers.browsable().map((datalayer) => {
-      datalayer._forcedVisibility = true
+      datalayer.autoLoaded = false
       if (allHidden) {
         datalayer.show()
       } else {

umap/static/umap/js/modules/data/layer.js

@@ -225,17 +225,27 @@ export class DataLayer {
   }
 
   showAtLoad() {
-    return this.autoLoaded() && this.showAtZoom()
+    return this.autoLoaded && this.showAtZoom()
   }
 
-  autoLoaded() {
-    if (!this._umap.datalayersFromQueryString) return this.properties.displayOnLoad
-    const datalayerIds = this._umap.datalayersFromQueryString
-    let loadMe = datalayerIds.includes(this.id.toString())
-    if (this.properties.old_id) {
-      loadMe = loadMe || datalayerIds.includes(this.properties.old_id.toString())
+  get autoLoaded() {
+    if (this._autoLoaded === undefined) {
+      if (this._umap.datalayersFromQueryString) {
+        const datalayerIds = this._umap.datalayersFromQueryString
+        this._autoLoaded = datalayerIds.includes(this.id.toString())
+        if (this.properties.old_id) {
+          this._autoLoaded =
+            this._autoLoaded || datalayerIds.includes(this.properties.old_id.toString())
+        }
+      } else {
+        this._autoLoaded = this.properties.displayOnLoad
+      }
     }
-    return loadMe
+    return this._autoLoaded
+  }
+
+  set autoLoaded(value) {
+    this._autoLoaded = value
   }
 
   insertBefore(other) {
@@ -1213,7 +1223,7 @@ export class DataLayer {
     // From now on, do not try to how/hide
     // automatically this layer, as user
     // has taken control on this.
-    this._forcedVisibility = true
+    this.autoLoaded = false
     let display = force
     if (force === undefined) {
       if (!this.isVisible()) display = true

umap/static/umap/js/modules/managers.js

@@ -59,6 +59,7 @@ export class FeatureManager extends Map {
     if (this.has(feature.id)) {
       console.error('Duplicate id', feature, this.get(feature.id))
       feature.id = Utils.generateId()
+      feature.datalayer._found_duplicate_id = true
     }
     this.set(feature.id, feature)
   }

umap/static/umap/js/modules/rendering/layers/base.js

@@ -53,7 +53,7 @@ export const LayerMixin = {
   },
 
   onZoomEnd() {
-    if (this.datalayer._forcedVisibility) return
+    if (!this.datalayer.autoLoaded) return
     if (!this.datalayer.showAtZoom() && this.datalayer.isVisible()) {
       this.datalayer.hide()
     }

umap/static/umap/js/modules/umap.js

@@ -1269,6 +1269,18 @@ export default class Umap {
     this.drop.enable()
     this.fire('edit:enabled')
     this.initSyncEngine()
+    this.datalayers.active().forEach((datalayer) => {
+      if (!datalayer.isReadOnly() && datalayer._found_duplicate_id) {
+        datalayer._found_duplicate_id = false
+        // Force user to resave those datalayers
+        datalayer.sync.update(
+          'properties.name',
+          datalayer.properties.name,
+          datalayer.properties.name
+        )
+        Alert.info(translate('Layer has been migrated, please save the map.'))
+      }
+    })
   }
 
   disableEdit() {

umap/static/umap/locale/zh_TW.js

@@ -595,7 +595,6 @@ const locale = {
     "Transform to regular line": "轉換為普通線條",
     "Transform to route": "轉換為路線",
     "Restore route": "恢復路線",
-    "Compute elevation": "計畫等高線",
     "Profile": "設定檔案",
     "Compute elevations": "計算等高線。",
     "Route preference": "路線偏好設定",
@@ -615,7 +614,8 @@ const locale = {
     "Loss:": "減少：",
     "Altitude:": "海拔：",
     "Right-click to edit": "按右鍵來編輯",
-    "Draw along routes": "沿著路線繪製"
+    "Draw along routes": "沿著路線繪製",
+    "Skipping invalid geometry": "略過無效的地理空間"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")

umap/static/umap/locale/zh_TW.json

@@ -595,7 +595,6 @@
     "Transform to regular line": "轉換為普通線條",
     "Transform to route": "轉換為路線",
     "Restore route": "恢復路線",
-    "Compute elevation": "計畫等高線",
     "Profile": "設定檔案",
     "Compute elevations": "計算等高線。",
     "Route preference": "路線偏好設定",
@@ -615,5 +614,6 @@
     "Loss:": "減少：",
     "Altitude:": "海拔：",
     "Right-click to edit": "按右鍵來編輯",
-    "Draw along routes": "沿著路線繪製"
+    "Draw along routes": "沿著路線繪製",
+    "Skipping invalid geometry": "略過無效的地理空間"
 }

umap/tests/integration/test_datalayer.py

@@ -1,8 +1,6 @@
-import json
 import re
 
 import pytest
-from django.core.files.base import ContentFile
 from playwright.sync_api import expect
 
 from ..base import DataLayerFactory
@@ -10,17 +8,9 @@ from ..base import DataLayerFactory
 pytestmark = pytest.mark.django_db
 
 
-def set_options(datalayer, **options):
-    # For now we need to change both the DB and the FS…
-    datalayer.settings.update(options)
-    data = json.load(datalayer.geojson.file)
-    data["_umap_options"].update(**options)
-    datalayer.geojson = ContentFile(json.dumps(data), "foo.json")
-    datalayer.save()
-
-
 def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
-    set_options(datalayer, displayOnLoad=False)
+    datalayer.settings.update(displayOnLoad=False)
+    datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
     layers = page.locator(".umap-browser .datalayer")
@@ -30,14 +20,17 @@ def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
     expect(layers_off).to_have_count(1)
     page.get_by_role("button", name="Open browser").click()
     page.get_by_label("Zoom in").click()
+    page.wait_for_timeout(300)
     expect(markers).to_be_hidden()
-    page.get_by_title("Show/hide layer").click()
+    with page.expect_response(re.compile(rf".*/datalayer/{map.pk}/{datalayer.pk}/.*")):
+        page.get_by_title("Show/hide layer").click()
     expect(layers_off).to_have_count(0)
     expect(markers).to_be_visible()
 
 
 def test_should_honour_fromZoom(live_server, map, datalayer, page):
-    set_options(datalayer, displayOnLoad=True, fromZoom=6)
+    datalayer.settings.update(displayOnLoad=True, fromZoom=6)
+    datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#5/48.55/14.68")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
@@ -55,7 +48,8 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page):
 
 
 def test_should_honour_toZoom(live_server, map, datalayer, page, new_page):
-    set_options(datalayer, displayOnLoad=True, toZoom=6)
+    datalayer.settings.update(displayOnLoad=True, toZoom=6)
+    datalayer.save()
     # Loading at zoom 7 should not show the marker
     page.goto(f"{live_server.url}{map.get_absolute_url()}#7/48.55/14.68")
     markers = page.locator(".leaflet-marker-icon")
@@ -123,7 +117,6 @@ def test_datalayers_in_query_string(live_server, datalayer, map, page):
     map.settings["properties"]["onLoadPanel"] = "datalayers"
     map.save()
     with_old_id = DataLayerFactory(old_id=134, map=map, name="with old id")
-    set_options(with_old_id, name="with old id")
     visible = page.locator(".umap-browser .datalayer:not(.off) .datalayer-name")
     hidden = page.locator(".umap-browser .datalayer.off .datalayer-name")
     page.goto(f"{live_server.url}{map.get_absolute_url()}")

{umap_project-3.3.5.dist-info → umap_project-3.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.5
+Version: 3.3.6
 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>

{umap_project-3.3.5.dist-info → umap_project-3.3.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=q-nEmrwgsCPkWnS7hzZUeU8TT3ysppos2-fV16jW2tg,18
+umap/__init__.py,sha256=dXcxAQVoifk8mnJp_WE7_cuoi0cl0OiyMlYF2X9SLWI,18
 umap/admin.py,sha256=YlK4CgEWb2eFYRKiklsKouxeiQ8z_b-H2Fv2XCaiGFQ,3014
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=sJkGqDLgMoPkq2nMRyRE_Hz3ZLJm1X5lgXiQJu6rYt0,660
@@ -238,7 +238,7 @@ umap/static/umap/js/components/modal.js,sha256=ugaibc2n5Pftocs1crN6zaPRJztSQm1at
 umap/static/umap/js/components/alerts/alert.css,sha256=fSmbDDjXjEYLfgnEAVDhyqWiBOUy2YhVRy0_den-7Dk,4930
 umap/static/umap/js/components/alerts/alert.js,sha256=_BcG9WluOkJTj_v795c0PIXvv5EZQs0uO5-rUhcwEco,4482
 umap/static/umap/js/modules/autocomplete.js,sha256=CLw4KP_Mmf5s55OWimK3Xw7GkwDLtuCqeEI2WqPSsOU,8729
-umap/static/umap/js/modules/browser.js,sha256=6WVBox4gLoqPasBzkh7dULz74AKKDQ-5Cp-b0-DbVHY,9753
+umap/static/umap/js/modules/browser.js,sha256=9uug5dbf0HCsg90xUAbva-_dwW_6znFFDUbaPDoUflc,9747
 umap/static/umap/js/modules/caption.js,sha256=glOSK2HIENR-tPO4iDWOvPRX8xgeWloKAbntRpYH1qc,5813
 umap/static/umap/js/modules/dompurify.js,sha256=SOmoM-pTgYCKCKXFo6-znemWPLiLsFgR4lxM_moWaA8,328
 umap/static/umap/js/modules/drop.js,sha256=aHuz_sDgWAqDEH49OWNhnnyFvGLDMCoeeo5xaBLZwAg,1431
@@ -249,7 +249,7 @@ umap/static/umap/js/modules/help.js,sha256=fnkc6ugsYI1TeermtqiJUYJFm9P1pcC-CoDuJ
 umap/static/umap/js/modules/i18n.js,sha256=dEpjsWoEZa-Tr5_MDO0tuWkt7kLL3crxXqhttyP-khU,1387
 umap/static/umap/js/modules/importer.js,sha256=UEEUodCoWmrhq1ActNusz4jU6n6R3DRuhPVd3_oSF00,11458
 umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
-umap/static/umap/js/modules/managers.js,sha256=hRj3lNFnXKhxBm8uIUpR15bYqlog_i8qeIP9879lDdc,2462
+umap/static/umap/js/modules/managers.js,sha256=7MCeiB5INYN1XTlksZSPDi2VwVBrr2tzzGUs4ePpLso,2513
 umap/static/umap/js/modules/orderable.js,sha256=zDtcElZ_MVPoGba8Iv9bxOzk4vuN7C-5XVl4UomDYHE,2521
 umap/static/umap/js/modules/permissions.js,sha256=t-kZvgGIGva8MNMu9Ydr-U9KVrdKUQery_BqniFWut0,8734
 umap/static/umap/js/modules/printer.js,sha256=fvb44tLBiYR7TyBdXJdroYsjQOrnbzw7-6F0dBCUEGg,3607
@@ -260,11 +260,11 @@ umap/static/umap/js/modules/share.js,sha256=xgojG1xHDcbgJZlUd-oP7VFrbGDpl2k1LmTl
 umap/static/umap/js/modules/slideshow.js,sha256=7tmW32iuEwLXTY_4A_DmiRMjdDr5luhpJSdmbz2SXPc,3608
 umap/static/umap/js/modules/tableeditor.js,sha256=NbUgJul5_fFhikWyXIZ1nOEp9hSVKO61i2y52noGISc,8537
 umap/static/umap/js/modules/templates.js,sha256=41fliDQLrVo-WosiyLkxpRry3WXpCVz4IW7kYn0AMfQ,4415
-umap/static/umap/js/modules/umap.js,sha256=_9A2AjVY4vkeprghMtEmL0J6XmOnMUyeGjU14byK1bM,54329
+umap/static/umap/js/modules/umap.js,sha256=GD3vS_MGMqH3I0SIgSNIDgdCKKJJ3sLjMqNuQYcVG48,54785
 umap/static/umap/js/modules/urls.js,sha256=76cFqycj2O8huuoYYBvxnVt2Fc2UDbgrRsiv6lQmcSY,890
 umap/static/umap/js/modules/utils.js,sha256=rT_RILODFUWAvvgjFpT5TtNbu8A9jzn0mlkpHEB8QqM,16044
 umap/static/umap/js/modules/data/features.js,sha256=goCRmPzAx47VE_A-WB_2xJbopid4UpW0jLOLibZ_aUk,38334
-umap/static/umap/js/modules/data/layer.js,sha256=dWj9wA8xIZei46jLqEiokRlK-PQ0v3GLGZgC-5fqjcw,44044
+umap/static/umap/js/modules/data/layer.js,sha256=E0nDlWk7ovEA5PdV58Pv4Z8CUPlBkLImWfn42m_kIXk,44262
 umap/static/umap/js/modules/form/builder.js,sha256=akRoO8VpKXqWr3LO4Y_B1zr9gXJL2S5RCJqRDREweq8,6452
 umap/static/umap/js/modules/form/fields.js,sha256=yUEUPDHF3tgnpDv7UdfMXHsabCMaGsUDXQq2-Qe1krg,36152
 umap/static/umap/js/modules/importers/banfr.js,sha256=TBwL3GQJdzYtaDtxeHxyPQ7Ycy5zTaQyvzXa55X7n2I,2932
@@ -281,7 +281,7 @@ umap/static/umap/js/modules/rendering/map.js,sha256=frdccjuaoK9-PMCNAGGk0y_rG5DV
 umap/static/umap/js/modules/rendering/popup.js,sha256=OtQYpjhWCoW20XBFeeSKCXMqN-szohaX1TKWhPc9eBo,2577
 umap/static/umap/js/modules/rendering/template.js,sha256=n74YzbZOS_4CeK3-Jn7NXbkzqsh4zjCbEX9w15QxKu0,11468
 umap/static/umap/js/modules/rendering/ui.js,sha256=3Uow0IHOHrPW7LJCa00kjCyZQFdRq5hViAOhoBuipHc,17617
-umap/static/umap/js/modules/rendering/layers/base.js,sha256=Prgd0xG2dp_ecITebKhckdrlSZOwxDYrcuwkJ6Vb5xk,2489
+umap/static/umap/js/modules/rendering/layers/base.js,sha256=k_TlwHiGc16CFvE41-OmgjTFa99LbkG0IUKCUoZaruk,2483
 umap/static/umap/js/modules/rendering/layers/classified.js,sha256=CLktnkjf5_6CzkKVyZcx5wAKvhsRp4pRpCIBauwKeO0,15068
 umap/static/umap/js/modules/rendering/layers/cluster.js,sha256=yRv9pXJtYQGimRL6hJXbE9xT1xUmQ4qy2Ja8GjFC5pE,8054
 umap/static/umap/js/modules/rendering/layers/heat.js,sha256=K_LsxnfpGImy2HlneV5nK0cBu1FxDmPNxR5VmsV4LaM,4975
@@ -393,8 +393,8 @@ umap/static/umap/locale/zh.js,sha256=Uzjdp0Oe4QXCewo_YtDuxbC8VTK7RqeBEmXwulGvV48
 umap/static/umap/locale/zh.json,sha256=Z6IaQd0Sy1MjmdJP2BfQ3ka7CcWpY37h3ytUPniYka8,34646
 umap/static/umap/locale/zh_CN.json,sha256=aGzn8kP65zQ4c9Z4Cw95XtJge94LgVeC2w-72mnODaU,34868
 umap/static/umap/locale/zh_TW.Big5.json,sha256=aGzn8kP65zQ4c9Z4Cw95XtJge94LgVeC2w-72mnODaU,34868
-umap/static/umap/locale/zh_TW.js,sha256=thikXtB9stolTrcHNPg6qhwnXEoSeQ6Gz11OU0TQk30,34391
-umap/static/umap/locale/zh_TW.json,sha256=-B-WKSrb1Nf-pBOnhQ0fsnp5p7B-B80COp6L8yN7cNI,34320
+umap/static/umap/locale/zh_TW.js,sha256=MTmNcH8LLqEcnKLsormJR5IetMiyHUjE7Yg8pm8FEm0,34411
+umap/static/umap/locale/zh_TW.json,sha256=0aGY_OSMS6F37hscpK8EPE1KrbH7X3FpKw8tBBkZerI,34340
 umap/static/umap/unittests/URLs.js,sha256=wF0hfRX3NqwFAe31QGeKFwavUpNP2T8pHwXBlcpiwNo,2070
 umap/static/umap/unittests/hlc.js,sha256=GvpBaBSgfMs0Zym0_zOs2QldUOcbFNVIKweBhuwM_QI,5294
 umap/static/umap/unittests/sync.js,sha256=SRzK5N7o7iZodye53evBTZZjXG1mMm6dguV_Iyh69XQ,11096
@@ -566,7 +566,7 @@ umap/tests/integration/test_circles_layer.py,sha256=PjYGmCvAd9qDnldnbiw6nomJs1Yg
 umap/tests/integration/test_cluster.py,sha256=Ltkk0KUeUtU59lbNwZeoTyaGSYWto5k-rS6_SZ_QnGc,5457
 umap/tests/integration/test_conditional_rules.py,sha256=D1vs3-fcxmLvlKK17Xf0i6dDkOK1UQWqBBFKodxfm0c,15657
 umap/tests/integration/test_dashboard.py,sha256=LClLBc8lgDM1-NGhkvUSUMLmMuKt3sR1ubt2Eo-Iq7A,1550
-umap/tests/integration/test_datalayer.py,sha256=CNxT97ZVB-pPjgXh77i3n3hJKgi4Sm0rYh5SbHB9ZWE,5752
+umap/tests/integration/test_datalayer.py,sha256=tjerFu7npF3bQ8L8VOHWjdFJrKU22rGjEqSv2-fj-bY,5525
 umap/tests/integration/test_draw_polygon.py,sha256=WNKXcxMqlTmwI0Yro_PbdpTi-M4gZNeIVa-fSXpS6rE,25298
 umap/tests/integration/test_draw_polyline.py,sha256=RgivhjEzjHVE6niPG5uAxJjtmEVD11ftuU4Tb47bXh8,14717
 umap/tests/integration/test_draw_route.py,sha256=hxa_uVqHLLEbbSsEIMsPsq5fMCNoKWY7cRCpMwqudmM,7276
@@ -602,8 +602,8 @@ umap/tests/integration/test_view_marker.py,sha256=NFCwNez__E_WsE1DuW5RuB0HVKDP4C
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=n3Nd9cDdYMfJjMIkGUidqeceAW2loM8nx17Bh57m0fo,28341
-umap_project-3.3.5.dist-info/METADATA,sha256=EP8EZHDKLEFQpRm87ui9IAS3A7cDjL1fk6kAWlO6oRM,5747
-umap_project-3.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-umap_project-3.3.5.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-3.3.5.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-3.3.5.dist-info/RECORD,,
+umap_project-3.3.6.dist-info/METADATA,sha256=I6p1JERct-0XUpF8rTBHHFqaC4bTXvZdsIKlOm1tbGY,5747
+umap_project-3.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+umap_project-3.3.6.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-3.3.6.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-3.3.6.dist-info/RECORD,,