Merge pull request #510 from codeforjapan/develop

Fix markers in dynamic_map #509

Author: ayuki-joto

config/initializers/decidim_override.rb

@@ -35,4 +35,29 @@
       end
     end
   end
+
+  module Decidim
+    module Map
+      class DynamicMap < Map::Frontend
+        class Builder < Decidim::Map::Frontend::Builder
+          # Overwrite
+          def map_element(html_options = {})
+            opts = view_options
+            opts["markers"] = opts["markers"].reject { |item| item[:latitude].nil? || item[:latitude].nan? } if opts["markers"].present?
+            map_html_options = {
+              "data-decidim-map" => opts.to_json,
+              # The data-markers-data is kept for backwards compatibility
+              "data-markers-data" => opts.fetch(:markers, []).to_json
+            }.merge(html_options)
+
+            content = template.capture { yield }.html_safe if block_given?
+
+            template.content_tag(:div, map_html_options) do
+              (content || "")
+            end
+          end
+        end
+      end
+    end
+  end
 end