- {include "../components/textArea.xml", route => "/wall$owner/makePost", graffiti => true, polls => true, notes => true}
+ {include "../components/textArea.xml", route => "/wall$owner/makePost", graffiti => true, polls => true, notes => true, geo => true}
diff --git a/Web/routes.yml b/Web/routes.yml
index d1a0e7ae..86332b38 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -137,6 +137,8 @@ routes:
handler: "Wall->delete"
- url: "/wall{num}_{num}/pin"
handler: "Wall->pin"
+ - url: "/wall{num}_{num}/nearest"
+ handler: "Wall->nearest"
- url: "/blob_{text}/{?path}.{text}"
handler: "Blob->file"
placeholders:
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index bb349c14..2c1dc611 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -262,4 +262,163 @@ async function showArticle(note_id) {
u("#articleText").html(`
${note.title}
` + note.html);
u("body").removeClass("dimmed");
u("body").addClass("article");
+}
+
+async function initGeo(tid) {
+ MessageBox("Прикрепить геометку", "
", ["Прикрепить", "Отмена"], [(function () {
+ let marker = {
+ lat: currentMarker._latlng.lat,
+ lng: currentMarker._latlng.lng,
+ name: currentMarker._popup._content
+ };
+ $(`#post-buttons${tid} #geo`).val(JSON.stringify(marker));
+ $(`#post-buttons${tid} .post-has-geo`).text(`Геометка: ${marker.name}`);
+ $(`#post-buttons${tid} .post-has-geo`).show();
+ }), Function.noop]);
+
+ const element = document.getElementById('osm-map');
+ element.style = 'height: 600px;';
+
+ let markerLayers = L.layerGroup();
+
+ let map = L.map(element, {
+ center: [55.322978, 38.673362],
+ zoom: 10,
+ attributionControl: false,
+ width: 800
+ });
+ let currentMarker = null;
+ markerLayers.addTo(map);
+
+ map.on('click', (e) => {
+ let lat = e.latlng.lat;
+ let lng = e.latlng.lng;
+
+ if (currentMarker) map.removeLayer(currentMarker);
+
+ $.get({
+ url: `https://nominatim.openstreetmap.org/reverse?lat=${lat}&lon=${lng}&format=jsonv2`,
+ success: (response) => {
+ markerLayers.clearLayers();
+
+ currentMarker = L.marker([lat, lng]).addTo(map);
+ currentMarker.bindPopup(response?.name ?? response?.display_name).openPopup();
+ markerLayers.addLayer(currentMarker);
+ }
+ })
+ });
+
+ const geocoderControl = L.Control.geocoder({
+ defaultMarkGeocode: false,
+ }).addTo(map);
+
+ geocoderControl.on('markgeocode', function (e) {
+ console.log(e);
+ let lat = e.geocode.properties.lat;
+ let lng = e.geocode.properties.lon;
+ let name = (e.geocode.properties?.name ?? e.geocode.properties.display_name);
+
+ if (currentMarker) map.removeLayer(currentMarker);
+
+ currentMarker = L.marker([lat, lng]).addTo(map);
+ currentMarker.bindPopup(name).openPopup();
+
+ console.log("Широта: " + lat + ", Долгота: " + lng);
+ console.log("Название места: " + name);
+
+ let marker = {
+ lat: lat,
+ lng: lng,
+ name: name
+ };
+ map.setView([lat, lng], 15);
+ });
+
+ L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+ attribution: '©
OpenStreetMap contributors'
+ }).addTo(map);
+
+ $(".ovk-diag-cont").width('50%');
+ setTimeout(function(){ map.invalidateSize()}, 100);
+}
+
+function openGeo(data, owner_id, virtual_id) {
+ MessageBox("Геометка", "
", ["Ближайшие посты", "OK"], [(function () {
+ getNearPosts(owner_id, virtual_id);
+ }), Function.noop]);
+
+ let element = document.getElementById('osm-map');
+ element.style = 'height: 600px;';
+
+ let map = L.map(element, {attributionControl: false});
+ let target = L.latLng(data.lat, data.lng);
+ map.setView(target, 15);
+ let marker = L.marker(target).addTo(map);
+ marker.bindPopup(data.name).openPopup();
+
+ L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+ attribution: '©
OpenStreetMap contributors'
+ }).addTo(map);
+
+ $(".ovk-diag-cont").width('50%');
+ setTimeout(function(){ map.invalidateSize()}, 100);
+}
+
+function getNearPosts(owner_id, virtual_id) {
+ $.ajax({
+ type: "POST",
+ url: `/wall${owner_id}_${virtual_id}/nearest`,
+ success: (response) => {
+ if (response.success) {
+ openNearPosts(response);
+ } else {
+ MessageBox("Ошибка", "Произошла ошибка в ходе запроса:" + (response?.error ?? "Неизвестная ошибка"), ["OK"], [Function.noop]);
+ }
+ }
+ });
+}
+
+function openNearPosts(posts) {
+ console.log(posts);
+ let MsgBody = "";
+
+ posts.posts.forEach((post) => {
+ MsgBody += `
+
+
+
+
+
+ 
+
+ |
+
+
+ ${post.owner.name}
+ ${post.owner.verified ? `  ` : ""}
+ ${post.owner.writes}
+
+
+ ${post.time}
+
+
+
+ ${post.preview}
+
+
+
+ Геометка: ${post.geo.name}
+
+ |
+
+
+
+ `;
+ });
+
+ if (posts.need_count) MsgBody += "
Показаны первые 25 постов"
+
+ MessageBox("Ближайшие посты", MsgBody, ["OK"], [Function.noop]);
}
\ No newline at end of file
diff --git a/Web/static/js/package.json b/Web/static/js/package.json
index f9459ce4..c77d587d 100644
--- a/Web/static/js/package.json
+++ b/Web/static/js/package.json
@@ -6,6 +6,8 @@
"jquery": "^3.0.0",
"knockout": "^3.5.1",
"ky": "^0.19.0",
+ "leaflet": "^1.9.4",
+ "leaflet-control-geocoder": "^2.4.0",
"literallycanvas": "^0.5.2",
"monaco-editor": "^0.20.0",
"msgpack-lite": "^0.1.26",
diff --git a/Web/static/js/yarn.lock b/Web/static/js/yarn.lock
index fa61ed9b..0bdd3afb 100644
--- a/Web/static/js/yarn.lock
+++ b/Web/static/js/yarn.lock
@@ -173,6 +173,18 @@ ky@^0.19.0:
resolved "https://registry.yarnpkg.com/ky/-/ky-0.19.0.tgz#d6ad117e89efe2d85a1c2e91462d48ca1cda1f7a"
integrity sha512-RkDgbg5ahMv1MjHfJI2WJA2+Qbxq0iNSLWhreYiCHeHry9Q12sedCnP5KYGPt7sydDvsyH+8UcG6Kanq5mpsyw==
+leaflet-control-geocoder@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/leaflet-control-geocoder/-/leaflet-control-geocoder-2.4.0.tgz#f6c00ae00b53d2ac5908e874a9aefd414f615f22"
+ integrity sha512-b2QlxuFd40uIDbnoUI3U9fzfnB4yKUYlmsXjquJ2d2YjoJqnyVYcIJeErAVv3kPvX3nI0gzvBq1XHMgSVFrGkQ==
+ optionalDependencies:
+ open-location-code "^1.0.0"
+
+leaflet@^1.9.4:
+ version "1.9.4"
+ resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+ integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
literallycanvas@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/literallycanvas/-/literallycanvas-0.5.2.tgz#7d4800a8d9c4b38a593e91695d52466689586abd"
@@ -225,6 +237,11 @@ object-assign@^4.1.0, object-assign@^4.1.1:
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+open-location-code@^1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/open-location-code/-/open-location-code-1.0.3.tgz#5ea1a34ee5221c6cafa04392e1bd906fd7488f7e"
+ integrity sha512-DBm14BSn40Ee241n80zIFXIT6+y8Tb0I+jTdosLJ8Sidvr2qONvymwqymVbHV2nS+1gkDZ5eTNpnOIVV0Kn2fw==
+
plotly.js-dist@^1.52.3:
version "1.52.3"
resolved "https://registry.yarnpkg.com/plotly.js-dist/-/plotly.js-dist-1.52.3.tgz#4c16c6da6adab6cdba169087b5005bdddbf10834"
diff --git a/install/sqls/00038-posts-geo.sql b/install/sqls/00038-posts-geo.sql
new file mode 100644
index 00000000..35c4099a
--- /dev/null
+++ b/install/sqls/00038-posts-geo.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `Posts`
+ ADD `geo` LONGTEXT NULL DEFAULT NULL AFTER `deleted`,
+ ADD `geo_lat` DECIMAL(10, 8) NULL DEFAULT NULL AFTER `geo`,
+ ADD `geo_lon` DECIMAL(10, 8) NULL DEFAULT NULL AFTER `geo_lat`;
{_poll}
+
+ 
+ Гео-метка
+