Uniqify counts for containing ways and relations on browse pages

Fixes #3519

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 77d3a5c16ec55ed86a90d299e1d4b028218d89c5..152223ae751089822fec7a32395fc9e203af6132 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -14,7 +14,7 @@
       <h4><%= t "browse.part_of" %></h4>
       <% unless node.ways.empty? %>
         <details <%= "open" if node.ways.count < 10 %>>
       <h4><%= t "browse.part_of" %></h4>
       <% unless node.ways.empty? %>
         <details <%= "open" if node.ways.count < 10 %>>

-          <summary><%= t "browse.part_of_ways", :count => node.ways.count %></summary>
+          <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>

           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
               <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
               <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>


@@ -24,7 +24,7 @@
       <% end %>
       <% unless node.containing_relation_members.empty? %>
         <details <%= "open" if node.containing_relation_members.count < 10 %>>
       <% end %>
       <% unless node.containing_relation_members.empty? %>
         <details <%= "open" if node.containing_relation_members.count < 10 %>>

-          <summary><%= t "browse.part_of_relations", :count => node.containing_relation_members.count %></summary>
+          <summary><%= t "browse.part_of_relations", :count => node.containing_relation_members.uniq.count %></summary>

           <ul class="list-unstyled">
             <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
           </ul>
           <ul class="list-unstyled">
             <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
           </ul>

diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index cf9c62b133951943b209759a9973fac338b4f841..8db40c8c74a954fc797eb9889eb6feac429a93a8 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -13,7 +13,7 @@
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if relation.containing_relation_members.count < 10 %>>

-        <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.count %></summary>
+        <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>

         <ul class="list-unstyled">
           <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
         </ul>
         <ul class="list-unstyled">
           <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
         </ul>

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index d99919e64fa35577b92a4bd899b58d8828f28346..4fdcd035ecf5c75296f624d124557531683ce952 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -13,7 +13,7 @@
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if way.containing_relation_members.count < 10 %>>
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
       <details <%= "open" if way.containing_relation_members.count < 10 %>>

-        <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.count %></summary>
+        <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary>

         <ul class="list-unstyled">
           <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
         </ul>
         <ul class="list-unstyled">
           <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
         </ul>