explicit to_json calls for map rendering, add popup option for overlays

Author: jkraemer

app/helpers/gtt_map_helper.rb

@@ -11,17 +11,24 @@ def map_form_field(form, map, field: :geojson, edit_mode:)
 
   def map_tag(map: nil, layers: map&.layers,
               geom: map.json, bounds: map.bounds,
-              edit: nil)
+              edit: nil, popup: nil)
 
     data = {
-      geom: geom,
-      layers: layers
+      geom: geom.is_a?(String) ? geom : geom.to_json
     }
-    data[:bounds] = bounds if bounds
+
+    if layers
+      data[:layers] = layers.is_a?(String) ? layers : layers.to_json
+    end
+
+    if bounds
+      data[:bounds] = bounds.is_a?(String) ? bounds : bounds.to_json
+    end
+
     data[:edit]   = edit   if edit
+    data[:popup]  = popup  if popup
 
-    map_id = rand(36**8).to_s(36)
-    content_tag(:div, "", data: data, id: "ol-#{map_id}", class: 'ol-map')
+    content_tag(:div, "", data: data, id: "ol-#{rand(36**8).to_s(36)}", class: 'ol-map')
   end
 
 end