Index: applications/editors/josm/plugins/public_transport_layer/build.xml
===================================================================
--- applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 32474)
+++ applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 32475)
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
--->
 <project name="public_transport_layer" default="dist" basedir=".">
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9278"/>
+    <property name="plugin.main.version" value="10353"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java
===================================================================
--- applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 32474)
+++ applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 32475)
@@ -52,5 +52,4 @@
         for (int i = 0; i < links.size(); i++) {
             final WayConnectionType link = links.get(i);
-            final WayConnectionType.Direction direction = link.direction;
             final List<Node> nodes = routeSegments.get(i).getWay().getNodes();
             switch (link.direction) {
@@ -131,9 +130,9 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             return;
         }
         final StringBuilder sb = new StringBuilder();
-        for (Relation relation : getCurrentDataSet().getSelectedRelations()) {
+        for (Relation relation : getLayerManager().getEditDataSet().getSelectedRelations()) {
             if (!isRouteSupported(relation)) {
                 JOptionPane.showMessageDialog(Main.parent, "<html>" + tr("A valid public_transport:version=2 route is required")
Index: applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java
===================================================================
--- applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 32474)
+++ applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 32475)
@@ -46,10 +46,10 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
-        if (mv == null || mv.getEditLayer() == null || mv.getEditLayer().data.selectionEmpty()) {
+        if (mv == null || mv.getLayerManager().getEditLayer() == null || mv.getLayerManager().getEditLayer().data.selectionEmpty()) {
             return;
         }
         final StyledMapRenderer renderer = new StyledMapRenderer(g, mv, false);
 
-        final Collection<Relation> selectedRelations = mv.getEditLayer().data.getSelectedRelations();
+        final Collection<Relation> selectedRelations = mv.getLayerManager().getEditLayer().data.getSelectedRelations();
         final MultiMap<Pair<Node, Node>, String> segmentRefs = new MultiMap<>();
         for (final Relation relation : selectedRelations) {
@@ -151,5 +151,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.main.addLayer(new PublicTransportLayer());
+            Main.getLayerManager().addLayer(new PublicTransportLayer());
         }
     }
