diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c45829e..bbbbbd9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,13 +7,11 @@ - - + - + - - - + @@ -185,6 +191,7 @@ - \ No newline at end of file diff --git a/client/src/lib/Map.svelte b/client/src/lib/Map.svelte index a43ba69..d1122f5 100644 --- a/client/src/lib/Map.svelte +++ b/client/src/lib/Map.svelte @@ -127,6 +127,7 @@ } }); }; + map.setMaxZoom(13); map.on('click', 'alerts', (e) => { createPopup(e, true); }); @@ -174,6 +175,7 @@ const dataLayer = { id: 'dataGl', type: 'custom', + maxZoom: 13, onAdd(map, gl) { const vertexShader = gl.createShader(gl.VERTEX_SHADER); gl.shaderSource(vertexShader, vertexSource); @@ -337,6 +339,9 @@ gl.uniform1i(gl.getUniformLocation(this.program, 'color2Data'), 13); }, render(gl, args) { + gl.enable(gl.SAMPLE_COVERAGE); + gl.sampleCoverage(1.0, false); + gl.activeTexture(gl.TEXTURE0 + 10); gl.bindTexture(gl.TEXTURE_2D, this.texture); gl.activeTexture(gl.TEXTURE0 + 11); diff --git a/client/src/lib/ToolbarProductSelector.svelte b/client/src/lib/ToolbarProductSelector.svelte index 53aad2b..2a04632 100644 --- a/client/src/lib/ToolbarProductSelector.svelte +++ b/client/src/lib/ToolbarProductSelector.svelte @@ -175,11 +175,6 @@ currentlySelectingFor = item.id; map.on('click', `select-${item.id}`, (e) => { if (e && e.features) { - map.flyTo({ - // @ts-expect-error it's fine, shhhh - center: e.features[0].geometry.coordinates, - zoom: 5 - }); // did we already have a site set? let alreadyHadSite = selectedSite != null; pickingSiteForCategory = false; diff --git a/client/src/lib/map/fragment.glsl b/client/src/lib/map/fragment.glsl index 9097a43..14e0104 100644 --- a/client/src/lib/map/fragment.glsl +++ b/client/src/lib/map/fragment.glsl @@ -61,7 +61,6 @@ void main() { } int gate_number = int(floor((distance_meters - 2125.0) / 250.0)); - float rawValue = texelFetch(data, ivec2(gate_number, azimuthNumber), 0).r; // colorize! @@ -83,6 +82,7 @@ void main() { return; } } + fragColor = vec4(0,0,0,0); return; } \ No newline at end of file