commit c61eb2ad77c9c7efd3b898c3d53412b770c9705f parent d4280263953c6696e9dc8e1eca5d0bb3f5264af1 Author: Sergej Orlov <wladimirych@gmail.com> Date: Sat, 30 Nov 2019 16:52:43 +0100 change import paths for lib according to new config import 'lib/...' => import '~/lib/...' Diffstat:
70 files changed, 186 insertions(+), 186 deletions(-)
diff --git a/src/App.js b/src/App.js @@ -2,35 +2,35 @@ import './App.css'; import './leaflet-fixes.css'; import L from 'leaflet'; import 'leaflet/dist/leaflet.css'; -import 'lib/leaflet.control.printPages/control' -import 'lib/leaflet.control.caption' +import '~/lib/leaflet.control.printPages/control' +import '~/lib/leaflet.control.caption' import config from './config' -import 'lib/leaflet.control.coordinates'; -import enableLayersControlHotKeys from 'lib/leaflet.control.layers.hotkeys'; -import 'lib/leaflet.hashState/Leaflet.Map'; -import 'lib/leaflet.hashState/Leaflet.Control.Layers'; -import {fixAll} from 'lib/leaflet.fixes' +import '~/lib/leaflet.control.coordinates'; +import enableLayersControlHotKeys from '~/lib/leaflet.control.layers.hotkeys'; +import '~/lib/leaflet.hashState/Leaflet.Map'; +import '~/lib/leaflet.hashState/Leaflet.Control.Layers'; +import {fixAll} from '~/lib/leaflet.fixes' import './adaptive.css'; -import 'lib/leaflet.control.panoramas'; -import 'lib/leaflet.control.track-list/track-list'; -import 'lib/leaflet.control.track-list/control-ruler'; -import 'lib/leaflet.control.track-list/track-list.hash-state'; -import 'lib/leaflet.control.track-list/track-list.localstorage'; -import enableLayersControlAdaptiveHeight from 'lib/leaflet.control.layers.adaptive-height'; -import enableLayersMinimize from 'lib/leaflet.control.layers.minimize'; -import enableLayersConfig from 'lib/leaflet.control.layers.configure'; -import raiseControlsOnFocus from 'lib/leaflet.controls.raise-on-focus'; -import getLayers from 'layers'; -import 'lib/leaflet.control.layers.events'; -import 'lib/leaflet.control.jnx'; -import 'lib/leaflet.control.jnx/hash-state'; -import 'lib/leaflet.control.azimuth'; -import {hashState, bindHashStateReadOnly} from 'lib/leaflet.hashState/hashState'; -import {LocateControl} from 'lib/leaflet.control.locate'; -import {notify} from 'lib/notifications'; -import ZoomDisplay from 'lib/leaflet.control.zoom-display'; -import logging from 'lib/logging'; -import safeLocalStorage from 'lib/safe-localstorage'; +import '~/lib/leaflet.control.panoramas'; +import '~/lib/leaflet.control.track-list/track-list'; +import '~/lib/leaflet.control.track-list/control-ruler'; +import '~/lib/leaflet.control.track-list/track-list.hash-state'; +import '~/lib/leaflet.control.track-list/track-list.localstorage'; +import enableLayersControlAdaptiveHeight from '~/lib/leaflet.control.layers.adaptive-height'; +import enableLayersMinimize from '~/lib/leaflet.control.layers.minimize'; +import enableLayersConfig from '~/lib/leaflet.control.layers.configure'; +import raiseControlsOnFocus from '~/lib/leaflet.controls.raise-on-focus'; +import getLayers from './layers'; +import '~/lib/leaflet.control.layers.events'; +import '~/lib/leaflet.control.jnx'; +import '~/lib/leaflet.control.jnx/hash-state'; +import '~/lib/leaflet.control.azimuth'; +import {hashState, bindHashStateReadOnly} from '~/lib/leaflet.hashState/hashState'; +import {LocateControl} from '~/lib/leaflet.control.locate'; +import {notify} from '~/lib/notifications'; +import ZoomDisplay from '~/lib/leaflet.control.zoom-display'; +import logging from '~/lib/logging'; +import safeLocalStorage from '~/lib/safe-localstorage'; const locationErrorMessage = { 0: 'Your browser does not support geolocation.', diff --git a/src/layers.js b/src/layers.js @@ -1,14 +1,14 @@ import L from "leaflet"; -import 'lib/leaflet.layer.yandex'; -import 'lib/leaflet.layer.google'; -import {BingLayer} from 'lib/leaflet.layer.bing'; -import {BingDates} from 'lib/leaflet.layer.bing/dates'; +import '~/lib/leaflet.layer.yandex'; +import '~/lib/leaflet.layer.google'; +import {BingLayer} from '~/lib/leaflet.layer.bing'; +import {BingDates} from '~/lib/leaflet.layer.bing/dates'; import config from './config'; -import 'lib/leaflet.layer.soviet-topomaps-grid'; -import 'lib/leaflet.layer.westraPasses'; -import 'lib/leaflet.layer.wikimapia'; -import {GeocachingSu} from 'lib/leaflet.layer.geocaching-su'; -import {StravaHeatmap} from 'lib/leaflet.layer.strava-heatmap'; +import '~/lib/leaflet.layer.soviet-topomaps-grid'; +import '~/lib/leaflet.layer.westraPasses'; +import '~/lib/leaflet.layer.wikimapia'; +import {GeocachingSu} from '~/lib/leaflet.layer.geocaching-su'; +import {StravaHeatmap} from '~/lib/leaflet.layer.strava-heatmap'; export default function getLayers() { const layers = [ diff --git a/src/lib/CORSProxy/index.js b/src/lib/CORSProxy/index.js @@ -1,4 +1,4 @@ -import config from 'config'; +import config from '~/config'; export default function urlViaCorsProxy(url) { return config.CORSProxyUrl + url.replace(/^(https?):\/\//, '$1/'); diff --git a/src/lib/clipboardCopy/index.js b/src/lib/clipboardCopy/index.js @@ -1,5 +1,5 @@ import './style.css'; -import logging from 'lib/logging'; +import logging from '~/lib/logging'; function showNotification(message, mouseEvent) { var el = document.createElement('div'); diff --git a/src/lib/file-read/index.js b/src/lib/file-read/index.js @@ -1,4 +1,4 @@ -import {arrayBufferToString} from 'lib/binary-strings'; +import {arrayBufferToString} from '~/lib/binary-strings'; const selectFiles = (() => { let fileInput; diff --git a/src/lib/googleMapsApi/index.js b/src/lib/googleMapsApi/index.js @@ -1,5 +1,5 @@ import loadScript from 'load-script'; -import config from 'config'; +import config from '~/config'; let _google = null; let _pending = null; diff --git a/src/lib/knockout.component.progress/progress.js b/src/lib/knockout.component.progress/progress.js @@ -1,6 +1,6 @@ -import ko from 'vendored/knockout'; +import ko from '~/vendored/knockout'; import './style.css'; -import 'lib/controls-styles/controls-styles.css'; +import '~/lib/controls-styles/controls-styles.css'; ko.components.register('progress-indicator', { template: ` diff --git a/src/lib/leaflet.control.azimuth/index.js b/src/lib/leaflet.control.azimuth/index.js @@ -1,15 +1,15 @@ import L from 'leaflet'; import ko from 'knockout'; -import {makeButtonWithBar} from 'lib/leaflet.control.commons'; +import {makeButtonWithBar} from '~/lib/leaflet.control.commons'; import layout from './control.html'; -import 'lib/controls-styles/controls-styles.css'; +import '~/lib/controls-styles/controls-styles.css'; import './style.css'; -import {getDeclination} from 'lib/magnetic-declination'; -import 'vendored/github.com/bbecquet/Leaflet.RotatedMarker/leaflet.rotatedMarker'; +import {getDeclination} from '~/lib/magnetic-declination'; +import '~/vendored/github.com/bbecquet/Leaflet.RotatedMarker/leaflet.rotatedMarker'; import iconPointer from './pointer.svg'; import iconPointerStart from './pointer-start.svg'; import iconPointerEnd from './pointer-end.svg'; -import {ElevationProfile, calcSamplingInterval} from 'lib/leaflet.control.elevation-profile'; +import {ElevationProfile, calcSamplingInterval} from '~/lib/leaflet.control.elevation-profile'; function radians(x) { return x / 180 * Math.PI; diff --git a/src/lib/leaflet.control.caption/index.js b/src/lib/leaflet.control.caption/index.js @@ -1,6 +1,6 @@ import L from 'leaflet'; import './style.css'; -import 'lib/leaflet.control.commons'; +import '~/lib/leaflet.control.commons'; L.Control.Caption = L.Control.extend({ options: { diff --git a/src/lib/leaflet.control.coordinates/index.js b/src/lib/leaflet.control.coordinates/index.js @@ -1,11 +1,11 @@ import L from 'leaflet' -import ko from 'vendored/knockout'; +import ko from '~/vendored/knockout'; import './coordinates.css'; -import copyToClipboard from 'lib/clipboardCopy'; -import Contextmenu from 'lib/contextmenu'; -import {makeButtonWithBar} from 'lib/leaflet.control.commons'; -import safeLocalStorage from 'lib/safe-localstorage'; -import 'lib/controls-styles/controls-styles.css'; +import copyToClipboard from '~/lib/clipboardCopy'; +import Contextmenu from '~/lib/contextmenu'; +import {makeButtonWithBar} from '~/lib/leaflet.control.commons'; +import safeLocalStorage from '~/lib/safe-localstorage'; +import '~/lib/controls-styles/controls-styles.css'; import formats from './formats'; const DEFAULT_FORMAT = formats.DEGREES; diff --git a/src/lib/leaflet.control.elevation-profile/index.js b/src/lib/leaflet.control.elevation-profile/index.js @@ -1,10 +1,10 @@ import L from 'leaflet'; import './elevation-profile.css'; -import {fetch} from 'lib/xhr-promise'; -import config from 'config'; -import 'lib/leaflet.control.commons'; -import {notify} from 'lib/notifications'; -import logging from 'lib/logging'; +import {fetch} from '~/lib/xhr-promise'; +import config from '~/config'; +import '~/lib/leaflet.control.commons'; +import {notify} from '~/lib/notifications'; +import logging from '~/lib/logging'; function calcSamplingInterval(length) { var targetPointsN = 2000; diff --git a/src/lib/leaflet.control.jnx/hash-state.js b/src/lib/leaflet.control.jnx/hash-state.js @@ -1,6 +1,6 @@ import L from 'leaflet'; import '../leaflet.control.layers.hotkeys/index'; -import 'lib/leaflet.hashState/leaflet.hashState'; +import '~/lib/leaflet.hashState/leaflet.hashState'; L.Control.JNX.include(L.Mixin.HashState); L.Control.JNX.include({ diff --git a/src/lib/leaflet.control.jnx/index.js b/src/lib/leaflet.control.jnx/index.js @@ -1,13 +1,13 @@ import L from 'leaflet'; -import ko from 'vendored/knockout'; +import ko from '~/vendored/knockout'; import './style.css'; -import 'lib/leaflet.control.commons'; +import '~/lib/leaflet.control.commons'; import {RectangleSelect} from './selector'; -import Contextmenu from 'lib/contextmenu'; +import Contextmenu from '~/lib/contextmenu'; import {makeJnxFromLayer, minZoom} from './jnx-maker'; -import {saveAs} from 'vendored/github.com/eligrey/FileSaver'; -import {notify} from 'lib/notifications'; -import logging from 'lib/logging'; +import {saveAs} from '~/vendored/github.com/eligrey/FileSaver'; +import {notify} from '~/lib/notifications'; +import logging from '~/lib/logging'; L.Control.JNX = L.Control.extend({ includes: L.Mixin.Events, diff --git a/src/lib/leaflet.control.jnx/jnx-maker.js b/src/lib/leaflet.control.jnx/jnx-maker.js @@ -1,8 +1,8 @@ import L from 'leaflet'; import {JnxWriter} from './jnx-encoder'; -import {getTempMap, disposeMap} from 'lib/leaflet.layer.rasterize'; -import {XHRQueue} from 'lib/xhr-promise'; -import {arrayBufferToString, stringToArrayBuffer} from 'lib/binary-strings'; +import {getTempMap, disposeMap} from '~/lib/leaflet.layer.rasterize'; +import {XHRQueue} from '~/lib/xhr-promise'; +import {arrayBufferToString, stringToArrayBuffer} from '~/lib/binary-strings'; const defaultXHROptions = { responseType: 'arraybuffer', diff --git a/src/lib/leaflet.control.layers.configure/index.js b/src/lib/leaflet.control.layers.configure/index.js @@ -1,10 +1,10 @@ import L from 'leaflet'; import './style.css'; -import enableTopRow from 'lib/leaflet.control.layers.top-row'; -import ko from 'vendored/knockout'; -import {notify} from 'lib/notifications'; -import logging from 'lib/logging'; -import safeLocalStorage from 'lib/safe-localstorage'; +import enableTopRow from '~/lib/leaflet.control.layers.top-row'; +import ko from '~/vendored/knockout'; +import {notify} from '~/lib/notifications'; +import logging from '~/lib/logging'; +import safeLocalStorage from '~/lib/safe-localstorage'; import './customLayer'; function enableConfig(control, {layers, customLayersOrder}) { diff --git a/src/lib/leaflet.control.layers.events/index.js b/src/lib/leaflet.control.layers.events/index.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import 'lib/leaflet.control.commons'; +import '~/lib/leaflet.control.commons'; const originalLayerOnAdd = L.Control.Layers.prototype.onAdd; diff --git a/src/lib/leaflet.control.layers.minimize/index.js b/src/lib/leaflet.control.layers.minimize/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; import './style.css'; -import 'lib/controls-styles/controls-styles.css'; -import enableTopRow from 'lib/leaflet.control.layers.top-row'; +import '~/lib/controls-styles/controls-styles.css'; +import enableTopRow from '~/lib/leaflet.control.layers.top-row'; function enableMinimize(control) { diff --git a/src/lib/leaflet.control.locate/index.js b/src/lib/leaflet.control.locate/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; -import {makeButton} from 'lib/leaflet.control.commons'; +import {makeButton} from '~/lib/leaflet.control.commons'; import './style.css'; -import localStorage from 'lib/safe-localstorage'; +import localStorage from '~/lib/safe-localstorage'; const STATE_DISABLED = 'disabled'; const STATE_LOCATING = 'locating'; diff --git a/src/lib/leaflet.control.panoramas/index.js b/src/lib/leaflet.control.panoramas/index.js @@ -1,10 +1,10 @@ import L from 'leaflet'; -import ko from 'vendored/knockout'; +import ko from '~/vendored/knockout'; import googleProvider from './lib/google'; import './style.css'; -import 'lib/controls-styles/controls-styles.css'; -import {makeButtonWithBar} from 'lib/leaflet.control.commons'; +import '~/lib/controls-styles/controls-styles.css'; +import {makeButtonWithBar} from '~/lib/leaflet.control.commons'; import mapillaryProvider from './lib/mapillary'; import wikimediaProvider from './lib/wikimedia'; diff --git a/src/lib/leaflet.control.panoramas/lib/google/index.js b/src/lib/leaflet.control.panoramas/lib/google/index.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import getGoogle from 'lib/googleMapsApi'; +import getGoogle from '~/lib/googleMapsApi'; function getCoverageLayer(options) { diff --git a/src/lib/leaflet.control.panoramas/lib/mapillary/index.js b/src/lib/leaflet.control.panoramas/lib/mapillary/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; import {MapillaryCoverage} from './mapillary-coverage-layer' -import {fetch} from 'lib/xhr-promise'; -import config from 'config'; +import {fetch} from '~/lib/xhr-promise'; +import config from '~/config'; import './style.css'; import '../common/style.css'; diff --git a/src/lib/leaflet.control.panoramas/lib/mapillary/mapillary-loader.js b/src/lib/leaflet.control.panoramas/lib/mapillary/mapillary-loader.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import {TiledDataLoader} from 'lib/tiled-data-loader'; +import {TiledDataLoader} from '~/lib/tiled-data-loader'; import {decodeMvt} from './mvt'; diff --git a/src/lib/leaflet.control.panoramas/lib/wikimedia/coverage-layer.js b/src/lib/leaflet.control.panoramas/lib/wikimedia/coverage-layer.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import {TiledDataLoader} from 'lib/tiled-data-loader'; +import {TiledDataLoader} from '~/lib/tiled-data-loader'; const MultiLayer = L.Layer.extend({ initialize: function(layers) { diff --git a/src/lib/leaflet.control.panoramas/lib/wikimedia/index.js b/src/lib/leaflet.control.panoramas/lib/wikimedia/index.js @@ -1,9 +1,9 @@ import L from 'leaflet'; import {MultiLayer, WikimediaVectorCoverage} from './coverage-layer'; -import {fetch} from 'lib/xhr-promise'; +import {fetch} from '~/lib/xhr-promise'; import './style.css'; import '../common/style.css'; -import config from 'config'; +import config from '~/config'; function getCoverageLayer(options) { diff --git a/src/lib/leaflet.control.printPages/control.js b/src/lib/leaflet.control.printPages/control.js @@ -1,19 +1,19 @@ import L from 'leaflet' -import ko from 'vendored/knockout'; -import 'lib/knockout.component.progress/progress'; -import 'lib/controls-styles/controls-styles.css'; +import ko from '~/vendored/knockout'; +import '~/lib/knockout.component.progress/progress'; +import '~/lib/controls-styles/controls-styles.css'; import './control.css'; import PageFeature from './pageFeature'; -import Contextmenu from 'lib/contextmenu'; +import Contextmenu from '~/lib/contextmenu'; import {renderPages} from './map-render' import formHtml from './form.html'; -import {notify} from 'lib/notifications'; +import {notify} from '~/lib/notifications'; import {makePdf} from './pdf'; -import {saveAs} from 'vendored/github.com/eligrey/FileSaver'; -import {blobFromString} from 'lib/binary-strings'; -import 'lib/leaflet.hashState/leaflet.hashState'; -import 'lib/leaflet.control.commons'; -import logging from 'lib/logging'; +import {saveAs} from '~/vendored/github.com/eligrey/FileSaver'; +import {blobFromString} from '~/lib/binary-strings'; +import '~/lib/leaflet.hashState/leaflet.hashState'; +import '~/lib/leaflet.control.commons'; +import logging from '~/lib/logging'; import {MagneticMeridians} from './decoration.magnetic-meridians'; import {OverlayScale} from './decoration.scale'; import {Grid} from './decoration.grid'; diff --git a/src/lib/leaflet.control.printPages/decoration.magnetic-meridians.js b/src/lib/leaflet.control.printPages/decoration.magnetic-meridians.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import {getDeclination} from 'lib/magnetic-declination'; +import {getDeclination} from '~/lib/magnetic-declination'; import {PrintStaticLayer} from './decorations'; function radians(degrees) { diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js @@ -1,6 +1,6 @@ import L from 'leaflet'; -import {getTempMap, disposeMap} from 'lib/leaflet.layer.rasterize'; -import {XHRQueue} from 'lib/xhr-promise'; +import {getTempMap, disposeMap} from '~/lib/leaflet.layer.rasterize'; +import {XHRQueue} from '~/lib/xhr-promise'; function getLayersForPrint(map, xhrQueue) { diff --git a/src/lib/leaflet.control.track-list/control-ruler.js b/src/lib/leaflet.control.track-list/control-ruler.js @@ -2,7 +2,7 @@ import L from 'leaflet'; import './track-list'; import './ruler.css'; import './track-list'; -import {makeButton} from 'lib/leaflet.control.commons'; +import {makeButton} from '~/lib/leaflet.control.commons'; L.Control.TrackList.Ruler = L.Control.extend({ options: { diff --git a/src/lib/leaflet.control.track-list/lib/parsers/gpx.js b/src/lib/leaflet.control.track-list/lib/parsers/gpx.js @@ -1,6 +1,6 @@ import {decode as utf8_decode} from 'utf8'; import {xmlGetNodeText} from './xmlUtils'; -import stripBom from 'lib/stripBom'; +import stripBom from '~/lib/stripBom'; function parseGpx(txt, name, preferNameFromFile) { var error; diff --git a/src/lib/leaflet.control.track-list/lib/parsers/jsInflate.js b/src/lib/leaflet.control.track-list/lib/parsers/jsInflate.js @@ -1,5 +1,5 @@ import tynyInflate from 'tiny-inflate'; -import {stringToArrayBuffer, arrayBufferToString} from 'lib/binary-strings'; +import {stringToArrayBuffer, arrayBufferToString} from '~/lib/binary-strings'; function jsInflate(compressed, originalSize) { if (originalSize === 0) { diff --git a/src/lib/leaflet.control.track-list/lib/parsers/kml.js b/src/lib/leaflet.control.track-list/lib/parsers/kml.js @@ -1,7 +1,7 @@ import {decode as utf8_decode} from 'utf8'; import {xmlGetNodeText} from './xmlUtils'; -import stripBom from 'lib/stripBom'; -import JSUnzip from 'vendored/github.com/augustl/js-unzip/js-unzip'; +import stripBom from '~/lib/stripBom'; +import JSUnzip from '~/vendored/github.com/augustl/js-unzip/js-unzip'; import jsInflate from './jsInflate'; function parseKml(txt, name) { diff --git a/src/lib/leaflet.control.track-list/lib/parsers/nktk.js b/src/lib/leaflet.control.track-list/lib/parsers/nktk.js @@ -1,6 +1,6 @@ import Pbf from 'pbf'; import {TrackView} from './nktk_pb'; -import {arrayBufferToString, stringToArrayBuffer} from 'lib/binary-strings'; +import {arrayBufferToString, stringToArrayBuffer} from '~/lib/binary-strings'; import utf8 from 'utf8'; import urlSafeBase64 from './urlSafeBase64'; diff --git a/src/lib/leaflet.control.track-list/lib/parsers/ozi.js b/src/lib/leaflet.control.track-list/lib/parsers/ozi.js @@ -1,5 +1,5 @@ import {decodeCP1251} from './codePages'; -import stripBom from 'lib/stripBom'; +import stripBom from '~/lib/stripBom'; function parseOziRte(txt, name) { let error, segments = []; diff --git a/src/lib/leaflet.control.track-list/lib/parsers/zip.js b/src/lib/leaflet.control.track-list/lib/parsers/zip.js @@ -1,4 +1,4 @@ -import JSUnzip from 'vendored/github.com/augustl/js-unzip/js-unzip'; +import JSUnzip from '~/vendored/github.com/augustl/js-unzip/js-unzip'; import jsInflate from './jsInflate'; import {decode866} from './codePages'; import parseGeoFile from '../parseGeoFile'; diff --git a/src/lib/leaflet.control.track-list/lib/services/baseService.js b/src/lib/leaflet.control.track-list/lib/services/baseService.js @@ -1,4 +1,4 @@ -import {fetch} from 'lib/xhr-promise'; +import {fetch} from '~/lib/xhr-promise'; class BaseService { constructor(url) { diff --git a/src/lib/leaflet.control.track-list/lib/services/endomondo.js b/src/lib/leaflet.control.track-list/lib/services/endomondo.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; class Endomondo extends BaseService { urlRegexps = [ diff --git a/src/lib/leaflet.control.track-list/lib/services/etomesto.js b/src/lib/leaflet.control.track-list/lib/services/etomesto.js @@ -1,4 +1,4 @@ -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import BaseService from './baseService'; import parseGpx from '../parsers/gpx'; diff --git a/src/lib/leaflet.control.track-list/lib/services/gpsies.js b/src/lib/leaflet.control.track-list/lib/services/gpsies.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import parseGpx from '../parsers/gpx'; import urlEncode from './urlEncode'; diff --git a/src/lib/leaflet.control.track-list/lib/services/gpslib.js b/src/lib/leaflet.control.track-list/lib/services/gpslib.js @@ -1,4 +1,4 @@ -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import BaseService from './baseService'; import parseGpx from '../parsers/gpx'; diff --git a/src/lib/leaflet.control.track-list/lib/services/movescount.js b/src/lib/leaflet.control.track-list/lib/services/movescount.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; class MovescountBase extends BaseService { isOurUrl() { diff --git a/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js b/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js @@ -1,10 +1,10 @@ import BaseService from '../baseService'; import {parseNktkSequence, parseTrackUrlData, parseNktkFragment} from '../../parsers/nktk'; -import config from 'config'; -import {parseHashParams} from 'lib/leaflet.hashState/hashState'; +import config from '~/config'; +import {parseHashParams} from '~/lib/leaflet.hashState/hashState'; import loadFromUrl from '../../loadFromUrl'; import loadTracksFromJson from './loadTracksFromJson'; -import {fetch} from 'lib/xhr-promise'; +import {fetch} from '~/lib/xhr-promise'; function flattenArray(ar) { return ar.reduce((cur, acc) => { diff --git a/src/lib/leaflet.control.track-list/lib/services/osm.js b/src/lib/leaflet.control.track-list/lib/services/osm.js @@ -1,4 +1,4 @@ -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import BaseService from './baseService'; import parseGpx from '../parsers/gpx'; diff --git a/src/lib/leaflet.control.track-list/lib/services/simpleService.js b/src/lib/leaflet.control.track-list/lib/services/simpleService.js @@ -1,6 +1,6 @@ import BaseService from './baseService'; import parseGeoFile from '../parseGeoFile'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; class SimpleService extends BaseService { isOurUrl() { diff --git a/src/lib/leaflet.control.track-list/lib/services/sportstracker.js b/src/lib/leaflet.control.track-list/lib/services/sportstracker.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import utf8 from 'utf8'; class SportsTrackerBase extends BaseService { diff --git a/src/lib/leaflet.control.track-list/lib/services/strava.js b/src/lib/leaflet.control.track-list/lib/services/strava.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import {decode as utf8_decode} from 'utf8'; class Strava extends BaseService { diff --git a/src/lib/leaflet.control.track-list/lib/services/tracedetrail.js b/src/lib/leaflet.control.track-list/lib/services/tracedetrail.js @@ -1,5 +1,5 @@ import BaseService from './baseService'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import L from 'leaflet'; class Tracedetrail extends BaseService { diff --git a/src/lib/leaflet.control.track-list/track-list.js b/src/lib/leaflet.control.track-list/track-list.js @@ -1,29 +1,29 @@ import L from 'leaflet'; -import ko from 'vendored/knockout'; -import Contextmenu from 'lib/contextmenu'; -import 'lib/knockout.component.progress/progress'; +import ko from '~/vendored/knockout'; +import Contextmenu from '~/lib/contextmenu'; +import '~/lib/knockout.component.progress/progress'; import './track-list.css'; -import {selectFiles, readFiles} from 'lib/file-read'; +import {selectFiles, readFiles} from '~/lib/file-read'; import parseGeoFile from './lib/parseGeoFile'; import loadFromUrl from './lib/loadFromUrl'; import geoExporters from './lib/geo_file_exporters'; -import copyToClipboard from 'lib/clipboardCopy'; -import {saveAs} from 'vendored/github.com/eligrey/FileSaver'; -import 'lib/leaflet.layer.canvasMarkers'; -import 'lib/leaflet.lineutil.simplifyLatLngs'; -import iconFromBackgroundImage from 'lib/iconFromBackgroundImage'; -import 'lib/controls-styles/controls-styles.css'; -import {ElevationProfile, calcSamplingInterval} from 'lib/leaflet.control.elevation-profile'; -import 'lib/leaflet.control.commons'; -import {blobFromString} from 'lib/binary-strings'; -import 'lib/leaflet.polyline-edit'; -import 'lib/leaflet.polyline-measure'; -import logging from 'lib/logging'; -import {notify} from 'lib/notifications'; -import {fetch} from 'lib/xhr-promise'; -import config from 'config'; +import copyToClipboard from '~/lib/clipboardCopy'; +import {saveAs} from '~/vendored/github.com/eligrey/FileSaver'; +import '~/lib/leaflet.layer.canvasMarkers'; +import '~/lib/leaflet.lineutil.simplifyLatLngs'; +import iconFromBackgroundImage from '~/lib/iconFromBackgroundImage'; +import '~/lib/controls-styles/controls-styles.css'; +import {ElevationProfile, calcSamplingInterval} from '~/lib/leaflet.control.elevation-profile'; +import '~/lib/leaflet.control.commons'; +import {blobFromString} from '~/lib/binary-strings'; +import '~/lib/leaflet.polyline-edit'; +import '~/lib/leaflet.polyline-measure'; +import logging from '~/lib/logging'; +import {notify} from '~/lib/notifications'; +import {fetch} from '~/lib/xhr-promise'; +import config from '~/config'; import md5 from './lib/md5'; -import {wrapLatLngToTarget, wrapLatLngBoundsToTarget} from 'lib/leaflet.fixes/fixWorldCopyJump'; +import {wrapLatLngToTarget, wrapLatLngBoundsToTarget} from '~/lib/leaflet.fixes/fixWorldCopyJump'; const TRACKLIST_TRACK_COLORS = ['#77f', '#f95', '#0ff', '#f77', '#f7f', '#ee5']; diff --git a/src/lib/leaflet.control.track-list/track-list.localstorage.js b/src/lib/leaflet.control.track-list/track-list.localstorage.js @@ -1,8 +1,8 @@ import './track-list' import L from 'leaflet'; import {parseNktkSequence} from './lib/parsers/nktk'; -import safeLocalStorage from 'lib/safe-localstorage'; -import logging from 'lib/logging'; +import safeLocalStorage from '~/lib/safe-localstorage'; +import logging from '~/lib/logging'; L.Control.TrackList.include({ maxLocalStorageSessions: 5, diff --git a/src/lib/leaflet.hashState/leaflet.hashState.js b/src/lib/leaflet.hashState/leaflet.hashState.js @@ -1,6 +1,6 @@ import L from 'leaflet'; import {hashState} from './hashState'; -import logging from 'lib/logging'; +import logging from '~/lib/logging'; L.Mixin.HashState = { enableHashState: function(key, defaultInitialState = null) { diff --git a/src/lib/leaflet.layer.canvasMarkers/index.js b/src/lib/leaflet.layer.canvasMarkers/index.js @@ -2,7 +2,7 @@ import L from 'leaflet'; import './canvasMarkers.css'; import rbush from 'rbush'; import loadImage from 'image-promise'; -import {wrapLatLngToTarget} from 'lib/leaflet.fixes/fixWorldCopyJump'; +import {wrapLatLngToTarget} from '~/lib/leaflet.fixes/fixWorldCopyJump'; /* Marker definition: diff --git a/src/lib/leaflet.layer.geocaching-su/index.js b/src/lib/leaflet.layer.geocaching-su/index.js @@ -1,11 +1,11 @@ import L from 'leaflet'; -import {fetch} from 'lib/xhr-promise'; -import 'lib/leaflet.layer.canvasMarkers'; -import logging from 'lib/logging'; -import {notify} from 'lib/notifications'; +import {fetch} from '~/lib/xhr-promise'; +import '~/lib/leaflet.layer.canvasMarkers'; +import logging from '~/lib/logging'; +import {notify} from '~/lib/notifications'; import './style.css'; -import iconFromBackgroundImage from 'lib/iconFromBackgroundImage'; -import {openPopupWindow} from 'lib/popup-window'; +import iconFromBackgroundImage from '~/lib/iconFromBackgroundImage'; +import {openPopupWindow} from '~/lib/popup-window'; const GeocachingSu = L.Layer.CanvasMarkers.extend({ diff --git a/src/lib/leaflet.layer.geojson-ajax/index.js b/src/lib/leaflet.layer.geojson-ajax/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; -import {fetch} from 'lib/xhr-promise'; -import {notify} from 'lib/notifications'; -import logging from 'lib/logging'; +import {fetch} from '~/lib/xhr-promise'; +import {notify} from '~/lib/notifications'; +import logging from '~/lib/logging'; L.Layer.GeoJSONAjax = L.GeoJSON.extend({ options: { diff --git a/src/lib/leaflet.layer.rasterize/Bing.js b/src/lib/leaflet.layer.rasterize/Bing.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import {BingLayer} from 'lib/leaflet.layer.bing'; +import {BingLayer} from '~/lib/leaflet.layer.bing'; BingLayer.include({ waitTilesReadyToGrab: function() { diff --git a/src/lib/leaflet.layer.rasterize/CanvasMarkers.js b/src/lib/leaflet.layer.rasterize/CanvasMarkers.js @@ -1,5 +1,5 @@ import L from "leaflet"; -import 'lib/leaflet.layer.canvasMarkers' +import '~/lib/leaflet.layer.canvasMarkers' L.Layer.CanvasMarkers.include({ _printProgressWeight: 0.1, diff --git a/src/lib/leaflet.layer.rasterize/Google.js b/src/lib/leaflet.layer.rasterize/Google.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import 'lib/leaflet.layer.google'; +import '~/lib/leaflet.layer.google'; L.Layer.GoogleBase.include({ cloneForPrint: function(options) { diff --git a/src/lib/leaflet.layer.rasterize/MeasuredLine.js b/src/lib/leaflet.layer.rasterize/MeasuredLine.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import 'lib/leaflet.polyline-measure'; +import '~/lib/leaflet.polyline-measure'; L.Polyline.include({ _printProgressWeight: 0.1, diff --git a/src/lib/leaflet.layer.rasterize/TileLayer.js b/src/lib/leaflet.layer.rasterize/TileLayer.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; import {imgFromDataString} from './imgFromDataString'; const GridLayerGrabMixin = { diff --git a/src/lib/leaflet.layer.rasterize/WestraPasses.js b/src/lib/leaflet.layer.rasterize/WestraPasses.js @@ -1,7 +1,7 @@ import L from "leaflet"; -import 'lib/leaflet.layer.westraPasses'; -import {WestraPassesMarkers} from 'lib/leaflet.layer.westraPasses/westraPassesMarkers'; -import 'lib/leaflet.layer.canvasMarkers' +import '~/lib/leaflet.layer.westraPasses'; +import {WestraPassesMarkers} from '~/lib/leaflet.layer.westraPasses/westraPassesMarkers'; +import '~/lib/leaflet.layer.canvasMarkers' import './CanvasMarkers'; L.Layer.WestraPasses.addInitHook(function() { diff --git a/src/lib/leaflet.layer.rasterize/Yandex.js b/src/lib/leaflet.layer.rasterize/Yandex.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import 'lib/leaflet.layer.yandex'; +import '~/lib/leaflet.layer.yandex'; L.Layer.Yandex.include({ cloneForPrint: function(options) { diff --git a/src/lib/leaflet.layer.soviet-topomaps-grid/index.js b/src/lib/leaflet.layer.soviet-topomaps-grid/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; import './style.css'; -import Contextmenu from 'lib/contextmenu'; -import copyToClipboard from 'lib/clipboardCopy'; +import Contextmenu from '~/lib/contextmenu'; +import copyToClipboard from '~/lib/clipboardCopy'; function zeroPad(num, size) { var s = num + ""; diff --git a/src/lib/leaflet.layer.strava-heatmap/index.js b/src/lib/leaflet.layer.strava-heatmap/index.js @@ -1,5 +1,5 @@ import L from 'leaflet'; -import {notify} from 'lib/notifications'; +import {notify} from '~/lib/notifications'; const StravaHeatmap = L.TileLayer.extend({ diff --git a/src/lib/leaflet.layer.westraPasses/index.js b/src/lib/leaflet.layer.westraPasses/index.js @@ -1,6 +1,6 @@ import L from 'leaflet'; import './westraPasses.css'; -import 'lib/leaflet.layer.geojson-ajax'; +import '~/lib/leaflet.layer.geojson-ajax'; import {WestraPassesMarkers} from './westraPassesMarkers'; L.Layer.WestraPasses = L.Layer.extend({ diff --git a/src/lib/leaflet.layer.westraPasses/westraPassesMarkers.js b/src/lib/leaflet.layer.westraPasses/westraPassesMarkers.js @@ -1,12 +1,12 @@ import L from 'leaflet'; -import 'lib/leaflet.layer.canvasMarkers' -import {openPopupWindow} from 'lib/popup-window'; +import '~/lib/leaflet.layer.canvasMarkers' +import {openPopupWindow} from '~/lib/popup-window'; import escapeHtml from 'escape-html'; -import {saveAs} from 'vendored/github.com/eligrey/FileSaver'; -import iconFromBackgroundImage from 'lib/iconFromBackgroundImage'; -import {fetch} from 'lib/xhr-promise'; -import {notify} from 'lib/notifications'; -import logging from 'lib/logging'; +import {saveAs} from '~/vendored/github.com/eligrey/FileSaver'; +import iconFromBackgroundImage from '~/lib/iconFromBackgroundImage'; +import {fetch} from '~/lib/xhr-promise'; +import {notify} from '~/lib/notifications'; +import logging from '~/lib/logging'; const WestraPassesMarkers = L.Layer.CanvasMarkers.extend({ options: { diff --git a/src/lib/leaflet.layer.wikimapia/index.js b/src/lib/leaflet.layer.wikimapia/index.js @@ -1,7 +1,7 @@ import L from 'leaflet'; import {WikimapiaLoader} from './wikimapia-loader'; import './style.css'; -import {openPopupWindow} from 'lib/popup-window'; +import {openPopupWindow} from '~/lib/popup-window'; function isPointInPolygon(polygon, p) { diff --git a/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js b/src/lib/leaflet.layer.wikimapia/wikimapia-loader.js @@ -1,6 +1,6 @@ -import {TiledDataLoader} from 'lib/tiled-data-loader'; +import {TiledDataLoader} from '~/lib/tiled-data-loader'; import wmUtils from './wm-utils' -import urlViaCorsProxy from 'lib/CORSProxy'; +import urlViaCorsProxy from '~/lib/CORSProxy'; class WikimapiaLoader extends TiledDataLoader { maxZoom = 15; diff --git a/src/lib/leaflet.polyline-edit/index.js b/src/lib/leaflet.polyline-edit/index.js @@ -1,6 +1,6 @@ import L from 'leaflet'; import './edit_line.css'; -import {wrapLatLngToTarget} from 'lib/leaflet.fixes/fixWorldCopyJump'; +import {wrapLatLngToTarget} from '~/lib/leaflet.fixes/fixWorldCopyJump'; L.Polyline.EditMixinOptions = { className: 'leaflet-editable-line' diff --git a/src/lib/magnetic-declination/index.js b/src/lib/magnetic-declination/index.js @@ -1,5 +1,5 @@ import declination from './declination.json'; -import {stringToArrayBuffer} from 'lib/binary-strings'; +import {stringToArrayBuffer} from '~/lib/binary-strings'; let data; diff --git a/src/lib/popup-window/index.js b/src/lib/popup-window/index.js @@ -1,4 +1,4 @@ -import logging from 'lib/logging'; +import logging from '~/lib/logging'; function openPopupWindow(url, width, uniqName = null) { var left, top, height, diff --git a/src/lib/tiled-data-loader/index.js b/src/lib/tiled-data-loader/index.js @@ -1,5 +1,5 @@ -import {Cache} from 'lib/cache'; -import {XHRQueue} from 'lib/xhr-promise'; +import {Cache} from '~/lib/cache'; +import {XHRQueue} from '~/lib/xhr-promise'; class TiledDataLoader { diff --git a/src/lib/xhr-promise/index.js b/src/lib/xhr-promise/index.js @@ -1,4 +1,4 @@ -import {arrayBufferToString} from 'lib/binary-strings'; +import {arrayBufferToString} from '~/lib/binary-strings'; function successIfStatus200(xhr) { return xhr.status >= 200 && xhr.status <= 299;