simple_mapnik 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde74f6c08431ecd79eadd9e53cb013c93f318e6
-  data.tar.gz: 67b3788a29f8a9e3fa08eff3b563292507f3affd
+  metadata.gz: 606d7bb053ce8d471f71f8d37763e932dbd3b292
+  data.tar.gz: 86b8767e26a6d7fa0f59873776a20ef951afa9e1
 SHA512:
-  metadata.gz: 30332c347f933f7699f91bfb13bda27983ad9536b4e5719c6de30285f00c880fe63b7444819afc48e6f9aa1e9ebb0d0a33e8296783cfbdf3ce52e00608a6a441
-  data.tar.gz: 136498479b705627db8c8f7cf11d669f53c596fe595a011884b003d32b4c32523e2d249454ac3bd850474728466390513acf0b230368cd25de482f63d0776ac5
+  metadata.gz: 2f51f5b63d46d1f1d6626d2657aa5eb74b1bced00e7e9fd6281336bea38fa88e158a41aef72f61b4502fe9e375c36b5a6379e8e4ab356562bd3a6135478e3143
+  data.tar.gz: 1847a6420707c81f291553c8812cc36e588c98ce4f3d76d9b8a55a621d6c288b90e22675d86bbb0ce14d73d0ec323c61399b985ac6f16d71000ced5f2e653a91

data/config/mapnik.yml

@@ -0,0 +1,14 @@
+background_color: '#ffffff' # use '#ffffff00' for a transparent background
+
+polygon_fill_color: '#fffff0'
+
+line_stroke_color: '#483d8b'
+line_stroke_width: '0.3'
+
+marker_fill: '#0000ff'
+marker_width: '5'
+marker_height: '5'
+marker_stroke_color: '#483d8b'
+marker_stroke_width: '0.2'
+marker_placement: 'point'
+marker_allow_overlap-overlap: 'true'

data/lib/simple_mapnik/config.rb

@@ -1,52 +1,102 @@
 require 'nokogiri'
+require 'yaml'
 
 module SimpleMapnik
   class Config
-    attr_accessor :path
-    attr_writer :background_color, :srs, :polygon_fill, :stroke, :stroke_width
+    attr_reader   :settings
+    attr_writer   :srs,
+                  :type,
+                  :background_color,
+                  :polygon_fill_color,
+                  :line_stroke_color,
+                  :line_stroke_width,
+                  :marker_fill,
+                  :marker_width,
+                  :marker_height,
+                  :marker_stroke_color,
+                  :marker_stroke_width
 
     def initialize(path)
       @path = path
+      @settings ||= File.exist?(config_file) ? YAML.load_file(config_file) : {}
     end
 
-    def background_color
-      @background_color ||= 'white'
+    def config_file
+      File.expand_path('../../config/mapnik.yml', File.dirname(__FILE__))
     end
 
     def srs
       @srs ||= '+init=epsg:4326'
     end
 
-    def polygon_fill
-      @polygon_fill ||= 'ivory'
+    def type
+      @type ||= 'shape'
     end
 
-    def stroke
-      @stroke ||= 'darkslateblue'
+    def background_color
+      @background_color ||= settings.fetch('background_color', '#483d8b')
     end
 
-    def stroke_width
-      @stroke_width ||= '.3'
+    def polygon_fill_color
+      @polygon_fill_color ||= settings.fetch('polygon_fill_color', '#fffff0')
     end
 
-    def type
-      @type ||= 'shape'
+    def line_stroke_color
+      @line_stroke_color ||= settings.fetch('line_stroke_color', '#483d8b')
+    end
+
+    def line_stroke_width
+      @line_stroke_width ||= settings.fetch('line_stroke_width', '0.2')
+    end
+
+    def marker_fill
+      @marker_fill ||= settings.fetch('marker_fill', '#0000ff')
+    end
+
+    def marker_width
+      @marker_width ||= settings.fetch('marker_width', '5')
+    end
+
+    def marker_height
+      @marker_height ||= settings.fetch('marker_height', '5')
+    end
+
+    def marker_stroke_color
+      @marker_stroke_color ||= settings.fetch('marker_stroke_color', '#483d8b')
+    end
+
+    def marker_stroke_width
+      @marker_stroke_width ||= settings.fetch('marker_stroke_width', '0.2')
     end
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def xml
       Nokogiri::XML::Builder.new do |xml|
-        xml.Map(srs: srs, 'background-color'.to_sym => background_color) do
+        xml.Map(srs: srs, :'background-color' => background_color) do
           xml.Style(name: 'style') do
             xml.Rule() do
-              xml.PolygonSymbolizer(fill: polygon_fill)
-              xml.LineSymbolizer(stroke: stroke, 'stroke-width'.to_sym => stroke_width)
+              xml.Filter('[mapnik::geometry_type]=point')
+              xml.MarkersSymbolizer(
+                fill: marker_fill,
+                width: marker_width,
+                height: marker_height,
+                :'stroke-color' => marker_stroke_color,
+                :'stroke-width' => marker_stroke_width,
+                :'allow_overlap-overlap' => 'true'
+              )
+            end
+            xml.Rule() do
+              xml.PolygonSymbolizer(fill: polygon_fill_color)
+              xml.LineSymbolizer(
+                stroke: line_stroke_color,
+                smooth: '1.0',
+                :'stroke-width' => line_stroke_width)
             end
           end
           xml.Layer(name: 'layer', srs: srs) do
             xml.StyleName 'style'
             xml.Datasource do
-              xml.Parameter(path, name: 'file')
+              xml.Parameter(@path, name: 'file')
               xml.Parameter(type, name: 'type')
             end
           end

data/lib/simple_mapnik/version.rb

@@ -1,3 +1,3 @@
 module SimpleMapnik
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/spec/lib/simple_mapnik/config_spec.rb

@@ -4,13 +4,12 @@ describe SimpleMapnik::Config do
   subject { described_class.new('shapefile') }
 
   describe '#xml' do
-    it 'has style elements' do
+    it 'has layer rules' do
       config = subject.xml
-      expect(config).to include('background-color')
+      expect(config).to include('MarkersSymbolizer')
+      expect(config).to include('PolygonSymbolizer')
+      expect(config).to include('LineSymbolizer')
       expect(config).to include('+init=epsg:4326')
-      expect(config).to include('ivory')
-      expect(config).to include('darkslateblue')
-      expect(config).to include('stroke-width')
       expect(config).to include('shape')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_mapnik
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eliot Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -169,6 +169,7 @@ files:
 - README.md
 - Rakefile
 - bin/mapnik_console
+- config/mapnik.yml
 - coveralls.yml
 - lib/simple_mapnik.rb
 - lib/simple_mapnik/api.rb