From 9fe89c2d711e91e30f4d5b5c584f4acf96d84f6b Mon Sep 17 00:00:00 2001 From: James Lyne Date: Mon, 27 Jun 2022 13:56:45 +0100 Subject: [PATCH] Remove remaining leaflet control references --- package-lock.json | 12 ++++++------ package.json | 2 +- src/components/Map.vue | 2 -- src/leaflet/LiveAtlasLeafletMap.ts | 23 +---------------------- src/scss/_leaflet.scss | 1 - 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index b314d73..f34b638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@kyvg/vue3-notification": "2.3.0", "@soerenmartius/vue3-clipboard": "^0.1", - "leaflet": "git+https://github.com/JLyne/Leaflet.git#843eb3124492dc48245cd187c6dc94c2f33b65c1", + "leaflet": "git+https://github.com/JLyne/Leaflet.git#0bf4e3f70c2559771592c077401027a6c4913376", "lodash.debounce": "^4.0.8", "modern-normalize": "^1.1.0", "vue": "^3.2.37", @@ -7606,8 +7606,8 @@ }, "node_modules/leaflet": { "version": "1.8.0-LiveAtlas", - "resolved": "git+ssh://git@github.com/JLyne/Leaflet.git#843eb3124492dc48245cd187c6dc94c2f33b65c1", - "integrity": "sha512-QJPpfKcc+xgcOzB6KlJEjdw4RJ41rMSeeTqPD7QsO1CvJ9uiJ/yhW4iSTKyhsmZ3JJDBw8Do2+cLevkddyLR9w==", + "resolved": "git+ssh://git@github.com/JLyne/Leaflet.git#0bf4e3f70c2559771592c077401027a6c4913376", + "integrity": "sha512-Fptn2BrpixOsx/+dAzObvWcdZML6+rCjSGxB8oeXt4sBCxHj4QuFB/8bAxMgzQW72oE0SytmMmLN+38WTRq3gA==", "license": "BSD-2-Clause" }, "node_modules/leven": { @@ -16196,9 +16196,9 @@ "peer": true }, "leaflet": { - "version": "git+ssh://git@github.com/JLyne/Leaflet.git#843eb3124492dc48245cd187c6dc94c2f33b65c1", - "integrity": "sha512-QJPpfKcc+xgcOzB6KlJEjdw4RJ41rMSeeTqPD7QsO1CvJ9uiJ/yhW4iSTKyhsmZ3JJDBw8Do2+cLevkddyLR9w==", - "from": "leaflet@git+https://github.com/JLyne/Leaflet.git#843eb3124492dc48245cd187c6dc94c2f33b65c1" + "version": "git+ssh://git@github.com/JLyne/Leaflet.git#0bf4e3f70c2559771592c077401027a6c4913376", + "integrity": "sha512-Fptn2BrpixOsx/+dAzObvWcdZML6+rCjSGxB8oeXt4sBCxHj4QuFB/8bAxMgzQW72oE0SytmMmLN+38WTRq3gA==", + "from": "leaflet@git+https://github.com/JLyne/Leaflet.git#0bf4e3f70c2559771592c077401027a6c4913376" }, "leven": { "version": "3.1.0", diff --git a/package.json b/package.json index 4d2a0df..780d35b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@kyvg/vue3-notification": "2.3.0", "@soerenmartius/vue3-clipboard": "^0.1", - "leaflet": "git+https://github.com/JLyne/Leaflet.git#843eb3124492dc48245cd187c6dc94c2f33b65c1", + "leaflet": "git+https://github.com/JLyne/Leaflet.git#0bf4e3f70c2559771592c077401027a6c4913376", "lodash.debounce": "^4.0.8", "modern-normalize": "^1.1.0", "vue": "^3.2.37", diff --git a/src/components/Map.vue b/src/components/Map.vue index 30afdb6..25c05bf 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -234,9 +234,7 @@ export default defineComponent({ center: new LatLng(0, 0), fadeAnimation: false, zoomAnimation: true, - zoomControl: false, preferCanvas: true, - attributionControl: false, crs: CRS.Simple, worldCopyJump: false, // markerZoomAnimation: false, diff --git a/src/leaflet/LiveAtlasLeafletMap.ts b/src/leaflet/LiveAtlasLeafletMap.ts index 4f76f3f..5b293d6 100644 --- a/src/leaflet/LiveAtlasLeafletMap.ts +++ b/src/leaflet/LiveAtlasLeafletMap.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {Map, DomUtil, MapOptions} from 'leaflet'; +import {Map, MapOptions} from 'leaflet'; export default class LiveAtlasLeafletMap extends Map { declare _controlCorners: any; @@ -24,25 +24,4 @@ export default class LiveAtlasLeafletMap extends Map { constructor(element: string | HTMLElement, options?: MapOptions) { super(element, options); } - - // noinspection JSUnusedGlobalSymbols - _initControlPos() { - const corners: any = this._controlCorners = {}, - l = 'leaflet-', - container = this._controlContainer = - DomUtil.create('div', l + 'control-container', this._container); - - function createCorner(vSide: string, hSide: string) { - const className = l + vSide + ' ' + l + hSide; - - corners[`${vSide}${hSide}`] = DomUtil.create('div', className, container); - } - - createCorner('top', 'left'); - createCorner('top', 'right'); - createCorner('top', 'center'); - createCorner('bottom', 'center'); - createCorner('bottom', 'left'); - createCorner('bottom', 'right'); - } } diff --git a/src/scss/_leaflet.scss b/src/scss/_leaflet.scss index f1c6037..0202556 100644 --- a/src/scss/_leaflet.scss +++ b/src/scss/_leaflet.scss @@ -14,7 +14,6 @@ * limitations under the License. */ -@import "leaflet/controls"; @import "leaflet/popups"; @import "leaflet/tooltips"; @import "leaflet/markers";