Extra check that nodes/segments in ways are visible

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 541926c744ebc9555837757a2d311d757225dd7b..c5a7c30ead5ac5f56559e51a8c3ef59b49405660 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -484,7 +484,9 @@ def readwayquery(id)
       "    FROM current_way_segments,current_segments,current_nodes AS n1,current_nodes AS n2 "+
       "   WHERE current_way_segments.id=#{id} "+
       "     AND segment_id=current_segments.id "+
       "    FROM current_way_segments,current_segments,current_nodes AS n1,current_nodes AS n2 "+
       "   WHERE current_way_segments.id=#{id} "+
       "     AND segment_id=current_segments.id "+

+         "     AND current_segments.visible=1 "+

       "     AND n1.id=node_a and n2.id=node_b "+
       "     AND n1.id=node_a and n2.id=node_b "+

+      "     AND n1.visible=1 AND n2.visible=1 "+

       "   ORDER BY sequence_id"
 end
 
       "   ORDER BY sequence_id"
 end
 

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index ebdcf8d19cb6e2261e83396bd97c54829ac1cc85..c9a70b79e83d020bbc9b42185f2533ca19992187 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -78,7 +78,7 @@
 
       <div id="left_menu">
     <div id="sotminfo">
 
       <div id="left_menu">
     <div id="sotminfo">

-Come the the first OpenStreetMap Conference - <a href="http://www.stateofthemap.org">The State of the Map</a> 14th-15th July, 2007, Manchester, UK.
+Come to the first OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 14th-15th July 2007, Manchester, UK.

 </div>
       </div>
 
 </div>
       </div>