mapnik_legendary 0.3.0 → 0.4.0

data/README.md

@@ -9,25 +9,16 @@
 
 ## Installation
 
-In the future (i.e. when I make a packaged release) you'll be able to use rubygems. Until then:
+You can install the gem from rubygems:
 
-`git clone https://github.com/gravitystorm/mapnik-legendary`
+`gem install mapnik_legendary`
 
-If you want to install the gem locally, run
+Alternatively, you can add the gem to your project's Gemfile
 
-```
-gem build mapnik_legendary.gemspec
-gem install mapnik_legendary-0.x.x.gem
-```
+`gem mapnik_legendary`
 
 ## Running
 
-To run locally, without installing a gem, run:
-
-`ruby -Ilib bin/mapnik_legendary`
-
-If you've installed the gem, `mapnik_legendary` will be in your path.
-
 For full options, run
 
 `mapnik_legendary -h`

data/lib/mapnik_legendary.rb

@@ -33,7 +33,7 @@ module MapnikLegendary
     map.layers.each do |l|
       layer_styles.push(name: l.name,
                         style: l.styles.map { |s| s } # get them out of the collection
-                        )
+                       )
     end
 
     docs = Docwriter.new
@@ -79,7 +79,19 @@ module MapnikLegendary
         i += 1
         filename = File.join(Dir.pwd, 'output', "#{id}-#{zoom}-#{i}.png")
       end
-      map.render_to_file(filename, 'png256:t=2')
+      begin
+        map.render_to_file(filename, 'png256:t=2')
+      rescue RuntimeError => e
+        r = /^CSV Plugin: no attribute '(?<key>[^']*)'/
+        match_data = r.match(e.message)
+        if match_data
+          log.error "'#{match_data[:key]}' is a key needed for the '#{feature.name}' feature."
+          log.error "Try adding '#{match_data[:key]}' to the extra_tags list."
+          next
+        else
+          raise e
+        end
+      end
       docs.add File.basename(filename), feature.description
     end
 

data/lib/mapnik_legendary/docwriter.rb

@@ -37,7 +37,7 @@ module MapnikLegendary
         font_size 12
         text title, style: :bold, size: 24, align: :center
         move_down(40)
-        data = Array.new
+        data = []
         image_scale = 0.5
         entries.each do |entry|
           data << { image: File.join(File.dirname(filename), entry[0]),

data/lib/mapnik_legendary/geometry.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 module MapnikLegendary
+  # A wkt-based geometry that can be used for the legend feature.
   class Geometry
     def initialize(type, zoom, map)
       proj = Mapnik::Projection.new(map.srs)
@@ -19,10 +20,10 @@ module MapnikLegendary
               when 'point75' then "POINT(#{@max_x * 0.5} #{@max_y * 0.75})"
               when 'polygon' then "POLYGON((0 0, #{@max_x} 0, #{@max_x} #{@max_y}, 0 #{@max_y}, 0 0))"
               when 'linestring-with-gap' then "MULTILINESTRING((0 0, #{@max_x * 0.45} #{@max_y * 0.45}),(#{@max_x * 0.55} #{@max_y * 0.55},#{@max_x} #{@max_y}))"
-              when 'polygon-with-hole' then "POLYGON((#{0.7 * @max_x} #{0.2 * @max_y}, #{0.9 * @max_x} #{0.9 * @max_y}" +
-                                            ", #{0.3 * @max_x} #{0.8 * @max_y}, #{0.2 * @max_x} #{0.4 * @max_y}" +
-                                            ", #{0.7 * @max_y} #{0.2 * @max_y}),( #{0.4 * @max_x} #{0.6 * @max_y}" +
-                                            ", #{0.7 * @max_x} #{0.7 * @max_y}, #{0.6 * @max_x} #{0.4 * @max_y}" +
+              when 'polygon-with-hole' then "POLYGON((#{0.7 * @max_x} #{0.2 * @max_y}, #{0.9 * @max_x} #{0.9 * @max_y}" \
+                                            ", #{0.3 * @max_x} #{0.8 * @max_y}, #{0.2 * @max_x} #{0.4 * @max_y}" \
+                                            ", #{0.7 * @max_y} #{0.2 * @max_y}),( #{0.4 * @max_x} #{0.6 * @max_y}" \
+                                            ", #{0.7 * @max_x} #{0.7 * @max_y}, #{0.6 * @max_x} #{0.4 * @max_y}" \
                                             ", #{0.4 * @max_x} #{0.6 * @max_y}))"
               else "LINESTRING(0 0, #{@max_x} #{@max_y})"
               end

data/lib/mapnik_legendary/tags.rb

@@ -1,11 +1,14 @@
 # encoding: utf-8
 
 module MapnikLegendary
+  # convenience methods for handling tags
   class Tags
+    # Merges a list of extra keys into an existing hash of tags.
+    # The extra keys are each given a null value.
     def self.merge_nulls(tags, extras)
       tags = {} if tags.nil?
       extras = [] if extras.nil?
-      Hash[extras.map { |t| [t, 'null'] }].merge(tags)
+      Hash[extras.map { |t| [t, nil] }].merge(tags)
     end
   end
 end

data/lib/mapnik_legendary/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MapnikLegendary
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mapnik_legendary
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mapnik