commit bfa359ebdb4a3c6d24ba06133d7761a47cf63c40
parent 63f13762cb547a5703880179522bcbb1e5afd537
Author: Sergej Orlov <wladimirych@gmail.com>
Date: Tue, 3 Jul 2018 14:21:20 +0300
Merge branch 'myadzel-azimuth-pointers'
Diffstat:
4 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/lib/leaflet.control.azimuth/index.js b/src/lib/leaflet.control.azimuth/index.js
@@ -63,8 +63,8 @@ L.Control.Azimuth = L.Control.extend({
end: null
};
const iconSingle = L.icon({iconUrl: iconPointer, iconSize: [30, 30]});
- const iconStart = L.icon({iconUrl: iconPointerStart, iconSize: [40, 40]});
- const iconEnd = L.icon({iconUrl: iconPointerEnd, iconSize: [40, 40]});
+ const iconStart = L.icon({iconUrl: iconPointerStart, iconSize: [30, 30]});
+ const iconEnd = L.icon({iconUrl: iconPointerEnd, iconSize: [30, 45]});
this.markers = {
single: L.marker([0, 0], {icon: iconSingle, draggable: true, which: 'start'})
.on('drag', this.onMarkerDrag, this)
diff --git a/src/lib/leaflet.control.azimuth/pointer-end.svg b/src/lib/leaflet.control.azimuth/pointer-end.svg
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 40 40" xml:space="preserve">
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 45">
<g>
- <ellipse ry="15" rx="15" id="svg_1" cy="24.5" cx="20" fill="#777" fill-opacity="0.5"/>
- <line x1="20" y1="20" x2="25" y2="30" stroke="#3388ff" stroke-width="2"/>
- <line x1="20" y1="20" x2="15" y2="30" stroke="#3388ff" stroke-width="2"/>
- <line x1="20" y1="20" x2="20" y2="38" stroke="#3388ff" stroke-width="1.2"/>
+ <ellipse ry="15" rx="15" cy="26" cx="15" fill="#777" fill-opacity="0.5"/>
+ <path d="M15,20 l-5,12 l10,0 z" fill="#3388ff"/>
</g>
</svg>
\ No newline at end of file
diff --git a/src/lib/leaflet.control.azimuth/pointer-start.svg b/src/lib/leaflet.control.azimuth/pointer-start.svg
@@ -1,12 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 40 40" xml:space="preserve">
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
<g>
- <ellipse ry="15" rx="15" id="svg_1" cy="22" cx="20" fill="#777" fill-opacity="0.5"/>
-
- <line x1="20" y1="20" x2="23" y2="24" stroke="#3388ff" stroke-width="1.5"/>
- <line x1="20" y1="20" x2="17" y2="24" stroke="#3388ff" stroke-width="1.5"/>
-
- <line x1="20" y1="20" x2="20" y2="7" stroke="#3388ff" stroke-width="1.5"/>
+ <ellipse ry="15" rx="15" cy="15" cx="15" fill="#777" fill-opacity="0.5"/>
+ <ellipse ry="3" rx="3" cy="15" cx="15" fill="#3388ff" />
</g>
</svg>
\ No newline at end of file
diff --git a/src/lib/leaflet.control.azimuth/pointer.svg b/src/lib/leaflet.control.azimuth/pointer.svg
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 30 30" xml:space="preserve">
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
<g>
- <ellipse ry="15" rx="15" id="svg_1" cy="15" cx="15" fill="#777" fill-opacity="0.5"/>
- <line x1="12" y1="12" x2="18" y2="18" stroke="#3388ff" stroke-width="1.5"/>
- <line x1="12" y1="18" x2="18" y2="12" stroke="#3388ff" stroke-width="1.5"/>
+ <ellipse ry="15" rx="15" cy="15" cx="15" fill="#777" fill-opacity="0.5"/>
+ <ellipse ry="3" rx="3" cy="15" cx="15" fill="#3388ff" />
</g>
</svg>
\ No newline at end of file