trying optional arguments

Author: sanak

lib/redmine_gtt_print/issue_to_json.rb

@@ -32,9 +32,15 @@ def call
                                                image_urls(@issue))
       }
 
+      scale = nil
+      basemap_url = nil
+      if !@other_attributes.nil?
+        scale = @other_attributes[:scale]
+        basemap_url = @other_attributes[:basemap_url]
+      end
       if data = @issue.geodata_for_print
         json[:attributes][:map] = self.class.map_data(data[:center], [data[:geojson]],
-          @other_attributes[:scale], @other_attributes[:basemap_url])
+          scale, basemap_url)
       end
 
       context = {
@@ -178,12 +184,12 @@ def self.map_data(center, features, scale, basemap_url)
             type: "geojson"
           },
           {
-            baseURL: basemap_url.sub(/\/{z}\/{x}\/{y}.png/,''),
+            baseURL: basemap_url.nil? ? "https://cyberjapandata.gsi.go.jp/xyz/std" : basemap_url.sub(/\/{z}\/{x}\/{y}.png/,''),
             imageExtension: "png",
             type: "osm"
           }
         ],
-        scale: scale,
+        scale: scale.nil? ? 25000 : scale,
         projection: "EPSG:3857",
         dpi: 144
       }

lib/redmine_gtt_print/mapfish.rb

@@ -31,7 +31,7 @@ def get_capabilities(print_config)
       end
     end
 
-    def print(job, referer, user_agent)
+    def print(job, referer = nil, user_agent = nil)
       if ref = request_print(job.json, job.print_config, job.format, referer, user_agent)
         CreateJobResult.new success: true, ref: ref
       else
@@ -63,17 +63,22 @@ def get_print(ref)
 
     private
 
-    def request_print(json, print_config, format, referer, user_agent)
+    def request_print(json, print_config, format, referer = nil, user_agent = nil)
       str = URI.escape(print_config)
       url = "#{@host}/print/#{str}/report.#{format}"
       if Rails.env.development?
         (File.open(Rails.root.join("tmp/mapfish.json"), "wb") << json).close
       end
-      r = HTTParty.post url, body: json, headers: {
-        'Content-Type' => 'application/json',
-        'Referer' => referer,
-        'User-Agent' => user_agent
+      headers = {
+        'Content-Type' => 'application/json'
       }
+      if !referer.nil?
+        headers['Referer'] = referer
+      end
+      if !user_agent.nil?
+        headers['User-Agent'] = user_agent
+      end
+      r = HTTParty.post url, body: json, headers: headers
       if r.success?
         json = JSON.parse r.body
         json['ref']