Don't let editor panels fuck up _factory.relationTags

diff --git a/TODO.txt b/TODO.txt
index 4e80264..2f0f1d6 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -13,7 +13,6 @@ Potlatch 2: main outstanding issues
 * Load from local file (Flash Player 10 only)
 * TagTransform (cf http://wiki.openstreetmap.org/wiki/Osmosis/TagTransform)
 * Connectivity isn't preserved when bringing ways through (e.g. from OSM layer)
-* Should disable most forms of editing for vector layers
 
 == Saving ==
 
@@ -21,7 +20,6 @@ Potlatch 2: main outstanding issues
 
 == Tag editing ==
 
-* Adding a new relation (e.g. cycle route) to a way which already has one can cause only the new one to be displayed
 * initialiseEditors is quite slow (typically 150ms)
 * Bug where the wrong feature is used, when an item that is dragged from the list when an POI has no icon.
 

diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
index 9319376..6e95fce 100644 (file)
--- a/net/systemeD/potlatch2/RelationSelectPanel.mxml
+++ b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -19,7 +19,7 @@
 
         public function init(e:Entity, t:Object):void {
           entity = e;
-                 tags = t;
+          tags = {}; for (var k:String in t) { tags[k]=t[k]; } // deep copy tags
           PopUpManager.addPopUp(this, Application(Application.application), true);
           PopUpManager.centerPopUp(this);
     

diff --git a/resources/map_features.xml b/resources/map_features.xml
index 11a7ac1..efeb104 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -392,6 +392,7 @@ Quick documentation:
     <inputSet ref="bicycle-permission" />
     <input type="route" name="National Cycle Route" description="A signposted route in the UK's National Cycle Network, or nearest equivalent." category="Cycle" priority="normal">
        <match k="type" v="route"/>
+       <match k="route" v="bicycle"/>
        <match k="network" v="ncn"/>
        <icon image="features/cycle__ncn.png" background="red" foreground="white">
          <font size="14pt"><b>${ref}</b></font><br />
@@ -400,6 +401,7 @@ Quick documentation:
     </input>
     <input type="route" name="Regional Cycle Route" description="A signposted route in the UK's Regional Cycle Network, or nearest equivalent." category="Cycle" priority="low">
        <match k="type" v="route"/>
+       <match k="route" v="bicycle"/>
        <match k="network" v="rcn"/>
        <icon image="features/cycle__rcn.png" background="cyan" foreground="white">
          <font size="14pt"><b>${ref}</b></font><br />
@@ -408,6 +410,7 @@ Quick documentation:
     </input>
     <input type="route" name="Local Cycle Route" description="A signposted route in the UK's Local Cycle Network, or nearest equivalent." category="Cycle" priority="lowest">
        <match k="type" v="route"/>
+       <match k="route" v="bicycle"/>
        <match k="network" v="lcn"/>
        <icon image="features/cycle__lcn.png" background="blue" foreground="white">
          <font size="14pt"><b>${ref}</b></font><br />