Changeset 20527 in osm for applications/editors/josm/plugins/turnrestrictions

Timestamp:

2010-03-17T11:17:57+01:00 (14 years ago)

Author:

guggis

Message:

added editing of raw tags and raw members

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• dnd/PrimitiveIdListTransferHandler.java (modified) (2 diffs)
• editor/AdvancedEditorPanel.java (added)
• editor/JosmSelectionListModel.java (modified) (1 diff)
• editor/RelationMemberColumnModel.java (added)
• editor/RelationMemberEditorModel.java (added)
• editor/RelationMemberModel.java (added)
• editor/RelationMemberTable.java (added)
• editor/TurnRestrictionEditor.java (modified) (4 diffs)
• editor/TurnRestrictionEditorModel.java (modified) (17 diffs)
• editor/TurnRestrictionLegEditor.java (modified) (10 diffs)
• editor/ViaListModel.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java

@@ -24 +24 @@
         
         /**
+         * Replies true if {@code transferFlavors} includes the data flavor {@see PrimitiveIdTransferable#PRIMITIVE_ID_LIST_FLAVOR}.
+
+         * @param transferFlavors an array of transferFlavors
+         * @return true if {@code transferFlavors} includes the data flavor {@see PrimitiveIdTransferable#PRIMITIVE_ID_LIST_FLAVOR}.
+         */
+        public static boolean isSupportedFlavor(DataFlavor[] transferFlavors) {
+                for (DataFlavor df: transferFlavors) {
+                        if (df.equals(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR)) return true;
+                }
+                return false;
+        }
+        
+        /**
          * Creates the transfer handler 
          * 
@@ -34 +47 @@
         }
 
-        /**
-         * Replies true if {@code transferFlavors} includes the data flavor {@see PrimitiveIdTransferable#PRIMITIVE_ID_LIST_FLAVOR}.
-
-         * @param transferFlavors an array of transferFlavors
-         * @return
-         */
-        protected boolean isSupportedFlavor(DataFlavor[] transferFlavors) {
-                for (DataFlavor df: transferFlavors) {
-                        if (df.equals(PrimitiveIdTransferable.PRIMITIVE_ID_LIST_FLAVOR)) return true;
-                }
-                return false;
-        }
+        
         
         protected Transferable createTransferable(JComponent c) {

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java

@@ -227 +227 @@
         public List<PrimitiveId> getSelectedPrimitiveIds() {
                 List<PrimitiveId> ret = new ArrayList<PrimitiveId>(getSelected().size());
-                for(OsmPrimitive p: getSelected()) {
-                        ret.add(p.getPrimitiveId());
+                for(int i=0; i< selection.size(); i++) {
+                        if (selectionModel.isSelectedIndex(i)) {
+                                ret.add(selection.get(i).getPrimitiveId());
+                        }
                 }
                 return ret;

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -77 +77 @@
     private JosmSelectionPanel pnlJosmSelection;
     private BasicEditorPanel pnlBasicEditor;
+    private AdvancedEditorPanel pnlAdvancedEditor;
     private TurnRestrictionEditorModel editorModel;
     
@@ -117 +118 @@
         tpEditors.setTitleAt(0, tr("Basic"));
         tpEditors.setToolTipTextAt(0, tr("Edit basic attributes of a turn restriction"));
+        
+        tpEditors.add(pnlAdvancedEditor = new AdvancedEditorPanel(editorModel));
+        tpEditors.setTitleAt(1, tr("Advanced"));
+        tpEditors.setToolTipTextAt(1, tr("Edit the raw tags and members of this turn restriction"));
+        
         pnl.add(tpEditors, BorderLayout.CENTER);
         return pnl;
@@ -161 +167 @@
      */
     protected void build() {            
-        editorModel = new TurnRestrictionEditorModel();
+        editorModel = new TurnRestrictionEditorModel(getLayer());
         Container c = getContentPane();
         c.setLayout(new BorderLayout());
@@ -222 +228 @@
       
         if (turnRestriction == null) {
-                editorModel.populate(new Relation(), getLayer().data);
-        } else if (turnRestriction.getDataSet() == null) {
-                editorModel.populate(turnRestriction, getLayer().data);
-        } else if (turnRestriction.getDataSet() == getLayer().data) {
+                editorModel.populate(new Relation());
+        } else if (turnRestriction.getDataSet() == null || turnRestriction.getDataSet() == getLayer().data) {
                 editorModel.populate(turnRestriction);
         } else {
-                throw new IllegalArgumentException(MessageFormat.format("turnRestriction must not belong to the layer {0}", getLayer().getName()));
+                throw new IllegalArgumentException(MessageFormat.format("turnRestriction must belong to layer ''{0}''", getLayer().getName()));
         }
         setTurnRestrictionSnapshot(turnRestriction == null ? null : new Relation(turnRestriction));

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -2 +2 @@
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Observable;
+import java.util.Set;
 import java.util.logging.Logger;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -13 +15 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.TagEditorModel;
+import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -59 +63 @@
         }
         
-        
-        /** 
-         * holds the relation member of turn restriction relation from which the turn
-         * restriction leg with role 'from' was initialized. This is needed if OSM
-         * data contains turn restrictions with multiple 'from' members. The
-         * field is null if a turn restriction didn't have a member with role
-         * 'from'.
-         */
-        private RelationMember fromRelationMember;
-        
-        /** 
-         * holds the relation member of turn restriction relation from which the turn
-         * restriction leg with role 'to' was initialized. This is needed if OSM
-         * data contains turn restrictions with multiple 'to' members. The
-         * field is null if a turn restriction didn't have a member with role
-         * 'to'.
-         */
-        private RelationMember toRelationMember;
-        private Way from;
-        private Way to;
-        private TagCollection tags = new TagCollection();
-        private DataSet dataSet;
-        private final List<OsmPrimitive> vias = new ArrayList<OsmPrimitive>();
-        
-        public TurnRestrictionEditorModel(){
+        private OsmDataLayer layer;
+        private final TagEditorModel tagEditorModel = new TagEditorModel();
+        private  RelationMemberEditorModel memberModel;
+        
+        /**
+         * Creates a model in the context of a {@see OsmDataLayer}
+         * 
+         * @param layer the layer. Must not be null.
+         * @throws IllegalArgumentException thrown if {@code layer} is null
+         */
+        public TurnRestrictionEditorModel(OsmDataLayer layer) throws IllegalArgumentException{
+                CheckParameterUtil.ensureParameterNotNull(layer, "layer");
+                this.layer = layer;
+                memberModel = new RelationMemberEditorModel(layer);
+                memberModel.addTableModelListener(new RelationMemberModelListener());
         }
         
@@ -96 +90 @@
         public void setTurnRestrictionLeg(TurnRestrictionLegRole role, Way way) {
                 CheckParameterUtil.ensureParameterNotNull(role, "role");
-                Way oldValue = null;
                 switch(role){
-                case FROM: 
-                        oldValue = this.from;
-                        this.from = way; 
+                case FROM:
+                        memberModel.setFromPrimitive(way);
                         break;
                 case TO:
-                        oldValue = this.to;
-                        this.to = way; 
+                        memberModel.setToPrimitive(way);
                         break;
                 }
+        }       
                 
-                if (oldValue != way) {
-                        setChanged();
-                        notifyObservers();              
-                }
-        }       
-        
         /**
          * Sets the way participating in the turn restriction in a given role.
@@ -132 +118 @@
                         throw new IllegalArgumentException(MessageFormat.format("parameter ''wayId'' of type {0} expected, got {1}", OsmPrimitiveType.WAY, wayId.getType()));
                 }
-                
-                if (dataSet == null) {                  
-                        throw new IllegalStateException("data set not initialized");                    
-                }
-                OsmPrimitive p = dataSet.getPrimitiveById(wayId);
+
+                OsmPrimitive p = layer.data.getPrimitiveById(wayId);
                 if (p == null) {
-                        throw new IllegalStateException(MessageFormat.format("didn't find way with id {0} in dataset {1}", wayId, dataSet));                    
+                        throw new IllegalStateException(MessageFormat.format("didn''t find way with id {0} in layer ''{1}''", wayId, layer.getName()));                 
                 }
                 setTurnRestrictionLeg(role, (Way)p);
@@ -144 +127 @@
         
         /**
-         * Replies the turn restrictioin leg with role {@code role}
+         * "Officially" a turn restriction should have exactly one member with 
+         * role {@see TurnRestrictionLegRole#FROM} and one member with role {@see TurnRestrictionLegRole#TO},
+         * both referring to an OSM {@see Way}. In order to deals with turn restrictions where these
+         * integrity constraints are violated, this model also supports relation with multiple or no
+         * 'from' or 'to' members.
+         * 
+         * Replies the turn restriction legs with role {@code role}. If no leg with this
+         * role exists, an empty set is returned. If multiple legs exists, the set of referred
+         * primitives is returned.  
          * 
          * @param role the role. Must not be null.
-         * @return the turn restrictioin leg with role {@code role}. null, if
+         * @return the set of turn restriction legs with role {@code role}. The empty set, if
          * no such turn restriction leg exists
          * @throws IllegalArgumentException thrown if role is null
          */
-        public Way getTurnRestrictionLeg(TurnRestrictionLegRole role){
+        public Set<OsmPrimitive>getTurnRestrictionLeg(TurnRestrictionLegRole role){
                 CheckParameterUtil.ensureParameterNotNull(role, "role");
                 switch(role){
-                case FROM: return from;
-                case TO: return to;
-                }
+                case FROM: return memberModel.getFromPrimitives();
+                case TO: return memberModel.getToPrimitives();
+                }
+                // should not happen
                 return null;
         }
@@ -167 +159 @@
          */
         protected void initFromTurnRestriction(Relation turnRestriction) {
-                this.from = null;
-                this.to = null;
-                this.fromRelationMember = null;
-                this.toRelationMember = null;
-                this.tags = new TagCollection();
-                this.vias.clear();
-                if (turnRestriction == null) return;
-                for (RelationMember rm: turnRestriction.getMembers()) {
-                        if (rm.getRole().equals("from") && rm.isWay()) {
-                                this.fromRelationMember = rm;
-                                this.from = rm.getWay();
-                                break;
-                        }
-                }
-                for (RelationMember rm: turnRestriction.getMembers()) {
-                        if (rm.getRole().equals("to") && rm.isWay()) {
-                                this.toRelationMember = rm;
-                                this.to = rm.getWay();
-                                break;
-                        }
-                }
                 
-                for (RelationMember rm: turnRestriction.getMembers()) {
-                        if (rm.getRole().equals("via")) {
-                                this.vias.add(rm.getMember());
-                        }
-                }
+                // populate the member model
+                memberModel.populate(turnRestriction);
                 
                 // make sure we have a restriction tag
-                tags = TagCollection.from(turnRestriction);
+                TagCollection tags = TagCollection.from(turnRestriction);
                 tags.setUniqueForKey("type", "restriction");
+                tagEditorModel.initFromTags(tags);
                                 
                 setChanged();
@@ -215 +184 @@
         public void populate(Relation turnRestriction) {
                 CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");
-                if (turnRestriction.getDataSet() == null) {                      
+                if (turnRestriction.getDataSet() != null && turnRestriction.getDataSet() != layer.data) {                       
                         throw new IllegalArgumentException(
                                 // don't translate - it's a technical message
-                                MessageFormat.format("turnRestriction {0} must belong to a dataset", turnRestriction.getId())
+                                MessageFormat.format("turnRestriction {0} must not belong to a different dataset than the dataset of layer ''{1}''", turnRestriction.getId(), layer.getName())
                         );
                 }
-                this.dataSet = turnRestriction.getDataSet();
                 initFromTurnRestriction(turnRestriction);
         }
         
-        /**
-         * Populates the turn restriction editor model with a new turn restriction,
-         * which isn't added to a data set yet. {@code ds} is the data set the turn
-         * restriction is eventually being added to. Relation members of this
-         * turn restriction must refer to objects in {@code ds}. 
-         *  
-         * {@code turnRestriction} is an arbitrary relation. A tag type=restriction
-         * isn't required. If it is missing, it is added here.  {@code turnRestriction}
-         * is required to be a new turn restriction with a negative id. It must not be
-         * part of a dataset yet
-         * 
-         * @param turnRestriction the turn restriction. Must not be null. New turn restriction
-         * required
-         * @param ds the dataset. Must not be null.
-         * @throws IllegalArgumentException thrown if turnRestriction is null
-         * @throws IllegalArgumentException thrown if turnRestriction is part of a dataset
-         * @throws IllegalArgumentException thrown if turnRestriction isn't a new turn restriction  
-         */
-        public void populate(Relation turnRestriction, DataSet ds) {
-                CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");
-                CheckParameterUtil.ensureParameterNotNull(ds, "ds");
-                if (!turnRestriction.isNew()){                  
-                        throw new IllegalArgumentException(
-                                        // don't translate - it's a technical message
-                                        MessageFormat.format("new turn restriction expected, got turn restriction with id {0}", turnRestriction.getId())
-                        );
-                }
-                if (turnRestriction.getDataSet() != null) {
-                        throw new IllegalArgumentException(
-                    // don't translate - it's a technical message
-                                        MessageFormat.format("expected turn restriction not assigned to a  dataset, got turn restriction with id {0} assigned to {1}", turnRestriction.getId(), turnRestriction.getDataSet())
-                        );
-                }
-                for(RelationMember rm: turnRestriction.getMembers()) {
-                        if (rm.getMember().getDataSet() != ds) {
-                                throw new IllegalArgumentException(
-                            // don't translate - it's a technical message
-                                                MessageFormat.format("expected all members assigned to dataset {0}, got member {1} assigned to {2}", ds, rm, rm.getMember().getDataSet())
-                                );
-                        }
-                }
-                this.dataSet = ds;
-                initFromTurnRestriction(turnRestriction);
-        }
         
         /**
@@ -277 +201 @@
         public void apply(Relation turnRestriction) {
                 CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");
-                // apply the tags
+                
+                TagCollection tags = tagEditorModel.getTagCollection();
                 tags.applyTo(turnRestriction);
-                
-                List<RelationMember> members = new ArrayList<RelationMember>();
-                if (from != null){
-                        members.add(new RelationMember("from", from));
-                }
-                if (to != null) {
-                        members.add(new RelationMember("to", to));                      
-                }
-                for(OsmPrimitive via: vias) {
-                        members.add(new RelationMember("via", via));
-                }
-                turnRestriction.setMembers(members);
+                memberModel.applyTo(turnRestriction);           
         }
         
@@ -300 +214 @@
          */
         public String getRestrictionTagValue() {
+                TagCollection tags = tagEditorModel.getTagCollection();
                 if (!tags.hasTagsFor("restriction")) return null;
                 return tags.getJoinedValues("restriction");
@@ -312 +227 @@
         public void setRestrictionTagValue(String value){
                 if (value == null || value.trim().equals("")) {
-                        tags.removeByKey("restriction");
+                        tagEditorModel.delete("restriction");                   
                 } else {
-                        tags.setUniqueForKey("restriction", value.trim());
+                        TagModel  tm = tagEditorModel.get("restriction");
+                        if (tm != null){
+                                tm.setValue(value);
+                        } else {
+                                tagEditorModel.add(new TagModel("restriction", value));
+                        }
                 }
                 setChanged();
@@ -327 +247 @@
          */
         public List<OsmPrimitive> getVias() {
-                return Collections.unmodifiableList(vias);
+                return memberModel.getVias();
         }
         
@@ -342 +262 @@
          */
         public void setVias(List<OsmPrimitive> vias) {
-                if (vias == null) {
-                        this.vias.clear();
-                        setChanged();
-                        notifyObservers();
-                        return;
-                }
-                for (OsmPrimitive p: vias) {
-                        if (p == null)
-                                throw new IllegalArgumentException("a via object must not be null");
-                        if (p.getDataSet() != dataSet)
-                                throw new IllegalArgumentException(MessageFormat.format("a via object must belong to dataset {1}, object {2} belongs to {3}", dataSet, p.getPrimitiveId(), p.getDataSet()));
-                }
-                this.vias.clear();
-                this.vias.addAll(vias);
-                setChanged();
-                notifyObservers();
-        }
-        
-        /**
-         * Replies the dataset this turn restriction editor model is 
-         * working with
-         * 
-         * @return the dataset 
-         */
-        public DataSet getDataSet() {
-                return this.dataSet;
-        }
-
+                memberModel.setVias(vias);
+        }
+        
+        /**
+         * Replies the layer in whose context this editor is working
+         * 
+         * @return the layer in whose context this editor is working
+         */
+        public OsmDataLayer getLayer() {
+                return layer;
+        }
+        
         /**
          * Registers this model with global event sources like {@see DatasetEventManager}
@@ -383 +287 @@
                 DatasetEventManager.getInstance().removeDatasetListener(this);
         }
+        
+        /**
+         * Replies the tag  editor model 
+         * 
+         * @return the tag  editor model
+         */
+        public TagEditorModel getTagEditorModel() {
+                return tagEditorModel;
+        }
+        
+        /**
+         * Replies the editor model for the relation members
+         * 
+         * @return the editor model for the relation members
+         */
+        public RelationMemberEditorModel getRelationMemberEditorModel() {
+                return memberModel;
+        }
 
         /* ----------------------------------------------------------------------------------------- */
         /* interface DataSetListener                                                                 */
-        /* ----------------------------------------------------------------------------------------- */
-        
+        /* ----------------------------------------------------------------------------------------- */ 
         protected boolean isAffectedByDataSetUpdate(DataSet ds, List<? extends OsmPrimitive> updatedPrimitives) {
-                if (ds != dataSet) return false;
+                if (ds != layer.data) return false;
                 if (updatedPrimitives == null || updatedPrimitives.isEmpty()) return false;
-                if (from != null && updatedPrimitives.contains(from)) return true;
-                if (to != null && updatedPrimitives.contains(to)) return true;
-                for (OsmPrimitive via: vias){
-                        if (updatedPrimitives.contains(via)) return true;
-                }
-                return false;
+                Set<OsmPrimitive> myPrimitives = memberModel.getMemberPrimitives();
+                int size1 = myPrimitives.size();
+                myPrimitives.retainAll(updatedPrimitives);
+                return size1 != myPrimitives.size();
         }
         
@@ -402 +321 @@
                 // refresh the views
                 setChanged();
-                notifyObservers();
-                
+                notifyObservers();              
         }
 
@@ -439 +357 @@
                 }               
         }       
+        
+        class RelationMemberModelListener implements TableModelListener {
+                public void tableChanged(TableModelEvent e) {
+                        setChanged();
+                        notifyObservers();
+                }               
+        }       
 }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java

@@ -5 +5 @@
 import java.awt.BorderLayout;
 import java.awt.Font;
-import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -20 +19 @@
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
+import java.util.Set;
 import java.util.logging.Logger;
 
@@ -28 +29 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -39 +39 @@
 import javax.swing.UIManager;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -58 +58 @@
  
         private JLabel lblOsmObject;
-        private Way way;
+        private final Set<OsmPrimitive> legs = new HashSet<OsmPrimitive>();
         private TurnRestrictionEditorModel model;
         private TurnRestrictionLegRole role; 
@@ -140 +140 @@
 
         protected void refresh(){
-                Way newWay = model.getTurnRestrictionLeg(role);
-                way = newWay;
-                if (way == null) {
+                legs.clear();
+                legs.addAll(model.getTurnRestrictionLeg(role));
+                if (legs.isEmpty()) {
                         lblOsmObject.setFont(UIManager.getFont("Label.font").deriveFont(Font.ITALIC));
                         lblOsmObject.setIcon(null);
                         lblOsmObject.setText(tr("please select a way"));
                         lblOsmObject.setToolTipText(null);
-                } else {
+                } else if (legs.size() == 1){
+                        OsmPrimitive leg = legs.iterator().next();
                         lblOsmObject.setFont(UIManager.getFont("Label.font"));
                         lblOsmObject.setIcon(ImageProvider.get("data", "way"));
-                        lblOsmObject.setText(DefaultNameFormatter.getInstance().format(way));
-                        lblOsmObject.setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(way));
+                        lblOsmObject.setText(leg.getDisplayName(DefaultNameFormatter.getInstance()));
+                        lblOsmObject.setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(leg));
+                } else {
+                        lblOsmObject.setFont(UIManager.getFont("Label.font").deriveFont(Font.ITALIC));
+                        lblOsmObject.setIcon(null);
+                        lblOsmObject.setText(tr("multiple objects with role ''{0}''",this.role.toString()));
+                        lblOsmObject.setToolTipText(null);                      
                 }
                 renderColors();
@@ -201 +207 @@
         /* ----------------------------------------------------------------------------- */
         public List<PrimitiveId> getSelectedPrimitiveIds() {
-                if (way == null) return Collections.emptyList();
-                return Collections.singletonList(way.getPrimitiveId());
+                if (legs.size() == 1) {
+                        return Collections.singletonList(legs.iterator().next().getPrimitiveId());
+                }
+                return Collections.emptyList();
         }
         
@@ -247 +255 @@
                 
                 public void updateEnabledState() {
-                        setEnabled(way != null);
+                        setEnabled(legs.size()>0);
                 }
         }
@@ -284 +292 @@
                 @Override
                 protected Transferable createTransferable(JComponent c) {
-                        if (way == null) return null;
+                        if (legs.size() != 1) return null;
                         return super.createTransferable(c);
                 }
@@ -326 +334 @@
                 
                 public void updateEnabledState() {
-                        setEnabled(way != null);
+                        setEnabled(legs.size() == 1);
                 }
         }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java

@@ -171 +171 @@
                 if (idsToInsert == null) return;
                 List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>(idsToInsert.size());
-                DataSet ds = model.getDataSet();
+                DataSet ds = model.getLayer().data;
                 for(PrimitiveId id: idsToInsert){
                         OsmPrimitive p = ds.getPrimitiveById(id);