Show other markers on the map in the edit mode

Resolves PastVu#482
circus2271 · Mar 4, 2023 · 8cb88f0 · 8cb88f0
1 parent 829db2e
commit 8cb88f0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/public/js/module/map/map.js b/public/js/module/map/map.js
@@ -626,10 +626,30 @@ define([
 
         // Обработчик переключения режима редактирования
         editHandler: function (edit) {
+            const self = this;
+
             if (edit) {
-                this.pointHighlightDestroy().pointEditCreate().markerManager.disable();
+                let highlightedPhotoLayer;
+
+                this.markerManager.layerPhotos.eachLayer(function (marker) {
+                    if (_.isEqual(self.point.geo(), marker.options.data.obj.geo)) {
+                        highlightedPhotoLayer = marker;
+                    }
+
+                    marker
+                        .off('click')
+                        .off('mouseover');
+                });
+
+                if (highlightedPhotoLayer) {
+                    this.markerManager.layerPhotos.removeLayer(highlightedPhotoLayer);
+                }
+
+                this.pointHighlightDestroy().pointEditCreate();
             } else {
-                this.pointEditDestroy().pointHighlightCreate().markerManager.enable();
+                this.markerManager.disable();
+                this.pointEditDestroy().pointHighlightCreate();
+                this.markerManager.enable();
             }
         },
         // Включает режим редактирования

diff --git a/public/style/map/map.less b/public/style/map/map.less
@@ -892,6 +892,26 @@
     }
 
     .mapContainer.embedded {
+        &.editing {
+            .clusterIcon {
+                display: none !important;
+            }
+
+            .clusterIconLocal,
+            .photoIcon {
+                .opacity(0.4);
+                cursor: grab;
+            }
+
+            .photoIcon:hover {
+                width: 8px !important;
+                height: 8px !important;
+                margin-left: -4px !important;
+                margin-top: -4px !important;
+                .box-shadow(0 0 1px 1px #fff);
+            }
+        }
+
         .mapNavigation {
             top: -33px;
             left: -13px;

diff --git a/views/module/map/map.pug b/views/module/map/map.pug
@@ -1,5 +1,5 @@
 .mapModuleWrapper(data-bind="with: repository[M!M]")
-    .mapContainer(data-bind="css: {embedded: embedded}")
+    .mapContainer(data-bind="css: {embedded: embedded, editing: editing}")
         .map
 
         //ko if: embedded