|
29 | 29 | mercator.x = poi.lng * Math.PI / 180 * earthRad; |
30 | 30 | var a = poi.lat * Math.PI / 180; |
31 | 31 | mercator.y = earthRad / 2 * Math.log((1.0 + Math.sin(a)) / (1.0 - Math.sin(a))); |
32 | | - console.log("mercator",mercator); |
| 32 | + console.log("mercator", mercator); |
33 | 33 | return mercator; //[12727039.383734727, 3579066.6894065146] |
34 | 34 | } |
35 | 35 | /** |
|
51 | 51 | 'pk.eyJ1IjoicGFybmRlZWRsaXQiLCJhIjoiY2o1MjBtYTRuMDhpaTMzbXhpdjd3YzhjdCJ9.sCoubaHF9-nhGTA-sgz0sA'; |
52 | 52 | var map = new mapboxgl.Map({ |
53 | 53 | container: 'mapid', |
54 | | - style: { |
55 | | - "version": 8, |
56 | | - "sources": { |
57 | | - "mapbox-tiles": { |
58 | | - "type": "raster", |
59 | | - 'tiles': [ |
60 | | - "https://api.tiles.mapbox.com/v4/mapbox.light/{z}/{x}/{y}.png?access_token=sk.eyJ1IjoiY2hlbmdkYWRhIiwiYSI6ImNqZDFjaGo0ZjFzcnoyeG54enoxdnNuZHUifQ.hTWXXBUQ0wdGeuDF3GWeUw" |
61 | | - ], |
62 | | - 'tileSize': 256 |
63 | | - } |
64 | | - }, |
65 | | - "layers": [{ |
66 | | - "id": "light-tiles", |
67 | | - "type": "raster", |
68 | | - "source": "mapbox-tiles", |
69 | | - "minzoom": 0, |
70 | | - "maxzoom": 22 |
71 | | - }] |
72 | | - }, |
| 54 | + style: 'mapbox://styles/mapbox/light-v9', |
73 | 55 | zoom: 3, |
74 | 56 | center: [7.5, 58] |
75 | 57 | }); |
|
79 | 61 | type: 'custom', |
80 | 62 |
|
81 | 63 | onAdd: function (map, gl) { |
82 | | - console.log(gl) |
83 | 64 | var vertexSource = "" + |
84 | 65 | "uniform mat4 u_matrix;" + |
85 | 66 | "attribute vec2 a_pos;" + |
|
106 | 87 |
|
107 | 88 | this.aPos = gl.getAttribLocation(this.program, "a_pos"); |
108 | 89 |
|
109 | | - var helsinki = getMercator({ |
| 90 | + var helsinki = mapboxgl.MercatorCoordinate.fromLngLat({ |
110 | 91 | lng: 25.004, |
111 | 92 | lat: 60.239 |
112 | 93 | }); |
113 | | - var berlin = getMercator({ |
| 94 | + var berlin = mapboxgl.MercatorCoordinate.fromLngLat({ |
114 | 95 | lng: 13.403, |
115 | 96 | lat: 52.562 |
116 | 97 | }); |
117 | | - var kyiv = getMercator({ |
| 98 | + var kyiv = mapboxgl.MercatorCoordinate.fromLngLat({ |
118 | 99 | lng: 30.498, |
119 | 100 | lat: 50.541 |
120 | 101 | }); |
|
141 | 122 | }; |
142 | 123 |
|
143 | 124 | map.on('load', function () { |
144 | | - map.addLayer(highlightLayer); |
| 125 | + var gllayer = map.addLayer(highlightLayer, 'building'); |
| 126 | + console.log(gllayer) |
145 | 127 | }); |
146 | 128 | </script> |
147 | 129 | </body> |
|
0 commit comments