umap-project 2.5.1__py3-none-any.whl → 2.6.0__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.

Potentially problematic release.


This version of umap-project might be problematic. Click here for more details.

Files changed (276) hide show
  1. umap/__init__.py +1 -1
  2. umap/admin.py +6 -1
  3. umap/context_processors.py +2 -1
  4. umap/decorators.py +13 -2
  5. umap/forms.py +26 -2
  6. umap/locale/br/LC_MESSAGES/django.mo +0 -0
  7. umap/locale/br/LC_MESSAGES/django.po +252 -146
  8. umap/locale/ca/LC_MESSAGES/django.mo +0 -0
  9. umap/locale/ca/LC_MESSAGES/django.po +274 -162
  10. umap/locale/cs_CZ/LC_MESSAGES/django.mo +0 -0
  11. umap/locale/cs_CZ/LC_MESSAGES/django.po +261 -150
  12. umap/locale/de/LC_MESSAGES/django.mo +0 -0
  13. umap/locale/de/LC_MESSAGES/django.po +299 -187
  14. umap/locale/el/LC_MESSAGES/django.mo +0 -0
  15. umap/locale/el/LC_MESSAGES/django.po +215 -159
  16. umap/locale/en/LC_MESSAGES/django.po +211 -155
  17. umap/locale/es/LC_MESSAGES/django.mo +0 -0
  18. umap/locale/es/LC_MESSAGES/django.po +255 -144
  19. umap/locale/eu/LC_MESSAGES/django.mo +0 -0
  20. umap/locale/eu/LC_MESSAGES/django.po +254 -198
  21. umap/locale/fa_IR/LC_MESSAGES/django.mo +0 -0
  22. umap/locale/fa_IR/LC_MESSAGES/django.po +347 -235
  23. umap/locale/fr/LC_MESSAGES/django.mo +0 -0
  24. umap/locale/fr/LC_MESSAGES/django.po +216 -160
  25. umap/locale/hu/LC_MESSAGES/django.mo +0 -0
  26. umap/locale/hu/LC_MESSAGES/django.po +215 -159
  27. umap/locale/it/LC_MESSAGES/django.mo +0 -0
  28. umap/locale/it/LC_MESSAGES/django.po +252 -146
  29. umap/locale/ms/LC_MESSAGES/django.mo +0 -0
  30. umap/locale/ms/LC_MESSAGES/django.po +252 -146
  31. umap/locale/pl/LC_MESSAGES/django.mo +0 -0
  32. umap/locale/pl/LC_MESSAGES/django.po +254 -148
  33. umap/locale/pt/LC_MESSAGES/django.mo +0 -0
  34. umap/locale/pt/LC_MESSAGES/django.po +215 -159
  35. umap/locale/sv/LC_MESSAGES/django.mo +0 -0
  36. umap/locale/sv/LC_MESSAGES/django.po +254 -143
  37. umap/locale/th_TH/LC_MESSAGES/django.mo +0 -0
  38. umap/locale/th_TH/LC_MESSAGES/django.po +125 -70
  39. umap/locale/zh_TW/LC_MESSAGES/django.mo +0 -0
  40. umap/locale/zh_TW/LC_MESSAGES/django.po +256 -145
  41. umap/migrations/0022_add_team.py +94 -0
  42. umap/models.py +45 -10
  43. umap/settings/__init__.py +2 -0
  44. umap/settings/base.py +9 -2
  45. umap/static/umap/base.css +32 -41
  46. umap/static/umap/content.css +19 -25
  47. umap/static/umap/css/icon.css +63 -37
  48. umap/static/umap/css/importers.css +1 -1
  49. umap/static/umap/css/slideshow.css +7 -5
  50. umap/static/umap/css/tableeditor.css +4 -3
  51. umap/static/umap/img/16-white.svg +1 -4
  52. umap/static/umap/img/16.svg +2 -6
  53. umap/static/umap/img/24-white.svg +4 -4
  54. umap/static/umap/img/24.svg +6 -6
  55. umap/static/umap/img/source/16-white.svg +2 -5
  56. umap/static/umap/img/source/16.svg +3 -7
  57. umap/static/umap/img/source/24-white.svg +7 -14
  58. umap/static/umap/img/source/24.svg +10 -17
  59. umap/static/umap/js/components/alerts/alert.css +20 -8
  60. umap/static/umap/js/modules/autocomplete.js +8 -12
  61. umap/static/umap/js/modules/browser.js +4 -3
  62. umap/static/umap/js/modules/caption.js +9 -11
  63. umap/static/umap/js/modules/data/features.js +993 -0
  64. umap/static/umap/js/modules/data/layer.js +1210 -0
  65. umap/static/umap/js/modules/formatter.js +12 -3
  66. umap/static/umap/js/modules/global.js +21 -5
  67. umap/static/umap/js/modules/importers/overpass.js +22 -8
  68. umap/static/umap/js/modules/permissions.js +280 -0
  69. umap/static/umap/js/{umap.icon.js → modules/rendering/icon.js} +77 -56
  70. umap/static/umap/js/modules/rendering/layers/base.js +105 -0
  71. umap/static/umap/js/modules/rendering/layers/classified.js +484 -0
  72. umap/static/umap/js/modules/rendering/layers/cluster.js +103 -0
  73. umap/static/umap/js/modules/rendering/layers/heat.js +182 -0
  74. umap/static/umap/js/modules/rendering/popup.js +99 -0
  75. umap/static/umap/js/modules/rendering/template.js +217 -0
  76. umap/static/umap/js/modules/rendering/ui.js +610 -0
  77. umap/static/umap/js/modules/rules.js +16 -3
  78. umap/static/umap/js/modules/schema.js +25 -1
  79. umap/static/umap/js/modules/share.js +66 -45
  80. umap/static/umap/js/modules/sync/updaters.js +9 -10
  81. umap/static/umap/js/modules/tableeditor.js +7 -7
  82. umap/static/umap/js/modules/ui/dialog.js +8 -4
  83. umap/static/umap/js/modules/utils.js +22 -13
  84. umap/static/umap/js/umap.controls.js +80 -146
  85. umap/static/umap/js/umap.core.js +9 -9
  86. umap/static/umap/js/umap.forms.js +41 -17
  87. umap/static/umap/js/umap.js +72 -65
  88. umap/static/umap/locale/am_ET.js +8 -2
  89. umap/static/umap/locale/am_ET.json +8 -2
  90. umap/static/umap/locale/ar.js +8 -2
  91. umap/static/umap/locale/ar.json +8 -2
  92. umap/static/umap/locale/ast.js +8 -2
  93. umap/static/umap/locale/ast.json +8 -2
  94. umap/static/umap/locale/bg.js +8 -2
  95. umap/static/umap/locale/bg.json +8 -2
  96. umap/static/umap/locale/br.js +42 -36
  97. umap/static/umap/locale/br.json +42 -36
  98. umap/static/umap/locale/ca.js +67 -61
  99. umap/static/umap/locale/ca.json +67 -61
  100. umap/static/umap/locale/cs_CZ.js +8 -2
  101. umap/static/umap/locale/cs_CZ.json +8 -2
  102. umap/static/umap/locale/da.js +8 -2
  103. umap/static/umap/locale/da.json +8 -2
  104. umap/static/umap/locale/de.js +143 -137
  105. umap/static/umap/locale/de.json +143 -137
  106. umap/static/umap/locale/el.js +54 -48
  107. umap/static/umap/locale/el.json +54 -48
  108. umap/static/umap/locale/en.js +10 -2
  109. umap/static/umap/locale/en.json +10 -2
  110. umap/static/umap/locale/en_US.json +8 -2
  111. umap/static/umap/locale/es.js +8 -2
  112. umap/static/umap/locale/es.json +8 -2
  113. umap/static/umap/locale/et.js +8 -2
  114. umap/static/umap/locale/et.json +8 -2
  115. umap/static/umap/locale/eu.js +346 -338
  116. umap/static/umap/locale/eu.json +346 -338
  117. umap/static/umap/locale/fa_IR.js +415 -407
  118. umap/static/umap/locale/fa_IR.json +415 -407
  119. umap/static/umap/locale/fi.js +8 -2
  120. umap/static/umap/locale/fi.json +8 -2
  121. umap/static/umap/locale/fr.js +11 -3
  122. umap/static/umap/locale/fr.json +11 -3
  123. umap/static/umap/locale/gl.js +8 -2
  124. umap/static/umap/locale/gl.json +8 -2
  125. umap/static/umap/locale/he.js +8 -2
  126. umap/static/umap/locale/he.json +8 -2
  127. umap/static/umap/locale/hr.js +8 -2
  128. umap/static/umap/locale/hr.json +8 -2
  129. umap/static/umap/locale/hu.js +31 -23
  130. umap/static/umap/locale/hu.json +31 -23
  131. umap/static/umap/locale/id.js +8 -2
  132. umap/static/umap/locale/id.json +8 -2
  133. umap/static/umap/locale/is.js +8 -2
  134. umap/static/umap/locale/is.json +8 -2
  135. umap/static/umap/locale/it.js +8 -2
  136. umap/static/umap/locale/it.json +8 -2
  137. umap/static/umap/locale/ja.js +8 -2
  138. umap/static/umap/locale/ja.json +8 -2
  139. umap/static/umap/locale/ko.js +8 -2
  140. umap/static/umap/locale/ko.json +8 -2
  141. umap/static/umap/locale/lt.js +8 -2
  142. umap/static/umap/locale/lt.json +8 -2
  143. umap/static/umap/locale/ms.js +8 -2
  144. umap/static/umap/locale/ms.json +8 -2
  145. umap/static/umap/locale/nl.js +8 -2
  146. umap/static/umap/locale/nl.json +8 -2
  147. umap/static/umap/locale/no.js +8 -2
  148. umap/static/umap/locale/no.json +8 -2
  149. umap/static/umap/locale/pl.js +54 -48
  150. umap/static/umap/locale/pl.json +54 -48
  151. umap/static/umap/locale/pl_PL.json +8 -2
  152. umap/static/umap/locale/pt.js +24 -18
  153. umap/static/umap/locale/pt.json +24 -18
  154. umap/static/umap/locale/pt_BR.js +8 -2
  155. umap/static/umap/locale/pt_BR.json +8 -2
  156. umap/static/umap/locale/pt_PT.js +214 -208
  157. umap/static/umap/locale/pt_PT.json +214 -208
  158. umap/static/umap/locale/ro.js +8 -2
  159. umap/static/umap/locale/ro.json +8 -2
  160. umap/static/umap/locale/ru.js +8 -2
  161. umap/static/umap/locale/ru.json +8 -2
  162. umap/static/umap/locale/sk_SK.js +8 -2
  163. umap/static/umap/locale/sk_SK.json +8 -2
  164. umap/static/umap/locale/sl.js +8 -2
  165. umap/static/umap/locale/sl.json +8 -2
  166. umap/static/umap/locale/sr.js +8 -2
  167. umap/static/umap/locale/sr.json +8 -2
  168. umap/static/umap/locale/sv.js +8 -2
  169. umap/static/umap/locale/sv.json +8 -2
  170. umap/static/umap/locale/th_TH.js +33 -27
  171. umap/static/umap/locale/th_TH.json +33 -27
  172. umap/static/umap/locale/tr.js +8 -2
  173. umap/static/umap/locale/tr.json +8 -2
  174. umap/static/umap/locale/uk_UA.js +8 -2
  175. umap/static/umap/locale/uk_UA.json +8 -2
  176. umap/static/umap/locale/vi.js +8 -2
  177. umap/static/umap/locale/vi.json +8 -2
  178. umap/static/umap/locale/vi_VN.json +8 -2
  179. umap/static/umap/locale/zh.js +8 -2
  180. umap/static/umap/locale/zh.json +8 -2
  181. umap/static/umap/locale/zh_CN.json +8 -2
  182. umap/static/umap/locale/zh_TW.Big5.json +8 -2
  183. umap/static/umap/locale/zh_TW.js +102 -96
  184. umap/static/umap/locale/zh_TW.json +102 -96
  185. umap/static/umap/map.css +111 -108
  186. umap/static/umap/nav.css +19 -10
  187. umap/static/umap/unittests/utils.js +230 -107
  188. umap/static/umap/vars.css +1 -0
  189. umap/static/umap/vendors/csv2geojson/csv2geojson.js +62 -40
  190. umap/static/umap/vendors/editable/Leaflet.Editable.js +2079 -1937
  191. umap/storage.py +1 -0
  192. umap/templates/404.html +5 -1
  193. umap/templates/500.html +3 -1
  194. umap/templates/auth/user_detail.html +8 -2
  195. umap/templates/auth/user_form.html +19 -10
  196. umap/templates/auth/user_stars.html +8 -2
  197. umap/templates/base.html +1 -0
  198. umap/templates/registration/login.html +18 -3
  199. umap/templates/umap/about.html +1 -0
  200. umap/templates/umap/about_summary.html +22 -7
  201. umap/templates/umap/components/alerts/alert.html +42 -21
  202. umap/templates/umap/content.html +2 -0
  203. umap/templates/umap/content_footer.html +7 -3
  204. umap/templates/umap/css.html +1 -0
  205. umap/templates/umap/dashboard_menu.html +15 -0
  206. umap/templates/umap/home.html +14 -4
  207. umap/templates/umap/js.html +4 -9
  208. umap/templates/umap/login_popup_end.html +10 -4
  209. umap/templates/umap/map_detail.html +8 -2
  210. umap/templates/umap/map_fragment.html +3 -1
  211. umap/templates/umap/map_init.html +2 -1
  212. umap/templates/umap/map_list.html +6 -3
  213. umap/templates/umap/map_table.html +36 -12
  214. umap/templates/umap/messages.html +0 -1
  215. umap/templates/umap/navigation.html +2 -1
  216. umap/templates/umap/password_change.html +5 -1
  217. umap/templates/umap/password_change_done.html +8 -2
  218. umap/templates/umap/search.html +8 -2
  219. umap/templates/umap/search_bar.html +1 -0
  220. umap/templates/umap/team_confirm_delete.html +19 -0
  221. umap/templates/umap/team_detail.html +27 -0
  222. umap/templates/umap/team_form.html +60 -0
  223. umap/templates/umap/user_dashboard.html +7 -9
  224. umap/templates/umap/user_teams.html +51 -0
  225. umap/tests/base.py +8 -1
  226. umap/tests/conftest.py +6 -0
  227. umap/tests/fixtures/test_circles_layer.geojson +219 -0
  228. umap/tests/fixtures/test_upload_georss.xml +20 -0
  229. umap/tests/integration/conftest.py +18 -4
  230. umap/tests/integration/helpers.py +12 -0
  231. umap/tests/integration/test_anonymous_owned_map.py +23 -0
  232. umap/tests/integration/test_basics.py +29 -0
  233. umap/tests/integration/test_browser.py +20 -0
  234. umap/tests/integration/test_caption.py +20 -0
  235. umap/tests/integration/test_circles_layer.py +69 -0
  236. umap/tests/integration/test_conditional_rules.py +102 -17
  237. umap/tests/integration/test_draw_polygon.py +138 -13
  238. umap/tests/integration/test_draw_polyline.py +8 -18
  239. umap/tests/integration/test_edit_datalayer.py +3 -3
  240. umap/tests/integration/test_import.py +124 -5
  241. umap/tests/integration/test_owned_map.py +21 -13
  242. umap/tests/integration/test_querystring.py +7 -0
  243. umap/tests/integration/test_team.py +47 -0
  244. umap/tests/integration/test_tilelayer.py +19 -2
  245. umap/tests/integration/test_view_marker.py +28 -1
  246. umap/tests/integration/test_websocket_sync.py +5 -5
  247. umap/tests/test_datalayer.py +32 -7
  248. umap/tests/test_datalayer_views.py +1 -1
  249. umap/tests/test_map.py +30 -4
  250. umap/tests/test_map_views.py +2 -2
  251. umap/tests/test_statics.py +40 -0
  252. umap/tests/test_team_views.py +131 -0
  253. umap/tests/test_views.py +15 -1
  254. umap/urls.py +23 -13
  255. umap/views.py +116 -10
  256. {umap_project-2.5.1.dist-info → umap_project-2.6.0.dist-info}/METADATA +14 -14
  257. {umap_project-2.5.1.dist-info → umap_project-2.6.0.dist-info}/RECORD +260 -253
  258. umap/static/umap/js/umap.datalayer.permissions.js +0 -70
  259. umap/static/umap/js/umap.features.js +0 -1290
  260. umap/static/umap/js/umap.layer.js +0 -1837
  261. umap/static/umap/js/umap.permissions.js +0 -208
  262. umap/static/umap/js/umap.popup.js +0 -341
  263. umap/static/umap/test/TableEditor.js +0 -104
  264. umap/static/umap/vendors/leaflet/leaflet-src.js +0 -14512
  265. umap/static/umap/vendors/leaflet/leaflet-src.js.map +0 -1
  266. umap/static/umap/vendors/leaflet/leaflet.js +0 -6
  267. umap/static/umap/vendors/leaflet/leaflet.js.map +0 -1
  268. umap/static/umap/vendors/markercluster/WhereAreTheJavascriptFiles.txt +0 -5
  269. umap/static/umap/vendors/markercluster/leaflet.markercluster-src.js +0 -2718
  270. umap/static/umap/vendors/markercluster/leaflet.markercluster-src.js.map +0 -1
  271. umap/static/umap/vendors/toolbar/leaflet.toolbar-src.css +0 -117
  272. umap/static/umap/vendors/toolbar/leaflet.toolbar-src.js +0 -365
  273. umap/tests/integration/test_statics.py +0 -47
  274. {umap_project-2.5.1.dist-info → umap_project-2.6.0.dist-info}/WHEEL +0 -0
  275. {umap_project-2.5.1.dist-info → umap_project-2.6.0.dist-info}/entry_points.txt +0 -0
  276. {umap_project-2.5.1.dist-info → umap_project-2.6.0.dist-info}/licenses/LICENSE +0 -0
