umap-project 2.6.3__py3-none-any.whl → 2.7.0__py3-none-any.whl

umap/management/commands/clean_tilelayer.py

@@ -0,0 +1,152 @@
+import json
+import sys
+
+from django.core.management.base import BaseCommand
+from django.db import connection
+from psycopg.types.json import Jsonb
+
+from umap.models import Map, TileLayer
+
+
+class Command(BaseCommand):
+    help = """Clean tilelayer in database
+
+    This will simply replace the URL in maps settings:
+    umap clean_tilelayer http://my.old/url/template http://my.new/url/template
+
+    This will replace the whole tilelayer in maps settings by the one with this name:
+    umap clean_tilelayer http://my.old/url/template "some string"
+
+    This will replace the whole tilelayer in maps settings by the one with this id:
+    umap clean_tilelayer http://my.old/url/template an_id
+
+    This will delete the whole tilelayer from maps settings:
+    umap clean_tilelayer http://my.old/url/template
+
+    To get the available tilelayers in db (available for users):
+    umap clean_tilelayer --available
+
+    To get statistics of tilelayers usage in db (including custom ones):
+    umap clean_tilelayer --available
+    """
+
+    def add_arguments(self, parser):
+        parser.add_argument("old", nargs="?", help="url template we want to clean")
+        parser.add_argument(
+            "new", help="what to replace this tilelayer with", nargs="?"
+        )
+        parser.add_argument(
+            "--no-input", action="store_true", help="Do not ask for confirm."
+        )
+        parser.add_argument(
+            "--available", action="store_true", help="List known tilelayers."
+        )
+        parser.add_argument(
+            "--stats", action="store_true", help="Display stats on tilelayer usage."
+        )
+
+    def handle(self, *args, **options):
+        self.no_input = options["no_input"]
+        if options["available"]:
+            self.list_available()
+            sys.exit()
+        if options["stats"]:
+            self.stats()
+            sys.exit()
+        old = options["old"]
+        new = options["new"]
+        if not old:
+            sys.exit("⚠ You must define an url_template")
+
+        count = Map.objects.filter(
+            settings__properties__tilelayer__url_template=old
+        ).count()
+        if not count:
+            self.stdout.write("⚠ No map found. Exiting.")
+            sys.exit()
+        self.stdout.write(f"{count} maps found.")
+        if not new:
+            self.delete(old)
+        elif new.startswith("http"):
+            self.replace_url(old, new)
+        else:
+            # Let's consider it's a name or an id
+            self.replace_tilelayer(old, new)
+
+    def confirm(self, message):
+        if self.no_input:
+            return True
+        result = input("%s (y/N) " % message) or "n"
+        if not result[0].lower() == "y":
+            self.stdout.write("⚠ Action cancelled.")
+            sys.exit()
+        return True
+
+    def delete(self, old):
+        if self.confirm(
+            "Are you sure you want to delete the tilelayer key from all those "
+            "maps settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties'] = (settings->'properties') - 'tilelayer'"
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(old)],
+                )
+            self.stdout.write(f"✔ Deleted {old} from {ret.rowcount} maps.")
+
+    def replace_url(self, old, new):
+        if self.confirm(
+            f"Are you sure you want to replace '{old}'' by '{new}'' from all those "
+            "map settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties']['tilelayer']['url_template'] = %s "
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(new), Jsonb(old)],
+                )
+            self.stdout.write(f"✔ Replaced {old} by {new} in {ret.rowcount} maps.")
+
+    def replace_tilelayer(self, old, new):
+        try:
+            tilelayer = TileLayer.objects.get(name=new)
+        except TileLayer.DoesNotExist:
+            try:
+                tilelayer = TileLayer.objects.get(id=new)
+            except (TileLayer.DoesNotExist, ValueError):
+                sys.exit(f"⚠ Cannot find a TileLayer with name or id = '{new}'.")
+        if self.confirm(
+            f"Are you sure you want to replace {old} by '{tilelayer.name}' "
+            "from all those map settings ?"
+        ):
+            with connection.cursor() as cursor:
+                ret = cursor.execute(
+                    "UPDATE umap_map "
+                    "SET settings['properties']['tilelayer'] = %s "
+                    "WHERE settings->'properties'->'tilelayer'->'url_template' = %s",
+                    [Jsonb(tilelayer.json), Jsonb(old)],
+                )
+            self.stdout.write(
+                f"✔ Replaced {old} by {tilelayer.name} in {ret.rowcount} maps."
+            )
+
+    def list_available(self):
+        tilelayers = TileLayer.objects.all()
+        for tilelayer in tilelayers:
+            print(f"{tilelayer.pk} '{tilelayer.name}' {tilelayer.url_template}")
+
+    def stats(self):
+        with connection.cursor() as cursor:
+            cursor.execute(
+                "SELECT COUNT(*) as count, "
+                "settings->'properties'->'tilelayer'->'url_template' as url "
+                "FROM umap_map "
+                "GROUP BY settings->'properties'->'tilelayer'->'url_template' "
+                "ORDER BY count DESC"
+            )
+            res = cursor.fetchall()
+        for count, url in res:
+            print(f"{count}\t{url}")

