update geo module

source/Ox.UI/js/Calendar/Ox.Calendar.js

@@ -925,23 +925,23 @@ Ox.Calendar = function(options, self) {
     function mousewheel(e, delta, deltaX, deltaY) {
         //Ox.Log('Calendar', 'mousewheel', delta, deltaX, deltaY);
         var deltaZ = 0;
-        if (!self.mousewheel && deltaY && Math.abs(deltaY) > Math.abs(deltaX)) {
+        if (!self.mousewheel && Math.abs(deltaY) > Math.abs(deltaX)) {
             if (deltaY < 0 && self.options.zoom > 0) {
                 deltaZ = -1;
             } else if (deltaY > 0 && self.options.zoom < self.maxZoom) {
                 deltaZ = 1;
             }
             if (deltaZ) {
-                self.options.date = deltaZ == -1 ?
-                    new Date(2 * +self.options.date - +getMouseDate(e)) :
-                    new Date((+self.options.date + +getMouseDate(e)) / 2);
+                self.options.date = deltaZ == -1
+                    ? new Date(2 * +self.options.date - +getMouseDate(e))
+                    : new Date((+self.options.date + +getMouseDate(e)) / 2);
                 zoomBy(deltaZ);
             }
+            self.mousewheel = true;
+            setTimeout(function() {
+                self.mousewheel = false;
+            }, 250);
         }
-        self.mousewheel = true;
-        setTimeout(function() {
-            self.mousewheel = false;
-        }, 250);
     }
 
     function overlaps(eventA, eventB) {

source/Ox.UI/js/Map/Ox.ListMap.js

@@ -354,7 +354,7 @@ Ox.ListMap = function(options, self) {
     self.$placeFlag = $('<img>')
         .addClass('OxFlag')
         .attr({
-            src: Ox.getImageByGeoname('icon', 16, '')
+            src: Ox.getFlagByGeoname('', 16)
         })
         .css({float: 'left', margin: '4px'})
         .appendTo(self.$placeTitle);
@@ -436,7 +436,7 @@ Ox.ListMap = function(options, self) {
                 countryCode = country ? country.code : '',
                 isResult = self.selectedPlace[0] == '_';
             self.$placeFlag.attr({
-                src: Ox.getImageByGeoname('icon', 16, geoname)
+                src: Ox.getFlagByGeoname(geoname, 16)
             });
             self.$placeName.options({title: geoname});
             self.$placeForm.values({countryCode: countryCode});
@@ -802,7 +802,7 @@ Ox.ListMap = function(options, self) {
             //isResult && self.options.places.push(place);
             self.selectedPlace = place.id;
             self.$placeFlag.attr({
-                src: Ox.getImageByGeoname('icon', 16, place.geoname)
+                src: Ox.getFlagByGeoname(place.geoname, 16)
             });
             self.$placeName.options({title: place.geoname || ''});
             self.$placeTitle.show();

source/Ox.UI/js/Map/Ox.Map.js

@@ -1187,7 +1187,7 @@ Ox.Map = function(options, self) {
         if (place) {
             self.$placeControls.flag.empty().append(
                 $('<img>').attr({
-                    src: Ox.getImageByGeoname('icon', 16, place.geoname)
+                    src: Ox.getFlagByGeoname(place.geoname, 16)
                 })
             ).show();
             self.$placeControls.name.options({title: place.name})

source/Ox.UI/js/Map/Ox.MapMarker.js

@@ -242,7 +242,7 @@ Ox.MapMarker = function(options) {
         that.tooltip && that.tooltip.remove();
         that.tooltip = Ox.Tooltip({
                 title: '<img src="'
-                    + Ox.getImageByGeoname('icon', 16, that.place.geoname)
+                    + Ox.getFlagByGeoname(that.place.geoname, 16)
                     + '" style="float: left; margin: 1px 0 1px -1px; border-radius: 4px"/>'
                     + '<div style="float: left; margin: 4px -1px 0 4px; font-size: 9px;">'
                     + that.place.name