umap/static/umap/map.css CHANGED
@@ -1,3 +1,24 @@
1
+ /* ************* */
2
+ /* temporary fix */
3
+ /* ************* */
4
+ /* https://github.com/umap-project/umap/pull/2046#issuecomment-2278046469 */
5
+ html[dir="rtl"] .leaflet-inplace-toolbar {
6
+ direction: ltr;
7
+ }
8
+ html[dir="rtl"] .leaflet-inplace-toolbar > * {
9
+ direction: rtl;
10
+ }
11
+ html[dir="rtl"] .leaflet-tooltip-pane {
12
+ direction: ltr;
13
+ }
14
+ html[dir="rtl"] .leaflet-tooltip-pane > * {
15
+ direction: rtl;
16
+ }
17
+ .marker-cluster div { /* fix cluster icon for rtl */
18
+ margin-left: unset;
19
+ margin-inline-start: 5px;
20
+ }
21
+
1
22
  /* *********** */
2
23
  /* Map details */
3
24
  /* *********** */
@@ -84,12 +105,12 @@
84
105
  .umap-control-more,
85
106
  .umap-control-less {
86
107
  background-image: url('./img/24-white.svg');
87
- background-position: -72px -474px;
108
+ background-position: -72px -366px;
88
109
  text-indent: -9999px;
89
110
  margin-bottom: 0;
90
111
  }
