Merge branch 'master' into cartonik

test/acceptance/cluster.js

@@ -555,7 +555,14 @@ describe('cluster', function () {
                         return done(err);
                     }
 
-                    assert.deepStrictEqual(body.rows, expected);
+                    const sort_f = ((a, b) => {
+                        return (a._cdb_feature_count < b._cdb_feature_count) ||
+                               (a._cdb_feature_count === b._cdb_feature_count &&
+                                    (a.type < b.type ||
+                                     a.type === b.type && a.max_value < b.max_value));
+                    });
+
+                    assert.deepStrictEqual(body.rows.sort(sort_f), expected.sort(sort_f));
 
                     testClient.drain(done);
                 });

test/acceptance/named_maps_static_view.js

@@ -106,7 +106,15 @@ describe('named maps static view', function() {
             }
             getStaticMap(function(err, img) {
                 assert.ok(!err);
-                assert.imageIsSimilarToFile(img, previewFixture('estimated'), PNG_IMAGE_TOLERANCE, done);
+                assert.imageIsSimilarToFile(img, previewFixture('estimated'), PNG_IMAGE_TOLERANCE,  err => {
+                    if (err) {
+                        assert.imageIsSimilarToFile(img, previewFixture('estimated-proj5'), PNG_IMAGE_TOLERANCE, done);
+                    }
+                    else
+                    {
+                        done();
+                    }
+                });
             });
         });
     });

test/support/prepare_db.sh

@@ -13,7 +13,6 @@
 PREPARE_REDIS=yes
 PREPARE_PGSQL=yes
 DOWNLOAD_SQL_FILES=yes
-PG_PARALLEL=$(pg_config --version | (awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0))
 
 while [ -n "$1" ]; do
   OPTION=$(echo "$1" | tr -d '[:space:]')