Merge branch 'master' of github.com:mapnik/mapnik.github.com

Author: Dane Springmeyer

Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'jekyll', '2.1.1'
-gem 'nokogiri', '1.6.7.2'
 gem 'rdiscount', '2.1.8'

_layouts/01_splash.html

@@ -125,22 +125,15 @@ <h2 class="med-news"><a href="{{site.baseurl}}{{ post1-url }}"> {{ post1-title }
 {% highlight js %}
 var mapnik = require("mapnik");
 var fs = require("fs");
-// register fonts and datasource plugins
 mapnik.register_default_fonts();
 mapnik.register_default_input_plugins();
 var map = new mapnik.Map(256, 256);
-map.load("./test/stylesheet.xml", function(err,map) {
-    if (err) throw err;
+map.load("./test/stylesheet.xml", function(err, map) {
     map.zoomAll();
     var im = new mapnik.Image(256, 256);
-    map.render(im, function(err,im) {
-        if (err) throw err;
-        im.encode("png", function(err,buffer) {
-            if (err) throw err;
-            fs.writeFile("map.png",buffer, function(err) {
-                if (err) throw err;
-                console.log("saved map image to map.png");
-            });
+    map.render(im, function(err, im) {
+        im.encode("png", function(err, buffer) {
+            fs.writeFile("map.png", buffer);
          });
     });
 });

_posts/blog/2015-07-11-3.0-cartographer.md

@@ -42,9 +42,17 @@ For PostGIS datasources with polygons that follow the left-hand rule instead, if
 
 The existing `line-offset` in the stylesheet will need to be inverted.
 
-### Text offsetting from lines
+### Offsetting from lines
+Direction of all offsets from lines is inverted. These properties have to be changed to achieve compatibility between 2.2 and 3.0:
 
-Handling of text offset from lines has changed. To get consistent behavior between 2.2 and 3.0, use `vertical-alignment: middle`. This may require adjustments to the `text-dy` value.
+* `TextSymbolizer` with line placement
+  * swap `top` and `bottom` values in `vertical-alignment`
+  * multiple `dy` by -1
+  * Take care of `vertical-alignment` and `dy` in `Layout` and `Placement` nodes.
+* `LineSymbolizer`, `LinePatternSymbolizer`, `MarkersSymbolizer` with line placement
+  * multiple `offset` by -1
+
+Special attention should be taken to `TextSymbolizer` when `dy` is not zero and `vertical-alignment` is not set. In such situation `vertical-alignment="middle"` needs to be set to get consistent behavior between 2.2 and 3.0.
 
 ### Harfbuzz support
 

_posts/blog/2016-09-08-release-3.0.12.md

@@ -0,0 +1,19 @@
+---
+layout: 01_post
+title: "Mapnik 3.0.12 Release"
+author: Artem Pavlenko
+category: Mapnik
+---
+
+![image](/images/la_save.jpg)
+
+After a long summer of coding and bug fixing, the Mapnik team is excited to announce the latest release in 3.0.x series - [v3.0.12](https://github.com/mapnik/mapnik/releases/tag/v3.0.12) ([La Save](https://fr.wikipedia.org/wiki/Save_(Garonne))).
+
+Everyone is encouraged to upgrade as this new release offers improved [stability and features](https://github.com/mapnik/mapnik/compare/v3.0.11...v3.0.12).
+
+Here is a detailed list of changes: [CHANGELOG](https://github.com/mapnik/mapnik/blob/master/CHANGELOG.md#3012). Big thank you to everyone involved!
+## Download
+
+Follow the links to [download the official source](https://github.com/mapnik/mapnik/releases/download/v3.0.12/mapnik-v3.0.12.tar.bz2) directly or grab it from our [downloads page](/pages/downloads.html).
+
+Mapnik team

images/la_save.jpg

@@ -5,30 +5,31 @@ title: Downloads
 
 ## Latest Release
 
-The latest release is Mapnik v3.0.10.
+The latest release is Mapnik v3.0.12.
 
-## Mapnik 3.0.10
+## Mapnik 3.0.12
 
-Release Date: 26 February 2016
+Release Date: 8 September 2016
 
 ### Prebuilt Binaries
 
-We plan on providing prebuilt binaries soon for Mapnik 3.0.10.
+We plan on providing prebuilt binaries soon for Mapnik 3.0.12.
 
 ### Source Installation
 
-To build Mapnik v3.0.10 from source either download the [v3.0.10 tarball](https://mapnik.s3.amazonaws.com/dist/v3.0.10/mapnik-v3.0.10.tar.bz2) or pull directly from github:
+To build Mapnik v3.0.12 from source either download the [v3.0.12 tarball](https://github.com/mapnik/mapnik/releases/download/v3.0.12/mapnik-v3.0.12.tar.bz2) or pull directly from github:
 
-	git clone https://github.com/mapnik/mapnik.git
-	git checkout v3.0.10
-	git submodule update --init
-	./configure && make && make test
+    git clone https://github.com/mapnik/mapnik.git
+    cd mapnik
+    git checkout v3.0.12
+    git submodule update --init
+    ./configure && make && make test
 
-For source install help see the [Install docs](https://github.com/mapnik/mapnik/blob/v3.0.10/INSTALL.md)
+For source install help see the [Install docs](https://github.com/mapnik/mapnik/blob/v3.0.12/INSTALL.md)
 
 You can also use git to fetch the latest code (will default to `master` branch):
 
-	git clone https://github.com/mapnik/mapnik.git
+    git clone https://github.com/mapnik/mapnik.git
 
 Browse the code at [github](https://github.com/mapnik/mapnik).
 
@@ -45,7 +46,7 @@ Release Date: June 3rd, 2013
 
 The recommend install method on OS X is `homebrew`. If you are running `homebrew` simply do:
 
-	brew update && brew install mapnik
+    brew update && brew install mapnik
 
 We also provide a pre-built [OS X 64 bit package](http://mapnik.s3.amazonaws.com/dist/v2.2.0/mapnik-osx-v2.2.0.dmg) that will install into the same place (`/usr/local`) as homebrew.
 
@@ -68,8 +69,8 @@ We also provide a pre-built [OS X 64 bit package](http://mapnik.s3.amazonaws.com
 
 To build Mapnik v2.2.0 from source either download the [v2.2.0 tarball](http://mapnik.s3.amazonaws.com/dist/v2.2.0/mapnik-v2.2.0.tar.bz2) or pull directly from github:
 
-	git clone https://github.com/mapnik/mapnik.git
-	git checkout v2.2.0
+    git clone https://github.com/mapnik/mapnik.git
+    git checkout v2.2.0
 
 For source install help see the [Install docs](https://github.com/mapnik/mapnik/blob/v2.2.0/INSTALL.md)