91
112
  .umap-control-less {
92
- background-position: -108px -476px;
113
+ background-position: -108px -366px;
93
114
  }
94
115
  .umap-more-controls .display-on-more,
95
116
  .umap-more-controls .umap-control-less {
@@ -138,7 +159,7 @@
138
159
  font-size: 0.8em;
139
160
  }
140
161
  .umap-control-text [type="button"] {
141
- float: right;
162
+ float: inline-end;
142
163
  background-color: #666;
143
164
  margin: 0;
144
165
  width: 36px;
@@ -150,11 +171,10 @@
150
171
  width: 24px;
151
172
  height: 24px;
152
173
  display: inline-block;
153
- vertical-align: middle;
174
+ vertical-align: -20%;
154
175
  background-image: url('./img/16-white.svg');
155
- background-position: -52px -49px;
176
+ background-position: -48px -48px;
156
177
  }
157
-
158
178
  .leaflet-control-edit-enable [type="button"] {
159
179
  width: initial;
160
180
  padding: 0 20px;
@@ -172,7 +192,7 @@
172
192
  }
173
193
  .umap-permanent-credits-container {
174
194
  max-width: 20rem;
175
- margin-left: 5px!important;
195
+ margin-inline-start: 5px!important;
176
196
  margin-bottom: 5px!important;
177
197
  padding: 0.5rem;
178
198
  }
