Index: applications/editors/josm/plugins/NanoLog/src/nanolog/GPXChooser.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/GPXChooser.java	(revision 31981)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/GPXChooser.java	(revision 32329)
@@ -19,5 +19,5 @@
     public static GpxLayer topLayer() {
         // return first found local layer
-        for( Layer layer : Main.map.mapView.getAllLayers() ) {
+        for( Layer layer : Main.getLayerManager().getLayers() ) {
             if( layer instanceof GpxLayer && ((GpxLayer)layer).isLocalFile() )
                 return (GpxLayer)layer;
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 31981)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 32329)
@@ -298,5 +298,5 @@
         public void mousePressed( MouseEvent e ) {
             int nearest = nearestEntry(e);
-            if( nearest > 0 && Main.map.mapView.getActiveLayer() == NanoLogLayer.this ) {
+            if( nearest > 0 && Main.getLayerManager().getActiveLayer() == NanoLogLayer.this ) {
                 dragging = nearest;
                 doDrag(e);
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 31981)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 32329)
@@ -37,5 +37,5 @@
     public void updateMarkers() {
         List<NanoLogEntry> entries = new ArrayList<>();
-        for( NanoLogLayer l : Main.map.mapView.getLayersOfType(NanoLogLayer.class) ) {
+        for( NanoLogLayer l : Main.getLayerManager().getLayersOfType(NanoLogLayer.class) ) {
             entries.addAll(l.getEntries());
         }