Revert "'#2224 and '#2208 Modifications to hide last JSON features if…

… a new selected item does not have its own JSON feature." This reverts commit 34d169c.
sepinf-inc · May 20, 2024 · 7d13379 · 7d13379
1 parent 34d169c
commit 7d13379
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/iped-geo/src/main/java/iped/geo/AbstractMapCanvas.java b/iped-geo/src/main/java/iped/geo/AbstractMapCanvas.java
@@ -225,7 +225,7 @@ public void drawPolyline(List<StringBuffer> gids) {
 
     }
 
-    public abstract void drawJSONFeature(String mid, String jsonFeature);
+    public abstract void drawJSONFeature(String string);
 
     public void drawJSONFeatures(String[] jsonFeatures) {
         // TODO Auto-generated method stub

diff --git a/iped-geo/src/main/java/iped/geo/impl/AppMapMarkerEventListener.java b/iped-geo/src/main/java/iped/geo/impl/AppMapMarkerEventListener.java
@@ -54,9 +54,7 @@ public void onClicked(String mid, MouseEvent e) {
             }
             String jsonFeature = mapaPanel.getSelectedJSONFeature();
             if (jsonFeature != null) {
-                mapaPanel.browserCanvas.drawJSONFeature(mid, jsonFeature);
-            } else {
-                mapaPanel.browserCanvas.drawJSONFeature(mid, "");
+                mapaPanel.browserCanvas.drawJSONFeature(jsonFeature);
             }
 
             mapViewer.desabilitaTemp = olddesabilitaTemp;

diff --git a/iped-geo/src/main/java/iped/geo/openstreet/MapCanvasOpenStreet.java b/iped-geo/src/main/java/iped/geo/openstreet/MapCanvasOpenStreet.java
@@ -629,14 +629,12 @@ public void run() {
     }
 
     @Override
-    public void drawJSONFeature(String mid, String jsonFeature) {
+    public void drawJSONFeature(String jsonFeature) {
         Platform.runLater(new Runnable() {
             public void run() {
                 try {
                     if (jsonFeature != null && jsonFeature.length() > 3) {
-                        webEngine.executeScript("try{track.hideLastFeature();track.drawFeature('" + mid + "', "
-                                + jsonFeature
-                                + ");}catch(e){alert(e);}");
+                        webEngine.executeScript("try{track.hideLastFeature();track.drawFeature(" + jsonFeature + ");}catch(e){alert(e);}");
                     } else {
                         webEngine.executeScript("try{track.hideLastFeature();}catch(e){alert(e);}");
                     }

diff --git a/iped-geo/src/main/resources/iped/geo/openstreet/L.KML.js b/iped-geo/src/main/resources/iped/geo/openstreet/L.KML.js
@@ -275,14 +275,12 @@ L.KML = L.MarkerClusterGroup.extend({
 			this.addKML(kml, kmlOptions);
 		}
 	},
-    drawFeature(mid, json){
-        if(this.markers[mid].selected == 'true'){
-            let l = L.geoJSON(json);
-            this.geoJSONLayers.push(l);
-            this.addLayer(l);
+    drawFeature(json){
+        let l = L.geoJSON(json);
+        this.geoJSONLayers.push(l);
+        this.addLayer(l);
 
-            this._map.fitBounds(l.getBounds());
-        }        
+        this._map.fitBounds(l.getBounds());
     },
     hideLastFeature(json){
         while(this.geoJSONLayers.length>0){
@@ -777,8 +775,6 @@ L.KML = L.MarkerClusterGroup.extend({
         return this.curMark;
     },
     clearVisibleMarkers(){
-        this.hideLastFeature();
-        this.deselectAll();
         if(this.curMark){
             let mark=this.curMark;
             mark.hideDirectionLines();
@@ -1393,8 +1389,8 @@ L.KMLMarker = L.Marker.extend({
             }
 
             if(!e.originalEvent.ctrlKey && !e.originalEvent.shiftKey && this.selected == 'true'){
-		      return; //does nothing as the item is already selected
-	        }
+		return; //does nothing as the item is already selected
+	    }
 
 
             if(this.parent){
@@ -1432,9 +1428,7 @@ L.KMLMarker = L.Marker.extend({
                 window.app.markerMouseClickedBF(this.id, button, modf);
             }
 
-            this.parent.hideLastFeature();
-            this.parent.curMark = this;
-
+            this.parent.curMark=this;
 
             var that = this;
         }catch(e){