@@ -193,13 +213,13 @@
193
213
  .leaflet-iconLayers-layer {
194
214
  width: 38px;
195
215
  height: 38px;
196
- box-shadow: 0px 0px 2px #444;
197
- border: 1px solid #bbb;
216
+ box-shadow: none;
217
+ border: 1px solid var(--color-lightGray);
198
218
  border-radius: 4px;
199
219
  }
200
220
  .leaflet-iconLayers-layerTitleContainer {
201
221
  display: none;
202
- left: 0;
222
+ inset-inline-start: 0;
203
223
  overflow: hidden;
204
224
  min-height: 1.5rem;
205
225
  height: 1.5rem;
@@ -218,6 +238,25 @@
218
238
  .leaflet-iconLayers-layerCell:hover .leaflet-iconLayers-layerTitleContainer {
219
239
  height: initial;
220
240
  }
241
+ .leaflet-iconLayers-layerCell-plus {
242
+ width: 80px;
243
+ height: 80px;
244
+ background-color: var(--background-color);
245
+ vertical-align: middle;
246
+ text-align: center;
247
+ font-size: 3rem;
248
+ display: none;
249
+ line-height: 100%;
250
+ border-radius: var(--border-radius);
251
+ margin-bottom: 0;
252
+ border: 1px solid var(--color-lightGray);
253
+ }
254
+ .leaflet-iconLayers-layerCell-plus:hover {
255
+ background-color: var(--color-lightGray);
256
+ }
257
+ .leaflet-iconLayers:hover .leaflet-iconLayers-layerCell-plus {
258
+ display: block;
259
+ }
221
260
 
222
261
 
223
262
 
@@ -238,13 +277,13 @@ ul.photon-autocomplete {
238
277
  overflow: hidden;
239
278
  white-space: nowrap;
240
279
  font-size: 1em;
241
- border-left: 4px solid #efefef;
280
+ border-inline-start: 4px solid #efefef;
242
281
  }
243
282
  .photon-autocomplete li strong {
244
283
  display: block;
245
284
  }
246
285
  .photon-autocomplete li.on {
247
- border-left: 4px solid #2980b9;
286
+ border-inline-start: 4px solid #2980b9;
248
287
  cursor: pointer;
249
288
  }
250
289
  .photon-autocomplete li.photon-no-result {
@@ -255,14 +294,14 @@ ul.photon-autocomplete {
255
294
  }
256
295
  .photon-autocomplete .photon-feedback {
257
296
  display: block;
258
- text-align: right;
297
+ text-align: end;
259
298
  font-size: 0.8em;
260
299
  padding: 3px;
261
300
  color: #999;
262
301
  border-top: 1px solid #eee;
263
302
  }
264
303
  .search-result-tools {
265
- float: right;
304
+ float: inline-end;
266
305
  display: block;
267
306
  }
268
307
 
@@ -271,31 +310,11 @@ ul.photon-autocomplete {
271
310
  /* ***************************** */
272
311
  /* Share and download panel */
273
312
  /* ***************************** */
274
- .download-file {
275
- height: 1.2em;
276
- min-height: 1.2em;
313
+ .downloads li {
314
+ height: 1.7em;
277
315
  padding: 0;
278
- text-align: left;
279
- vertical-align: bottom;
280
- }
281
- .download-file:before,
282
- .download-backup:before {
283
- height: 24px;
284
- width: 24px;
285
- background-repeat: no-repeat;
286
- background-image: url('./img/16.svg');
287
- background-size: auto auto;
288
- background-position: -4px -145px;
289
- content: " ";
316
+ text-align: start;
290
317
  vertical-align: bottom;
291
- display: inline-block;
292
- }
293
- .download-backup:before {
294
- background-position: -27px -144px;
295
- }
296
- .leaflet-container .download-backup {
297
- color: black;
298
- display: block;
299
318
  }
300
319
  .vspace {
301
320
  height: 32px;
@@ -412,7 +431,7 @@ ul.photon-autocomplete {
412
431
  display: inline-block;
413
432
  width: 16px;
414
433
  height: 16px;
415
- margin-left: 5px;
434
+ margin-inline-start: 5px;
416
435
  background-position: -4px -4px;
417
436
  background-repeat: no-repeat;
418
437
  background-image: url('./img/16.svg');
@@ -507,7 +526,7 @@ ul.photon-autocomplete {
507
526
  .leaflet-container .leaflet-control-edit-disable span,
508
527
  .leaflet-container .leaflet-control-edit-save span,
509
528
  .leaflet-container .leaflet-control-edit-cancel span {
510
- margin-left: 10px;
529
+ margin-inline-start: 10px;
511
530
  }
512
531
  .leaflet-container .leaflet-control-edit-save:before {
513
532
  background-position: -148px -2px;
@@ -575,7 +594,7 @@ ul.photon-autocomplete {
575
594
  height: 46px;
576
595
  background-color: var(--color-darkGray);
577
596
  padding: 0 10px;
578
- text-align: left;
597
+ text-align: start;
579
598
  line-height: var(--control-size);
580
599
  cursor: auto;
581
600
  border-bottom: 1px solid #222;
@@ -614,7 +633,7 @@ ul.photon-autocomplete {
614
633
  white-space: nowrap;
615
634
  text-overflow: ellipsis;
616
635
  font-weight: bold;
617
- text-align: left;
636
+ text-align: start;
618
637
  }
619
638
  .umap-main-edit-toolbox .share-status {
620
639
  font-size: 1em;
@@ -622,10 +641,9 @@ ul.photon-autocomplete {
622
641
  overflow: hidden;
623
642
  text-overflow: ellipsis;
624
643
  }
625
-
626
644
  .map-name:after {
627
645
  content: '\00a0';
628
- padding-left: 3px;
646
+ padding-inline-start: 3px;
629
647
  width: 1ch;
630
648
  display: inline-block;
631
649
  }
@@ -640,11 +658,11 @@ ul.photon-autocomplete {
640
658
  display: inline;
641
659
  }
642
660
  .umap-caption-bar button {
643
- margin-left: 10px;
661
+ margin-inline-start: 10px;
644
662
  }
645
663
  .umap-caption-bar button + button:before {
646
664
  content: '|';
647
- padding-right: 10px;
665
+ padding-inline-end: 10px;
648
666
  }
649
667
  .umap-main-edit-toolbox .umap-user {
650
668
  color: #fff;
@@ -654,7 +672,7 @@ ul.photon-autocomplete {
654
672
  }
655
673
  .umap-main-edit-toolbox .umap-user:after {
656
674
  content: '|';
657
- padding-left: 20px;
675
+ padding-inline-start: 20px;
658
676
  display: inline-block; /* Prevents underline on hover. */
659
677
  }
660
678
  .umap-caption-bar-enabled .umap-caption-bar {
@@ -667,7 +685,7 @@ ul.photon-autocomplete {
667
685
  bottom: 0;
668
686
  right: 0;
669
687
  padding: var(--gutter);
670
- text-align: left;
688
+ text-align: start;
671
689
  line-height: 100%;
672
690
  cursor: auto;
673
691
  border-top: 1px solid var(--color-lightGray);
@@ -689,7 +707,7 @@ ul.photon-autocomplete {
689
707
  background-position: -122px -73px;
690
708
  background-repeat: no-repeat;
691
709
  background-image: url('./img/16-white.svg');
692
- margin-right: 10px;
710
+ margin-inline-end: 10px;
693
711
  }
694
712
 
695
713
  .leaflet-toolbar-tip {
@@ -745,7 +763,7 @@ ul.photon-autocomplete {
745
763
  .umap-browser .feature-title {
746
764
  width: inherit;
747
765
  cursor: inherit;
748
- padding-left: 6px;
766
+ padding-inline-start: 6px;
749
767
  }
750
768
  .umap-browser .feature-title {
751
769
  font-size: 12px;
@@ -816,7 +834,7 @@ a.umap-control-caption,
816
834
  .umap-browser h5, .umap-facet-search h5 {
817
835
  margin-bottom: 0;
818
836
  overflow: hidden;
819
- padding-left: 5px;
837
+ padding-inline-start: 5px;
820
838
  height: 30px;
821
839
  line-height: 30px;
822
840
  background-color: var(--color-lightGray);
@@ -829,7 +847,7 @@ a.umap-control-caption,
829
847
  color: white;
830
848
  }
831
849
  .umap-browser h5 span {
832
- margin-left: 10px;
850
+ margin-inline-start: 10px;
833
851
  }
834
852
  .umap-browser li, .umap-facet-search li {
835
853
  padding: 2px 0;
@@ -854,7 +872,7 @@ a.umap-control-caption,
854
872
  padding: 0;
855
873
  width: 24px;
856
874
  text-align: center;
857
- margin-left: 5px;
875
+ margin-inline-start: 5px;
858
876
  }
859
877
  .umap-browser.dark .datalayer .feature-color {
860
878
  box-shadow: 0 0 2px 0 #999 inset;
@@ -879,8 +897,8 @@ a.umap-control-caption,
879
897
  background-position: -48px -25px;
880
898
  }
881
899
  .umap-browser .datalayer-toggle-list {
882
- float: right;
883
- margin-right: 5px;
900
+ float: inline-end;
901
+ margin-inline-end: 5px;
884
902
  background-position: -145px -70px;
885
903
  }
886
904
  .umap-browser .show-list .datalayer-toggle-list {
@@ -904,8 +922,8 @@ a.umap-control-caption,
904
922
  .datalayer-name {
905
923
  cursor: pointer;
906
924
  }
907
- .umap-caption .umap-map-owner {
908
- padding-left: 31px;
925
+ .umap-caption .umap-map-author {
926
+ padding-inline-start: 31px;
909
927
  }
910
928
 
911
929
 
@@ -932,7 +950,7 @@ a.umap-control-caption,
932
950
  height: 56px;
933
951
  line-height: 56px;
934
952
  opacity: 0.9;
935
- padding-left: 10px;
953
+ padding-inline-start: 10px;
936
954
  position: absolute;
937
955
  width: 100%;
938
956
  text-align: center;
@@ -942,9 +960,9 @@ a.umap-control-caption,
942
960
  content: "✓";
943
961
  font-size: 1.3em;
944
962
  line-height: 56px;
945
- padding-right: 7px;
963
+ padding-inline-end: 7px;
946
964
  position: absolute;
947
- left: 7px;
965
+ inset-inline-start: 7px;
948
966
  }
949
967
  .umap-tilelayer-switcher-container li img {
950
968
  display: block;
@@ -958,7 +976,7 @@ a.umap-control-caption,
958
976
  display: inline-block;
959
977
  width: 16px;
960
978
  height: 16px;
961
- margin-right: 10px;
979
+ margin-inline-end: 10px;
962
980
  border: 1px solid #000;
963
981
  background-color: transparent;
964
982
  vertical-align: middle;
@@ -975,6 +993,19 @@ a.umap-control-caption,
975
993
  padding: 0;
976
994
  margin: 0;
977
995
  }
996
+ .datalayer-legend .circles-layer-legend {
997
+ padding: var(--box-padding);
998
+ }
999
+ .circles-layer-legend li {
1000
+ display: flex;
1001
+ align-items: center;
1002
+ justify-content: space-between;
1003
+ }
1004
+ .circles-layer-legend li .circle {
1005
+ border-radius: 50%;
1006
+ display: inline-block;
1007
+ text-align: center;
1008
+ }
978
1009
 
979
1010
  /* ********************************* */
980
1011
  /* Popup */
@@ -989,39 +1020,13 @@ a.umap-control-caption,
989
1020
  position: relative;
990
1021
  background-color: rgb(68, 68, 68);
991
1022
  color: white;
992
- display: table;
1023
+ display: flex;
993
1024
  width: 100%;
994
1025
  margin-top: auto;
995
1026
  min-width: 99px;
996
1027
  border-radius: 2px;
997
1028
  max-height: 24px;
998
- }
999
- .umap-popup-footer li {
1000
- line-height: 24px;
1001
- height: 24px;
1002
- display: table-cell;
1003
- width: 33.3%;
1004
- cursor: pointer;
1005
- text-align: center;
1006
- }
1007
- .umap-popup-footer li:before {
1008
- display: inline-block;
1009
- width: 16px;
1010
- height: 16px;
1011
- margin-left: 5px;
1012
- background-repeat: no-repeat;
1013
- background-image: url('./img/16.svg');
1014
- vertical-align: middle;
1015
- content: " ";
1016
- }
1017
- .umap-popup-footer li.zoom:before {
1018
- background-position: -5px -101px;
1019
- }
1020
- .umap-popup-footer li.previous:before {
1021
- background-position: -28px -77px;
1022
- }
1023
- .umap-popup-footer li.next:before {
1024
- background-position: -5px -77px;
1029
+ justify-content: space-around;
1025
1030
  }
1026
1031
  .umap-popup a:hover {
1027
1032
  text-decoration: underline;
@@ -1040,11 +1045,11 @@ a[href^='tel']::before {
1040
1045
  content: '☎︎ ';
1041
1046
  }
1042
1047
  address span {
1043
- padding-right: 5px;
1048
+ padding-inline-end: 5px;
1044
1049
  }
1045
1050
  .osm-link {
1046
1051
  margin-top: 10px;
1047
- text-align: right;
1052
+ text-align: end;
1048
1053
  font-style: italic;
1049
1054
  }
1050
1055
  span.popup-icon {
@@ -1071,7 +1076,7 @@ span.popup-icon {
1071
1076
  box-shadow: 7px 10px 10px -1px black;
1072
1077
  height: 36px;
1073
1078
  line-height: 36px;
1074
- margin-left: -2px;
1079
+ margin-inline-start: -2px;
1075
1080
  margin-top: -4px;
1076
1081
  opacity: 1.0!important;
1077
1082
  width: 36px;
@@ -1086,7 +1091,7 @@ span.popup-icon {
1086
1091
  border-right: 8px solid transparent;
1087
1092
  border-top: 8px solid #2270b5;
1088
1093
  height: 0;
1089
- left: 8px;
1094
+ inset-inline-start: 8px;
1090
1095
  position: relative;
1091
1096
  width: 0;
1092
1097
  opacity: 0.9;
@@ -1099,7 +1104,7 @@ span.popup-icon {
1099
1104
  border-right: 10px solid transparent;
1100
1105
  border-top: 16px solid #2270B5;
1101
1106
  height: 0;
1102
- left: 6px;
1107
+ inset-inline-start: 6px;
1103
1108
  position: relative;
1104
1109
  top: -4px;
1105
1110
  width: 0;
@@ -1108,7 +1113,7 @@ span.popup-icon {
1108
1113
  border-left-width: 12px;
1109
1114
  border-right-width: 12px;
1110
1115
  border-top-width: 18px;
1111
- left: 4px;
1116
+ inset-inline-start: 4px;
1112
1117
  opacity: 1.0!important;
1113
1118
  }
1114
1119
  .umap-drop-icon .icon_container {
@@ -1126,7 +1131,7 @@ span.popup-icon {
1126
1131
  border-radius: 18px 18px 18px 18px;
1127
1132
  height: 36px;
1128
1133
  line-height: 36px;
1129
- margin-left: -2px;
1134
+ margin-inline-start: -2px;
1130
1135
  margin-top: -6px;
1131
1136
  opacity: 1.0!important;
1132
1137
  width: 36px;
@@ -1144,14 +1149,14 @@ span.popup-icon {
1144
1149
  .umap-circle-icon {
1145
1150
  border: 1px solid white;
1146
1151
  border-radius: 10px 10px 10px 10px;
1147
- margin-left: -6px;
1152
+ margin-inline-start: -6px;
1148
1153
  margin-top: -6px;
1149
1154
  height: 12px;
1150
1155
  width: 12px;
1151
1156
  }
1152
1157
  .umap-circle-icon.umap-icon-active {
1153
1158
  height: 16px;
1154
- margin-left: -8px;
1159
+ margin-inline-start: -8px;
1155
1160
  margin-top: -8px;
1156
1161
  opacity: 1.0!important;
1157
1162
  width: 16px;
@@ -1169,7 +1174,7 @@ span.popup-icon {
1169
1174
  .umap-ball-icon.umap-icon-active .icon_container {
1170
1175
  border-radius: 10px 10px 10px 10px;
1171
1176
  box-shadow: 1px 23px 7px -1px black;
1172
- margin-left: -2px;
1177
+ margin-inline-start: -2px;
1173
1178
  margin-top: -4px;
1174
1179
  height: 20px;
1175
1180
  opacity: 1.0!important;
@@ -1178,7 +1183,7 @@ span.popup-icon {
1178
1183
  .umap-ball-icon .icon_arrow {
1179
1184
  background-color: black;
1180
1185
  height: 16px;
1181
- left: 7px;
1186
+ inset-inline-start: 7px;
1182
1187
  opacity: 0.9;
1183
1188
  position: relative;
1184
1189
  top: -1px;
@@ -1375,10 +1380,10 @@ span.popup-icon {
1375
1380
  line-height: var(--control-size);
1376
1381
  }
1377
1382
  .leaflet-container .leaflet-control-zoom {
1378
- margin-left: 10px;
1383
+ margin-inline-start: 10px;
1379
1384
  }
1380
- .leaflet-top {
1381
- z-index: calc(var(--zindex-panels) - 1);
1385
+ .leaflet-top, .leaflet-bottom {
1386
+ z-index: var(--zindex-controls);
1382
1387
  }
1383
1388
  .leaflet-popup-content {
1384
1389
  min-width: 200px;
@@ -1407,7 +1412,7 @@ span.popup-icon {
1407
1412
  background-color: #f6f6f6;
1408
1413
  }
1409
1414
  .umap-popup-content th {
1410
- text-align: left;
1415
+ text-align: start;
1411
1416
  }
1412
1417
  .umap-popup-content td {
1413
1418
  word-break: break-word;
@@ -1492,7 +1497,7 @@ span.popup-icon {
1492
1497
  display: none;
1493
1498
  }
1494
1499
  .umap-main-edit-toolbox .umap-user {
1495
- margin-right: 10px;
1500
+ margin-inline-end: 10px;
1496
1501
  }
1497
1502
  .umap-main-edit-toolbox .umap-user:after {
1498
1503
  display: none;
@@ -1519,13 +1524,11 @@ span.popup-icon {
1519
1524
 
1520
1525
  .leaflet-control-layers-expanded label {
1521
1526
  display: inline-block;
1522
- margin-right: 10px;
1527
+ margin-inline-end: 10px;
1523
1528
  }
1524
-
1525
1529
  .leaflet-control-layers-expanded {
1526
- margin-left: 10px;
1530
+ margin-inline-start: 10px;
1527
1531
  }
1528
-
1529
1532
  .umap-permanent-credits-container {
1530
1533
  max-width: 100%;
1531
1534
  }
umap/static/umap/nav.css CHANGED
@@ -3,15 +3,17 @@ header {
3
3
  }
4
4
 
5
5
  footer {
6
- height: 140px;
6
+ min-height: 140px;
7
7
  margin-top: 40px;
8
- background-color: #2E3641;
9
- text-align: center;
10
- line-height: 140px;
11
- color: #fff;
8
+ background-color: var(--color-darkBlue);
9
+ color: var(--color-light);
10
+ display: flex;
11
+ align-items: center;
12
+ justify-content: space-evenly;
13
+ flex-wrap: wrap;
12
14
  }
13
15
  footer a {
14
- color: #fff;
16
+ color: var(--color-light);
15
17
  text-decoration: underline;
16
18
  }
17
19
  footer a.branding {
@@ -20,11 +22,15 @@ footer a.branding {
20
22
  background-repeat: no-repeat;
21
23
  background-size: 60px auto;
22
24
  font-size: 30px;
25
+ height: 60px;
26
+ line-height: 60px;
23
27
  font-weight: bold;
24
- height: 140px;
25
- padding-left: 70px;
28
+ padding-inline-start: 70px;
26
29
  display: inline-block;
27
30
  }
31
+ html[dir="rtl"] footer a.branding {
32
+ background-position: right center;
33
+ }
28
34
 
29
35
  footer .i18n_switch {
30
36
  display: inline-block;
@@ -51,10 +57,13 @@ footer .i18n_switch {
51
57
  background-repeat: no-repeat;
52
58
  background-size: 60px auto;
53
59
  line-height: 70px;
54
- padding-left: 80px;
60
+ padding-inline-start: 80px;
55
61
  display: block;
56
62
  font-size: 2.5rem;
57
63
  }
64
+ html[dir="rtl"] .umap-nav h1 a {
65
+ background-position: right center;
66
+ }
58
67
  .umap-nav ul {
59
68
  text-align: center;
60
69
  font-weight: bold;
@@ -66,7 +75,7 @@ footer .i18n_switch {
66
75
  .umap-nav .button:hover {
67
76
  text-decoration: none;
68
77
  min-width: 150px;
69
- margin-left: 1rem;
78
+ margin-inline-start: 1rem;
70
79
  }
71
80
 
72
81
  @media only screen and (min-width: 500px) {