umap/management/commands/purge_purgatory.py

@@ -0,0 +1,28 @@
+import time
+from pathlib import Path
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = "Remove old files from purgatory. Eg.: umap purge_purgatory --days 7"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--days",
+            help="Number of days to consider files for removal",
+            default=30,
+            type=int,
+        )
+
+    def handle(self, *args, **options):
+        days = options["days"]
+        root = Path(settings.UMAP_PURGATORY_ROOT)
+        threshold = time.time() - days * 86400
+        for path in root.iterdir():
+            stats = path.stat()
+            filestamp = stats.st_mtime
+            if filestamp < threshold:
+                path.unlink()
+                print(f"Removed old file {path}")

umap/models.py

@@ -3,6 +3,7 @@ import operator
 import os
 import time
 import uuid
+from pathlib import Path
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -255,6 +256,13 @@ class Map(NamedModel):
         )
         return map_settings
 
+    def delete(self, **kwargs):
+        # Explicitely call datalayers.delete, so we can deal with removing files
+        # (the cascade delete would not call the model delete method)
+        for datalayer in self.datalayer_set.all():
+            datalayer.delete()
+        return super().delete(**kwargs)
+
     def generate_umapjson(self, request):
         umapjson = self.settings
         umapjson["type"] = "umap"
@@ -462,7 +470,9 @@ class DataLayer(NamedModel):
 
     def save(self, force_insert=False, force_update=False, **kwargs):
         is_new = not bool(self.pk)
-        super(DataLayer, self).save(force_insert, force_update, **kwargs)
+        super(DataLayer, self).save(
+            force_insert=force_insert, force_update=force_update, **kwargs
+        )
 
         if is_new:
             force_insert, force_update = False, True
@@ -471,10 +481,25 @@ class DataLayer(NamedModel):
             new_name = self.geojson.storage.save(filename, self.geojson)
             self.geojson.storage.delete(old_name)
             self.geojson.name = new_name
-            super(DataLayer, self).save(force_insert, force_update, **kwargs)
+            super(DataLayer, self).save(
+                force_insert=force_insert, force_update=force_update, **kwargs
+            )
         self.purge_gzip()
         self.purge_old_versions()
 
+    def delete(self, **kwargs):
+        self.purge_gzip()
+        self.to_purgatory()
+        return super().delete(**kwargs)
+
+    def to_purgatory(self):
+        dest = Path(settings.UMAP_PURGATORY_ROOT)
+        dest.mkdir(parents=True, exist_ok=True)
+        src = Path(self.geojson.storage.location) / self.storage_root()
+        for version in self.versions:
+            name = version["name"]
+            (src / name).rename(dest / f"{self.map.pk}_{name}")
+
     def upload_to(self):
         root = self.storage_root()
         name = "%s_%s.geojson" % (self.pk, int(time.time() * 1000))

umap/settings/base.py

@@ -19,7 +19,7 @@ env = environ.Env()
 INTERNAL_IPS = env.list("INTERNAL_IPS", default=["127.0.0.1"])
 ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"])
 ADMINS = tuple(parseaddr(email) for email in env.list("ADMINS", default=[]))
-
+ASGI_APPLICATION = "umap.asgi.application"
 
 DEBUG = env.bool("DEBUG", default=False)
 
@@ -240,6 +240,7 @@ USER_URL_FIELD = "username"
 # Miscellaneous project settings
 # =============================================================================
 UMAP_ALLOW_ANONYMOUS = env.bool("UMAP_ALLOW_ANONYMOUS", default=False)
