nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit b765a9631528b4eb3f55fb2c193d21432d918550
parent 853e0badea9d87f3b5667d96b2b60906424ae2a3
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Fri,  6 Dec 2024 11:14:53 +0100

tracks: remove loading tracks from openstretmap.ru

service is not working for long time

Diffstat:
Msrc/lib/leaflet.control.track-list/lib/services/index.js | 2--
Dsrc/lib/leaflet.control.track-list/lib/services/openstreetmapRu.js | 39---------------------------------------
Mtest/test_track_load.js | 3---
Dtest/track_load_data/testcases/openstreetmapRu.json | 57---------------------------------------------------------
Dtest/track_load_data/testcases/openstreetmapRuGpx.json | 52----------------------------------------------------
Dtest/track_load_data/testcases/openstreetmapRu_not_exists.json | 4----
6 files changed, 0 insertions(+), 157 deletions(-)

diff --git a/src/lib/leaflet.control.track-list/lib/services/index.js b/src/lib/leaflet.control.track-list/lib/services/index.js @@ -7,7 +7,6 @@ import {YandexRuler} from './yandex'; import {NakarteTrack, NakarteUrl} from './nakarte'; import {GarminActivity, GarminRoute} from './garmin'; import {SportsTrackerActivity} from './sportstracker'; -import OpenStreetMapRu from './openstreetmapRu'; import Wikiloc from './wikiloc'; const services = [ @@ -21,7 +20,6 @@ const services = [ GarminActivity, GarminRoute, SportsTrackerActivity, - OpenStreetMapRu, Wikiloc, SimpleService ]; diff --git a/src/lib/leaflet.control.track-list/lib/services/openstreetmapRu.js b/src/lib/leaflet.control.track-list/lib/services/openstreetmapRu.js @@ -1,39 +0,0 @@ -import urlViaCorsProxy from '~/lib/CORSProxy'; -import BaseService from './baseService'; -import parseGpx from '../parsers/gpx'; - -class OpenStreetMapRu extends BaseService { - urlRe = /^https?:\/\/(?:www\.)?openstreetmap\.ru\/\?mapid=(\d+)/u; - - getTrackId() { - const m = this.urlRe.exec(this.origUrl); - return m[1]; - } - - isOurUrl() { - return this.urlRe.test(this.origUrl); - } - - requestOptions() { - const trackId = this.getTrackId(); - return [{ - url: urlViaCorsProxy(`https://openstreetmap.ru/mymap.php?id=${trackId}&format=gpx`), - options: {responseType: 'binarystring'} - }]; - } - - parseResponse(responses) { - const trackId = this.getTrackId(); - const response = responses[0]; - const geodata = parseGpx(response.responseBinaryText, `PersonalMap ${trackId}`, true); - if (!geodata) { - return [{name: name, error: 'UNSUPPORTED'}]; - } - if (geodata[0].tracks.length === 0 && geodata[0].points.length === 0) { - return [{error: 'Personal map is empty or does not exist'}]; - } - return geodata; - } -} - -export default OpenStreetMapRu; diff --git a/test/test_track_load.js b/test/test_track_load.js @@ -65,9 +65,6 @@ suite('Load tracks from services'); 'sportstracker_without_title', 'sportstracker_private', 'sportstracker_not_exists', - 'openstreetmapRu', - 'openstreetmapRuGpx', - 'openstreetmapRu_not_exists', 'wikiloc_not_exists', 'wikiloc_with_waypoints', 'wikiloc', diff --git a/test/track_load_data/testcases/openstreetmapRu.json b/test/track_load_data/testcases/openstreetmapRu.json @@ -1,57 +0,0 @@ -{ - "query": [ - "http://openstreetmap.ru/?mapid=89153950", - "http://www.openstreetmap.ru/?mapid=89153950", - "https://openstreetmap.ru/?mapid=89153950", - "http://openstreetmap.ru/?mapid=89153950&hash=0a111111111111111111124b891b5a06" - ], - "geodata": [ - { - "name": "PersonalMap 89153950", - "tracks": [ - [ - { - "lat": 60.997918899506, - "lng": 29.712181091309 - }, - { - "lat": 61.012064600294, - "lng": 29.848823547363 - }, - { - "lat": 60.973440281647, - "lng": 29.848480224609 - }, - { - "lat": 60.940606026894, - "lng": 29.755783081055 - } - ], - [ - { - "lat": 61.00906956606, - "lng": 29.685745239258 - }, - { - "lat": 60.967442643408, - "lng": 29.667892456055 - } - ] - ], - "points": [ - { - "lat": 60.979436788711, - "lng": 29.72110748291, - "name": "Point 1", - "symbol_name": null - }, - { - "lat": 60.974523067988, - "lng": 29.700508117676, - "name": "Точка 2", - "symbol_name": null - } - ] - } - ] -} diff --git a/test/track_load_data/testcases/openstreetmapRuGpx.json b/test/track_load_data/testcases/openstreetmapRuGpx.json @@ -1,52 +0,0 @@ -{ - "query": ["http://openstreetmap.ru/mymap.php?id=89153950&format=gpx"], - "geodata": [ - { - "name": "mymap.php", - "tracks": [ - [ - { - "lat": 60.997918899506, - "lng": 29.712181091309 - }, - { - "lat": 61.012064600294, - "lng": 29.848823547363 - }, - { - "lat": 60.973440281647, - "lng": 29.848480224609 - }, - { - "lat": 60.940606026894, - "lng": 29.755783081055 - } - ], - [ - { - "lat": 61.00906956606, - "lng": 29.685745239258 - }, - { - "lat": 60.967442643408, - "lng": 29.667892456055 - } - ] - ], - "points": [ - { - "lat": 60.979436788711, - "lng": 29.72110748291, - "name": "Point 1", - "symbol_name": null - }, - { - "lat": 60.974523067988, - "lng": 29.700508117676, - "name": "Точка 2", - "symbol_name": null - } - ] - } - ] -} diff --git a/test/track_load_data/testcases/openstreetmapRu_not_exists.json b/test/track_load_data/testcases/openstreetmapRu_not_exists.json @@ -1,4 +0,0 @@ -{ - "query": ["http://openstreetmap.ru/?mapid=891539501"], - "geodata": [{"error": "Personal map is empty or does not exist"}] -}