График работы: неизвестно
+ Отсканируйте QR или нажмите на него diff --git a/merged-data.json b/merged-data.json index 19da2fd..c2f0ff0 100644 --- a/merged-data.json +++ b/merged-data.json @@ -690,6 +690,7 @@ ], "link": "https://ozon.ru/point/518290", "name": "г. Мариуполь ул. Урицкого 63", + "address": "г. Мариуполь ул. Урицкого 63", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -701,6 +702,7 @@ ], "link": "https://ozon.ru/point/524695", "name": "Макеевка, улица Ленина, 50А", + "address": "Макеевка, улица Ленина, 50А", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -712,6 +714,7 @@ ], "link": "https://ozon.ru/point/533299", "name": "Макеевка, улица Ленина, 108", + "address": "Макеевка, улица Ленина, 108", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -723,6 +726,7 @@ ], "link": "https://ozon.ru/point/536829", "name": "Мариуполь, пр. Металлургов 97", + "address": "Мариуполь, пр. Металлургов 97", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -734,6 +738,7 @@ ], "link": "https://ozon.ru/point/536828", "name": "Мариуполь, пр. Металлургов 227", + "address": "Мариуполь, пр. Металлургов 227", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -745,6 +750,7 @@ ], "link": "https://ozon.ru/point/536673", "name": "Мариуполь, пр. Победы 89", + "address": "Мариуполь, пр. Победы 89", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -756,6 +762,7 @@ ], "link": "https://ozon.ru/point/536837", "name": "Мариуполь, ул. Киевская 51", + "address": "Мариуполь, ул. Киевская 51", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -767,6 +774,7 @@ ], "link": "https://ozon.ru/point/536835", "name": "Мариуполь, ул. Февральская 44а", + "address": "Мариуполь, ул. Февральская 44а", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" @@ -778,6 +786,7 @@ ], "link": "https://ozon.ru/point/536831", "name": "Мариуполь, Казанцева 22а", + "address": "Мариуполь, Казанцева 22а", "operationTime": "неизвестно", "source": "https://dostavka.7telecom.ru", "provider": "7dostavka" diff --git a/popup.js b/popup.js index 9da81d5..c770685 100644 --- a/popup.js +++ b/popup.js @@ -2,6 +2,7 @@ import map from "./map"; import { Overlay } from "ol"; import QRCode from "qrcode"; import { el } from "./utils"; +import { toLonLat } from "ol/proj"; const container = el("popup"); const closer = el("popup-closer"); @@ -38,8 +39,11 @@ function onClick(event) { const coordinates = feature.getGeometry().getCoordinates(); + const [lon, lat] = toLonLat(coordinates); + popupName.textContent = feature.get("name"); popupAddress.textContent = feature.get("address"); + popupAddress.href = `https://yandex.ru/maps/?pt=${lon},${lat}&z=18&l=map` popupLink.href = feature.get("link"); popupSource.href = feature.get("source"); popupOperationTime.textContent = feature.get("operationTime") ?? "неизвестно"; diff --git a/scripts/update.js b/scripts/update.js index 97d8dd6..1accc7e 100644 --- a/scripts/update.js +++ b/scripts/update.js @@ -1,8 +1,8 @@ import fs from "node:fs/promises"; import { asyncMap } from "modern-async"; -import { JSDOM } from "jsdom"; import { getFinalURL } from "./utils.js"; import ozonWbDpr from "./update/ozon-wb-dpr.js"; +import sevenDostavka from "./update/sevenDostavka.js"; async function woyag() { const apiResponse = await fetch("https://login.woyag.ru/ajax/pvz-list"); @@ -40,52 +40,10 @@ async function woyag() { ); } -const linkRegexp = new RegExp(/https:\/\/ozon\.ru\/point\/\d+/); - -async function sevenDostavka() { - const res = await fetch("https://dostavka.7telecom.ru"); - const htmlText = await res.text(); - - const dom = new JSDOM(htmlText); - const document = dom.window.document; - const scripts = document.querySelectorAll("script"); - - for (let script of scripts) { - if (script.textContent.includes("ДОБАВИТЬ ПУНКТ ВЫДАЧИ В ПРИЛОЖЕНИЕ")) { - let x = script.textContent.split("[\n{\n").pop().split("\n},\n]")[0]; - - if (x) { - const points = new Function(`return [{${x}}]`)(); - - fs.writeFile( - "data/99_sevenDostavka.json", - JSON.stringify( - { - name: "7dostavka", - source: "https://dostavka.7telecom.ru", - points: points.map((point) => ({ - coordinates: [ - parseFloat(point["lng"]), - parseFloat(point["lat"]), - ], - link: linkRegexp.exec(point.descr)[0], - name: point.title, - operationTime: "неизвестно", - })), - }, - undefined, - 4 - ) - ); - } - } - } -} - async function main() { - await woyag(); + // await woyag(); await sevenDostavka(); - await ozonWbDpr(); + // await ozonWbDpr(); } main(); diff --git a/scripts/update/sevenDostavka.js b/scripts/update/sevenDostavka.js new file mode 100644 index 0000000..87afeb4 --- /dev/null +++ b/scripts/update/sevenDostavka.js @@ -0,0 +1,47 @@ +import fs from "node:fs/promises"; +import { JSDOM } from "jsdom"; + +const linkRegexp = new RegExp(/https:\/\/ozon\.ru\/point\/\d+/); + +async function sevenDostavka() { + const res = await fetch("https://dostavka.7telecom.ru"); + const htmlText = await res.text(); + + const dom = new JSDOM(htmlText); + const document = dom.window.document; + const scripts = document.querySelectorAll("script"); + + for (let script of scripts) { + if (script.textContent.includes("ДОБАВИТЬ ПУНКТ ВЫДАЧИ В ПРИЛОЖЕНИЕ")) { + let x = script.textContent.split("[\n{\n").pop().split("\n},\n]")[0]; + + if (x) { + const points = new Function(`return [{${x}}]`)(); + + fs.writeFile( + "data/99_sevenDostavka.json", + JSON.stringify( + { + name: "7dostavka", + source: "https://dostavka.7telecom.ru", + points: points.map((point) => ({ + coordinates: [ + parseFloat(point["lng"]), + parseFloat(point["lat"]), + ], + link: linkRegexp.exec(point.descr)[0], + name: point.title, + address: point.title, + operationTime: "неизвестно", + })), + }, + undefined, + 4 + ) + ); + } + } + } +} + +export default sevenDostavka; \ No newline at end of file