+UMAP_ALLOW_EDIT_PROFILE = env.bool("UMAP_ALLOW_EDIT_PROFILE", default=True)
 
 UMAP_EXTRA_URLS = {
     "routing": "http://www.openstreetmap.org/directions?engine=osrm_car&route={lat},{lng}&locale={locale}#map={zoom}/{lat}/{lng}",  # noqa
@@ -266,6 +267,7 @@ UMAP_DEFAULT_FEATURES_HAVE_OWNERS = False
 UMAP_HOME_FEED = "latest"
 UMAP_IMPORTERS = {}
 UMAP_HOST_INFOS = {}
+UMAP_PURGATORY_ROOT = "/tmp/umappurgatory"
 
 UMAP_READONLY = env("UMAP_READONLY", default=False)
 UMAP_GZIP = True

umap/static/umap/base.css

@@ -307,9 +307,6 @@ input + .help-text {
 .formbox.with-switch {
     padding-top: 2px;
 }
-.formbox select {
-    width: calc(100% - 14px);
-}
 fieldset.formbox {
     border: none;
     border-top: 1px solid var(--color-lightGray);
@@ -386,6 +383,10 @@ fieldset legend {
     font-size: .9rem;
     padding: 0 5px;
 }
+fieldset.separator {
+    border: none;
+    border-top: 1px solid var(--color-lightGray);
+}
 
 [data-badge] {
     position: relative;
@@ -633,7 +634,6 @@ i.info {
 .umap-datalayer-container,
 .umap-layer-properties-container,
 .umap-browse-data,
-.umap-facet-search,
 .umap-tilelayer-switcher-container {
     padding: 0 10px;
 }

umap/static/umap/css/contextmenu.css

@@ -1,7 +1,7 @@
 .umap-contextmenu {
     background-color: var(--background-color);
     padding: calc(var(--box-padding) / 2) var(--box-padding);
-    position: absolute;
+    position: fixed;
     z-index: var(--zindex-contextmenu);
     border-radius: var(--border-radius);
     box-shadow: var(--block-shadow);
@@ -9,3 +9,8 @@
 .umap-contextmenu li + li {
     margin-top: var(--text-margin);
 }
+
+.umap-contextmenu hr {
+    margin-top: var(--text-margin);
+    margin-bottom: var(--text-margin);
+}

umap/static/umap/css/icon.css

@@ -35,9 +35,11 @@ html[dir="rtl"] .icon {
 .icon-block + span {
     margin-inline-start: 0;
 }
+.icon-16.icon-white,
 .dark .icon-16 {
     background-image: url('../img/16-white.svg');
 }
+.icon-24.icon-white,
 .dark .icon-24 {
     background-image: url('../img/24-white.svg');
 }
@@ -105,10 +107,13 @@ html[dir="rtl"] .icon {
     background-position: calc(var(--tile) * 3) calc(var(--tile) * 5);
 }
 .icon-polygon {
-    background-position: var(--tile) calc(var(--tile) * 5);
+    background-position: var(--tile) calc(var(--tile) * 3);
 }
 .icon-polyline {
-    background-position: 0 calc(var(--tile) * 5);
+    background-position: 0 calc(var(--tile) * 3);
+}
+.icon-profile {
+    background-position: 0 calc(var(--tile) * 4);
 }
 .icon-resize {
     background-position: calc(var(--tile) * 3) calc(var(--tile) * 6);

umap/static/umap/css/importers.css

@@ -43,6 +43,10 @@
 .importers ul .communesfr:before {
     background-image: url(../img/importers/communesfr.svg);
 }
+.importer.cadastrefr h3:before,
+.importers ul .cadastrefr:before {
+    background-image: url(../img/importers/cadastrefr.svg);
+}
 .importer.overpass h3:before,
 .importers ul .overpass:before {
     background-image: url(../img/importers/overpass.svg);

umap/static/umap/img/16-white.svg

@@ -130,8 +130,8 @@
   <rect id="rect4243-2-5" x="89" y="901.36" width="2" height="2" fill="#f2f2f2"/>
   <path id="delete-30-7" d="m131 937.36v1c-1.4286 0-3.2857 0.5999-4 2v1h10v-1c-0.71429-1.4001-2.5714-2-4-2v-1zm-4 5 2 9h6l2-9z" fill="#b3b3b3" stroke="#999" stroke-width=".25"/>
   <path id="path437" d="m113.29 943.47 0.9072 0.5491c0.1786 0.10817 0.2366 0.34196 0.1294 0.52223-0.0319 0.0535-0.0764 0.0983-0.1294 0.13055l-7.0072 4.2412-7.0071-4.2412c-0.17869-0.10817-0.23664-0.34196-0.12942-0.52222 0.0319-0.0536 0.0763-0.0984 0.12942-0.13056l0.90714-0.5491 6.0999 3.6922zm0 3.578 0.9072 0.5491c0.1786 0.1081 0.2366 0.3419 0.1294 0.5222-0.0319 0.0535-0.0764 0.0983-0.1294 0.1306l-6.6189 4.0061c-0.239 0.1447-0.53753 0.1447-0.77652 0l-6.6188-4.0061c-0.17869-0.1082-0.23664-0.342-0.12942-0.5223 0.0319-0.0536 0.0763-0.0984 0.12942-0.1305l0.90714-0.5491 6.0999 3.6921zm-5.7117-10.575 6.6189 4.0062c0.1786 0.10815 0.2366 0.34196 0.1294 0.52222-0.0319 0.0536-0.0764 0.0984-0.1294 0.13056l-7.0072 4.2412-7.0071-4.2412c-0.17869-0.10815-0.23664-0.34196-0.12942-0.52222 0.0319-0.0536 0.0763-0.0984 0.12942-0.13056l6.6188-4.0062c0.23899-0.14465 0.53752-0.14465 0.77652 0z" fill="#f2f2f2" stroke="#999" stroke-width=".178"/>
-  <path id="linestring" d="m7 937.36v2h1.8828l6.1172 3.0586v0.23438l-6.707 6.707h-1.293v2h2v-1.293l6.707-6.707h1.293v-2h-1.8828l-6.1172-3.0586v-0.94141z" color="#000000" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".2"/>
-  <path id="polygon" d="m29 936.36v2h0.92773l-0.85547 12h-1.0723v2h2v-1.1992l8-1.6016v0.80078h2v-2h-0.77734l1.5547-7h1.2227v-2h-2v0.72656l-9-2.4531v-1.2734z" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".2"/>
+  <path id="linestring" d="m7 889.36v2h1.8828l6.1172 3.0586v0.23438l-6.707 6.707h-1.293v2h2v-1.293l6.707-6.707h1.293v-2h-1.8828l-6.1172-3.0586v-0.94141z" color="#000000" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".2"/>
+  <path id="polygon" d="m29 888.36v2h0.92773l-0.85547 12h-1.0723v2h2v-1.1992l8-1.6016v0.80078h2v-2h-0.77734l1.5547-7h1.2227v-2h-2v0.72656l-9-2.4531v-1.2734z" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".2"/>
   <path id="marker" d="m84 936.36c-2.625 0-5.25 1.7022-6 5.1064 0 2.0426 1.5 6.1277 6 10.894 4.5-4.7659 6-8.851 6-10.894-0.75-3.4042-3.375-5.1064-6-5.1064zm0 2.383c1.6569 0 3 1.2193 3 2.7234s-1.3431 2.7234-3 2.7234c-1.6568 0-3-1.2194-3-2.7234s1.3432-2.7234 3-2.7234z" fill="#f2f2f2" stroke="#999" stroke-width=".25"/>
   <g id="settings" class="sprite" transform="matrix(.16295 0 0 .16296 27.835 912.23)" fill="#f2f2f2" stroke="#999" stroke-width="1.4974">
    <path id="path27812" d="m98.762 43.652c-0.186-1.386-1.481-2.582-2.876-2.659l-6.172-0.337c-1.395-0.076-2.899-1.224-3.341-2.55l-2.28-5.518c-0.629-1.249-0.379-3.121 0.553-4.161l4.122-4.6c0.933-1.042 0.962-2.77 0.066-3.842l-8.813-8.813c-1.073-0.897-2.803-0.867-3.845 0.065l-4.598 4.122c-1.039 0.934-2.915 1.182-4.161 0.551l-5.521-2.279c-1.324-0.442-2.472-1.945-2.549-3.34l-0.337-6.17c-0.077-1.396-1.272-2.691-2.659-2.878 0 0-3.252-0.44-6.248-0.44-2.991 0-6.243 0.44-6.243 0.44-1.386 0.188-2.582 1.483-2.658 2.878l-0.338 6.17c-0.076 1.396-1.224 2.898-2.551 3.34l-5.517 2.279c-1.249 0.631-3.122 0.382-4.161-0.551l-4.601-4.122c-1.042-0.932-2.769-0.962-3.842-0.065l-8.813 8.813c-0.897 1.073-0.867 2.801 0.066 3.842l4.122 4.6c0.933 1.041 1.182 2.913 0.551 4.161l-2.279 5.518c-0.442 1.326-1.946 2.474-3.34 2.55l-6.17 0.337c-1.396 0.077-2.691 1.272-2.879 2.659 0 0-0.439 3.253-0.439 6.243s0.44 6.24 0.44 6.24c0.188 1.389 1.483 2.582 2.879 2.659l6.169 0.339c1.396 0.075 2.898 1.225 3.341 2.549l2.278 5.517c0.631 1.248 0.381 3.122-0.551 4.163l-4.122 4.598c-0.933 1.042-0.963 2.771-0.066 3.845l8.814 8.813c1.073 0.896 2.801 0.866 3.842-0.066l4.6-4.122c1.041-0.932 2.913-1.182 4.161-0.553l5.517 2.28c1.327 0.441 2.475 1.946 2.55 3.343l0.338 6.168c0.076 1.395 1.272 2.692 2.658 2.88 0 0 3.252 0.439 6.244 0.439 2.996 0 6.25-0.439 6.25-0.439 1.385-0.188 2.58-1.485 2.657-2.88l0.337-6.168c0.077-1.396 1.225-2.901 2.551-3.343l5.517-2.28c1.248-0.629 3.122-0.379 4.163 0.553l4.598 4.122c1.042 0.933 2.771 0.964 3.843 0.067l8.815-8.814c0.896-1.073 0.866-2.803-0.066-3.845l-4.122-4.598c-0.932-1.041-1.182-2.915-0.553-4.163l2.28-5.517c0.441-1.324 1.946-2.474 3.341-2.549l6.172-0.339c1.395-0.077 2.692-1.271 2.876-2.659 0 0 0.441-3.25 0.441-6.24s-0.441-6.243-0.441-6.243zm-48.658 18.709c-6.886 0-12.468-5.585-12.468-12.467 0-6.885 5.582-12.467 12.468-12.467 6.89 0 12.475 5.582 12.475 12.467-1e-3 6.882-5.586 12.467-12.475 12.467z" fill="#f2f2f2" stroke="#999" stroke-width="1.4974"/>
@@ -189,5 +189,12 @@
   <path id="path8" transform="translate(0 812.36)" d="m8.1903 37.424c-0.48722-0.17411-0.79231-0.44207-0.99467-0.87363l-0.1908-0.40689-1.3703-0.0034c-1.4983-0.0037-1.5911-0.03214-1.5406-0.47225l0.026557-0.23161 2.8423-0.0451 0.19827-0.3895c0.34789-0.68343 0.86349-1.0091 1.5923-1.0058 0.71771 0.0033 1.3415 0.43242 1.6291 1.1207l0.11636 0.27848h4.6574c4.5203 0 4.66 0.0047 4.7428 0.1594 0.1159 0.21656 0.10767 0.30093-0.04419 0.45278-0.11466 0.11466-0.66063 0.1295-4.7632 0.1295h-4.6337l-0.10498 0.2903c-0.15257 0.42194-0.62749 0.84447-1.1103 0.98785-0.49622 0.14736-0.6615 0.14879-1.0524 0.0091zm0.96896-0.84513c0.698-0.33122 0.698-1.3772 0-1.7084-0.35156-0.16682-0.49258-0.16849-0.82704-0.0098-0.33761 0.16021-0.5445 0.51333-0.5445 0.92936 0 0.36801 0.16007 0.60614 0.53566 0.79693 0.31576 0.16039 0.48419 0.15875 0.83587-0.0081z" fill="#f2f2f2" stroke="#999" stroke-width=".25" style="paint-order:fill markers stroke"/>
   <path id="path9" transform="translate(0 812.36)" d="m12.773 42.244c-0.4045-0.18728-0.73246-0.52685-0.9029-0.93487l-0.12875-0.30821-7.6214-0.04285-0.026557-0.23161c-0.055311-0.48238-0.16774-0.4688 3.8893-0.46961l3.7189-7.33e-4 0.21287-0.43192c0.65163-1.3222 2.4726-1.2846 3.1257 0.06446l0.17859 0.36892h2.2972c2.2584 0 2.2988 3e-3 2.391 0.17524 0.06808 0.12721 0.06936 0.22886 0.0047 0.37084l-0.08912 0.1956h-4.6108l-0.15493 0.35024c-0.38713 0.87516-1.4373 1.2865-2.2839 0.89448zm1.0632-0.70036c0.37802-0.15795 0.5443-0.42579 0.54116-0.87174-4e-3 -0.57358-0.36338-0.90877-0.9743-0.90877-0.31204 0-0.40386 0.04292-0.64992 0.30383-0.25777 0.27331-0.28248 0.33986-0.2461 0.66262 0.04524 0.40136 0.22819 0.65122 0.5956 0.81339 0.31718 0.14001 0.39991 0.14008 0.73356 6.68e-4z" fill="#f2f2f2" stroke="#999" stroke-width=".25" style="paint-order:fill markers stroke"/>
   <path id="path1-67-5" d="m154.68 963.54 4.7344 4.7344-5.0508 4.6836-1.3594-1.4668 3.5274-3.2695-3.2656-3.2656z" color="#000000" fill="#f2f2f2" fill-rule="evenodd" stroke="#999" stroke-width=".25"/>
+  <path id="copy" d="m58 914.36v3.5h4v4h3.5v-7.5zm-4 4v7.5h7.5v-7.5z" fill="#f2f2f2" style="paint-order:fill markers stroke"/>
+  <g id="g1-5" transform="translate(.1 .1)">
+   <g id="g24" fill="#f2f2f2" stroke="#999" stroke-width=".2">
+    <path id="path24" d="m12 912.36c-4.4183 0-8 3.5817-8 8 0.00463 1.6156 0.49829 3.1919 1.416 4.5215 0.19802 0.28729 0.41463 0.56131 0.64844 0.82032 1.5128 1.6866 3.6699 2.6526 5.9355 2.6582 2.2669-6e-3 4.4249-0.97357 5.9375-2.6621 0.23535-0.26077 0.45327-0.53676 0.65234-0.82617 0.91377-1.3275 1.4053-2.9001 1.4102-4.5117 0-4.4183-3.5817-8-8-8zm-5.3242 12.506c1.3285-1.5609 3.2745-2.461 5.3242-2.4629 2.0504 1e-3 3.9972 0.90149 5.3262 2.4629 0 0-0.0035-3e-3 0.0059 6e-3 0 0-0.5371 0.5762-0.83984 0.82812-0.17533 0.14821-0.35784 0.2877-0.54687 0.41797-0.06626 0.0467-0.13333 0.0923-0.20117 0.13672-0.2448 0.15763-0.4992 0.29983-0.76172 0.42578-0.93187 0.44366-1.9503 0.67577-2.9824 0.67969-0.61808-5e-3 -1.2328-0.0915-1.8281-0.25781-0.67532-0.18416-1.3192-0.46858-1.9102-0.84375-0.0685-0.0444-0.13622-0.09-0.20312-0.13672-0.00521-4e-3 -0.010422-8e-3 -0.015625-0.0117-0.18766-0.12974-0.36887-0.26858-0.54297-0.41602-0.29972-0.24977-0.57803-0.52416-0.83203-0.82031m-0.5918-0.81445c-0.69766-1.1081-1.0705-2.3898-1.0762-3.6992 0-3.866 3.134-7 7-7l-4.1e-5 -1.6e-4c3.866 0 7 3.134 7 7-0.0054 1.3023-0.37406 2.5773-1.0645 3.6816-1.5163-1.6794-3.6729-2.6381-5.9355-2.6387-2.2613 8e-3 -4.4134 0.97341-5.9238 2.6562" style="paint-order:fill markers stroke"/>
+    <path id="path11" d="m12 914.86a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5z" style="paint-order:fill markers stroke"/>
+   </g>
+  </g>
  </g>
 </svg>