Update package version to 1.2.0

X-Ray style: add circle symbols for point layers

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",

public/templates/data.tmpl

@@ -69,6 +69,16 @@
         type: 'line',
         paint: {'line-color': colorText}
       });
+      layers_.push({
+        id: el['id'] + Math.random(),
+        source: 'vector_layer_',
+        'source-layer': el['id'],
+        interactive: true,
+        type: 'circle',
+        paint: {'circle-color': colorText,
+                'circle-radius': 3},
+        filter: ["==", "$type", "Point"]
+      });
       var item = document.createElement('div');
       item.innerHTML = '<div style="' +
         'background:rgba(' + color[0] + ',' + color[1] + ',' + color[2] + ',1);' +
@@ -124,6 +134,10 @@
   <div id='map'></div>
   <script>
     var map = L.mapbox.map('map', '/data/{{id}}.json{{&key_query}}', { zoomControl: false });
+    map.eachLayer(function(layer) {
+      // do not add scale prefix even if retina display is detected
+      layer.scalePrefix = '.';
+    });
     new L.Control.Zoom({ position: 'topright' }).addTo(map);
     setTimeout(function() {
       new L.Hash(map);

src/serve_rendered.js

@@ -202,6 +202,7 @@ module.exports = function(options, repo, params, id, dataResolver) {
               // meta url which will be detected when requested
               'mbtiles://' + name + '/{z}/{x}/{y}.' + (info.format || 'pbf')
             ];
+            delete source.scheme;
             if (source.format == 'pbf') {
               map.sources[name].emptyTile = new Buffer(0);
             } else {
@@ -431,14 +432,16 @@ module.exports = function(options, repo, params, id, dataResolver) {
 
     var minCorner = mercator.px([bbox[0], bbox[3]], z),
         maxCorner = mercator.px([bbox[2], bbox[1]], z);
-    w /= (1 + 2 * padding);
-    h /= (1 + 2 * padding);
+    var w_ = w / (1 + 2 * padding);
+    var h_ = h / (1 + 2 * padding);
 
     z -= Math.max(
-      Math.log((maxCorner[0] - minCorner[0]) / w),
-      Math.log((maxCorner[1] - minCorner[1]) / h)
+      Math.log((maxCorner[0] - minCorner[0]) / w_),
+      Math.log((maxCorner[1] - minCorner[1]) / h_)
     ) / Math.LN2;
 
+    z = Math.max(Math.log(Math.max(w, h) / 256) / Math.LN2, Math.min(25, z));
+
     return z;
   };
 

src/server.js

@@ -249,7 +249,7 @@ module.exports = function(opts, callback) {
 
         var tiles = utils.getTileUrls(
             req, style.serving_rendered.tiles,
-            'styles/' + id, style.serving_rendered.format);
+            'styles/' + id + '/rendered', style.serving_rendered.format);
         style.xyz_link = tiles[0];
       }
     });