umap-project 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- umap/__init__.py +1 -1
- umap/autocomplete.py +9 -0
- umap/locale/en/LC_MESSAGES/django.po +11 -7
- umap/locale/fr/LC_MESSAGES/django.mo +0 -0
- umap/locale/fr/LC_MESSAGES/django.po +11 -7
- umap/locale/nl/LC_MESSAGES/django.mo +0 -0
- umap/locale/nl/LC_MESSAGES/django.po +136 -56
- umap/settings/base.py +2 -2
- umap/static/umap/base.css +4 -0
- umap/static/umap/css/bar.css +2 -1
- umap/static/umap/css/form.css +5 -8
- umap/static/umap/css/icon.css +1 -1
- umap/static/umap/img/16-white.svg +1 -1
- umap/static/umap/img/16.svg +1 -1
- umap/static/umap/img/24-white.svg +1 -0
- umap/static/umap/img/24.svg +2 -1
- umap/static/umap/img/source/16-white.svg +3 -3
- umap/static/umap/img/source/16.svg +1 -1
- umap/static/umap/img/source/24-white.svg +3 -2
- umap/static/umap/img/source/24.svg +5 -4
- umap/static/umap/js/modules/browser.js +1 -0
- umap/static/umap/js/modules/caption.js +2 -2
- umap/static/umap/js/modules/data/features.js +7 -10
- umap/static/umap/js/modules/data/layer.js +9 -1
- umap/static/umap/js/modules/form/fields.js +4 -2
- umap/static/umap/js/modules/importers/cadastrefr.js +14 -12
- umap/static/umap/js/modules/importers/geodatamine.js +11 -9
- umap/static/umap/js/modules/rendering/map.js +2 -4
- umap/static/umap/js/modules/rendering/ui.js +0 -1
- umap/static/umap/js/modules/schema.js +12 -0
- umap/static/umap/js/modules/ui/bar.js +2 -2
- umap/static/umap/js/modules/umap.js +23 -1
- umap/static/umap/js/modules/utils.js +2 -0
- umap/static/umap/js/umap.controls.js +3 -3
- umap/static/umap/js/umap.core.js +6 -2
- umap/static/umap/locale/cs_CZ.js +4 -2
- umap/static/umap/locale/cs_CZ.json +4 -2
- umap/static/umap/locale/de.js +4 -2
- umap/static/umap/locale/de.json +4 -2
- umap/static/umap/locale/en.js +4 -2
- umap/static/umap/locale/en.json +4 -2
- umap/static/umap/locale/es.js +4 -2
- umap/static/umap/locale/es.json +4 -2
- umap/static/umap/locale/eu.js +4 -2
- umap/static/umap/locale/eu.json +4 -2
- umap/static/umap/locale/fa_IR.js +4 -2
- umap/static/umap/locale/fa_IR.json +4 -2
- umap/static/umap/locale/fr.js +4 -2
- umap/static/umap/locale/fr.json +4 -2
- umap/static/umap/locale/gl.js +4 -2
- umap/static/umap/locale/gl.json +4 -2
- umap/static/umap/locale/hu.js +4 -2
- umap/static/umap/locale/hu.json +4 -2
- umap/static/umap/locale/it.js +4 -2
- umap/static/umap/locale/it.json +4 -2
- umap/static/umap/locale/nl.js +12 -10
- umap/static/umap/locale/nl.json +12 -10
- umap/static/umap/locale/pt.js +4 -2
- umap/static/umap/locale/pt.json +4 -2
- umap/static/umap/locale/pt_PT.js +4 -2
- umap/static/umap/locale/pt_PT.json +4 -2
- umap/static/umap/locale/zh_TW.js +4 -2
- umap/static/umap/locale/zh_TW.json +4 -2
- umap/static/umap/map.css +3 -1
- umap/templates/umap/search.html +10 -1
- umap/tests/integration/test_edit_map.py +1 -7
- umap/tests/integration/test_picto.py +10 -2
- umap/tests/test_views.py +18 -0
- umap/views.py +6 -3
- {umap_project-3.0.1.dist-info → umap_project-3.0.3.dist-info}/METADATA +6 -6
- {umap_project-3.0.1.dist-info → umap_project-3.0.3.dist-info}/RECORD +74 -74
- {umap_project-3.0.1.dist-info → umap_project-3.0.3.dist-info}/WHEEL +0 -0
- {umap_project-3.0.1.dist-info → umap_project-3.0.3.dist-info}/entry_points.txt +0 -0
- {umap_project-3.0.1.dist-info → umap_project-3.0.3.dist-info}/licenses/LICENSE +0 -0
umap/static/umap/locale/eu.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Aukeratu datu-multzo hau",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: OpenStreetMap-eko datu tematikoak",
|
|
459
459
|
"Choose a theme": "Aukeratu gai bat",
|
|
460
|
-
"Symplify all geometries to points": "Sinplifikatu geometria guztiak puntutan",
|
|
461
460
|
"Choose this data": "Aukeratu datu hauek",
|
|
462
461
|
"Search admin boundary": "Bilatu muga administratiboa",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Aukeratu gai bat eta muga bat.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/fa_IR.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "انتخاب این مجموعهداده",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine:دادههای موضوعی از اوپناستریتمپ",
|
|
459
459
|
"Choose a theme": "یک موضوع انتخاب کنید",
|
|
460
|
-
"Symplify all geometries to points": "همهٔ هندسهها به نقطه ساده شوند",
|
|
461
460
|
"Choose this data": "انتخاب این داده",
|
|
462
461
|
"Search admin boundary": "جستجوی تقسیمات (admin boundary)",
|
|
463
462
|
"Please choose a theme and a boundary first.": "لطفاً ابتدا یک موضوع و یک تقسیمات انتخاب کنید.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("fa_IR", locale)
|
|
544
546
|
L.setLocale("fa_IR")
|
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "انتخاب این مجموعهداده",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine:دادههای موضوعی از اوپناستریتمپ",
|
|
459
459
|
"Choose a theme": "یک موضوع انتخاب کنید",
|
|
460
|
-
"Symplify all geometries to points": "همهٔ هندسهها به نقطه ساده شوند",
|
|
461
460
|
"Choose this data": "انتخاب این داده",
|
|
462
461
|
"Search admin boundary": "جستجوی تقسیمات (admin boundary)",
|
|
463
462
|
"Please choose a theme and a boundary first.": "لطفاً ابتدا یک موضوع و یک تقسیمات انتخاب کنید.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/fr.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Choisir ce jeu de données",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GéoDataMine : données thématiques à partir d'OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Choisir un thème",
|
|
460
|
-
"Symplify all geometries to points": "Simplifier les géométries en points",
|
|
461
460
|
"Choose this data": "Choisir ces données",
|
|
462
461
|
"Search admin boundary": "Chercher une limite administrative",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Merci de choisir un thème et une limite administrative.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Catégories",
|
|
541
|
-
"Geocode": "Géocoder"
|
|
540
|
+
"Geocode": "Géocoder",
|
|
541
|
+
"Display the back to home icon": "Afficher le bouton de retour à l'accueil",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Afficher un sélecteur de calques dans la barre de légende ?",
|
|
543
|
+
"Simplify all geometries to points": "Simplifier les géométries en points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("fr", locale)
|
|
544
546
|
L.setLocale("fr")
|
umap/static/umap/locale/fr.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Choisir ce jeu de données",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GéoDataMine : données thématiques à partir d'OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Choisir un thème",
|
|
460
|
-
"Symplify all geometries to points": "Simplifier les géométries en points",
|
|
461
460
|
"Choose this data": "Choisir ces données",
|
|
462
461
|
"Search admin boundary": "Chercher une limite administrative",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Merci de choisir un thème et une limite administrative.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Catégories",
|
|
541
|
-
"Geocode": "Géocoder"
|
|
540
|
+
"Geocode": "Géocoder",
|
|
541
|
+
"Display the back to home icon": "Afficher le bouton de retour à l'accueil",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Afficher un sélecteur de calques dans la barre de légende ?",
|
|
543
|
+
"Simplify all geometries to points": "Simplifier les géométries en points"
|
|
542
544
|
}
|
umap/static/umap/locale/gl.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Escoller este conxunto de datos",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: datos temáticos de OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escoller un tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as xeometrías a puntos",
|
|
461
460
|
"Choose this data": "Escoller estes datos",
|
|
462
461
|
"Search admin boundary": "Buscar un límite administrativo",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolle primeiro un tema e un límite.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("gl", locale)
|
|
544
546
|
L.setLocale("gl")
|
umap/static/umap/locale/gl.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Escoller este conxunto de datos",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: datos temáticos de OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escoller un tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as xeometrías a puntos",
|
|
461
460
|
"Choose this data": "Escoller estes datos",
|
|
462
461
|
"Search admin boundary": "Buscar un límite administrativo",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolle primeiro un tema e un límite.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/hu.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Ezen adatkészlet kiválasztása",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: tematikus adatok az OpenStreetMap-ről",
|
|
459
459
|
"Choose a theme": "Téma kiválasztása",
|
|
460
|
-
"Symplify all geometries to points": "Az összes alakzat egyszerűsítése pontokká",
|
|
461
460
|
"Choose this data": "Ezen adatok kiválasztása",
|
|
462
461
|
"Search admin boundary": "Közigazgatási határ keresése",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Először válasszon ki egy témát és egy határt.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("hu", locale)
|
|
544
546
|
L.setLocale("hu")
|
umap/static/umap/locale/hu.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Ezen adatkészlet kiválasztása",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: tematikus adatok az OpenStreetMap-ről",
|
|
459
459
|
"Choose a theme": "Téma kiválasztása",
|
|
460
|
-
"Symplify all geometries to points": "Az összes alakzat egyszerűsítése pontokká",
|
|
461
460
|
"Choose this data": "Ezen adatok kiválasztása",
|
|
462
461
|
"Search admin boundary": "Közigazgatási határ keresése",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Először válasszon ki egy témát és egy határt.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/it.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Scegli questo dataset",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Seleziona un tema",
|
|
460
|
-
"Symplify all geometries to points": "Semplifica tutte le geometrie in punti",
|
|
461
460
|
"Choose this data": "Seleziona questi dati",
|
|
462
461
|
"Search admin boundary": "Cerca confini amministrativi",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("it", locale)
|
|
544
546
|
L.setLocale("it")
|
umap/static/umap/locale/it.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Scegli questo dataset",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Seleziona un tema",
|
|
460
|
-
"Symplify all geometries to points": "Semplifica tutte le geometrie in punti",
|
|
461
460
|
"Choose this data": "Seleziona questi dati",
|
|
462
461
|
"Search admin boundary": "Cerca confini amministrativi",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/nl.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Kies deze dataset",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematische data van OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Kies een thema",
|
|
460
|
-
"Symplify all geometries to points": "Symplificeer alle geometrieën tot punten",
|
|
461
460
|
"Choose this data": "Kies deze data",
|
|
462
461
|
"Search admin boundary": "Zoeken administrative grens",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Kies eerst een thema en een grens.",
|
|
@@ -528,17 +527,20 @@ const locale = {
|
|
|
528
527
|
"Edit map default view": "Standaardweergave van de kaart bewerken",
|
|
529
528
|
"Use current center and zoom": "Gebruik huidig centrum en zoomniveau",
|
|
530
529
|
"Layer permalink": "Permalink-laag",
|
|
531
|
-
"Back to home": "
|
|
532
|
-
"Home logo": "
|
|
533
|
-
"Add this geometry to my map": "
|
|
534
|
-
"Add this place to my map": "
|
|
535
|
-
"Cancel last edit": "
|
|
536
|
-
"Redo last edit": "
|
|
537
|
-
"Links": "
|
|
538
|
-
"Images": "
|
|
530
|
+
"Back to home": "Terug naar thuispagina",
|
|
531
|
+
"Home logo": "Thuispagina logo",
|
|
532
|
+
"Add this geometry to my map": "Voeg deze geometrie toe aan mijn kaart",
|
|
533
|
+
"Add this place to my map": "Voeg deze plaats toe aan mijn kaart",
|
|
534
|
+
"Cancel last edit": "Laatste bewerking annuleren",
|
|
535
|
+
"Redo last edit": "Laatste bewerking opnieuw uitvoeren",
|
|
536
|
+
"Links": "Koppelingen",
|
|
537
|
+
"Images": "Afbeeldingen",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("nl", locale)
|
|
544
546
|
L.setLocale("nl")
|
umap/static/umap/locale/nl.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Kies deze dataset",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematische data van OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Kies een thema",
|
|
460
|
-
"Symplify all geometries to points": "Symplificeer alle geometrieën tot punten",
|
|
461
460
|
"Choose this data": "Kies deze data",
|
|
462
461
|
"Search admin boundary": "Zoeken administrative grens",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Kies eerst een thema en een grens.",
|
|
@@ -528,15 +527,18 @@
|
|
|
528
527
|
"Edit map default view": "Standaardweergave van de kaart bewerken",
|
|
529
528
|
"Use current center and zoom": "Gebruik huidig centrum en zoomniveau",
|
|
530
529
|
"Layer permalink": "Permalink-laag",
|
|
531
|
-
"Back to home": "
|
|
532
|
-
"Home logo": "
|
|
533
|
-
"Add this geometry to my map": "
|
|
534
|
-
"Add this place to my map": "
|
|
535
|
-
"Cancel last edit": "
|
|
536
|
-
"Redo last edit": "
|
|
537
|
-
"Links": "
|
|
538
|
-
"Images": "
|
|
530
|
+
"Back to home": "Terug naar thuispagina",
|
|
531
|
+
"Home logo": "Thuispagina logo",
|
|
532
|
+
"Add this geometry to my map": "Voeg deze geometrie toe aan mijn kaart",
|
|
533
|
+
"Add this place to my map": "Voeg deze plaats toe aan mijn kaart",
|
|
534
|
+
"Cancel last edit": "Laatste bewerking annuleren",
|
|
535
|
+
"Redo last edit": "Laatste bewerking opnieuw uitvoeren",
|
|
536
|
+
"Links": "Koppelingen",
|
|
537
|
+
"Images": "Afbeeldingen",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/pt.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Escolher este conjunto de dados",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: dados temáticos do OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escolher um tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as geometrias para pontos",
|
|
461
460
|
"Choose this data": "Selecionar estes dados",
|
|
462
461
|
"Search admin boundary": "Pesquisar limite administrativo",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolha primeiro um tema e um limite.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("pt", locale)
|
|
544
546
|
L.setLocale("pt")
|
umap/static/umap/locale/pt.json
CHANGED
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Escolher este conjunto de dados",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: dados temáticos do OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escolher um tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as geometrias para pontos",
|
|
461
460
|
"Choose this data": "Selecionar estes dados",
|
|
462
461
|
"Search admin boundary": "Pesquisar limite administrativo",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolha primeiro um tema e um limite.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/pt_PT.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "Escolher este conjunto de dados",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: dados temáticos do OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escolher um tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as geometrias para pontos",
|
|
461
460
|
"Choose this data": "Escolher estes dados",
|
|
462
461
|
"Search admin boundary": "Pesquisar limites administrativos",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolha primeiro um tema e um limite.",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("pt_PT", locale)
|
|
544
546
|
L.setLocale("pt_PT")
|
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "Escolher este conjunto de dados",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: dados temáticos do OpenStreetMap",
|
|
459
459
|
"Choose a theme": "Escolher um tema",
|
|
460
|
-
"Symplify all geometries to points": "Simplificar todas as geometrias para pontos",
|
|
461
460
|
"Choose this data": "Escolher estes dados",
|
|
462
461
|
"Search admin boundary": "Pesquisar limites administrativos",
|
|
463
462
|
"Please choose a theme and a boundary first.": "Escolha primeiro um tema e um limite.",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/locale/zh_TW.js
CHANGED
|
@@ -457,7 +457,6 @@ const locale = {
|
|
|
457
457
|
"Choose this dataset": "選擇這個資料集",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine:從開放街圖來的主題資料",
|
|
459
459
|
"Choose a theme": "選擇主題",
|
|
460
|
-
"Symplify all geometries to points": "簡化所有地理範圍的節點",
|
|
461
460
|
"Choose this data": "選擇這個資料",
|
|
462
461
|
"Search admin boundary": "搜尋行政邊界",
|
|
463
462
|
"Please choose a theme and a boundary first.": "請先選擇主題與邊界。",
|
|
@@ -538,7 +537,10 @@ const locale = {
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
|
543
545
|
L.registerLocale("zh_TW", locale)
|
|
544
546
|
L.setLocale("zh_TW")
|
|
@@ -457,7 +457,6 @@
|
|
|
457
457
|
"Choose this dataset": "選擇這個資料集",
|
|
458
458
|
"GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine:從開放街圖來的主題資料",
|
|
459
459
|
"Choose a theme": "選擇主題",
|
|
460
|
-
"Symplify all geometries to points": "簡化所有地理範圍的節點",
|
|
461
460
|
"Choose this data": "選擇這個資料",
|
|
462
461
|
"Search admin boundary": "搜尋行政邊界",
|
|
463
462
|
"Please choose a theme and a boundary first.": "請先選擇主題與邊界。",
|
|
@@ -538,5 +537,8 @@
|
|
|
538
537
|
"Images": "Images",
|
|
539
538
|
"Iframes": "Iframes",
|
|
540
539
|
"Tags": "Tags",
|
|
541
|
-
"Geocode": "Geocode"
|
|
540
|
+
"Geocode": "Geocode",
|
|
541
|
+
"Display the back to home icon": "Display the back to home icon",
|
|
542
|
+
"Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
|
|
543
|
+
"Simplify all geometries to points": "Simplify all geometries to points"
|
|
542
544
|
}
|
umap/static/umap/map.css
CHANGED
|
@@ -118,7 +118,7 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
|
|
|
118
118
|
display: none;
|
|
119
119
|
}
|
|
120
120
|
.leaflet-control-embed [type="button"] {
|
|
121
|
-
background-position:
|
|
121
|
+
background-position: 0 -180px;
|
|
122
122
|
}
|
|
123
123
|
.leaflet-control-tilelayers [type="button"] {
|
|
124
124
|
background-position: -72px 0;
|
|
@@ -321,9 +321,11 @@ ul.photon-autocomplete {
|
|
|
321
321
|
}
|
|
322
322
|
.search-result-tools button {
|
|
323
323
|
padding: 8px;
|
|
324
|
+
background-color: var(--background-color);
|
|
324
325
|
}
|
|
325
326
|
.umap-edit-enabled .photon-autocomplete li.on .search-result-tools {
|
|
326
327
|
display: flex;
|
|
328
|
+
position: relative;
|
|
327
329
|
}
|
|
328
330
|
|
|
329
331
|
|
umap/templates/umap/search.html
CHANGED
|
@@ -32,7 +32,16 @@
|
|
|
32
32
|
{% endif %}
|
|
33
33
|
{% else %}
|
|
34
34
|
<h2>
|
|
35
|
-
{%
|
|
35
|
+
{% if request.GET.tags %}
|
|
36
|
+
{% trans "Latest created maps in category" %}
|
|
37
|
+
{% for value, label in UMAP_TAGS %}
|
|
38
|
+
{% if request.GET.tags == value %}
|
|
39
|
+
<mark>{{ label }}</mark>:
|
|
40
|
+
{% endif %}
|
|
41
|
+
{% endfor %}
|
|
42
|
+
{% else %}
|
|
43
|
+
{% trans "Latest created maps" %}
|
|
44
|
+
{% endif %}
|
|
36
45
|
</h2>
|
|
37
46
|
<div class="grid-container">
|
|
38
47
|
{% include "umap/map_list.html" with prefix="search_map" %}
|
|
@@ -69,13 +69,7 @@ def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
|
|
|
69
69
|
|
|
70
70
|
# Hide them
|
|
71
71
|
page.get_by_text("User interface options").click()
|
|
72
|
-
|
|
73
|
-
page.locator(".panel")
|
|
74
|
-
.filter(has_text=re.compile("Display the zoom control"))
|
|
75
|
-
.locator("label")
|
|
76
|
-
.nth(2)
|
|
77
|
-
)
|
|
78
|
-
hide_zoom_controls.click()
|
|
72
|
+
page.locator(".panel .umap-field-zoomControl").get_by_text("never").click()
|
|
79
73
|
|
|
80
74
|
expect(zoom_in).to_be_hidden()
|
|
81
75
|
expect(zoom_out).to_be_hidden()
|
|
@@ -32,9 +32,15 @@ FIXTURES = Path(__file__).parent.parent / "fixtures"
|
|
|
32
32
|
@pytest.fixture
|
|
33
33
|
def pictos():
|
|
34
34
|
path = FIXTURES / "star.svg"
|
|
35
|
-
Pictogram(
|
|
35
|
+
Pictogram(
|
|
36
|
+
name="star", pictogram=ContentFile(path.read_text(), path.name), category="cat1"
|
|
37
|
+
).save()
|
|
36
38
|
path = FIXTURES / "circle.svg"
|
|
37
|
-
Pictogram(
|
|
39
|
+
Pictogram(
|
|
40
|
+
name="circle",
|
|
41
|
+
pictogram=ContentFile(path.read_text(), path.name),
|
|
42
|
+
category="cat2",
|
|
43
|
+
).save()
|
|
38
44
|
|
|
39
45
|
|
|
40
46
|
def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
|
|
@@ -57,6 +63,8 @@ def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
|
|
|
57
63
|
define.click()
|
|
58
64
|
# No picto defined yet, so recent should not be visible
|
|
59
65
|
expect(page.get_by_text("Recent")).to_be_hidden()
|
|
66
|
+
expect(page.get_by_text("cat1")).to_be_visible()
|
|
67
|
+
expect(page.get_by_text("cat2")).to_be_visible()
|
|
60
68
|
symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
|
|
61
69
|
expect(symbols).to_have_count(2)
|
|
62
70
|
search = page.locator(".umap-pictogram-body input")
|
umap/tests/test_views.py
CHANGED
|
@@ -510,3 +510,21 @@ def test_can_combine_search_and_filter(client, map):
|
|
|
510
510
|
url = reverse("search")
|
|
511
511
|
response = client.get(url + "?q=dur&tags=bike")
|
|
512
512
|
assert "Blé dur" in response.content.decode()
|
|
513
|
+
|
|
514
|
+
|
|
515
|
+
@pytest.mark.django_db
|
|
516
|
+
def test_can_find_small_usernames(client):
|
|
517
|
+
UserFactory(username="Joe")
|
|
518
|
+
UserFactory(username="JoeJoe")
|
|
519
|
+
UserFactory(username="Joe3")
|
|
520
|
+
UserFactory(username="Joe57")
|
|
521
|
+
UserFactory(username="JoeBar")
|
|
522
|
+
url = "/agnocomplete/AutocompleteUser/"
|
|
523
|
+
response = client.get(url + "?q=joe")
|
|
524
|
+
data = json.loads(response.content)["data"]
|
|
525
|
+
assert len(data) == 5
|
|
526
|
+
assert data[0]["label"] == "Joe"
|
|
527
|
+
response = client.get(url + "?q=joej")
|
|
528
|
+
data = json.loads(response.content)["data"]
|
|
529
|
+
assert len(data) == 1
|
|
530
|
+
assert data[0]["label"] == "JoeJoe"
|
umap/views.py
CHANGED
|
@@ -1047,12 +1047,15 @@ class MapDelete(DeleteView):
|
|
|
1047
1047
|
if not self.object.can_delete(self.request):
|
|
1048
1048
|
return HttpResponseForbidden(_("Only its owner can delete the map."))
|
|
1049
1049
|
self.object.move_to_trash()
|
|
1050
|
-
|
|
1050
|
+
if self.request.user.is_authenticated:
|
|
1051
|
+
redirect_url = reverse("user_dashboard")
|
|
1052
|
+
else:
|
|
1053
|
+
redirect_url = reverse("home")
|
|
1051
1054
|
messages.info(self.request, _("Map successfully deleted."))
|
|
1052
1055
|
if is_ajax(self.request):
|
|
1053
|
-
return simple_json_response(redirect=
|
|
1056
|
+
return simple_json_response(redirect=redirect_url)
|
|
1054
1057
|
else:
|
|
1055
|
-
return HttpResponseRedirect(form.data.get("next") or
|
|
1058
|
+
return HttpResponseRedirect(form.data.get("next") or redirect_url)
|
|
1056
1059
|
|
|
1057
1060
|
|
|
1058
1061
|
class MapClone(PermissionsMixin, View):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: umap-project
|
|
3
|
-
Version: 3.0.
|
|
3
|
+
Version: 3.0.3
|
|
4
4
|
Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
|
|
5
5
|
Author-email: Yohan Boniface <yb@enix.org>
|
|
6
6
|
Maintainer-email: David Larlet <david@larlet.fr>
|
|
@@ -29,26 +29,26 @@ Requires-Dist: social-auth-app-django==5.4.3
|
|
|
29
29
|
Requires-Dist: social-auth-core==4.5.6
|
|
30
30
|
Provides-Extra: dev
|
|
31
31
|
Requires-Dist: djlint==1.36.4; extra == 'dev'
|
|
32
|
-
Requires-Dist: hatch==1.14.
|
|
32
|
+
Requires-Dist: hatch==1.14.1; extra == 'dev'
|
|
33
33
|
Requires-Dist: isort==6.0.1; extra == 'dev'
|
|
34
34
|
Requires-Dist: mkdocs-material==9.6.10; extra == 'dev'
|
|
35
35
|
Requires-Dist: mkdocs-static-i18n==1.3.0; extra == 'dev'
|
|
36
36
|
Requires-Dist: mkdocs==1.6.1; extra == 'dev'
|
|
37
37
|
Requires-Dist: pymdown-extensions==10.14.3; extra == 'dev'
|
|
38
|
-
Requires-Dist: ruff==0.11.
|
|
38
|
+
Requires-Dist: ruff==0.11.4; extra == 'dev'
|
|
39
39
|
Requires-Dist: vermin==1.6.0; extra == 'dev'
|
|
40
40
|
Provides-Extra: docker
|
|
41
41
|
Requires-Dist: uvicorn==0.34.0; extra == 'docker'
|
|
42
42
|
Provides-Extra: s3
|
|
43
|
-
Requires-Dist: django-storages[s3]==1.14.
|
|
43
|
+
Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
|
|
44
44
|
Provides-Extra: sync
|
|
45
|
-
Requires-Dist: pydantic==2.11.
|
|
45
|
+
Requires-Dist: pydantic==2.11.2; extra == 'sync'
|
|
46
46
|
Requires-Dist: redis==5.2.1; extra == 'sync'
|
|
47
47
|
Requires-Dist: websockets==15.0.1; extra == 'sync'
|
|
48
48
|
Provides-Extra: test
|
|
49
49
|
Requires-Dist: daphne==4.1.2; extra == 'test'
|
|
50
50
|
Requires-Dist: factory-boy==3.3.3; extra == 'test'
|
|
51
|
-
Requires-Dist: moto[s3]==5.1.
|
|
51
|
+
Requires-Dist: moto[s3]==5.1.3; extra == 'test'
|
|
52
52
|
Requires-Dist: playwright>=1.39; extra == 'test'
|
|
53
53
|
Requires-Dist: pytest-django==4.10.0; extra == 'test'
|
|
54
54
|
Requires-Dist: pytest-playwright==0.7.0; extra == 'test'
|