Show other markers on the map in the edit mode

public/js/module/map/map.js

@@ -540,6 +540,7 @@ define([
                 openNewTab: this.openNewTab(),
                 isPainting: this.isPainting(),
                 embedded: this.embedded,
+                editing: this.editing,
                 year: this.yearLow,
                 year2: this.yearHigh,
             });
@@ -626,10 +627,22 @@ define([
 
         // Обработчик переключения режима редактирования
         editHandler: function (edit) {
+            this.markerManager.enable();
+
             if (edit) {
-                this.pointHighlightDestroy().pointEditCreate().markerManager.disable();
+                const currentPointCid = this.point.cid();
+                const currentPhoto = this.markerManager.mapObjects.photos[currentPointCid];
+                // const currentPhotoMarker = currentPhoto?.marker;
+
+                this.currentPhotoMarker = currentPhoto.marker;
+                this.markerManager.layerPhotos.removeLayer(this.currentPhotoMarker);
+                this.pointHighlightDestroy().pointEditCreate();
             } else {
-                this.pointEditDestroy().pointHighlightCreate().markerManager.enable();
+                if (this.currentPhotoMarker) {
+                    this.markerManager.layerPhotos.addLayer(this.currentPhotoMarker);
+                }
+
+                this.pointEditDestroy().pointHighlightCreate();
             }
         },
         // Включает режим редактирования

public/js/module/map/marker.js

@@ -32,6 +32,7 @@ define([
         this.openNewTab = options.openNewTab;
         this.embedded = options.embedded;
         this.isPainting = options.isPainting;
+        this.editing = options.editing;
         this.year = options.year || undefined;
         this.year2 = options.year2 || undefined;
 
@@ -963,6 +964,10 @@ define([
      * @param {Event} evt
      */
     MarkerManager.prototype.clickMarker = function (evt) {
+        if (this.editing()) {
+            return;
+        }
+
         const marker = evt.target;
         const object = marker.options.data.obj;
         const eventPoint = this.map.mouseEventToContainerPoint(evt.originalEvent);
@@ -1086,6 +1091,13 @@ define([
         }
     };
     MarkerManager.prototype.popupPhotoOver = function (evt) {
+        if (this.editing()) {
+            console.log(this.editing());
+            return;
+        }
+
+        console.log(this.editing());
+
         const type = evt.target.options.data.type;
 
         window.clearTimeout(this.popupTimeout);

public/js/module/photo/photo.js

@@ -528,7 +528,7 @@ define(['underscore', 'Utils', 'socket!', 'Params', 'knockout', 'knockout.mappin
             this.mapVM.setPoint(this.genMapPoint(), this.isPainting());
         },
         genMapPoint: function () {
-            return _.pick(this.p, 'geo', 'year', 'dir', 'title', 'regions');
+            return _.pick(this.p, 'geo', 'year', 'cid', 'dir', 'title', 'regions');
         },
         editGeoChange: function (geo) {
             if (geo) {

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;

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