diff --git a/package-lock.json b/package-lock.json index 36ea182..a04feb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -277,39 +277,6 @@ "node": ">=6.9.0" } }, - "node_modules/@emnapi/core": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz", - "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.2.0", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.0.tgz", - "integrity": "sha512-oAYoQnCYaQZKVS53Fq23ceWMRxq5EhQsE0x0RdQ55jT7wagMu5k+fS39v1fiSLrtrLQlXwVINenqhLMtTrV/1Q==", - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz", - "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@emotion/babel-plugin": { "version": "11.13.5", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", @@ -1208,13 +1175,12 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.0.tgz", - "integrity": "sha512-/JZsqKzKt01IFoiLLAzlNqys7qk2F3JkcUhj50zuRhKDQkZNOz9E5N6wAQWprXdsvjRP4lTFj+/+36NSv5AwhQ==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz", + "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "darwin" @@ -1224,13 +1190,12 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.0.tgz", - "integrity": "sha512-/hV8erWq4SNlVgglUiW5UmQ5Hwy5EW/AbbXlJCn6zkfKxTy/E/U3V8U1Ocm2YCTUoFgQdoMxRyRMOW5jYy4ygg==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz", + "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "darwin" @@ -1240,13 +1205,12 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.0.tgz", - "integrity": "sha512-GkjL/Q7MWOwqWR9zoxu1TIHzkOI2l2BHCf7FzeQG87zPgs+6WDh+oC9Sw9ARuuL/FUk6JNCgKRkA6rEQYadUaw==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz", + "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "linux" @@ -1256,13 +1220,12 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.0.tgz", - "integrity": "sha512-1ffhC6KY5qWLg5miMlKJp3dZbXelEfjuXt1qcp5WzSCQy36CV3y+JT7OC1WSFKizGQCDOcQbfkH/IjZP3cdRNA==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz", + "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "linux" @@ -1304,13 +1267,12 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.0.tgz", - "integrity": "sha512-UMiFNQf5H7+1ZsZPxEsA064WEuFbRNq/kEXyepbCnSErp4f5iut75dBA8UeerFIG3vDaQNOfCpevnERPp2V+nA==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz", + "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "win32" @@ -1320,13 +1282,12 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.0.tgz", - "integrity": "sha512-DRrNJKW+/eimrZgdhVN1uvkN1OI4j6Lpefwr44jKQ0YQzztlmOBUUzHuV5GxOMPK3nmodAYElUVCY8ZXo/IWeA==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz", + "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "win32" @@ -1387,6 +1348,7 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -1586,6 +1548,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -1606,6 +1569,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -2879,7 +2843,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -3392,6 +3356,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, "license": "Apache-2.0", "optional": true, "bin": { @@ -4174,7 +4139,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -4859,7 +4824,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4905,7 +4870,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -4944,7 +4909,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -5384,7 +5349,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -5542,6 +5507,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, "license": "MIT", "optional": true }, @@ -5817,7 +5783,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -6818,7 +6784,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" diff --git a/src/components/Equipo_Computo/MapaCalor.tsx b/src/components/Equipo_Computo/MapaCalor.tsx index c31d304..ff67f2e 100644 --- a/src/components/Equipo_Computo/MapaCalor.tsx +++ b/src/components/Equipo_Computo/MapaCalor.tsx @@ -1,13 +1,14 @@ "use client"; + import { MapContainer, ImageOverlay, useMap } from "react-leaflet"; -import L from "leaflet"; +import L, { LatLngBoundsExpression } from "leaflet"; import "leaflet/dist/leaflet.css"; import "leaflet.heat"; import { useEffect } from "react"; // Ajustar vista automáticamente -function AjustarVista({ bounds }) { +function AjustarVista({ bounds }: { bounds: LatLngBoundsExpression }) { const map = useMap(); useEffect(() => { @@ -24,7 +25,7 @@ function HeatLayer() { // A 4768x3368 const edificios = { - A1: [[1400, 3060], [1470, 3060], [1470, 3360], [1400, 3360]], + A1: [[1407, 3054], [1470, 3054], [1470, 3360], [1407, 3360]], A2: [[1570, 3130], [1570, 3190], [1850, 3190], [1850, 3130]], A3: [[1640, 2650], [1705, 2650], [1705, 2950], [1640, 2950]], A4: [[1268, 2765], [1268, 2830], [1540, 2830], [1540, 2765]], @@ -32,21 +33,36 @@ function HeatLayer() { A6: [[1390, 2385], [1450, 2385], [1450, 2655], [1390, 2655]], A7: [[1234, 2014], [1296, 2014], [1296, 2317], [1234, 2317]], A8: [[1390, 2055], [1700, 2055], [1700, 2118], [1390, 2118]], - A9: [[1730, 1550], [1980, 1550], [1980, 1640], [1730, 1640]], - A10: [[1580, 1660], [1580, 1960], [1660, 1960], [1580, 1660]], - A11: [[1525, 1370], [1825, 1370], [1825, 1440], [1525, 1440]], - A12: [[1750, 1140], [1750, 1520], [1910, 1520], [1910, 1140]], - A13: [[1380, 680], [1380, 1020], [1480, 1020], [1480, 680]], - A14: [[1320, 480], [1680, 480], [1680, 580], [1320, 580]], + A9: [[1215, 1825], [1480, 1825], [1480, 1890], [1215, 1890]], + A10: [[1570, 1695], [1635, 1695], [1635, 1960], [1570, 1960]], + A11: [[1475, 1510], [1780, 1510], [1780, 1570], [1475, 1570]], + A12: [[1310, 1395], [1375, 1395], [1375, 1700], [1310, 1700]], + A13: [[1780, 810], [1845, 810], [1845, 1020], [1780, 1020]], + A14: [[1505, 775], [1713, 775], [1713, 840], [1505, 840]], A15: [[2027, 2580], [2087, 2580], [2087, 2900], [2027, 2900]], - CEDTEC: [[900, 2900], [1100, 2900], [1100, 3200], [900, 3200]], - BIBLIOTECA: [[1600, 2200], [1900, 2200], [1900, 2500], [1600, 2500]], - POSGRADO: [[1100, 1525], [860, 1525], [860, 1325], [1100, 1325]] - + AEROGRAFIA: [[1157, 3308], [1254, 3308], [1254, 3369], [1157, 3369]], + ALMACEN: [[989, 1523], [1027, 1523], [1027, 1749], [989, 1749]], + APOYO_DOC: [[1115, 1222], [1475, 1222], [1475, 1293], [1115, 1293]], + BIBLIOTECA: [[1579, 2373], [1579, 2199], [1900, 2500], [1600, 2500]], + CEI: [[1570, 990], [1767, 990], [1767, 1155], [1570, 1155]], + INVEST: [[1570, 1240], [1727, 1240], [1727, 1400], [1570, 1400]], + CEDTEC: [[885, 2900], [1080, 2900], [1080, 3200], [885, 3200]], + CEMM: [[2167, 863], [2453, 863], [2453, 1458], [2167, 1458]], + CAFETERIA_Y_LIBRERIA: [[2027, 1483], [2158, 1483], [2158, 1600], [2027, 1600]], + CTED: [[1802, 1063], [1908, 1128], [1888, 1179], [1772, 1151]], + POSGRADO: [[857, 1472], [1004, 1471],[1004, 1327],[1086, 1325],[1086, 1512], [860, 1512],], + UNIDAD_SEMINA: [[1145, 2894], [1320, 2894], [1320, 3070], [1145, 3070]], + TALLS_Y_LAB: [[1085, 3209], [1292, 3209], [1292, 3307], [1085, 3307]], + UNIDAD_DE_TALLERES_MULTIDISC: [[1624, 3244], [1920, 3240], [1954, 3476], [1622, 3477]], + USC: [[992, 2656], [1029, 2656], [1029, 2828], [992, 2828]], + UIM: [[294, 3224], [901, 3257], [899, 3358], [312, 3386]], + GOB: [[950, 2068], [1104, 2068], [1104, 2218], [950, 2218]], + SERV_GRALES: [[1024, 882], [1089, 882], [1089, 1138], [1024, 1138]], + SM: [[893, 1789], [935, 1789], [935, 1891], [893, 1891]] }; - const puntos = []; + const puntos: any[] = []; Object.entries(edificios).forEach(([nombre, poligono]) => { for (let i = 0; i < 15; i++) { @@ -61,7 +77,7 @@ function HeatLayer() { }); - const heat = L.heatLayer(puntos, { + const heat = (L as any).heatLayer(puntos, { radius: 35, blur: 25, maxZoom: 2, @@ -77,8 +93,8 @@ function HeatLayer() { heat.addTo(map); - Object.entries(edificios).forEach(([nombre, coords]) => { - L.polygon(coords, { + Object.entries(edificios).forEach(([nombre, coords]: any) => { + L.polygon((coords), { color: "#77ee9f", weight: 2, fillOpacity: 0.25 @@ -103,9 +119,9 @@ function HeatLayer() { export default function MapaCalor() { - const bounds = [ + const bounds: LatLngBoundsExpression = [ [0, 0], - [3368, 4768] + [3368, 4768] ]; return ( diff --git a/src/components/Equipo_Computo/Pregunta7.tsx b/src/components/Equipo_Computo/Pregunta7.tsx index 15c376f..44a37d3 100644 --- a/src/components/Equipo_Computo/Pregunta7.tsx +++ b/src/components/Equipo_Computo/Pregunta7.tsx @@ -6,7 +6,12 @@ import Cookies from "js-cookie"; import axios from "axios"; import "./pregunta7.css"; import ToggleButton from "../Toggle/ToggleButton"; -import MapaCalor from "./MapaCalor"; +import dynamic from "next/dynamic"; + +const MapaCalor = dynamic( + () => import("./MapaCalor"), + { ssr: false } +); type AntiguedadItem = { antiguedad: string | null;