fix small relation issues

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index cff6efc2eab5839d5853a6629d9899a6e9f2a1c2..010493148bec517bfd4d3dc8d6b2f2549a288b6e 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -71,8 +71,10 @@ package net.systemeD.halcyon.connection {
                     tags = parseTags(nodeData.tag);
                     if ( node == null )
                         setNode(new Node(id, version, tags, true, lat, lon),false);
-                    else
+                    else {
                         node.update(version, tags, true, lat, lon);
+                        sendEvent(new EntityEvent(NEW_NODE, node), false);
+                    }
                 }
             }
 
@@ -88,8 +90,10 @@ package net.systemeD.halcyon.connection {
                     tags = parseTags(data.tag);
                     if ( way == null )
                         setWay(new Way(id, version, tags, true, nodes),false);
-                    else
+                    else {
                         way.update(version, tags, true, nodes);
+                        sendEvent(new EntityEvent(NEW_WAY, way), false);
+                    }
                 }
             }
             
@@ -132,8 +136,10 @@ package net.systemeD.halcyon.connection {
                     
                     if ( rel == null )
                         setRelation(new Relation(id, version, tags, true, members), false);
-                    else
+                    else {
                         rel.update(version,tags,true,members);
+                        sendEvent(new EntityEvent(NEW_RELATION, rel), false);
+                    }
                 }
             }
             

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/RouteEditor.mxml b/net/systemeD/potlatch2/mapfeatures/editors/RouteEditor.mxml
index 9abe7e8fc1184c3953cda74d318d13095388f169..9599620301d0e36946870cc095c5e0b571bdebce 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/RouteEditor.mxml
+++ b/net/systemeD/potlatch2/mapfeatures/editors/RouteEditor.mxml
@@ -23,17 +23,20 @@
             var icon:RouteIcon = new RouteIcon();
             icon.setRoute(relation, RouteEditorFactory(_factory).icon);
             
-            icon.addEventListener(MouseEvent.CLICK, function(event:Event):void {
-                trace(relation+" is clicked");
-                var panel:RelationEditorPanel = RelationEditorPanel(
-                    PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
-                panel.setRelation(relation);
-                PopUpManager.centerPopUp(panel);
-            });
+            icon.addEventListener(MouseEvent.CLICK, routeClicked);
             routeIcons.addChild(icon);
         }
     }
     
+    public function routeClicked(event:Event):void {
+        var relation:Relation = RouteIcon(event.currentTarget).route;
+        trace(relation+" is clicked");
+        var panel:RelationEditorPanel = RelationEditorPanel(
+            PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
+        panel.setRelation(relation);
+        PopUpManager.centerPopUp(panel);
+    }
+    
   ]]></mx:Script>
 </edit:RelationMemberEditor>
 

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/RouteIcon.mxml b/net/systemeD/potlatch2/mapfeatures/editors/RouteIcon.mxml
index dba2041659ae94b534b5e77a4b81c39e4ebade4b..08b0b95f8f46b622c05abb510c511a81cfa986ca 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/RouteIcon.mxml
+++ b/net/systemeD/potlatch2/mapfeatures/editors/RouteIcon.mxml
@@ -19,8 +19,10 @@
     private var _iconHTML:String = "";
     private var _bg:String = "white";
     private var _fg:String = "black";
+    private var _relation:Relation;
          
     public function setRoute(relation:Relation, icon:XMLList):void {   
+        _relation = relation;
         _iconHTML = Feature.makeHTMLIcon(icon, relation);
 
         if ( icon.length() > 0 ) {
@@ -54,6 +56,10 @@
     private function get bg():uint {
         return MapCSS.parseCSSColor(_bg);
     }
+    
+    public function get route():Relation {
+        return _relation;
+    }
     ]]></mx:Script>
 </mx:HBox>
 

diff --git a/resources/features/transport__bus.png b/resources/features/transport__bus.png
new file mode 100644 (file)
index 0000000..b779706
Binary files /dev/null and b/resources/features/transport__bus.png differ

diff --git a/resources/map_features.xml b/resources/map_features.xml
index 79da68be97764d3ce6ce3d2670d465a7287ac967..9730746b76a6b6692ed0e449be0ff788c26e89aa 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -29,6 +29,8 @@
     <inputSet ref="roadRefs"/>
     <inputSet ref="roadRestrictions"/>
     <inputSet ref="roadPhysical"/>
+    <inputSet ref="cycle"/>
+    <inputSet ref="bus-route"/>
   </inputSet>
   
   <inputSet id="minorRoad">
@@ -36,6 +38,7 @@
     <inputSet ref="roadRestrictions"/>
     <inputSet ref="roadPhysical"/>
     <inputSet ref="cycle"/>
+    <inputSet ref="bus-route"/>
   </inputSet>
   
   <inputSet id="roadNames">
@@ -142,6 +145,16 @@
     <inputSet ref="naptan" />
   </inputSet>
   
+  <inputSet id="bus-route">
+    <input type="route" name="Bus Route" description="Bus route" category="Transport" priority="low" presence="onTagMatch">
+      <match k="type" v="route"/>
+      <match k="route" v="bus"/>
+      <icon image="features/transport__bus.png">
+        <font size="12pt">${operator} <b>${ref}</b></font>
+      </icon>
+    </input>
+  </inputSet>
+  
   <inputSet id="cycle">
     <input type="route" name="National Cycle Route" description="National cycle route" category="Cycle" priority="normal">
        <match k="type" v="route"/>
@@ -169,7 +182,7 @@
     </input>
   </inputSet>
   
-  <inputSet id="cycle-route">
+  <inputSet id="route">
     <inputSet ref="roadNames"/>
     <inputSet ref="roadRefs"/>
   </inputSet>
@@ -549,7 +562,7 @@
     <tag k="type" v="route"/>
     <tag k="network" v="ncn"/>
       
-    <inputSet ref="cycle-route"/>
+    <inputSet ref="route"/>
   </feature>
   
   <feature name="Regional Cycle Network">
@@ -563,7 +576,7 @@
     <tag k="type" v="route"/>
     <tag k="network" v="rcn"/>
       
-    <inputSet ref="cycle-route"/>
+    <inputSet ref="route"/>
   </feature>
 
   <feature name="Local Cycle Network">
@@ -577,8 +590,40 @@
     <tag k="type" v="route"/>
     <tag k="network" v="lcn"/>
       
-    <inputSet ref="cycle-route"/>
+    <inputSet ref="route"/>
   </feature>
 
+
+  <!-- paths -->
+  <feature name="Long Distance Path">
+    <category>paths</category>
+    <icon image="features/paths__footway.png" background="green" foreground="white">
+      <font size="14pt"><b>${ref}</b></font><br />
+      <font size="12pt">${name}</font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="foot"/>
+      
+    <inputSet ref="route"/>
+  </feature>
+
+
+  <!-- bus routes -->
+  <feature name="Bus Route">
+    <category>transport</category>
+    <icon image="features/transport__bus.png">
+      <font size="12pt">${operator} <b>${ref}</b></font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="bus"/>
+      
+    <inputSet ref="route"/>
+  </feature>
+  
+  
 </mapFeatures>