Skip to content

Commit e0f86c5

Browse files
committed
[BUILD]
1 parent 7f6c921 commit e0f86c5

File tree

3 files changed

+52
-23
lines changed

3 files changed

+52
-23
lines changed

dist/ol-ext.js

+39-21
Original file line numberDiff line numberDiff line change
@@ -5064,30 +5064,41 @@ ol.control.Search = class olcontrolSearch extends ol.control.Control {
50645064
// move up/down
50655065
if (e.key == 'ArrowDown' || e.key == 'ArrowUp' || e.key == 'Down' || e.key == 'Up') {
50665066
if (li) {
5067-
li.classList.remove("select");
5068-
li = (/Down/.test(e.key)) ? li.nextElementSibling : li.previousElementSibling;
5069-
if (li)
5070-
li.classList.add("select");
5067+
var newli = (/Down/.test(e.key)) ? li.nextElementSibling : li.previousElementSibling;
5068+
if (newli && !newli.classList.contains('copy')) {
5069+
li.classList.remove("select");
5070+
newli.classList.add("select");
5071+
input.value = newli.innerText;
5072+
}
50715073
} else {
5072-
element.querySelector("ul.autocomplete li").classList.add("select");
5074+
li = element.querySelector("ul.autocomplete li")
5075+
li.classList.add("select");
5076+
input.value = li.innerText;
50735077
}
50745078
}
50755079
// Clear input
5076-
else if (e.type == 'input' && !val) {
5077-
setTimeout(function () {
5078-
self.drawList_();
5079-
}, 200);
5080+
else if (e.type == 'input') {
5081+
if (!val) {
5082+
setTimeout(function () {
5083+
self.drawList_();
5084+
}, 200);
5085+
}
5086+
if (li) {
5087+
input.value = val = '';
5088+
li.classList.remove("select");
5089+
}
50805090
}
50815091
// Select in the list
5082-
else if (li && (e.type == "search" || e.key == "Enter")) {
5083-
if (element.classList.contains("ol-control"))
5092+
else if (li && (e.type === "search" || e.key === "Enter")) {
5093+
if (element.classList.contains("ol-control")) {
50845094
input.blur();
5095+
}
50855096
li.classList.remove("select");
50865097
cur = val;
50875098
self._handleSelect(self._list[li.getAttribute("data-search")]);
50885099
}
50895100
// Search / autocomplete
5090-
else if ((e.type == "search" || e.key == 'Enter')
5101+
else if ((e.type === "search" || e.key === 'Enter')
50915102
|| (cur != val && options.typing >= 0)) {
50925103
// current search
50935104
cur = val;
@@ -5136,6 +5147,11 @@ ol.control.Search = class olcontrolSearch extends ol.control.Control {
51365147
element.classList.remove('ol-revers');
51375148
}
51385149
}.bind(this));
5150+
input.addEventListener('keydown', function() {
5151+
this.set('reverse', false);
5152+
element.classList.remove('ol-collapsed');
5153+
element.classList.remove('ol-revers');
5154+
}.bind(this))
51395155
}
51405156
element.appendChild(input);
51415157
// Reverse geocode
@@ -5144,15 +5160,17 @@ ol.control.Search = class olcontrolSearch extends ol.control.Control {
51445160
type: 'button',
51455161
class: 'ol-revers',
51465162
title: options.reverseTitle || 'click on the map',
5147-
click: function () {
5148-
if (!this.get('reverse')) {
5149-
this.set('reverse', !this.get('reverse'));
5150-
input.focus();
5151-
element.classList.add('ol-revers');
5152-
} else {
5153-
this.set('reverse', false);
5154-
}
5155-
}.bind(this)
5163+
on: {
5164+
focus: function () {
5165+
if (!this.get('reverse')) {
5166+
this.set('reverse', !this.get('reverse'));
5167+
input.focus();
5168+
element.classList.add('ol-revers');
5169+
} else {
5170+
this.set('reverse', false);
5171+
}
5172+
}.bind(this)
5173+
}
51565174
});
51575175
element.appendChild(reverse);
51585176
}

dist/ol-ext.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/misc/map.georef2wmts.html

+12-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@
3535

3636
<style>
3737
#map {
38+
/*
3839
width: 600px;
3940
height: 400px;
41+
*/
42+
inset: 0;
43+
margin: 0;
44+
position: fixed;
4045
}
4146
</style>
4247

@@ -75,7 +80,7 @@ <h1>ol-ext: </h1>
7580
map.addControl(new ol.control.LayerSwitcher());
7681
map.addControl(new ol.control.Permalink({visible: false}));
7782

78-
var tileSize = 512;
83+
var tileSize = 256 // 512;
7984
var geoImage;
8085
var ddrop = new ol.interaction.DropFile({
8186
formatConstructors: ['none']
@@ -132,9 +137,15 @@ <h1>ol-ext: </h1>
132137
[tileSize,tileSize]
133138
);
134139
// var dt = canvas.toDataURL('image/png');
140+
/** /
135141
canvas.toBlob(function(blob) {
136142
saveAs(blob, geoImage.get('title')+'_'+z+'-'+x+'-'+y+'.png');
137143
}, 'image/png');
144+
/*/
145+
canvas.toBlob(function(blob) {
146+
saveAs(blob, geoImage.get('title')+'_'+z+'-'+x+'-'+y+'.jpg');
147+
}, 'imag/jpeg', 0.7);
148+
/**/
138149
}
139150
console.log(tiles.length)
140151
if (tiles.length) setTimeout(function() { loadFiles(tiles); }, 1000);

0 commit comments

Comments
 (0)