From d956ceea01c9bceddd7bcce17a98ccefd38e4b66 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Tue, 29 Dec 2020 17:18:43 -0500 Subject: [PATCH] update AllLayers.js to new MapBox API (will need patch release) (#493) * update AllLayers.js to new MapBox API re #491 * fixes mapbox baselayers in example too * bump v2.4.1 with new mapbox API --- dist/LeafletEnvironmentalLayers.js | 27 +++++++-------------------- example/layers.js | 11 +++++------ package.json | 2 +- src/AllLayers.js | 10 ++++++---- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dist/LeafletEnvironmentalLayers.js b/dist/LeafletEnvironmentalLayers.js index 31a1fee78..6e66f63dd 100644 --- a/dist/LeafletEnvironmentalLayers.js +++ b/dist/LeafletEnvironmentalLayers.js @@ -25914,11 +25914,13 @@ L.LayerGroup.environmentalLayers = L.LayerGroup.extend( this._map = map; this.overlayMaps = {}; this.groupedOverlayMaps = {}; // For grouping layers in the new menu - var defaultBaseLayer = L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors', + var defaultBaseLayer = L.tileLayer('https://api.mapbox.com/styles/v1/jywarren/ckj06ujnc1nmi19nuelh46pr9/tiles/{z}/{x}/{y}?access_token=pk.eyJ1Ijoianl3YXJyZW4iLCJhIjoiVzVZcGg3NCJ9.BJ6ArUPuTs1JT9Ssu3K8ig', { + tileSize: 512, + zoomOffset: -1, + attribution: '© Mapbox © OpenStreetMap' }); - var baseMaps = this.options.baseLayers ? this.options.baseLayers : { "Grey-scale": defaultBaseLayer.addTo(map) }; - + var baseMaps = this.options.baseLayers ? this.options.baseLayers : { "Grey-scale": defaultBaseLayer.addTo(map) }; + for (let layer of this.options.layers.include) { if (this.options.layers0.includes(layer)) { this.overlayMaps[layer] = window['L']['layerGroup'][layer](); @@ -26125,7 +26127,6 @@ L.LayerGroup.PLpeopleLayer = L.LayerGroup.extend( function popupDisplay(obj) { var popup_content = ""; - // if (image_url) popup_content += ""; // not available in the api yet popup_content += "
"; if (obj.image_url) popup_content += "
"; popup_content += "
@" + obj.name + "
"; @@ -27229,12 +27230,11 @@ L.LayerGroup.LayerCode = L.LayerGroup.extend( } if (this.layer == 'skytruth') { - var redDotIcon =new L.icon.skyTruthIcon(); var lat = data.lat; var lng = data.lng; var title = data.title; var url = data.link; - var defaultMarker = L.marker([lat, lng], {icon: redDotIcon}); + var defaultMarker = L.circleMarker(L.latLng([lat, lng]), { radius: 8, weight: 2, fillOpacity: 0.6, color: '#d20000', fillColor: '#f00' }); var minimalMarker = L.circleMarker(L.latLng([lat, lng]), { radius: 5, weight: 1, fillOpacity: 1, color: '#7c7c7c', fillColor: '#f00' }); var content = '' +title + '
' + '
lat: ' + lat + @@ -27559,19 +27559,6 @@ L.icon.fracTrackerIcon = function() { return new L.Icon.FracTrackerIcon(); }; -L.Icon.SkyTruthIcon = L.Icon.extend({ - options: { - iconUrl: 'https://www.clker.com/cliparts/T/G/b/7/r/A/red-dot.svg', - iconSize: [30, 20], - iconAnchor: [20, 0], - popupAnchor: [-5, -5], - }, -}); - -L.icon.skyTruthIcon = function() { - return new L.Icon.SkyTruthIcon(); -}; - L.Icon.OdorReportIcon = L.Icon.extend({ options: { iconUrl: 'https://www.clker.com/cliparts/T/3/6/T/S/8/ink-splash-md.png', diff --git a/example/layers.js b/example/layers.js index 09de22975..c16152763 100644 --- a/example/layers.js +++ b/example/layers.js @@ -7,12 +7,11 @@ var map = L.map('map', { maxBoundsViscosity: 0.75, }).setView([43, -83], 3); map.options.minZoom = 3; -var baselayer1 = L.tileLayer( - 'https://api.tiles.mapbox.com/v4/mapbox.emerald/{z}/{x}/{y}.png?access_token=pk.eyJ1Ijoic2FnYXJwcmVldDk3IiwiYSI6ImNqaXhlZjgwaDJtb3EzcW1zdDdwMzJkODcifQ.MA2YIv6VpGLLAo-QYUudTA', - { - attribution: - '© OpenStreetMap contributors', - }, +var baselayer1 = L.tileLayer('https://api.mapbox.com/styles/v1/jywarren/ckj06ujnc1nmi19nuelh46pr9/tiles/{z}/{x}/{y}?access_token=pk.eyJ1Ijoianl3YXJyZW4iLCJhIjoiVzVZcGg3NCJ9.BJ6ArUPuTs1JT9Ssu3K8ig', { + tileSize: 512, + zoomOffset: -1, + attribution: '© Mapbox © OpenStreetMap' +}, ).addTo(map); var baselayer3 = L.tileLayer( 'https://api.tiles.mapbox.com/v4/mapbox.streets-basic/{z}/{x}/{y}.png?access_token=pk.eyJ1Ijoic2FnYXJwcmVldDk3IiwiYSI6ImNqaXhlZjgwaDJtb3EzcW1zdDdwMzJkODcifQ.MA2YIv6VpGLLAo-QYUudTA', diff --git a/package.json b/package.json index 393591d20..2af0bcb51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leaflet-environmental-layers", - "version": "2.4.0", + "version": "2.4.1", "description": "", "main": "index.js", "directories": { diff --git a/src/AllLayers.js b/src/AllLayers.js index 77d2f432f..6416365fc 100644 --- a/src/AllLayers.js +++ b/src/AllLayers.js @@ -68,11 +68,13 @@ L.LayerGroup.environmentalLayers = L.LayerGroup.extend( this._map = map; this.overlayMaps = {}; this.groupedOverlayMaps = {}; // For grouping layers in the new menu - var defaultBaseLayer = L.tileLayer('https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors', + var defaultBaseLayer = L.tileLayer('https://api.mapbox.com/styles/v1/jywarren/ckj06ujnc1nmi19nuelh46pr9/tiles/{z}/{x}/{y}?access_token=pk.eyJ1Ijoianl3YXJyZW4iLCJhIjoiVzVZcGg3NCJ9.BJ6ArUPuTs1JT9Ssu3K8ig', { + tileSize: 512, + zoomOffset: -1, + attribution: '© Mapbox © OpenStreetMap' }); - var baseMaps = this.options.baseLayers ? this.options.baseLayers : { "Grey-scale": defaultBaseLayer.addTo(map) }; - + var baseMaps = this.options.baseLayers ? this.options.baseLayers : { "Grey-scale": defaultBaseLayer.addTo(map) }; + for (let layer of this.options.layers.include) { if (this.options.layers0.includes(layer)) { this.overlayMaps[layer] = window['L']['layerGroup'][layer]();