mapfile.rake in gb_mapfish_appserver-0.0.4

- old
+ new

@@ -36,11 +36,10 @@
     include FileUtils
 
     def initialize(mapfile, site)
       @map = MapObj.new(mapfile)
       @site = site || DEFAULT_SITE
-      @ic = Iconv.new('UTF-8','LATIN1')
     end
 
     def import(dbonly = false)
       topic = Topic.find_or_create_by_name(@map.name)
       topic.title = @map.web.metadata['ows_title'] || @map.web.metadata['wms_title']
@@ -196,10 +195,11 @@
                   symfile = File.join(@map.mappath, filename)
                   filename = File.basename(filename)
                   cp(symfile, File.join(legend_icon_path, filename))
                 end
                 sympath ="/images/custom/#{topic_name.downcase}/#{filename}"
-                legtext = lclass.name.force_encoding('utf-8').encode || lclass.getExpressionString
+                legtext = lclass.name || lclass.getExpressionString
+                legtext = legtext.force_encoding('UTF-8') if legtext.respond_to?(:force_encoding)
                 file << "  <%= leg_tab_row('#{legtext}', '#{sympath}') %>\n"
               end
               file << "</table>\n"
             end
           end