From bf830c2992cfcc46e76740c81d7f5ec3e428cc38 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 28 Mar 2013 19:43:56 -0700 Subject: [PATCH 1/3] New plugin add a zoom slider to map --- ATTRIBUTION.md | 1 + dist/images/zoom-slider.png | Bin 0 -> 2778 bytes external/L.Control.Zoomslider.css | 106 ++++++++++++++ external/L.Control.Zoomslider.js | 221 ++++++++++++++++++++++++++++++ images/zoom-slider.png | Bin 0 -> 2778 bytes plugins/zoom-slider.user.js | 53 +++++++ 6 files changed, 381 insertions(+) create mode 100644 dist/images/zoom-slider.png create mode 100644 external/L.Control.Zoomslider.css create mode 100644 external/L.Control.Zoomslider.js create mode 100644 images/zoom-slider.png create mode 100644 plugins/zoom-slider.user.js diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 4cd6e083..334db65a 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -9,5 +9,6 @@ This project is licensed under the permissive ISC license. Parts imported from o - [oms.min.js by George MacKerron; MIT](https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet) - [taphold.js by Rich Adams; unknown](https://github.com/richadams/jquery-taphold) - [L.Control.Pan.js by Kartena AB; same as Leaftlet](https://github.com/kartena/Leaflet.Pancontrol) +- [L.Control.Zoomslider.js by Kartena AB; same as Leaftlet](https://github.com/kartena/Leaflet.zoomslider) - StackOverflow-CopyPasta is attributed in the source; [CC-Wiki](https://creativecommons.org/licenses/by-sa/3.0/) - all Ingress/Niantic related stuff obviously remains non-free and is still copyrighted by Niantic/Google diff --git a/dist/images/zoom-slider.png b/dist/images/zoom-slider.png new file mode 100644 index 0000000000000000000000000000000000000000..529f451ba050e32d8c14450857fd3eed00aeefab GIT binary patch literal 2778 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 gV1T1~B(@9#0256CU

G%>V!Z07*qoM6N<$f}{mF>;M1& literal 0 HcmV?d00001 diff --git a/external/L.Control.Zoomslider.css b/external/L.Control.Zoomslider.css new file mode 100644 index 00000000..59317566 --- /dev/null +++ b/external/L.Control.Zoomslider.css @@ -0,0 +1,106 @@ +/** Slider **/ +.leaflet-control-zoomslider-slider { + padding-top: 5px ; + padding-bottom: 5px; +} + +.leaflet-control-zoomslider-slider-body { + background-image: url(@@INCLUDEIMAGE:images/zoom-slider.png@@); + background-repeat: repeat-y; + background-position: center 0px; + height: 100%; + cursor: default; +} + +.leaflet-control-zoomslider-slider-knob { + width: 13px; + height:5px; + background-color: black; + background-position: center; + -webkit-border-radius: 15px; + border-radius: 15px; + margin-left: 5px; + /*border: 5px; */ + position:relative; +} + +.leaflet-control-zoomslider-slider-body:hover { + cursor: pointer; +} + +.leaflet-control-zoomslider-slider-knob:hover { + cursor: default; + cursor: -webkit-grab; + cursor: -moz-grab; +} + +.leaflet-dragging .leaflet-control-zoomslider, +.leaflet-dragging .leaflet-control-zoomslider-slider, +.leaflet-dragging .leaflet-control-zoomslider-slider-body, +.leaflet-dragging .leaflet-control-zoomslider a, +.leaflet-dragging .leaflet-control-zoomslider a.leaflet-control-zoomslider-disabled, +.leaflet-dragging .leaflet-control-zoomslider-slider-knob:hover { + cursor: move; + cursor: -webkit-grabbing; + cursor: -moz-grabbing; +} + +/** Leaflet Zoom Styles **/ +.leaflet-container .leaflet-control-zoomslider { + margin-left: 13px; + margin-top: 12px; +} +.leaflet-control-zoomslider a { + width: 23px; + height: 22px; + text-align: center; + text-decoration: none; + color: black; + display: block; +} +.leaflet-control-zoomslider a:hover { + background-color: #fff; + color: #777; +} +.leaflet-control-zoomslider-in { + font: bold 19px/24px Arial, Helvetica, sans-serif; +} +.leaflet-control-zoomslider-in:after{ + content:"+" +} +.leaflet-control-zoomslider-out { + font: bold 23px/20px Tahoma, Verdana, sans-serif; +} +.leaflet-control-zoomslider-out:after{ + content:"-" +} +.leaflet-control-zoomslider a.leaflet-control-zoomslider-disabled { + cursor: default; + color: #bbb; +} + +/* Touch */ + +.leaflet-touch .leaflet-control-zoomslider-slider-knob { + width:20px; +} +.leaflet-touch .leaflet-control-zoomslider a { + width: 30px; + height: 30px; +} +.leaflet-touch .leaflet-control-zoomslider-in { + font-size: 24px; + line-height: 29px; +} +.leaflet-touch .leaflet-control-zoomslider-out { + font-size: 28px; + line-height: 24px; +} + +.leaflet-touch .leaflet-control-zoomslider { + box-shadow: none; +} + +.leaflet-touch .leaflet-control-zoomslider { + border: 4px solid rgba(0,0,0,0.3); +} diff --git a/external/L.Control.Zoomslider.js b/external/L.Control.Zoomslider.js new file mode 100644 index 00000000..06b594b0 --- /dev/null +++ b/external/L.Control.Zoomslider.js @@ -0,0 +1,221 @@ +L.Control.Zoomslider = (function(){ + + var Knob = L.Draggable.extend({ + initialize: function (element, steps, stepHeight, knobHeight) { + var sliderHeight = steps * stepHeight; + L.Draggable.prototype.initialize.call(this, element, element); + + this._element = element; + this._maxValue = steps - 1; + + // conversion parameters + // the conversion is just a common linear function. + this._k = -stepHeight; + this._m = sliderHeight - (stepHeight + knobHeight) / 2; + + this.on('predrag', function() { + this._newPos.x = 0; + this._newPos.y = this._adjust(this._newPos.y); + }, this); + }, + + _adjust: function (y) { + var value = Math.round(this._toValue(y)); + value = Math.max(0, Math.min(this._maxValue, value)); + return this._toY(value); + }, + + // y = k*v + m + _toY: function (value) { + return this._k * value + this._m; + }, + // v = (y - m) / k + _toValue: function (y) { + return (y - this._m) / this._k; + }, + + setPosition: function (y) { + L.DomUtil.setPosition(this._element, + L.point(0, this._adjust(y))); + }, + + setValue: function (v) { + this.setPosition(this._toY(v)); + }, + + getValue: function () { + return this._toValue(L.DomUtil.getPosition(this._element).y); + } + }); + + var Zoomslider = L.Control.extend({ + options: { + position: 'topleft', + // Height of zoom-slider.png in px + stepHeight: 9, + // Height of the knob div in px + knobHeight: 5, + styleNS: 'leaflet-control-zoomslider' + }, + + onAdd: function (map) { + var container = L.DomUtil.create('div', this.options.styleNS + ' leaflet-bar'); + + L.DomEvent.disableClickPropagation(container); + + this._map = map; + + this._zoomInButton = this._createZoomButton( + 'in', 'top', container, this._zoomIn); + + this._sliderElem = L.DomUtil.create( + 'div', + this.options.styleNS + "-slider leaflet-bar-part", + container); + + this._zoomOutButton = this._createZoomButton( + 'out', 'bottom', container, this._zoomOut); + + map .on('layeradd layerremove', this._refresh, this) + .on("zoomend", this._updateSlider, this) + .on("zoomend", this._updateDisabled, this) + .whenReady(this._createSlider, this) + .whenReady(this._createKnob, this) + .whenReady(this._updateSlider, this) + .whenReady(this._updateDisabled, this); + + return container; + }, + + onRemove: function (map) { + map .off("zoomend", this._updateSlider) + .off("zoomend", this._updateDisabled) + .off('layeradd layerremove', this._refresh); + }, + + _refresh: function () { + // TODO: listen to zoomlevelschange-event instead in 0.6.x + this._map + .removeControl(this) + .addControl(this); + }, + _zoomLevels: function(){ + return this._map.getMaxZoom() - this._map.getMinZoom() + 1; + }, + + _createSlider: function () { + var zoomLevels = this._zoomLevels(); + + // No tilelayer probably + if(zoomLevels == Infinity){ + return; + } + + this._sliderBody = L.DomUtil.create('div', + this.options.styleNS + '-slider-body', + this._sliderElem); + this._sliderBody.style.height + = (this.options.stepHeight * zoomLevels) + "px"; + L.DomEvent.on(this._sliderBody, 'click', this._onSliderClick, this); + }, + + _createKnob: function () { + var knobElem, + zoomLevels = this._zoomLevels(); + + // No tilelayer probably + if(zoomLevels == Infinity) { + return; + } + + knobElem = L.DomUtil.create('div', this.options.styleNS + '-slider-knob', + this._sliderBody); + L.DomEvent.disableClickPropagation(knobElem); + + this._knob = new Knob(knobElem, + this._zoomLevels(), + this.options.stepHeight, + this.options.knobHeight) + .on('dragend', this._updateZoom, this); + this._knob.enable(); + }, + + _onSliderClick: function (e) { + var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e); + var y = L.DomEvent.getMousePosition(first).y + - L.DomUtil.getViewportOffset(this._sliderBody).y; // Cache this? + this._knob.setPosition(y); + this._updateZoom(); + }, + + _zoomIn: function (e) { + this._map.zoomIn(e.shiftKey ? 3 : 1); + }, + _zoomOut: function (e) { + this._map.zoomOut(e.shiftKey ? 3 : 1); + }, + + _createZoomButton: function (zoomDir, end, container, fn) { + var barPart = 'leaflet-bar-part', + classDef = this.options.styleNS + '-' + zoomDir + + ' ' + barPart + + ' ' + barPart + '-' + end, + title = 'Zoom ' + zoomDir, + link = L.DomUtil.create('a', classDef, container); + link.href = '#'; + link.title = title; + + L.DomEvent + .on(link, 'click', L.DomEvent.preventDefault) + .on(link, 'click', fn, this); + + return link; + }, + _toZoomLevel: function (sliderValue) { + return sliderValue + this._map.getMinZoom(); + }, + _toSliderValue: function (zoomLevel) { + return zoomLevel - this._map.getMinZoom(); + }, + + _updateZoom: function(){ + this._map.setZoom(this._toZoomLevel(this._knob.getValue())); + }, + _updateSlider: function(){ + if(this._knob){ + this._knob.setValue(this._toSliderValue(this._map.getZoom())); + } + }, + _updateDisabled: function () { + var map = this._map, + className = this.options.styleNS + '-disabled'; + + L.DomUtil.removeClass(this._zoomInButton, className); + L.DomUtil.removeClass(this._zoomOutButton, className); + + if (map.getZoom() === map.getMinZoom()) { + L.DomUtil.addClass(this._zoomOutButton, className); + } + if (map.getZoom() === map.getMaxZoom()) { + L.DomUtil.addClass(this._zoomInButton, className); + } + } + }); + return Zoomslider; +})(); + +L.Map.mergeOptions({ + zoomControl: false, + zoomsliderControl: true +}); + +L.Map.addInitHook(function () { + if (this.options.zoomsliderControl) { + this.zoomsliderControl = new L.Control.Zoomslider(); + this.addControl(this.zoomsliderControl); + } +}); + +L.control.zoomslider = function (options) { + return new L.Control.Zoomslider(options); +}; diff --git a/images/zoom-slider.png b/images/zoom-slider.png new file mode 100644 index 0000000000000000000000000000000000000000..529f451ba050e32d8c14450857fd3eed00aeefab GIT binary patch literal 2778 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 gV1T1~B(@9#0256CU

G%>V!Z07*qoM6N<$f}{mF>;M1& literal 0 HcmV?d00001 diff --git a/plugins/zoom-slider.user.js b/plugins/zoom-slider.user.js new file mode 100644 index 00000000..dc864bd2 --- /dev/null +++ b/plugins/zoom-slider.user.js @@ -0,0 +1,53 @@ +// ==UserScript== +// @id iitc-plugin-zoom-slider@fragger +// @name IITC plugin: zoom slider +// @version 0.1.0.@@DATETIMEVERSION@@ +// @namespace https://github.com/jonatkins/ingress-intel-total-conversion +// @updateURL @@UPDATEURL@@ +// @downloadURL @@DOWNLOADURL@@ +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Shows a zoom slider on the map instead of the zoom buttons +// @include https://www.ingress.com/intel* +// @include http://www.ingress.com/intel* +// @match https://www.ingress.com/intel* +// @match http://www.ingress.com/intel* +// ==/UserScript== + +function wrapper() { +// ensure plugin framework is there, even if iitc is not yet loaded +if(typeof window.plugin !== 'function') window.plugin = function() {}; + + +// PLUGIN START //////////////////////////////////////////////////////// + + +// use own namespace for plugin +window.plugin.zoomSlider = function() {}; + +window.plugin.zoomSlider.setup = function() { + try { console.log('Loading Leaflet.zoomslider JS now'); } catch(e) {} + @@INCLUDERAW:external/L.Control.Zoomslider.js@@ + try { console.log('done loading Leaflet.zoomslider JS'); } catch(e) {} + + window.map.removeControl(map.zoomControl); + window.map.addControl(L.control.zoomslider()); + + $('head').append(''); +}; + +var setup = window.plugin.zoomSlider.setup; + +// PLUGIN END ////////////////////////////////////////////////////////// + +if(window.iitcLoaded && typeof setup === 'function') { + setup(); +} else { + if(window.bootPlugins) + window.bootPlugins.push(setup); + else + window.bootPlugins = [setup]; +} +} // wrapper end +// inject code into site context +var script = document.createElement('script'); +script.appendChild(document.createTextNode('('+ wrapper +')();')); +(document.body || document.head || document.documentElement).appendChild(script); From cd3380cb69b5641408e7297f7a43d67ae125f8a8 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 28 Mar 2013 21:17:07 -0700 Subject: [PATCH 2/3] No more dist folder, don't need to add image to it --- dist/images/zoom-slider.png | Bin 2778 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dist/images/zoom-slider.png diff --git a/dist/images/zoom-slider.png b/dist/images/zoom-slider.png deleted file mode 100644 index 529f451ba050e32d8c14450857fd3eed00aeefab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2778 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 gV1T1~B(@9#0256CU

G%>V!Z07*qoM6N<$f}{mF>;M1& From b7e317bb026215e1fc8e053d15fc72092f73f4cb Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 31 Mar 2013 02:11:16 -0700 Subject: [PATCH 3/3] Nits and fixes --- external/L.Control.Zoomslider.css | 4 ++-- plugins/zoom-slider.user.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/external/L.Control.Zoomslider.css b/external/L.Control.Zoomslider.css index 59317566..5e70bbee 100644 --- a/external/L.Control.Zoomslider.css +++ b/external/L.Control.Zoomslider.css @@ -17,7 +17,7 @@ height:5px; background-color: black; background-position: center; - -webkit-border-radius: 15px; + -webkit-border-radius: 15px; border-radius: 15px; margin-left: 5px; /*border: 5px; */ @@ -36,7 +36,7 @@ .leaflet-dragging .leaflet-control-zoomslider, .leaflet-dragging .leaflet-control-zoomslider-slider, -.leaflet-dragging .leaflet-control-zoomslider-slider-body, +.leaflet-dragging .leaflet-control-zoomslider-slider-body, .leaflet-dragging .leaflet-control-zoomslider a, .leaflet-dragging .leaflet-control-zoomslider a.leaflet-control-zoomslider-disabled, .leaflet-dragging .leaflet-control-zoomslider-slider-knob:hover { diff --git a/plugins/zoom-slider.user.js b/plugins/zoom-slider.user.js index dc864bd2..a0b41b7b 100644 --- a/plugins/zoom-slider.user.js +++ b/plugins/zoom-slider.user.js @@ -27,10 +27,12 @@ window.plugin.zoomSlider.setup = function() { try { console.log('Loading Leaflet.zoomslider JS now'); } catch(e) {} @@INCLUDERAW:external/L.Control.Zoomslider.js@@ try { console.log('done loading Leaflet.zoomslider JS'); } catch(e) {} - - window.map.removeControl(map.zoomControl); + + if(map.zoomControl._map) { + window.map.removeControl(map.zoomControl); + } window.map.addControl(L.control.zoomslider()); - + $('head').append(''); };