diff --git a/VerticalTabs/verticalTabs.css b/VerticalTabs/verticalTabs.css new file mode 100644 index 0000000..6dc7352 --- /dev/null +++ b/VerticalTabs/verticalTabs.css @@ -0,0 +1,268 @@ +/* + * Responsive vertical tabs for Bootstrap 5 + * + * Main stylesheet. @import "custom-variables.sccss" before + * this file to compile into final CSS + * + * Copyright (c) 2020-2021 Tromgy (tromgy@yahoo.com) + * + * This software is supplied under the terms of the MIT License, a + * copy of which should be located in the distribution where this + * file was obtained (LICENSE.txt). A copy of the license may also be + * found online at https://opensource.org/licenses/MIT. + * + */ +.right-tabs.sideways-tabs, .left-tabs.sideways-tabs { + margin-top: 5rem; + border: none; + position: relative; + margin-bottom: 0; +} + +.right-tabs.sideways-tabs, .left-tabs.sideways-tabs, .right-tabs.nav-tabs, .left-tabs.nav-tabs { + height: 100%; + flex-direction: column; +} + +.ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding-right: 0.5rem; +} + +.vtabs .tab-clickable { + cursor: pointer; +} + +.left-tabs.nav-tabs { + border-right: var(--bs-border-width) solid var(--bs-border-color); + border-bottom: none; +} + +.left-tabs .nav-link { + border-top-left-radius: var(--bs-border-radius); + border-bottom-left-radius: var(--bs-border-radius); + border-bottom-right-radius: 0; + border-top-right-radius: 0; + margin-right: -var(--bs-border-width); + text-align: left; +} + +.left-tabs .nav-link:hover { + border-right: var(--bs-border-width) solid transparent; +} + +.left-tabs .nav-link.active { + border-top: var(--bs-border-width) solid var(--bs-border-color); + border-right: var(--bs-border-width) solid transparent; + border-bottom: var(--bs-border-width) solid var(--bs-border-color); + border-left: var(--bs-border-width) solid var(--bs-border-color); +} + +.right-tabs.nav-tabs { + border-left: var(--bs-border-width) solid var(--bs-border-color); + border-bottom: none; +} + +.right-tabs .nav-link { + border-top-right-radius: var(--bs-border-radius); + border-bottom-right-radius: var(--bs-border-radius); + border-bottom-left-radius: 0; + border-top-left-radius: 0; + margin-left: -var(--bs-border-width); + text-align: right; +} + +.right-tabs .nav-link:hover { + border-left: var(--bs-border-width) solid transparent; +} + +.right-tabs .nav-link.active { + border-top: var(--bs-border-width) solid var(--bs-border-color); + border-right: var(--bs-border-width) solid var(--bs-border-color); + border-bottom: var(--bs-border-width) solid var(--bs-border-color); + border-left: var(--bs-border-width) solid transparent; +} + +.left-tabs.sideways-tabs { + border-right: none; + left: -3.2rem; +} + +.sideways-tabs.left-tabs .nav-item { + transform: rotate(-90deg); + height: 1rem; + margin-bottom: calc(92px - 1rem); +} + +.sideways-tabs.left-tabs .nav-link { + width: 92px; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + border-top-right-radius: var(--bs-border-radius); + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-top-left-radius: var(--bs-border-radius); + border-bottom: var(--bs-border-width) solid var(--bs-border-color); +} + +.sideways-tabs.left-tabs .nav-link:hover { + border-right: var(--bs-border-width) solid #e9ecef; +} + +.sideways-tabs.left-tabs .nav-link.active { + border-top: var(--bs-border-width) solid var(--bs-border-color); + border-right: var(--bs-border-width) solid var(--bs-border-color); + border-bottom: var(--bs-border-width) solid transparent; + border-left: var(--bs-border-width) solid var(--bs-border-color); +} + +.right-tabs.sideways-tabs { + border-left: none; + right: 3.2rem; +} + +.sideways-tabs.right-tabs .nav-item { + transform: rotate(90deg); + height: 1rem; + margin-bottom: calc(92px - 1rem); +} + +.sideways-tabs.right-tabs .nav-link { + width: 92px; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + border-top-right-radius: var(--bs-border-radius); + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-top-left-radius: var(--bs-border-radius); + border-bottom: var(--bs-border-width) solid var(--bs-border-color); +} + +.sideways-tabs.right-tabs .nav-link:hover { + border-left: var(--bs-border-width) solid #e9ecef; +} + +.sideways-tabs.right-tabs .nav-link.active { + border-top: var(--bs-border-width) solid var(--bs-border-color); + border-right: var(--bs-border-width) solid var(--bs-border-color); + border-bottom: var(--bs-border-width) solid transparent; + border-left: var(--bs-border-width) solid var(--bs-border-color); +} + +.vtabs .accordion-header { + display: none; +} + +@media (max-width: 400px) { + .left-tabs.nav-tabs { + flex-direction: row; + border-right: none; + border-left: none; + min-width: 100%; + border-bottom: var(--bs-border-width) solid var(--bs-border-color); + left: auto; + margin-top: auto; + } + .left-tabs .nav-link { + width: 92px; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + border-top-right-radius: var(--bs-border-radius); + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + border-top-left-radius: var(--bs-border-radius); + margin-right: 0; + margin-bottom: -var(--bs-border-width); + } + .left-tabs .nav-link.nav-link:hover { + border-right-color: var(--bs-border-color); + border-bottom-color: transparent; + } + .left-tabs .nav-link.active { + border-top-color: var(--bs-border-color); + border-right-color: var(--bs-border-color); + border-bottom-color: transparent; + border-left-color: var(--bs-border-color); + } + .sideways-tabs.left-tabs .nav-item, + .sideways-tabs.right-tabs .nav-item { + transform: none; + height: auto; + width: auto; + margin-bottom: 0; + } + .right-tabs.nav-tabs { + flex-direction: row; + border-right: none; + border-left: none; + min-width: 100%; + border-top: var(--bs-border-width) solid var(--bs-border-color); + right: auto; + margin-top: auto; + } + .sideways-tabs.right-tabs .nav-link, + .right-tabs .nav-link { + width: 92px; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + border-top-right-radius: 0; + border-bottom-right-radius: var(--bs-border-radius); + border-bottom-left-radius: var(--bs-border-radius); + border-top-left-radius: 0; + margin-left: 0; + margin-top: -var(--bs-border-width); + border-bottom-color: transparent; + } + .right-tabs .nav-link:hover { + border-top-color: transparent; + border-left-color: var(--bs-border-color); + border-bottom-color: #e9ecef; + } + .sideways-tabs.right-tabs .nav-link.active, + .right-tabs .nav-link.active { + border-top-color: transparent; + border-right-color: var(--bs-border-color); + border-bottom-color: var(--bs-border-color); + border-left-color: var(--bs-border-color); + } +} +@media (max-width: 350px) { + .left-tabs.nav-tabs { + display: none; + } + .right-tabs.nav-tabs { + display: none; + } + .vtabs .tab-content > .tab-pane { + display: block !important; + opacity: 1; + } + .vtabs .accordion-header { + display: block; + } + .vtabs button.accordion-button:focus { + border: none; + outline: none; + box-shadow: none; + } +} +@media (min-width: 351px) { + .vtabs .accordion-item { + border: none; + } + .vtabs .accordion-body.collapse { + display: block; + } +} + +/*# sourceMappingURL=verticalTabs.css.map */ diff --git a/VerticalTabs/verticalTabs.css.map b/VerticalTabs/verticalTabs.css.map new file mode 100644 index 0000000..13f0fff --- /dev/null +++ b/VerticalTabs/verticalTabs.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../node_modules/bootstrap-5-vertical-tabs/scss/responsive-vertical-tabs.scss","../node_modules/bootstrap/scss/_variables.scss","verticalTabs.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwBA;EACE,YALqB;EAMrB;EACA;EACA;;;AAIF;EACE;EACA;;;AAwBF;EApBE;EACA;EACA;EAoBA;;;AASF;EACE;;;AAIF;EAEE;EACA;;;AAGF;EACE,wBC+jCkC;ED9jClC,2BC8jCkC;ED7jClC;EACA;EACA;EACA,YEhFqB;;;AFmFvB;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAIF;EAEE;EACA;;;AAGF;EACE,yBCoiCkC;EDniClC,4BCmiCkC;EDliClC;EACA;EACA;EACA,YE1GsB;;;AF6GxB;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAIF;EAGE;EACA;;;AAGF;EACE;EACA,QApHqB;EAqHrB;;;AAIF;EAjGE,OEzCe;EF0Cf;EARA;EACA;EACA;EAwGA,yBCggCkC;ED//BlC;EACA;EACA,wBC6/BkC;ED5/BlC;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAIF;EAGE;EACA,OApJuB;;;AAuJzB;EACE;EACA,QAvJqB;EAwJrB;;;AAIF;EApIE,OEzCe;EF0Cf;EARA;EACA;EACA;EA2IA,yBC69BkC;ED59BlC;EACA;EACA,wBC09BkC;EDz9BlC;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAIF;EACE;;;AAIF;EACE;IAxJA;IACA;IACA;IACA;IAuJE;IACA;IACA;;EAGF;IAtKA,OEzCe;IF0Cf;IARA;IACA;IACA;IA6KE,yBC27BgC;ID17BhC;IACA;IACA,wBCw7BgC;IDv7BhC;IACA;;EAGF;IACE,oBCg7BgC;ID/6BhC;;EAGF;IACE,kBC26BgC;ID16BhC,oBC06BgC;IDz6BhC;IACA,mBCw6BgC;;EDr6BlC;AAAA;IAEE;IACA;IACA;IACA;;EAIF;IA9LA;IACA;IACA;IACA;IA6LE;IACA;IACA;;EAGF;AAAA;IA5MA,OEzCe;IF0Cf;IARA;IACA;IACA;IAoNE;IACA,4BCm5BgC;IDl5BhC,2BCk5BgC;IDj5BhC;IACA;IACA;IACA;;EAGF;IACE;IACA,mBCu4BgC;IDt4BhC,qBC9PO;;EDiQT;AAAA;IAEE;IACA,oBCg4BgC;ID/3BhC,qBC+3BgC;ID93BhC,mBC83BgC;;;ADz3BpC;EACE;IACE;;EAGF;IACE;;EAIF;IACE;IACA;;EAGF;IACE;;EAGF;IACE;IACA;IACA;;;AAKJ;EACE;IACE;;EAGF;IACE","file":"verticalTabs.css"} \ No newline at end of file diff --git a/VerticalTabs/verticalTabs.scss b/VerticalTabs/verticalTabs.scss new file mode 100644 index 0000000..6a46e26 --- /dev/null +++ b/VerticalTabs/verticalTabs.scss @@ -0,0 +1,10 @@ +$horizontal-tabs-min: 350px; + +$vertical-tabs-min: 400px; + +$fixed-tab-size: 92px; + +$left-tabs-text-align: left; +$right-tabs-text-align: right; + +@import "../node_modules/bootstrap-5-vertical-tabs/scss/responsive-vertical-tabs"; diff --git a/about.html b/about.html index 8253987..51e3e75 100644 --- a/about.html +++ b/about.html @@ -12,7 +12,7 @@
- +
diff --git a/constants.js b/constants.js index 2f8bcd4..8bbd081 100644 --- a/constants.js +++ b/constants.js @@ -196,8 +196,8 @@ exports.getFirmwareClassification = (desc) => { /* Version number for the latest firmware */ -exports.latestFirmwareVersionArray = ['1', '9', '0']; -exports.latestFirmwareVersionString = '1.9.0'; +exports.latestFirmwareVersionArray = ['1', '10', '0']; +exports.latestFirmwareVersionString = '1.10.0'; /* Time zone modes */ @@ -216,4 +216,42 @@ exports.MILLISECONDS_IN_SECOND = 1000; exports.SECONDS_IN_MINUTE = 60; exports.SECONDS_IN_DAY = 86400; -exports.MINUTES_IN_HOUR = 60; \ No newline at end of file +exports.MINUTES_IN_HOUR = 60; +exports.MINUTES_IN_DAY = 1440; + +/* Schedule limitations */ + +exports.MAX_PERIODS = 4; + +/* Sunrise and sunset results */ + +exports.SUN_ABOVE_HORIZON = 0; +exports.NORMAL_SOLUTION = 1; +exports.SUN_BELOW_HORIZON = 2; + +exports.DAY_LONGER_THAN_NIGHT = 0; +exports.DAY_EQUAL_TO_NIGHT = 1; +exports.DAY_SHORTER_THAN_NIGHT = 2; + +exports.MINIMUM_SUN_RECORDING_GAP = 60; +exports.SUN_RECORDING_GAP_MULTIPLIER = 4; + +/* Sun schedule modes */ + +exports.MODE_BEFORE_SUNRISE_AFTER_SUNRISE = 0; +exports.MODE_BEFORE_SUNSET_AFTER_SUNSET = 1; +exports.MODE_BEFORE_BOTH_AFTER_BOTH = 2; +exports.MODE_BEFORE_SUNSET_AFTER_SUNRISE = 3; +exports.MODE_BEFORE_SUNRISE_AFTER_SUNSET = 4; + +/* Sun events modes */ + +exports.SUNRISE_AND_SUNSET = 0; +exports.CIVIL_DAWN_AND_DUSK = 1; +exports.NAUTICAL_DAWN_AND_DUSK = 2; +exports.ASTRONOMICAL_DAWN_AND_DUSK = 3; + +/* First/last recording date range */ + +exports.MIN_FIRST_LAST_DATE = '2020-01-01'; +exports.MAX_FIRST_LAST_DATE = '2029-12-31'; diff --git a/index.css b/index.css index 40661b4..0a0709c 100644 --- a/index.css +++ b/index.css @@ -1,6 +1,6 @@ @font-face { font-family: 'Ubuntu'; - src: url('./ubuntu.mono.ttf'); + src: url('./resources/ubuntu.mono.ttf'); } input[type=number]::-webkit-inner-spin-button, @@ -56,3 +56,25 @@ input { .greyStart { display: inline-block; } + +.form-select-sm { + height: 25px; + font-family: Helvetica, Arial, sans-serif; + font-size: 10pt; +} + +canvas { + image-rendering: pixelated; + image-rendering: crisp-edges; +} + +.wider-col { + height: 182px; + width: 89.55%; +} + +.button-icon { + width: 13px; + height: 13px; + vertical-align: initial; +} diff --git a/index.html b/index.html index cdecafe..47f29e4 100644 --- a/index.html +++ b/index.html @@ -4,12 +4,13 @@ + - -
+ +
@@ -263,48 +264,177 @@
-
- +
+ +
- - -
-
- -
-
-
Start recording:
-
-
-
-
+ + +
+ +
+
    +
-
-
End recording:
-
-
-
+ + + +
+ +
+
+
+ +
+ +
+ +
+
+
Start recording:
+
+
+
+
+
+
+
+
End recording:
+
+
+
+
+
+
+
+
+ + +
+
+
+ +
+ + +
-
-
-
- - + +
+ +
+ +
+ +
+ Location (ddd.dd°): +
+
+
+
+
+
+
+
+
+
+
+
+ +
+ +
+ +
+ +
+ Sun recording mode: +
+
+
+ +
+
+ +
+ +
+ +
+ Sunrise interval - before and after (mins): +
+
+
+
+
+
+
+ - +
+
+
+
+ +
+ +
+ +
+ Sunset interval - before and after (mins): +
+ +
+
+
+
+
+
+ - +
+
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+
+ +
+ +
+
-
- - -
+
@@ -774,9 +904,9 @@
- +
-
+
diff --git a/lifeDisplay.js b/lifeDisplay.js index d4edb6b..e0c57a8 100644 --- a/lifeDisplay.js +++ b/lifeDisplay.js @@ -51,11 +51,11 @@ function getDailyCounts (timePeriods, recSecs, sleepSecs) { } else if (startMins === endMins) { - periodSecs = 1440; + periodSecs = constants.MINUTES_IN_DAY; } else if (startMins > endMins) { - periodSecs = (1440 - startMins) + endMins; + periodSecs = (constants.MINUTES_IN_DAY - startMins) + endMins; } @@ -245,11 +245,11 @@ exports.updateLifeDisplay = (schedule, configuration, recLength, sleepLength, am } else if (startMins === endMins) { - length = 1440; + length = constants.MINUTES_IN_DAY; } else if (startMins > endMins) { - length = (1440 - startMins) + endMins; + length = (constants.MINUTES_IN_DAY - startMins) + endMins; } @@ -459,7 +459,7 @@ exports.toggleSizeWarning = (updateFunction) => { if (!displaySizeWarning) { - setTimeout(function () { + setTimeout(() => { displaySizeWarning = true; updateFunction(); diff --git a/main.js b/main.js index 3e4e106..60af307 100644 --- a/main.js +++ b/main.js @@ -21,7 +21,7 @@ require('electron-debug')({ devToolsMode: 'undocked' }); -let mainWindow, aboutWindow, expansionWindow, splitWindow, downsampleWindow, summariseWindow, timeZoneSelectionWindow; +let mainWindow, aboutWindow, expansionWindow, splitWindow, downsampleWindow, summariseWindow, timeZoneSelectionWindow, mapWindow; const iconLocation = (process.platform === 'linux') ? '/build/icon.png' : '/build/icon.ico'; const standardWindowSettings = { @@ -48,6 +48,8 @@ let timeZoneMode = constants.TIME_ZONE_MODE_UTC; let customTimeZone = 0; +let sunDefinitionIndex = constants.SUNRISE_AND_SUNSET; + /* Generate settings objects for windows and progress bars */ function generateSettings (width, height, title) { @@ -408,6 +410,62 @@ function openAboutWindow () { } +function openMapWindow (event, lat, lon) { + + const windowWidth = 600; + const windowHeight = 550; + + const newZoom = lat[0] === 0 && lat[1] === 0 && lon[0] === 0 && lon[1] === 0 ? 5 : 12; + + if (mapWindow) { + + mapWindow.webContents.send('update-location-sub-window', lat, lon, true, newZoom); + + mapWindow.show(); + return; + + } + + const settings = generateSettings(windowWidth, windowHeight, 'Select Location'); + settings.resizable = true; + mapWindow = new BrowserWindow(settings); + + mapWindow.setMenu(null); + mapWindow.loadURL(path.join('file://', __dirname, '/map.html')); + + require('@electron/remote/main').enable(mapWindow.webContents); + + mapWindow.on('close', (e) => { + + e.preventDefault(); + mapWindow.hide(); + + }); + + mapWindow.webContents.on('dom-ready', () => { + + /* If the co-ordinate text boxes have been changed from the default then zoom in when you load the window */ + + mapWindow.webContents.send('update-location-sub-window', lat, lon, true, newZoom); + + mainWindow.webContents.send('poll-night-mode'); + + }); + + ipcMain.on('night-mode-poll-reply', (e, nightMode) => { + + if (mapWindow) { + + mapWindow.webContents.send('night-mode', nightMode); + + } + + }); + +} + +ipcMain.on('open-map-window', openMapWindow); + function openTimeZoneSelectionWindow () { let windowWidth = 448; @@ -587,6 +645,52 @@ app.on('ready', () => { mainWindow.webContents.send('amplitude-threshold-scale', 0); + } + }, { + type: 'separator' + }, { + type: 'radio', + id: 'sun0', + label: 'Sunrise And Sunset', + checked: true, + click: () => { + + sunDefinitionIndex = constants.SUNRISE_AND_SUNSET; + mainWindow.webContents.send('sun-definition-change', sunDefinitionIndex); + + } + }, { + type: 'radio', + id: 'sun1', + label: 'Civil Dawn And Dusk', + checked: false, + click: () => { + + sunDefinitionIndex = constants.CIVIL_DAWN_AND_DUSK; + mainWindow.webContents.send('sun-definition-change', sunDefinitionIndex); + + } + }, { + type: 'radio', + id: 'sun2', + label: 'Nautical Dawn And Dusk', + checked: false, + click: () => { + + sunDefinitionIndex = constants.NAUTICAL_DAWN_AND_DUSK; + mainWindow.webContents.send('sun-definition-change', sunDefinitionIndex); + + } + }, { + type: 'radio', + id: 'sun3', + label: 'Astronomical Dawn And Dusk', + checked: false, + click: () => { + + sunDefinitionIndex = constants.ASTRONOMICAL_DAWN_AND_DUSK; + mainWindow.webContents.send('sun-definition-change', sunDefinitionIndex); + } }, { type: 'separator' @@ -812,7 +916,7 @@ ipcMain.on('set-expansion-bar-completed', (event, successCount, errorCount, erro expandProgressBar.detail = messageText; - setTimeout(function () { + setTimeout(() => { expandProgressBar.close(); expandProgressBar = null; @@ -941,7 +1045,7 @@ ipcMain.on('set-split-bar-completed', (event, successCount, errorCount, errorWri splitProgressBar.detail = messageText; - setTimeout(function () { + setTimeout(() => { splitProgressBar.close(); splitProgressBar = null; @@ -1070,7 +1174,7 @@ ipcMain.on('set-downsample-bar-completed', (event, successCount, errorCount, err downsampleProgressBar.detail = messageText; - setTimeout(function () { + setTimeout(() => { downsampleProgressBar.close(); downsampleProgressBar = null; @@ -1188,7 +1292,7 @@ ipcMain.on('set-summarise-bar-completed', (event, successCount, finaliseResult) summariseProgressBar.detail = messageText; - setTimeout(function () { + setTimeout(() => { summariseProgressBar.close(); summariseProgressBar = null; @@ -1279,3 +1383,36 @@ ipcMain.on('request-custom-time-zone', (event) => { event.returnValue = customTimeZone; }); + +ipcMain.on('request-sun-definition-index', (event) => { + + event.returnValue = sunDefinitionIndex; + +}); + +ipcMain.on('set-sun-definition-index', (event, index) => { + + sunDefinitionIndex = index; + + const menu = Menu.getApplicationMenu(); + const sunDefinitionRadioButtons = [menu.getMenuItemById('sun0'), menu.getMenuItemById('sun1'), menu.getMenuItemById('sun2'), menu.getMenuItemById('sun3')]; + + sunDefinitionRadioButtons[sunDefinitionIndex].checked = true; + +}); + +ipcMain.on('update-location-main-window', (event, latArray, lonArray) => { + + mainWindow.webContents.send('update-location', latArray, lonArray); + +}); + +ipcMain.on('update-location-sub-window', (event, lat, lon) => { + + if (mapWindow) { + + mapWindow.webContents.send('update-location-sub-window', lat, lon, false); + + } + +}); diff --git a/map.html b/map.html new file mode 100644 index 0000000..565185e --- /dev/null +++ b/map.html @@ -0,0 +1,24 @@ + + + + + + + + + Select Location + + + + +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/map/images/layers-2x.png b/map/images/layers-2x.png new file mode 100644 index 0000000..200c333 Binary files /dev/null and b/map/images/layers-2x.png differ diff --git a/map/images/layers.png b/map/images/layers.png new file mode 100644 index 0000000..1a72e57 Binary files /dev/null and b/map/images/layers.png differ diff --git a/map/images/marker-icon-2x.png b/map/images/marker-icon-2x.png new file mode 100644 index 0000000..88f9e50 Binary files /dev/null and b/map/images/marker-icon-2x.png differ diff --git a/map/images/marker-icon.png b/map/images/marker-icon.png new file mode 100644 index 0000000..950edf2 Binary files /dev/null and b/map/images/marker-icon.png differ diff --git a/map/images/marker-shadow.png b/map/images/marker-shadow.png new file mode 100644 index 0000000..9fd2979 Binary files /dev/null and b/map/images/marker-shadow.png differ diff --git a/map/leaflet.css b/map/leaflet.css new file mode 100644 index 0000000..f2e8093 --- /dev/null +++ b/map/leaflet.css @@ -0,0 +1,478 @@ +/* required styles */ + +.leaflet-map-pane, +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-tile-pane, +.leaflet-tile-container, +.leaflet-overlay-pane, +.leaflet-shadow-pane, +.leaflet-marker-pane, +.leaflet-popup-pane, +.leaflet-overlay-pane svg, +.leaflet-zoom-box, +.leaflet-image-layer, +.leaflet-layer { + position: absolute; + left: 0; + top: 0; + } +.leaflet-container { + overflow: hidden; + -ms-touch-action: none; + } +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + -webkit-user-drag: none; + } +.leaflet-marker-icon, +.leaflet-marker-shadow { + display: block; + } +/* map is broken in FF if you have max-width: 100% on tiles */ +.leaflet-container img { + max-width: none !important; + } +/* stupid Android 2 doesn't understand "max-width: none" properly */ +.leaflet-container img.leaflet-image-layer { + max-width: 15000px !important; + } +.leaflet-tile { + filter: inherit; + visibility: hidden; + } +.leaflet-tile-loaded { + visibility: inherit; + } +.leaflet-zoom-box { + width: 0; + height: 0; + } +/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ +.leaflet-overlay-pane svg { + -moz-user-select: none; + } + +.leaflet-tile-pane { z-index: 2; } +.leaflet-objects-pane { z-index: 3; } +.leaflet-overlay-pane { z-index: 4; } +.leaflet-shadow-pane { z-index: 5; } +.leaflet-marker-pane { z-index: 6; } +.leaflet-popup-pane { z-index: 7; } + +.leaflet-vml-shape { + width: 1px; + height: 1px; + } +.lvml { + behavior: url(#default#VML); + display: inline-block; + position: absolute; + } + + +/* control positioning */ + +.leaflet-control { + position: relative; + z-index: 7; + pointer-events: auto; + } +.leaflet-top, +.leaflet-bottom { + position: absolute; + z-index: 1000; + pointer-events: none; + } +.leaflet-top { + top: 0; + } +.leaflet-right { + right: 0; + } +.leaflet-bottom { + bottom: 0; + } +.leaflet-left { + left: 0; + } +.leaflet-control { + float: left; + clear: both; + } +.leaflet-right .leaflet-control { + float: right; + } +.leaflet-top .leaflet-control { + margin-top: 10px; + } +.leaflet-bottom .leaflet-control { + margin-bottom: 10px; + } +.leaflet-left .leaflet-control { + margin-left: 10px; + } +.leaflet-right .leaflet-control { + margin-right: 10px; + } + + +/* zoom and fade animations */ + +.leaflet-fade-anim .leaflet-tile, +.leaflet-fade-anim .leaflet-popup { + opacity: 0; + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; + } +.leaflet-fade-anim .leaflet-tile-loaded, +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { + opacity: 1; + } + +.leaflet-zoom-anim .leaflet-zoom-animated { + -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); + -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); + -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); + transition: transform 0.25s cubic-bezier(0,0,0.25,1); + } +.leaflet-zoom-anim .leaflet-tile, +.leaflet-pan-anim .leaflet-tile, +.leaflet-touching .leaflet-zoom-animated { + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; + } + +.leaflet-zoom-anim .leaflet-zoom-hide { + visibility: hidden; + } + + +/* cursors */ + +.leaflet-clickable { + cursor: pointer; + } +.leaflet-container { + cursor: -webkit-grab; + cursor: -moz-grab; + } +.leaflet-popup-pane, +.leaflet-control { + cursor: auto; + } +.leaflet-dragging .leaflet-container, +.leaflet-dragging .leaflet-clickable { + cursor: move; + cursor: -webkit-grabbing; + cursor: -moz-grabbing; + } + + +/* visual tweaks */ + +.leaflet-container { + background: #ddd; + outline: 0; + } +.leaflet-container a { + color: #0078A8; + } +.leaflet-container a.leaflet-active { + outline: 2px solid orange; + } +.leaflet-zoom-box { + border: 2px dotted #38f; + background: rgba(255,255,255,0.5); + } + + +/* general typography */ +.leaflet-container { + font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; + } + + +/* general toolbar styles */ + +.leaflet-bar { + box-shadow: 0 1px 5px rgba(0,0,0,0.65); + border-radius: 4px; + } +.leaflet-bar a, +.leaflet-bar a:hover { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; + } +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; + } +.leaflet-bar a:hover { + background-color: #f4f4f4; + } +.leaflet-bar a:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + } +.leaflet-bar a:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom: none; + } +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; + } + +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; + line-height: 30px; + } + + +/* zoom control */ + +.leaflet-control-zoom-in, +.leaflet-control-zoom-out { + font: bold 18px 'Lucida Console', Monaco, monospace; + text-indent: 1px; + } +.leaflet-control-zoom-out { + font-size: 20px; + } + +.leaflet-touch .leaflet-control-zoom-in { + font-size: 22px; + } +.leaflet-touch .leaflet-control-zoom-out { + font-size: 24px; + } + + +/* layers control */ + +.leaflet-control-layers { + box-shadow: 0 1px 5px rgba(0,0,0,0.4); + background: #fff; + border-radius: 5px; + } +.leaflet-control-layers-toggle { + background-image: url(images/layers.png); + width: 36px; + height: 36px; + } +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url(images/layers-2x.png); + background-size: 26px 26px; + } +.leaflet-touch .leaflet-control-layers-toggle { + width: 44px; + height: 44px; + } +.leaflet-control-layers .leaflet-control-layers-list, +.leaflet-control-layers-expanded .leaflet-control-layers-toggle { + display: none; + } +.leaflet-control-layers-expanded .leaflet-control-layers-list { + display: block; + position: relative; + } +.leaflet-control-layers-expanded { + padding: 6px 10px 6px 6px; + color: #333; + background: #fff; + } +.leaflet-control-layers-selector { + margin-top: 2px; + position: relative; + top: 1px; + } +.leaflet-control-layers label { + display: block; + } +.leaflet-control-layers-separator { + height: 0; + border-top: 1px solid #ddd; + margin: 5px -10px 5px -6px; + } + + +/* attribution and scale controls */ + +.leaflet-container .leaflet-control-attribution { + background: #fff; + background: rgba(255, 255, 255, 0.7); + margin: 0; + } +.leaflet-control-attribution, +.leaflet-control-scale-line { + padding: 0 5px; + color: #333; + } +.leaflet-control-attribution a { + text-decoration: none; + } +.leaflet-control-attribution a:hover { + text-decoration: underline; + } +.leaflet-container .leaflet-control-attribution, +.leaflet-container .leaflet-control-scale { + font-size: 11px; + } +.leaflet-left .leaflet-control-scale { + margin-left: 5px; + } +.leaflet-bottom .leaflet-control-scale { + margin-bottom: 5px; + } +.leaflet-control-scale-line { + border: 2px solid #777; + border-top: none; + line-height: 1.1; + padding: 2px 5px 1px; + font-size: 11px; + white-space: nowrap; + overflow: hidden; + -moz-box-sizing: content-box; + box-sizing: content-box; + + background: #fff; + background: rgba(255, 255, 255, 0.5); + } +.leaflet-control-scale-line:not(:first-child) { + border-top: 2px solid #777; + border-bottom: none; + margin-top: -2px; + } +.leaflet-control-scale-line:not(:first-child):not(:last-child) { + border-bottom: 2px solid #777; + } + +.leaflet-touch .leaflet-control-attribution, +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + box-shadow: none; + } +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + border: 2px solid rgba(0,0,0,0.2); + background-clip: padding-box; + } + + +/* popup */ + +.leaflet-popup { + position: absolute; + text-align: center; + } +.leaflet-popup-content-wrapper { + padding: 1px; + text-align: left; + border-radius: 12px; + } +.leaflet-popup-content { + margin: 13px 19px; + line-height: 1.4; + } +.leaflet-popup-content p { + margin: 18px 0; + } +.leaflet-popup-tip-container { + margin: 0 auto; + width: 40px; + height: 20px; + position: relative; + overflow: hidden; + } +.leaflet-popup-tip { + width: 17px; + height: 17px; + padding: 1px; + + margin: -10px auto 0; + + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + } +.leaflet-popup-content-wrapper, +.leaflet-popup-tip { + background: white; + + box-shadow: 0 3px 14px rgba(0,0,0,0.4); + } +.leaflet-container a.leaflet-popup-close-button { + position: absolute; + top: 0; + right: 0; + padding: 4px 4px 0 0; + text-align: center; + width: 18px; + height: 14px; + font: 16px/14px Tahoma, Verdana, sans-serif; + color: #c3c3c3; + text-decoration: none; + font-weight: bold; + background: transparent; + } +.leaflet-container a.leaflet-popup-close-button:hover { + color: #999; + } +.leaflet-popup-scrolled { + overflow: auto; + border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; + } + +.leaflet-oldie .leaflet-popup-content-wrapper { + zoom: 1; + } +.leaflet-oldie .leaflet-popup-tip { + width: 24px; + margin: 0 auto; + + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; + filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); + } +.leaflet-oldie .leaflet-popup-tip-container { + margin-top: -1px; + } + +.leaflet-oldie .leaflet-control-zoom, +.leaflet-oldie .leaflet-control-layers, +.leaflet-oldie .leaflet-popup-content-wrapper, +.leaflet-oldie .leaflet-popup-tip { + border: 1px solid #999; + } + + +/* div icon */ + +.leaflet-div-icon { + background: #fff; + border: 1px solid #666; + } \ No newline at end of file diff --git a/map/leaflet.js b/map/leaflet.js new file mode 100644 index 0000000..03434b7 --- /dev/null +++ b/map/leaflet.js @@ -0,0 +1,9 @@ +/* + Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com + (c) 2010-2013, Vladimir Agafonkin + (c) 2010-2011, CloudMade +*/ +!function(t,e,i){var n=t.L,o={};o.version="0.7.3","object"==typeof module&&"object"==typeof module.exports?module.exports=o:"function"==typeof define&&define.amd&&define(o),o.noConflict=function(){return t.L=n,this},t.L=o,o.Util={extend:function(t){var e,i,n,o,s=Array.prototype.slice.call(arguments,1);for(i=0,n=s.length;n>i;i++){o=s[i]||{};for(e in o)o.hasOwnProperty(e)&&(t[e]=o[e])}return t},bind:function(t,e){var i=arguments.length>2?Array.prototype.slice.call(arguments,2):null;return function(){return t.apply(e,i||arguments)}},stamp:function(){var t=0,e="_leaflet_id";return function(i){return i[e]=i[e]||++t,i[e]}}(),invokeEach:function(t,e,i){var n,o;if("object"==typeof t){o=Array.prototype.slice.call(arguments,3);for(n in t)e.apply(i,[n,t[n]].concat(o));return!0}return!1},limitExecByInterval:function(t,e,i){var n,o;return function s(){var a=arguments;return n?void(o=!0):(n=!0,setTimeout(function(){n=!1,o&&(s.apply(i,a),o=!1)},e),void t.apply(i,a))}},falseFn:function(){return!1},formatNum:function(t,e){var i=Math.pow(10,e||5);return Math.round(t*i)/i},trim:function(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")},splitWords:function(t){return o.Util.trim(t).split(/\s+/)},setOptions:function(t,e){return t.options=o.extend({},t.options,e),t.options},getParamString:function(t,e,i){var n=[];for(var o in t)n.push(encodeURIComponent(i?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(e&&-1!==e.indexOf("?")?"&":"?")+n.join("&")},template:function(t,e){return t.replace(/\{ *([\w_]+) *\}/g,function(t,n){var o=e[n];if(o===i)throw new Error("No value provided for variable "+t);return"function"==typeof o&&(o=o(e)),o})},isArray:Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},emptyImageUrl:"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="},function(){function e(e){var i,n,o=["webkit","moz","o","ms"];for(i=0;it;t++)n._initHooks[t].call(this)}},e},o.Class.include=function(t){o.extend(this.prototype,t)},o.Class.mergeOptions=function(t){o.extend(this.prototype.options,t)},o.Class.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i)};var s="_leaflet_events";o.Mixin={},o.Mixin.Events={addEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d=this[s]=this[s]||{},p=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)r={action:e,context:i||this},h=t[n],p?(l=h+"_idx",u=l+"_len",c=d[l]=d[l]||{},c[p]||(c[p]=[],d[u]=(d[u]||0)+1),c[p].push(r)):(d[h]=d[h]||[],d[h].push(r));return this},hasEventListeners:function(t){var e=this[s];return!!e&&(t in e&&e[t].length>0||t+"_idx"in e&&e[t+"_idx_len"]>0)},removeEventListener:function(t,e,i){if(!this[s])return this;if(!t)return this.clearAllEventListeners();if(o.Util.invokeEach(t,this.removeEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d,p,_=this[s],m=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)if(r=t[n],u=r+"_idx",c=u+"_len",d=_[u],e){if(h=m&&d?d[m]:_[r]){for(l=h.length-1;l>=0;l--)h[l].action!==e||i&&h[l].context!==i||(p=h.splice(l,1),p[0].action=o.Util.falseFn);i&&d&&0===h.length&&(delete d[m],_[c]--)}}else delete _[r],delete _[u],delete _[c];return this},clearAllEventListeners:function(){return delete this[s],this},fireEvent:function(t,e){if(!this.hasEventListeners(t))return this;var i,n,a,r,h,l=o.Util.extend({},e,{type:t,target:this}),u=this[s];if(u[t])for(i=u[t].slice(),n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);r=u[t+"_idx"];for(h in r)if(i=r[h].slice())for(n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);return this},addOneTimeEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addOneTimeEventListener,this,e,i))return this;var n=o.bind(function(){this.removeEventListener(t,e,i).removeEventListener(t,n,i)},this);return this.addEventListener(t,e,i).addEventListener(t,n,i)}},o.Mixin.Events.on=o.Mixin.Events.addEventListener,o.Mixin.Events.off=o.Mixin.Events.removeEventListener,o.Mixin.Events.once=o.Mixin.Events.addOneTimeEventListener,o.Mixin.Events.fire=o.Mixin.Events.fireEvent,function(){var n="ActiveXObject"in t,s=n&&!e.addEventListener,a=navigator.userAgent.toLowerCase(),r=-1!==a.indexOf("webkit"),h=-1!==a.indexOf("chrome"),l=-1!==a.indexOf("phantom"),u=-1!==a.indexOf("android"),c=-1!==a.search("android [23]"),d=-1!==a.indexOf("gecko"),p=typeof orientation!=i+"",_=t.navigator&&t.navigator.msPointerEnabled&&t.navigator.msMaxTouchPoints&&!t.PointerEvent,m=t.PointerEvent&&t.navigator.pointerEnabled&&t.navigator.maxTouchPoints||_,f="devicePixelRatio"in t&&t.devicePixelRatio>1||"matchMedia"in t&&t.matchMedia("(min-resolution:144dpi)")&&t.matchMedia("(min-resolution:144dpi)").matches,g=e.documentElement,v=n&&"transition"in g.style,y="WebKitCSSMatrix"in t&&"m11"in new t.WebKitCSSMatrix&&!c,P="MozPerspective"in g.style,L="OTransition"in g.style,x=!t.L_DISABLE_3D&&(v||y||P||L)&&!l,w=!t.L_NO_TOUCH&&!l&&function(){var t="ontouchstart";if(m||t in g)return!0;var i=e.createElement("div"),n=!1;return i.setAttribute?(i.setAttribute(t,"return;"),"function"==typeof i[t]&&(n=!0),i.removeAttribute(t),i=null,n):!1}();o.Browser={ie:n,ielt9:s,webkit:r,gecko:d&&!r&&!t.opera&&!n,android:u,android23:c,chrome:h,ie3d:v,webkit3d:y,gecko3d:P,opera3d:L,any3d:x,mobile:p,mobileWebkit:p&&r,mobileWebkit3d:p&&y,mobileOpera:p&&t.opera,touch:w,msPointer:_,pointer:m,retina:f}}(),o.Point=function(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e},o.Point.prototype={clone:function(){return new o.Point(this.x,this.y)},add:function(t){return this.clone()._add(o.point(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(o.point(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},distanceTo:function(t){t=o.point(t);var e=t.x-this.x,i=t.y-this.y;return Math.sqrt(e*e+i*i)},equals:function(t){return t=o.point(t),t.x===this.x&&t.y===this.y},contains:function(t){return t=o.point(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+o.Util.formatNum(this.x)+", "+o.Util.formatNum(this.y)+")"}},o.point=function(t,e,n){return t instanceof o.Point?t:o.Util.isArray(t)?new o.Point(t[0],t[1]):t===i||null===t?t:new o.Point(t,e,n)},o.Bounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.Bounds.prototype={extend:function(t){return t=o.point(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new o.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new o.Point(this.min.x,this.max.y)},getTopRight:function(){return new o.Point(this.max.x,this.min.y)},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return t="number"==typeof t[0]||t instanceof o.Point?o.point(t):o.bounds(t),t instanceof o.Bounds?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=o.bounds(t);var e=this.min,i=this.max,n=t.min,s=t.max,a=s.x>=e.x&&n.x<=i.x,r=s.y>=e.y&&n.y<=i.y;return a&&r},isValid:function(){return!(!this.min||!this.max)}},o.bounds=function(t,e){return!t||t instanceof o.Bounds?t:new o.Bounds(t,e)},o.Transformation=function(t,e,i,n){this._a=t,this._b=e,this._c=i,this._d=n},o.Transformation.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return e=e||1,t.x=e*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return e=e||1,new o.Point((t.x/e-this._b)/this._a,(t.y/e-this._d)/this._c)}},o.DomUtil={get:function(t){return"string"==typeof t?e.getElementById(t):t},getStyle:function(t,i){var n=t.style[i];if(!n&&t.currentStyle&&(n=t.currentStyle[i]),(!n||"auto"===n)&&e.defaultView){var o=e.defaultView.getComputedStyle(t,null);n=o?o[i]:null}return"auto"===n?null:n},getViewportOffset:function(t){var i,n=0,s=0,a=t,r=e.body,h=e.documentElement;do{if(n+=a.offsetTop||0,s+=a.offsetLeft||0,n+=parseInt(o.DomUtil.getStyle(a,"borderTopWidth"),10)||0,s+=parseInt(o.DomUtil.getStyle(a,"borderLeftWidth"),10)||0,i=o.DomUtil.getStyle(a,"position"),a.offsetParent===r&&"absolute"===i)break;if("fixed"===i){n+=r.scrollTop||h.scrollTop||0,s+=r.scrollLeft||h.scrollLeft||0;break}if("relative"===i&&!a.offsetLeft){var l=o.DomUtil.getStyle(a,"width"),u=o.DomUtil.getStyle(a,"max-width"),c=a.getBoundingClientRect();("none"!==l||"none"!==u)&&(s+=c.left+a.clientLeft),n+=c.top+(r.scrollTop||h.scrollTop||0);break}a=a.offsetParent}while(a);a=t;do{if(a===r)break;n-=a.scrollTop||0,s-=a.scrollLeft||0,a=a.parentNode}while(a);return new o.Point(s,n)},documentIsLtr:function(){return o.DomUtil._docIsLtrCached||(o.DomUtil._docIsLtrCached=!0,o.DomUtil._docIsLtr="ltr"===o.DomUtil.getStyle(e.body,"direction")),o.DomUtil._docIsLtr},create:function(t,i,n){var o=e.createElement(t);return o.className=i,n&&n.appendChild(o),o},hasClass:function(t,e){if(t.classList!==i)return t.classList.contains(e);var n=o.DomUtil._getClass(t);return n.length>0&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(n)},addClass:function(t,e){if(t.classList!==i)for(var n=o.Util.splitWords(e),s=0,a=n.length;a>s;s++)t.classList.add(n[s]);else if(!o.DomUtil.hasClass(t,e)){var r=o.DomUtil._getClass(t);o.DomUtil._setClass(t,(r?r+" ":"")+e)}},removeClass:function(t,e){t.classList!==i?t.classList.remove(e):o.DomUtil._setClass(t,o.Util.trim((" "+o.DomUtil._getClass(t)+" ").replace(" "+e+" "," ")))},_setClass:function(t,e){t.className.baseVal===i?t.className=e:t.className.baseVal=e},_getClass:function(t){return t.className.baseVal===i?t.className:t.className.baseVal},setOpacity:function(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(o){if(1===e)return}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}},testProp:function(t){for(var i=e.documentElement.style,n=0;ni||i===e?e:t),new o.LatLng(this.lat,i)}},o.latLng=function(t,e){return t instanceof o.LatLng?t:o.Util.isArray(t)?"number"==typeof t[0]||"string"==typeof t[0]?new o.LatLng(t[0],t[1],t[2]):null:t===i||null===t?t:"object"==typeof t&&"lat"in t?new o.LatLng(t.lat,"lng"in t?t.lng:t.lon):e===i?null:new o.LatLng(t,e)},o.LatLngBounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.LatLngBounds.prototype={extend:function(t){if(!t)return this;var e=o.latLng(t);return t=null!==e?e:o.latLngBounds(t),t instanceof o.LatLng?this._southWest||this._northEast?(this._southWest.lat=Math.min(t.lat,this._southWest.lat),this._southWest.lng=Math.min(t.lng,this._southWest.lng),this._northEast.lat=Math.max(t.lat,this._northEast.lat),this._northEast.lng=Math.max(t.lng,this._northEast.lng)):(this._southWest=new o.LatLng(t.lat,t.lng),this._northEast=new o.LatLng(t.lat,t.lng)):t instanceof o.LatLngBounds&&(this.extend(t._southWest),this.extend(t._northEast)),this},pad:function(t){var e=this._southWest,i=this._northEast,n=Math.abs(e.lat-i.lat)*t,s=Math.abs(e.lng-i.lng)*t;return new o.LatLngBounds(new o.LatLng(e.lat-n,e.lng-s),new o.LatLng(i.lat+n,i.lng+s))},getCenter:function(){return new o.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new o.LatLng(this.getNorth(),this.getWest())},getSouthEast:function(){return new o.LatLng(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof o.LatLng?o.latLng(t):o.latLngBounds(t);var e,i,n=this._southWest,s=this._northEast;return t instanceof o.LatLngBounds?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=n.lat&&i.lat<=s.lat&&e.lng>=n.lng&&i.lng<=s.lng},intersects:function(t){t=o.latLngBounds(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),s=t.getNorthEast(),a=s.lat>=e.lat&&n.lat<=i.lat,r=s.lng>=e.lng&&n.lng<=i.lng;return a&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t){return t?(t=o.latLngBounds(t),this._southWest.equals(t.getSouthWest())&&this._northEast.equals(t.getNorthEast())):!1},isValid:function(){return!(!this._southWest||!this._northEast)}},o.latLngBounds=function(t,e){return!t||t instanceof o.LatLngBounds?t:new o.LatLngBounds(t,e)},o.Projection={},o.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=t.lng*e,a=n*e;return a=Math.log(Math.tan(Math.PI/4+a/2)),new o.Point(s,a)},unproject:function(t){var e=o.LatLng.RAD_TO_DEG,i=t.x*e,n=(2*Math.atan(Math.exp(t.y))-Math.PI/2)*e;return new o.LatLng(n,i)}},o.Projection.LonLat={project:function(t){return new o.Point(t.lng,t.lat)},unproject:function(t){return new o.LatLng(t.y,t.x)}},o.CRS={latLngToPoint:function(t,e){var i=this.projection.project(t),n=this.scale(e);return this.transformation._transform(i,n)},pointToLatLng:function(t,e){var i=this.scale(e),n=this.transformation.untransform(t,i);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},scale:function(t){return 256*Math.pow(2,t)},getSize:function(t){var e=this.scale(t);return o.point(e,e)}},o.CRS.Simple=o.extend({},o.CRS,{projection:o.Projection.LonLat,transformation:new o.Transformation(1,0,-1,0),scale:function(t){return Math.pow(2,t)}}),o.CRS.EPSG3857=o.extend({},o.CRS,{code:"EPSG:3857",projection:o.Projection.SphericalMercator,transformation:new o.Transformation(.5/Math.PI,.5,-.5/Math.PI,.5),project:function(t){var e=this.projection.project(t),i=6378137;return e.multiplyBy(i)}}),o.CRS.EPSG900913=o.extend({},o.CRS.EPSG3857,{code:"EPSG:900913"}),o.CRS.EPSG4326=o.extend({},o.CRS,{code:"EPSG:4326",projection:o.Projection.LonLat,transformation:new o.Transformation(1/360,.5,-1/360,.5)}),o.Map=o.Class.extend({includes:o.Mixin.Events,options:{crs:o.CRS.EPSG3857,fadeAnimation:o.DomUtil.TRANSITION&&!o.Browser.android23,trackResize:!0,markerZoomAnimation:o.DomUtil.TRANSITION&&o.Browser.any3d},initialize:function(t,e){e=o.setOptions(this,e),this._initContainer(t),this._initLayout(),this._onResize=o.bind(this._onResize,this),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),e.center&&e.zoom!==i&&this.setView(o.latLng(e.center),e.zoom,{reset:!0}),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._tileLayersNum=0,this.callInitHooks(),this._addLayers(e.layers)},setView:function(t,e){return e=e===i?this.getZoom():e,this._resetView(o.latLng(t),this._limitZoom(e)),this},setZoom:function(t,e){return this._loaded?this.setView(this.getCenter(),t,{zoom:e}):(this._zoom=this._limitZoom(t),this)},zoomIn:function(t,e){return this.setZoom(this._zoom+(t||1),e)},zoomOut:function(t,e){return this.setZoom(this._zoom-(t||1),e)},setZoomAround:function(t,e,i){var n=this.getZoomScale(e),s=this.getSize().divideBy(2),a=t instanceof o.Point?t:this.latLngToContainerPoint(t),r=a.subtract(s).multiplyBy(1-1/n),h=this.containerPointToLatLng(s.add(r));return this.setView(h,e,{zoom:i})},fitBounds:function(t,e){e=e||{},t=t.getBounds?t.getBounds():o.latLngBounds(t);var i=o.point(e.paddingTopLeft||e.padding||[0,0]),n=o.point(e.paddingBottomRight||e.padding||[0,0]),s=this.getBoundsZoom(t,!1,i.add(n)),a=n.subtract(i).divideBy(2),r=this.project(t.getSouthWest(),s),h=this.project(t.getNorthEast(),s),l=this.unproject(r.add(h).divideBy(2).add(a),s);return s=e&&e.maxZoom?Math.min(e.maxZoom,s):s,this.setView(l,s,e)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,e){return this.setView(t,this._zoom,{pan:e})},panBy:function(t){return this.fire("movestart"),this._rawPanBy(o.point(t)),this.fire("move"),this.fire("moveend")},setMaxBounds:function(t){return t=o.latLngBounds(t),this.options.maxBounds=t,t?(this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds,this)):this.off("moveend",this._panInsideMaxBounds,this)},panInsideBounds:function(t,e){var i=this.getCenter(),n=this._limitCenter(i,this._zoom,t);return i.equals(n)?this:this.panTo(n,e)},addLayer:function(t){var e=o.stamp(t);return this._layers[e]?this:(this._layers[e]=t,!t.options||isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[e]=t,this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum++,this._tileLayersToLoad++,t.on("load",this._onTileLayerLoad,this)),this._loaded&&this._layerAdd(t),this)},removeLayer:function(t){var e=o.stamp(t);return this._layers[e]?(this._loaded&&t.onRemove(this),delete this._layers[e],this._loaded&&this.fire("layerremove",{layer:t}),this._zoomBoundLayers[e]&&(delete this._zoomBoundLayers[e],this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum--,this._tileLayersToLoad--,t.off("load",this._onTileLayerLoad,this)),this):this},hasLayer:function(t){return t?o.stamp(t)in this._layers:!1},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},invalidateSize:function(t){if(!this._loaded)return this;t=o.extend({animate:!1,pan:!0},t===!0?{animate:!0}:t);var e=this.getSize();this._sizeChanged=!0,this._initialCenter=null;var i=this.getSize(),n=e.divideBy(2).round(),s=i.divideBy(2).round(),a=n.subtract(s);return a.x||a.y?(t.animate&&t.pan?this.panBy(a):(t.pan&&this._rawPanBy(a),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(o.bind(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:e,newSize:i})):this},addHandler:function(t,e){if(!e)return this;var i=this[t]=new e(this);return this._handlers.push(i),this.options[t]&&i.enable(),this},remove:function(){this._loaded&&this.fire("unload"),this._initEvents("off");try{delete this._container._leaflet}catch(t){this._container._leaflet=i}return this._clearPanes(),this._clearControlPos&&this._clearControlPos(),this._clearHandlers(),this},getCenter:function(){return this._checkIfLoaded(),this._initialCenter&&!this._moved()?this._initialCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds(),e=this.unproject(t.getBottomLeft()),i=this.unproject(t.getTopRight());return new o.LatLngBounds(e,i)},getMinZoom:function(){return this.options.minZoom===i?this._layersMinZoom===i?0:this._layersMinZoom:this.options.minZoom},getMaxZoom:function(){return this.options.maxZoom===i?this._layersMaxZoom===i?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=o.latLngBounds(t);var n,s=this.getMinZoom()-(e?1:0),a=this.getMaxZoom(),r=this.getSize(),h=t.getNorthWest(),l=t.getSouthEast(),u=!0;i=o.point(i||[0,0]);do s++,n=this.project(l,s).subtract(this.project(h,s)).add(i),u=e?n.x=s);return u&&e?null:e?s:s-1},getSize:function(){return(!this._size||this._sizeChanged)&&(this._size=new o.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(){var t=this._getTopLeftPoint();return new o.Bounds(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._initialTopLeftPoint},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t){var e=this.options.crs;return e.scale(t)/e.scale(this._zoom)},getScaleZoom:function(t){return this._zoom+Math.log(t)/Math.LN2},project:function(t,e){return e=e===i?this._zoom:e,this.options.crs.latLngToPoint(o.latLng(t),e)},unproject:function(t,e){return e=e===i?this._zoom:e,this.options.crs.pointToLatLng(o.point(t),e)},layerPointToLatLng:function(t){var e=o.point(t).add(this.getPixelOrigin());return this.unproject(e)},latLngToLayerPoint:function(t){var e=this.project(o.latLng(t))._round();return e._subtract(this.getPixelOrigin())},containerPointToLayerPoint:function(t){return o.point(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return o.point(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var e=this.containerPointToLayerPoint(o.point(t));return this.layerPointToLatLng(e)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t)))},mouseEventToContainerPoint:function(t){return o.DomEvent.getMousePosition(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var e=this._container=o.DomUtil.get(t);if(!e)throw new Error("Map container not found.");if(e._leaflet)throw new Error("Map container is already initialized.");e._leaflet=!0},_initLayout:function(){var t=this._container;o.DomUtil.addClass(t,"leaflet-container"+(o.Browser.touch?" leaflet-touch":"")+(o.Browser.retina?" leaflet-retina":"")+(o.Browser.ielt9?" leaflet-oldie":"")+(this.options.fadeAnimation?" leaflet-fade-anim":""));var e=o.DomUtil.getStyle(t,"position");"absolute"!==e&&"relative"!==e&&"fixed"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._mapPane=t.mapPane=this._createPane("leaflet-map-pane",this._container),this._tilePane=t.tilePane=this._createPane("leaflet-tile-pane",this._mapPane),t.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane),t.shadowPane=this._createPane("leaflet-shadow-pane"),t.overlayPane=this._createPane("leaflet-overlay-pane"),t.markerPane=this._createPane("leaflet-marker-pane"),t.popupPane=this._createPane("leaflet-popup-pane");var e=" leaflet-zoom-hide";this.options.markerZoomAnimation||(o.DomUtil.addClass(t.markerPane,e),o.DomUtil.addClass(t.shadowPane,e),o.DomUtil.addClass(t.popupPane,e))},_createPane:function(t,e){return o.DomUtil.create("div",t,e||this._panes.objectsPane)},_clearPanes:function(){this._container.removeChild(this._mapPane)},_addLayers:function(t){t=t?o.Util.isArray(t)?t:[t]:[];for(var e=0,i=t.length;i>e;e++)this.addLayer(t[e])},_resetView:function(t,e,i,n){var s=this._zoom!==e;n||(this.fire("movestart"),s&&this.fire("zoomstart")),this._zoom=e,this._initialCenter=t,this._initialTopLeftPoint=this._getNewTopLeftPoint(t),i?this._initialTopLeftPoint._add(this._getMapPanePos()):o.DomUtil.setPosition(this._mapPane,new o.Point(0,0)),this._tileLayersToLoad=this._tileLayersNum;var a=!this._loaded;this._loaded=!0,this.fire("viewreset",{hard:!i}),a&&(this.fire("load"),this.eachLayer(this._layerAdd,this)),this.fire("move"),(s||n)&&this.fire("zoomend"),this.fire("moveend",{hard:!i})},_rawPanBy:function(t){o.DomUtil.setPosition(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_updateZoomLevels:function(){var t,e=1/0,n=-1/0,o=this._getZoomSpan();for(t in this._zoomBoundLayers){var s=this._zoomBoundLayers[t];isNaN(s.options.minZoom)||(e=Math.min(e,s.options.minZoom)),isNaN(s.options.maxZoom)||(n=Math.max(n,s.options.maxZoom))}t===i?this._layersMaxZoom=this._layersMinZoom=i:(this._layersMaxZoom=n,this._layersMinZoom=e),o!==this._getZoomSpan()&&this.fire("zoomlevelschange")},_panInsideMaxBounds:function(){this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(e){if(o.DomEvent){e=e||"on",o.DomEvent[e](this._container,"click",this._onMouseClick,this);var i,n,s=["dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","contextmenu"];for(i=0,n=s.length;n>i;i++)o.DomEvent[e](this._container,s[i],this._fireMouseEvent,this);this.options.trackResize&&o.DomEvent[e](t,"resize",this._onResize,this)}},_onResize:function(){o.Util.cancelAnimFrame(this._resizeRequest),this._resizeRequest=o.Util.requestAnimFrame(function(){this.invalidateSize({debounceMoveend:!0})},this,!1,this._container)},_onMouseClick:function(t){!this._loaded||!t._simulated&&(this.dragging&&this.dragging.moved()||this.boxZoom&&this.boxZoom.moved())||o.DomEvent._skipped(t)||(this.fire("preclick"),this._fireMouseEvent(t))},_fireMouseEvent:function(t){if(this._loaded&&!o.DomEvent._skipped(t)){var e=t.type;if(e="mouseenter"===e?"mouseover":"mouseleave"===e?"mouseout":e,this.hasEventListeners(e)){"contextmenu"===e&&o.DomEvent.preventDefault(t);var i=this.mouseEventToContainerPoint(t),n=this.containerPointToLayerPoint(i),s=this.layerPointToLatLng(n);this.fire(e,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t})}}},_onTileLayerLoad:function(){this._tileLayersToLoad--,this._tileLayersNum&&!this._tileLayersToLoad&&this.fire("tilelayersload")},_clearHandlers:function(){for(var t=0,e=this._handlers.length;e>t;t++)this._handlers[t].disable()},whenReady:function(t,e){return this._loaded?t.call(e||this,this):this.on("load",t,e),this},_layerAdd:function(t){t.onAdd(this),this.fire("layeradd",{layer:t})},_getMapPanePos:function(){return o.DomUtil.getPosition(this._mapPane)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(){return this.getPixelOrigin().subtract(this._getMapPanePos())},_getNewTopLeftPoint:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._round()},_latLngToNewLayerPoint:function(t,e,i){var n=this._getNewTopLeftPoint(i,e).add(this._getMapPanePos());return this.project(t,e)._subtract(n)},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,e,i){if(!i)return t;var n=this.project(t,e),s=this.getSize().divideBy(2),a=new o.Bounds(n.subtract(s),n.add(s)),r=this._getBoundsOffset(a,i,e);return this.unproject(n.add(r),e)},_limitOffset:function(t,e){if(!e)return t;var i=this.getPixelBounds(),n=new o.Bounds(i.min.add(t),i.max.add(t));return t.add(this._getBoundsOffset(n,e))},_getBoundsOffset:function(t,e,i){var n=this.project(e.getNorthWest(),i).subtract(t.min),s=this.project(e.getSouthEast(),i).subtract(t.max),a=this._rebound(n.x,-s.x),r=this._rebound(n.y,-s.y);return new o.Point(a,r)},_rebound:function(t,e){return t+e>0?Math.round(t-e)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(e))},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom();return Math.max(e,Math.min(i,t))}}),o.map=function(t,e){return new o.Map(t,e)},o.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.314245179,R_MAJOR:6378137,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=this.R_MAJOR,a=this.R_MINOR,r=t.lng*e*s,h=n*e,l=a/s,u=Math.sqrt(1-l*l),c=u*Math.sin(h);c=Math.pow((1-c)/(1+c),.5*u);var d=Math.tan(.5*(.5*Math.PI-h))/c;return h=-s*Math.log(d),new o.Point(r,h)},unproject:function(t){for(var e,i=o.LatLng.RAD_TO_DEG,n=this.R_MAJOR,s=this.R_MINOR,a=t.x*i/n,r=s/n,h=Math.sqrt(1-r*r),l=Math.exp(-t.y/n),u=Math.PI/2-2*Math.atan(l),c=15,d=1e-7,p=c,_=.1;Math.abs(_)>d&&--p>0;)e=h*Math.sin(u),_=Math.PI/2-2*Math.atan(l*Math.pow((1-e)/(1+e),.5*h))-u,u+=_; +return new o.LatLng(u*i,a)}},o.CRS.EPSG3395=o.extend({},o.CRS,{code:"EPSG:3395",projection:o.Projection.Mercator,transformation:function(){var t=o.Projection.Mercator,e=t.R_MAJOR,i=.5/(Math.PI*e);return new o.Transformation(i,.5,-i,.5)}()}),o.TileLayer=o.Class.extend({includes:o.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",zoomOffset:0,opacity:1,unloadInvisibleTiles:o.Browser.mobile,updateWhenIdle:o.Browser.mobile},initialize:function(t,e){e=o.setOptions(this,e),e.detectRetina&&o.Browser.retina&&e.maxZoom>0&&(e.tileSize=Math.floor(e.tileSize/2),e.zoomOffset++,e.minZoom>0&&e.minZoom--,this.options.maxZoom--),e.bounds&&(e.bounds=o.latLngBounds(e.bounds)),this._url=t;var i=this.options.subdomains;"string"==typeof i&&(this.options.subdomains=i.split(""))},onAdd:function(t){this._map=t,this._animated=t._zoomAnimated,this._initContainer(),t.on({viewreset:this._reset,moveend:this._update},this),this._animated&&t.on({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||(this._limitedUpdate=o.Util.limitExecByInterval(this._update,150,this),t.on("move",this._limitedUpdate,this)),this._reset(),this._update()},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._container.parentNode.removeChild(this._container),t.off({viewreset:this._reset,moveend:this._update},this),this._animated&&t.off({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||t.off("move",this._limitedUpdate,this),this._container=null,this._map=null},bringToFront:function(){var t=this._map._panes.tilePane;return this._container&&(t.appendChild(this._container),this._setAutoZIndex(t,Math.max)),this},bringToBack:function(){var t=this._map._panes.tilePane;return this._container&&(t.insertBefore(this._container,t.firstChild),this._setAutoZIndex(t,Math.min)),this},getAttribution:function(){return this.options.attribution},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},setUrl:function(t,e){return this._url=t,e||this.redraw(),this},redraw:function(){return this._map&&(this._reset({hard:!0}),this._update()),this},_updateZIndex:function(){this._container&&this.options.zIndex!==i&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t,e){var i,n,o,s=t.children,a=-e(1/0,-1/0);for(n=0,o=s.length;o>n;n++)s[n]!==this._container&&(i=parseInt(s[n].style.zIndex,10),isNaN(i)||(a=e(a,i)));this.options.zIndex=this._container.style.zIndex=(isFinite(a)?a:0)+e(1,-1)},_updateOpacity:function(){var t,e=this._tiles;if(o.Browser.ielt9)for(t in e)o.DomUtil.setOpacity(e[t],this.options.opacity);else o.DomUtil.setOpacity(this._container,this.options.opacity)},_initContainer:function(){var t=this._map._panes.tilePane;if(!this._container){if(this._container=o.DomUtil.create("div","leaflet-layer"),this._updateZIndex(),this._animated){var e="leaflet-tile-container";this._bgBuffer=o.DomUtil.create("div",e,this._container),this._tileContainer=o.DomUtil.create("div",e,this._container)}else this._tileContainer=this._container;t.appendChild(this._container),this.options.opacity<1&&this._updateOpacity()}},_reset:function(t){for(var e in this._tiles)this.fire("tileunload",{tile:this._tiles[e]});this._tiles={},this._tilesToLoad=0,this.options.reuseTiles&&(this._unusedTiles=[]),this._tileContainer.innerHTML="",this._animated&&t&&t.hard&&this._clearBgBuffer(),this._initContainer()},_getTileSize:function(){var t=this._map,e=t.getZoom()+this.options.zoomOffset,i=this.options.maxNativeZoom,n=this.options.tileSize;return i&&e>i&&(n=Math.round(t.getZoomScale(e)/t.getZoomScale(i)*n)),n},_update:function(){if(this._map){var t=this._map,e=t.getPixelBounds(),i=t.getZoom(),n=this._getTileSize();if(!(i>this.options.maxZoom||in;n++)this._addTile(a[n],l);this._tileContainer.appendChild(l)}},_tileShouldBeLoaded:function(t){if(t.x+":"+t.y in this._tiles)return!1;var e=this.options;if(!e.continuousWorld){var i=this._getWrapTileNum();if(e.noWrap&&(t.x<0||t.x>=i.x)||t.y<0||t.y>=i.y)return!1}if(e.bounds){var n=e.tileSize,o=t.multiplyBy(n),s=o.add([n,n]),a=this._map.unproject(o),r=this._map.unproject(s);if(e.continuousWorld||e.noWrap||(a=a.wrap(),r=r.wrap()),!e.bounds.intersects([a,r]))return!1}return!0},_removeOtherTiles:function(t){var e,i,n,o;for(o in this._tiles)e=o.split(":"),i=parseInt(e[0],10),n=parseInt(e[1],10),(it.max.x||nt.max.y)&&this._removeTile(o)},_removeTile:function(t){var e=this._tiles[t];this.fire("tileunload",{tile:e,url:e.src}),this.options.reuseTiles?(o.DomUtil.removeClass(e,"leaflet-tile-loaded"),this._unusedTiles.push(e)):e.parentNode===this._tileContainer&&this._tileContainer.removeChild(e),o.Browser.android||(e.onload=null,e.src=o.Util.emptyImageUrl),delete this._tiles[t]},_addTile:function(t,e){var i=this._getTilePos(t),n=this._getTile();o.DomUtil.setPosition(n,i,o.Browser.chrome),this._tiles[t.x+":"+t.y]=n,this._loadTile(n,t),n.parentNode!==this._tileContainer&&e.appendChild(n)},_getZoomForUrl:function(){var t=this.options,e=this._map.getZoom();return t.zoomReverse&&(e=t.maxZoom-e),e+=t.zoomOffset,t.maxNativeZoom?Math.min(e,t.maxNativeZoom):e},_getTilePos:function(t){var e=this._map.getPixelOrigin(),i=this._getTileSize();return t.multiplyBy(i).subtract(e)},getTileUrl:function(t){return o.Util.template(this._url,o.extend({s:this._getSubdomain(t),z:t.z,x:t.x,y:t.y},this.options))},_getWrapTileNum:function(){var t=this._map.options.crs,e=t.getSize(this._map.getZoom());return e.divideBy(this._getTileSize())._floor()},_adjustTilePoint:function(t){var e=this._getWrapTileNum();this.options.continuousWorld||this.options.noWrap||(t.x=(t.x%e.x+e.x)%e.x),this.options.tms&&(t.y=e.y-t.y-1),t.z=this._getZoomForUrl()},_getSubdomain:function(t){var e=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[e]},_getTile:function(){if(this.options.reuseTiles&&this._unusedTiles.length>0){var t=this._unusedTiles.pop();return this._resetTile(t),t}return this._createTile()},_resetTile:function(){},_createTile:function(){var t=o.DomUtil.create("img","leaflet-tile");return t.style.width=t.style.height=this._getTileSize()+"px",t.galleryimg="no",t.onselectstart=t.onmousemove=o.Util.falseFn,o.Browser.ielt9&&this.options.opacity!==i&&o.DomUtil.setOpacity(t,this.options.opacity),o.Browser.mobileWebkit3d&&(t.style.WebkitBackfaceVisibility="hidden"),t},_loadTile:function(t,e){t._layer=this,t.onload=this._tileOnLoad,t.onerror=this._tileOnError,this._adjustTilePoint(e),t.src=this.getTileUrl(e),this.fire("tileloadstart",{tile:t,url:t.src})},_tileLoaded:function(){this._tilesToLoad--,this._animated&&o.DomUtil.addClass(this._tileContainer,"leaflet-zoom-animated"),this._tilesToLoad||(this.fire("load"),this._animated&&(clearTimeout(this._clearBgBufferTimer),this._clearBgBufferTimer=setTimeout(o.bind(this._clearBgBuffer,this),500)))},_tileOnLoad:function(){var t=this._layer;this.src!==o.Util.emptyImageUrl&&(o.DomUtil.addClass(this,"leaflet-tile-loaded"),t.fire("tileload",{tile:this,url:this.src})),t._tileLoaded()},_tileOnError:function(){var t=this._layer;t.fire("tileerror",{tile:this,url:this.src});var e=t.options.errorTileUrl;e&&(this.src=e),t._tileLoaded()}}),o.tileLayer=function(t,e){return new o.TileLayer(t,e)},o.TileLayer.WMS=o.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(t,e){this._url=t;var i=o.extend({},this.defaultWmsParams),n=e.tileSize||this.options.tileSize;i.width=i.height=e.detectRetina&&o.Browser.retina?2*n:n;for(var s in e)this.options.hasOwnProperty(s)||"crs"===s||(i[s]=e[s]);this.wmsParams=i,o.setOptions(this,e)},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var e=this._wmsVersion>=1.3?"crs":"srs";this.wmsParams[e]=this._crs.code,o.TileLayer.prototype.onAdd.call(this,t)},getTileUrl:function(t){var e=this._map,i=this.options.tileSize,n=t.multiplyBy(i),s=n.add([i,i]),a=this._crs.project(e.unproject(n,t.z)),r=this._crs.project(e.unproject(s,t.z)),h=this._wmsVersion>=1.3&&this._crs===o.CRS.EPSG4326?[r.y,a.x,a.y,r.x].join(","):[a.x,r.y,r.x,a.y].join(","),l=o.Util.template(this._url,{s:this._getSubdomain(t)});return l+o.Util.getParamString(this.wmsParams,l,!0)+"&BBOX="+h},setParams:function(t,e){return o.extend(this.wmsParams,t),e||this.redraw(),this}}),o.tileLayer.wms=function(t,e){return new o.TileLayer.WMS(t,e)},o.TileLayer.Canvas=o.TileLayer.extend({options:{async:!1},initialize:function(t){o.setOptions(this,t)},redraw:function(){this._map&&(this._reset({hard:!0}),this._update());for(var t in this._tiles)this._redrawTile(this._tiles[t]);return this},_redrawTile:function(t){this.drawTile(t,t._tilePoint,this._map._zoom)},_createTile:function(){var t=o.DomUtil.create("canvas","leaflet-tile");return t.width=t.height=this.options.tileSize,t.onselectstart=t.onmousemove=o.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t._tilePoint=e,this._redrawTile(t),this.options.async||this.tileDrawn(t)},drawTile:function(){},tileDrawn:function(t){this._tileOnLoad.call(t)}}),o.tileLayer.canvas=function(t){return new o.TileLayer.Canvas(t)},o.ImageOverlay=o.Class.extend({includes:o.Mixin.Events,options:{opacity:1},initialize:function(t,e,i){this._url=t,this._bounds=o.latLngBounds(e),o.setOptions(this,i)},onAdd:function(t){this._map=t,this._image||this._initImage(),t._panes.overlayPane.appendChild(this._image),t.on("viewreset",this._reset,this),t.options.zoomAnimation&&o.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._image),t.off("viewreset",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},bringToFront:function(){return this._image&&this._map._panes.overlayPane.appendChild(this._image),this},bringToBack:function(){var t=this._map._panes.overlayPane;return this._image&&t.insertBefore(this._image,t.firstChild),this},setUrl:function(t){this._url=t,this._image.src=this._url},getAttribution:function(){return this.options.attribution},_initImage:function(){this._image=o.DomUtil.create("img","leaflet-image-layer"),this._map.options.zoomAnimation&&o.Browser.any3d?o.DomUtil.addClass(this._image,"leaflet-zoom-animated"):o.DomUtil.addClass(this._image,"leaflet-zoom-hide"),this._updateOpacity(),o.extend(this._image,{galleryimg:"no",onselectstart:o.Util.falseFn,onmousemove:o.Util.falseFn,onload:o.bind(this._onImageLoad,this),src:this._url})},_animateZoom:function(t){var e=this._map,i=this._image,n=e.getZoomScale(t.zoom),s=this._bounds.getNorthWest(),a=this._bounds.getSouthEast(),r=e._latLngToNewLayerPoint(s,t.zoom,t.center),h=e._latLngToNewLayerPoint(a,t.zoom,t.center)._subtract(r),l=r._add(h._multiplyBy(.5*(1-1/n)));i.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(l)+" scale("+n+") "},_reset:function(){var t=this._image,e=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),i=this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(e);o.DomUtil.setPosition(t,e),t.style.width=i.x+"px",t.style.height=i.y+"px"},_onImageLoad:function(){this.fire("load")},_updateOpacity:function(){o.DomUtil.setOpacity(this._image,this.options.opacity)}}),o.imageOverlay=function(t,e,i){return new o.ImageOverlay(t,e,i)},o.Icon=o.Class.extend({options:{className:""},initialize:function(t){o.setOptions(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,e){var i=this._getIconUrl(t);if(!i){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n;return n=e&&"IMG"===e.tagName?this._createImg(i,e):this._createImg(i),this._setIconStyles(n,t),n},_setIconStyles:function(t,e){var i,n=this.options,s=o.point(n[e+"Size"]);i=o.point("shadow"===e?n.shadowAnchor||n.iconAnchor:n.iconAnchor),!i&&s&&(i=s.divideBy(2,!0)),t.className="leaflet-marker-"+e+" "+n.className,i&&(t.style.marginLeft=-i.x+"px",t.style.marginTop=-i.y+"px"),s&&(t.style.width=s.x+"px",t.style.height=s.y+"px")},_createImg:function(t,i){return i=i||e.createElement("img"),i.src=t,i},_getIconUrl:function(t){return o.Browser.retina&&this.options[t+"RetinaUrl"]?this.options[t+"RetinaUrl"]:this.options[t+"Url"]}}),o.icon=function(t){return new o.Icon(t)},o.Icon.Default=o.Icon.extend({options:{iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],shadowSize:[41,41]},_getIconUrl:function(t){var e=t+"Url";if(this.options[e])return this.options[e];o.Browser.retina&&"icon"===t&&(t+="-2x");var i=o.Icon.Default.imagePath;if(!i)throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");return i+"/marker-"+t+".png"}}),o.Icon.Default.imagePath=function(){var t,i,n,o,s,a=e.getElementsByTagName("script"),r=/[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;for(t=0,i=a.length;i>t;t++)if(n=a[t].src,o=n.match(r))return s=n.split(r)[0],(s?s+"/":"")+"images"}(),o.Marker=o.Class.extend({includes:o.Mixin.Events,options:{icon:new o.Icon.Default,title:"",alt:"",clickable:!0,draggable:!1,keyboard:!0,zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250},initialize:function(t,e){o.setOptions(this,e),this._latlng=o.latLng(t)},onAdd:function(t){this._map=t,t.on("viewreset",this.update,this),this._initIcon(),this.update(),this.fire("add"),t.options.zoomAnimation&&t.options.markerZoomAnimation&&t.on("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this.dragging&&this.dragging.disable(),this._removeIcon(),this._removeShadow(),this.fire("remove"),t.off({viewreset:this.update,zoomanim:this._animateZoom},this),this._map=null},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=o.latLng(t),this.update(),this.fire("move",{latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update(),this},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup),this},update:function(){if(this._icon){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,e=this._map,i=e.options.zoomAnimation&&e.options.markerZoomAnimation,n=i?"leaflet-zoom-animated":"leaflet-zoom-hide",s=t.icon.createIcon(this._icon),a=!1;s!==this._icon&&(this._icon&&this._removeIcon(),a=!0,t.title&&(s.title=t.title),t.alt&&(s.alt=t.alt)),o.DomUtil.addClass(s,n),t.keyboard&&(s.tabIndex="0"),this._icon=s,this._initInteraction(),t.riseOnHover&&o.DomEvent.on(s,"mouseover",this._bringToFront,this).on(s,"mouseout",this._resetZIndex,this);var r=t.icon.createShadow(this._shadow),h=!1;r!==this._shadow&&(this._removeShadow(),h=!0),r&&o.DomUtil.addClass(r,n),this._shadow=r,t.opacity<1&&this._updateOpacity();var l=this._map._panes;a&&l.markerPane.appendChild(this._icon),r&&h&&l.shadowPane.appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&o.DomEvent.off(this._icon,"mouseover",this._bringToFront).off(this._icon,"mouseout",this._resetZIndex),this._map._panes.markerPane.removeChild(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&this._map._panes.shadowPane.removeChild(this._shadow),this._shadow=null},_setPos:function(t){o.DomUtil.setPosition(this._icon,t),this._shadow&&o.DomUtil.setPosition(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(e)},_initInteraction:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu"];o.DomUtil.addClass(t,"leaflet-clickable"),o.DomEvent.on(t,"click",this._onMouseClick,this),o.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;is?(e.height=s+"px",o.DomUtil.addClass(t,a)):o.DomUtil.removeClass(t,a),this._containerWidth=this._container.offsetWidth},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),e=this._animated,i=o.point(this.options.offset);e&&o.DomUtil.setPosition(this._container,t),this._containerBottom=-i.y-(e?0:t.y),this._containerLeft=-Math.round(this._containerWidth/2)+i.x+(e?0:t.x),this._container.style.bottom=this._containerBottom+"px",this._container.style.left=this._containerLeft+"px"}},_zoomAnimation:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);o.DomUtil.setPosition(this._container,e)},_adjustPan:function(){if(this.options.autoPan){var t=this._map,e=this._container.offsetHeight,i=this._containerWidth,n=new o.Point(this._containerLeft,-e-this._containerBottom);this._animated&&n._add(o.DomUtil.getPosition(this._container));var s=t.layerPointToContainerPoint(n),a=o.point(this.options.autoPanPadding),r=o.point(this.options.autoPanPaddingTopLeft||a),h=o.point(this.options.autoPanPaddingBottomRight||a),l=t.getSize(),u=0,c=0;s.x+i+h.x>l.x&&(u=s.x+i-l.x+h.x),s.x-u-r.x<0&&(u=s.x-r.x),s.y+e+h.y>l.y&&(c=s.y+e-l.y+h.y),s.y-c-r.y<0&&(c=s.y-r.y),(u||c)&&t.fire("autopanstart").panBy([u,c])}},_onCloseButtonClick:function(t){this._close(),o.DomEvent.stop(t)}}),o.popup=function(t,e){return new o.Popup(t,e)},o.Map.include({openPopup:function(t,e,i){if(this.closePopup(),!(t instanceof o.Popup)){var n=t;t=new o.Popup(i).setLatLng(e).setContent(n)}return t._isOpen=!0,this._popup=t,this.addLayer(t)},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&(this.removeLayer(t),t._isOpen=!1),this}}),o.Marker.include({openPopup:function(){return this._popup&&this._map&&!this._map.hasLayer(this._popup)&&(this._popup.setLatLng(this._latlng),this._map.openPopup(this._popup)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(){return this._popup&&(this._popup._isOpen?this.closePopup():this.openPopup()),this},bindPopup:function(t,e){var i=o.point(this.options.icon.options.popupAnchor||[0,0]);return i=i.add(o.Popup.prototype.options.offset),e&&e.offset&&(i=i.add(e.offset)),e=o.extend({offset:i},e),this._popupHandlersAdded||(this.on("click",this.togglePopup,this).on("remove",this.closePopup,this).on("move",this._movePopup,this),this._popupHandlersAdded=!0),t instanceof o.Popup?(o.setOptions(t,e),this._popup=t):this._popup=new o.Popup(e,this).setContent(t),this},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this.togglePopup,this).off("remove",this.closePopup,this).off("move",this._movePopup,this),this._popupHandlersAdded=!1),this},getPopup:function(){return this._popup},_movePopup:function(t){this._popup.setLatLng(t.latlng)}}),o.LayerGroup=o.Class.extend({initialize:function(t){this._layers={};var e,i;if(t)for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},addLayer:function(t){var e=this.getLayerId(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var e=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[e]&&this._map.removeLayer(this._layers[e]),delete this._layers[e],this},hasLayer:function(t){return t?t in this._layers||this.getLayerId(t)in this._layers:!1},clearLayers:function(){return this.eachLayer(this.removeLayer,this),this},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)i=this._layers[e],i[t]&&i[t].apply(i,n);return this},onAdd:function(t){this._map=t,this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t),this._map=null},addTo:function(t){return t.addLayer(this),this},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];for(var e in this._layers)t.push(this._layers[e]);return t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return o.stamp(t)}}),o.layerGroup=function(t){return new o.LayerGroup(t)},o.FeatureGroup=o.LayerGroup.extend({includes:o.Mixin.Events,statics:{EVENTS:"click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose"},addLayer:function(t){return this.hasLayer(t)?this:("on"in t&&t.on(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.addLayer.call(this,t),this._popupContent&&t.bindPopup&&t.bindPopup(this._popupContent,this._popupOptions),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.off(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.removeLayer.call(this,t),this._popupContent&&this.invoke("unbindPopup"),this.fire("layerremove",{layer:t})):this},bindPopup:function(t,e){return this._popupContent=t,this._popupOptions=e,this.invoke("bindPopup",t,e)},openPopup:function(t){for(var e in this._layers){this._layers[e].openPopup(t);break}return this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new o.LatLngBounds;return this.eachLayer(function(e){t.extend(e instanceof o.Marker?e.getLatLng():e.getBounds())}),t},_propagateEvent:function(t){t=o.extend({layer:t.target,target:this},t),this.fire(t.type,t)}}),o.featureGroup=function(t){return new o.FeatureGroup(t)},o.Path=o.Class.extend({includes:[o.Mixin.Events],statics:{CLIP_PADDING:function(){var e=o.Browser.mobile?1280:2e3,i=(e/Math.max(t.outerWidth,t.outerHeight)-1)/2;return Math.max(0,Math.min(.5,i))}()},options:{stroke:!0,color:"#0033ff",dashArray:null,lineCap:null,lineJoin:null,weight:5,opacity:.5,fill:!1,fillColor:null,fillOpacity:.2,clickable:!0},initialize:function(t){o.setOptions(this,t)},onAdd:function(t){this._map=t,this._container||(this._initElements(),this._initEvents()),this.projectLatlngs(),this._updatePath(),this._container&&this._map._pathRoot.appendChild(this._container),this.fire("add"),t.on({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){t._pathRoot.removeChild(this._container),this.fire("remove"),this._map=null,o.Browser.vml&&(this._container=null,this._stroke=null,this._fill=null),t.off({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},projectLatlngs:function(){},setStyle:function(t){return o.setOptions(this,t),this._container&&this._updateStyle(),this},redraw:function(){return this._map&&(this.projectLatlngs(),this._updatePath()),this}}),o.Map.include({_updatePathViewport:function(){var t=o.Path.CLIP_PADDING,e=this.getSize(),i=o.DomUtil.getPosition(this._mapPane),n=i.multiplyBy(-1)._subtract(e.multiplyBy(t)._round()),s=n.add(e.multiplyBy(1+2*t)._round());this._pathViewport=new o.Bounds(n,s)}}),o.Path.SVG_NS="http://www.w3.org/2000/svg",o.Browser.svg=!(!e.createElementNS||!e.createElementNS(o.Path.SVG_NS,"svg").createSVGRect),o.Path=o.Path.extend({statics:{SVG:o.Browser.svg},bringToFront:function(){var t=this._map._pathRoot,e=this._container;return e&&t.lastChild!==e&&t.appendChild(e),this},bringToBack:function(){var t=this._map._pathRoot,e=this._container,i=t.firstChild;return e&&i!==e&&t.insertBefore(e,i),this},getPathString:function(){},_createElement:function(t){return e.createElementNS(o.Path.SVG_NS,t)},_initElements:function(){this._map._initPathRoot(),this._initPath(),this._initStyle()},_initPath:function(){this._container=this._createElement("g"),this._path=this._createElement("path"),this.options.className&&o.DomUtil.addClass(this._path,this.options.className),this._container.appendChild(this._path)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round")),this.options.fill&&this._path.setAttribute("fill-rule","evenodd"),this.options.pointerEvents&&this._path.setAttribute("pointer-events",this.options.pointerEvents),this.options.clickable||this.options.pointerEvents||this._path.setAttribute("pointer-events","none"),this._updateStyle()},_updateStyle:function(){this.options.stroke?(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",this.options.weight),this.options.dashArray?this._path.setAttribute("stroke-dasharray",this.options.dashArray):this._path.removeAttribute("stroke-dasharray"),this.options.lineCap&&this._path.setAttribute("stroke-linecap",this.options.lineCap),this.options.lineJoin&&this._path.setAttribute("stroke-linejoin",this.options.lineJoin)):this._path.setAttribute("stroke","none"),this.options.fill?(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity)):this._path.setAttribute("fill","none")},_updatePath:function(){var t=this.getPathString();t||(t="M0 0"),this._path.setAttribute("d",t)},_initEvents:function(){if(this.options.clickable){(o.Browser.svg||!o.Browser.vml)&&o.DomUtil.addClass(this._path,"leaflet-clickable"),o.DomEvent.on(this._container,"click",this._onMouseClick,this);for(var t=["dblclick","mousedown","mouseover","mouseout","mousemove","contextmenu"],e=0;e';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(n){return!1}}(),o.Path=o.Browser.svg||!o.Browser.vml?o.Path:o.Path.extend({statics:{VML:!0,CLIP_PADDING:.02},_createElement:function(){try{return e.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return e.createElement("')}}catch(t){return function(t){return e.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initPath:function(){var t=this._container=this._createElement("shape");o.DomUtil.addClass(t,"leaflet-vml-shape"+(this.options.className?" "+this.options.className:"")),this.options.clickable&&o.DomUtil.addClass(t,"leaflet-clickable"),t.coordsize="1 1",this._path=this._createElement("path"),t.appendChild(this._path),this._map._pathRoot.appendChild(t)},_initStyle:function(){this._updateStyle()},_updateStyle:function(){var t=this._stroke,e=this._fill,i=this.options,n=this._container;n.stroked=i.stroke,n.filled=i.fill,i.stroke?(t||(t=this._stroke=this._createElement("stroke"),t.endcap="round",n.appendChild(t)),t.weight=i.weight+"px",t.color=i.color,t.opacity=i.opacity,t.dashStyle=i.dashArray?o.Util.isArray(i.dashArray)?i.dashArray.join(" "):i.dashArray.replace(/( *, *)/g," "):"",i.lineCap&&(t.endcap=i.lineCap.replace("butt","flat")),i.lineJoin&&(t.joinstyle=i.lineJoin)):t&&(n.removeChild(t),this._stroke=null),i.fill?(e||(e=this._fill=this._createElement("fill"),n.appendChild(e)),e.color=i.fillColor||i.color,e.opacity=i.fillOpacity):e&&(n.removeChild(e),this._fill=null)},_updatePath:function(){var t=this._container.style;t.display="none",this._path.v=this.getPathString()+" ",t.display=""}}),o.Map.include(o.Browser.svg||!o.Browser.vml?{}:{_initPathRoot:function(){if(!this._pathRoot){var t=this._pathRoot=e.createElement("div");t.className="leaflet-vml-container",this._panes.overlayPane.appendChild(t),this.on("moveend",this._updatePathViewport),this._updatePathViewport()}}}),o.Browser.canvas=function(){return!!e.createElement("canvas").getContext}(),o.Path=o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?o.Path:o.Path.extend({statics:{CANVAS:!0,SVG:!1},redraw:function(){return this._map&&(this.projectLatlngs(),this._requestUpdate()),this},setStyle:function(t){return o.setOptions(this,t),this._map&&(this._updateStyle(),this._requestUpdate()),this},onRemove:function(t){t.off("viewreset",this.projectLatlngs,this).off("moveend",this._updatePath,this),this.options.clickable&&(this._map.off("click",this._onClick,this),this._map.off("mousemove",this._onMouseMove,this)),this._requestUpdate(),this.fire("remove"),this._map=null},_requestUpdate:function(){this._map&&!o.Path._updateRequest&&(o.Path._updateRequest=o.Util.requestAnimFrame(this._fireMapMoveEnd,this._map))},_fireMapMoveEnd:function(){o.Path._updateRequest=null,this.fire("moveend")},_initElements:function(){this._map._initPathRoot(),this._ctx=this._map._canvasCtx},_updateStyle:function(){var t=this.options;t.stroke&&(this._ctx.lineWidth=t.weight,this._ctx.strokeStyle=t.color),t.fill&&(this._ctx.fillStyle=t.fillColor||t.color)},_drawPath:function(){var t,e,i,n,s,a;for(this._ctx.beginPath(),t=0,i=this._parts.length;i>t;t++){for(e=0,n=this._parts[t].length;n>e;e++)s=this._parts[t][e],a=(0===e?"move":"line")+"To",this._ctx[a](s.x,s.y);this instanceof o.Polygon&&this._ctx.closePath()}},_checkIfEmpty:function(){return!this._parts.length},_updatePath:function(){if(!this._checkIfEmpty()){var t=this._ctx,e=this.options;this._drawPath(),t.save(),this._updateStyle(),e.fill&&(t.globalAlpha=e.fillOpacity,t.fill()),e.stroke&&(t.globalAlpha=e.opacity,t.stroke()),t.restore()}},_initEvents:function(){this.options.clickable&&(this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onClick,this))},_onClick:function(t){this._containsPoint(t.layerPoint)&&this.fire("click",t)},_onMouseMove:function(t){this._map&&!this._map._animatingZoom&&(this._containsPoint(t.layerPoint)?(this._ctx.canvas.style.cursor="pointer",this._mouseInside=!0,this.fire("mouseover",t)):this._mouseInside&&(this._ctx.canvas.style.cursor="",this._mouseInside=!1,this.fire("mouseout",t)))}}),o.Map.include(o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?{}:{_initPathRoot:function(){var t,i=this._pathRoot;i||(i=this._pathRoot=e.createElement("canvas"),i.style.position="absolute",t=this._canvasCtx=i.getContext("2d"),t.lineCap="round",t.lineJoin="round",this._panes.overlayPane.appendChild(i),this.options.zoomAnimation&&(this._pathRoot.className="leaflet-zoom-animated",this.on("zoomanim",this._animatePathZoom),this.on("zoomend",this._endPathZoom)),this.on("moveend",this._updateCanvasViewport),this._updateCanvasViewport())},_updateCanvasViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max.subtract(e),n=this._pathRoot;o.DomUtil.setPosition(n,e),n.width=i.x,n.height=i.y,n.getContext("2d").translate(-e.x,-e.y)}}}),o.LineUtil={simplify:function(t,e){if(!e||!t.length)return t.slice();var i=e*e;return t=this._reducePoints(t,i),t=this._simplifyDP(t,i)},pointToSegmentDistance:function(t,e,i){return Math.sqrt(this._sqClosestPointOnSegment(t,e,i,!0))},closestPointOnSegment:function(t,e,i){return this._sqClosestPointOnSegment(t,e,i)},_simplifyDP:function(t,e){var n=t.length,o=typeof Uint8Array!=i+""?Uint8Array:Array,s=new o(n);s[0]=s[n-1]=1,this._simplifyDPStep(t,s,e,0,n-1);var a,r=[];for(a=0;n>a;a++)s[a]&&r.push(t[a]);return r},_simplifyDPStep:function(t,e,i,n,o){var s,a,r,h=0;for(a=n+1;o-1>=a;a++)r=this._sqClosestPointOnSegment(t[a],t[n],t[o],!0),r>h&&(s=a,h=r);h>i&&(e[s]=1,this._simplifyDPStep(t,e,i,n,s),this._simplifyDPStep(t,e,i,s,o))},_reducePoints:function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;s>n;n++)this._sqDist(t[n],t[o])>e&&(i.push(t[n]),o=n);return s-1>o&&i.push(t[s-1]),i},clipSegment:function(t,e,i,n){var o,s,a,r=n?this._lastCode:this._getBitCode(t,i),h=this._getBitCode(e,i);for(this._lastCode=h;;){if(!(r|h))return[t,e];if(r&h)return!1;o=r||h,s=this._getEdgeIntersection(t,e,o,i),a=this._getBitCode(s,i),o===r?(t=s,r=a):(e=s,h=a)}},_getEdgeIntersection:function(t,e,i,n){var s=e.x-t.x,a=e.y-t.y,r=n.min,h=n.max;return 8&i?new o.Point(t.x+s*(h.y-t.y)/a,h.y):4&i?new o.Point(t.x+s*(r.y-t.y)/a,r.y):2&i?new o.Point(h.x,t.y+a*(h.x-t.x)/s):1&i?new o.Point(r.x,t.y+a*(r.x-t.x)/s):void 0},_getBitCode:function(t,e){var i=0;return t.xe.max.x&&(i|=2),t.ye.max.y&&(i|=8),i},_sqDist:function(t,e){var i=e.x-t.x,n=e.y-t.y;return i*i+n*n},_sqClosestPointOnSegment:function(t,e,i,n){var s,a=e.x,r=e.y,h=i.x-a,l=i.y-r,u=h*h+l*l;return u>0&&(s=((t.x-a)*h+(t.y-r)*l)/u,s>1?(a=i.x,r=i.y):s>0&&(a+=h*s,r+=l*s)),h=t.x-a,l=t.y-r,n?h*h+l*l:new o.Point(a,r)}},o.Polyline=o.Path.extend({initialize:function(t,e){o.Path.prototype.initialize.call(this,e),this._latlngs=this._convertLatLngs(t)},options:{smoothFactor:1,noClip:!1},projectLatlngs:function(){this._originalPoints=[];for(var t=0,e=this._latlngs.length;e>t;t++)this._originalPoints[t]=this._map.latLngToLayerPoint(this._latlngs[t])},getPathString:function(){for(var t=0,e=this._parts.length,i="";e>t;t++)i+=this._getPathPartStr(this._parts[t]);return i},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._latlngs=this._convertLatLngs(t),this.redraw()},addLatLng:function(t){return this._latlngs.push(o.latLng(t)),this.redraw()},spliceLatLngs:function(){var t=[].splice.apply(this._latlngs,arguments);return this._convertLatLngs(this._latlngs,!0),this.redraw(),t},closestLayerPoint:function(t){for(var e,i,n=1/0,s=this._parts,a=null,r=0,h=s.length;h>r;r++)for(var l=s[r],u=1,c=l.length;c>u;u++){e=l[u-1],i=l[u];var d=o.LineUtil._sqClosestPointOnSegment(t,e,i,!0);n>d&&(n=d,a=o.LineUtil._sqClosestPointOnSegment(t,e,i))}return a&&(a.distance=Math.sqrt(n)),a},getBounds:function(){return new o.LatLngBounds(this.getLatLngs())},_convertLatLngs:function(t,e){var i,n,s=e?t:[];for(i=0,n=t.length;n>i;i++){if(o.Util.isArray(t[i])&&"number"!=typeof t[i][0])return;s[i]=o.latLng(t[i])}return s},_initEvents:function(){o.Path.prototype._initEvents.call(this)},_getPathPartStr:function(t){for(var e,i=o.Path.VML,n=0,s=t.length,a="";s>n;n++)e=t[n],i&&e._round(),a+=(n?"L":"M")+e.x+" "+e.y;return a},_clipPoints:function(){var t,e,i,n=this._originalPoints,s=n.length;if(this.options.noClip)return void(this._parts=[n]);this._parts=[];var a=this._parts,r=this._map._pathViewport,h=o.LineUtil;for(t=0,e=0;s-1>t;t++)i=h.clipSegment(n[t],n[t+1],r,t),i&&(a[e]=a[e]||[],a[e].push(i[0]),(i[1]!==n[t+1]||t===s-2)&&(a[e].push(i[1]),e++))},_simplifyPoints:function(){for(var t=this._parts,e=o.LineUtil,i=0,n=t.length;n>i;i++)t[i]=e.simplify(t[i],this.options.smoothFactor)},_updatePath:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),o.Path.prototype._updatePath.call(this))}}),o.polyline=function(t,e){return new o.Polyline(t,e)},o.PolyUtil={},o.PolyUtil.clipPolygon=function(t,e){var i,n,s,a,r,h,l,u,c,d=[1,4,2,8],p=o.LineUtil;for(n=0,l=t.length;l>n;n++)t[n]._code=p._getBitCode(t[n],e);for(a=0;4>a;a++){for(u=d[a],i=[],n=0,l=t.length,s=l-1;l>n;s=n++)r=t[n],h=t[s],r._code&u?h._code&u||(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)):(h._code&u&&(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)),i.push(r));t=i}return t},o.Polygon=o.Polyline.extend({options:{fill:!0},initialize:function(t,e){o.Polyline.prototype.initialize.call(this,t,e),this._initWithHoles(t)},_initWithHoles:function(t){var e,i,n;if(t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0])for(this._latlngs=this._convertLatLngs(t[0]),this._holes=t.slice(1),e=0,i=this._holes.length;i>e;e++)n=this._holes[e]=this._convertLatLngs(this._holes[e]),n[0].equals(n[n.length-1])&&n.pop();t=this._latlngs,t.length>=2&&t[0].equals(t[t.length-1])&&t.pop()},projectLatlngs:function(){if(o.Polyline.prototype.projectLatlngs.call(this),this._holePoints=[],this._holes){var t,e,i,n;for(t=0,i=this._holes.length;i>t;t++)for(this._holePoints[t]=[],e=0,n=this._holes[t].length;n>e;e++)this._holePoints[t][e]=this._map.latLngToLayerPoint(this._holes[t][e])}},setLatLngs:function(t){return t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0]?(this._initWithHoles(t),this.redraw()):o.Polyline.prototype.setLatLngs.call(this,t)},_clipPoints:function(){var t=this._originalPoints,e=[];if(this._parts=[t].concat(this._holePoints),!this.options.noClip){for(var i=0,n=this._parts.length;n>i;i++){var s=o.PolyUtil.clipPolygon(this._parts[i],this._map._pathViewport);s.length&&e.push(s)}this._parts=e}},_getPathPartStr:function(t){var e=o.Polyline.prototype._getPathPartStr.call(this,t);return e+(o.Browser.svg?"z":"x")}}),o.polygon=function(t,e){return new o.Polygon(t,e)},function(){function t(t){return o.FeatureGroup.extend({initialize:function(t,e){this._layers={},this._options=e,this.setLatLngs(t)},setLatLngs:function(e){var i=0,n=e.length;for(this.eachLayer(function(t){n>i?t.setLatLngs(e[i++]):this.removeLayer(t)},this);n>i;)this.addLayer(new t(e[i++],this._options));return this},getLatLngs:function(){var t=[];return this.eachLayer(function(e){t.push(e.getLatLngs())}),t}})}o.MultiPolyline=t(o.Polyline),o.MultiPolygon=t(o.Polygon),o.multiPolyline=function(t,e){return new o.MultiPolyline(t,e)},o.multiPolygon=function(t,e){return new o.MultiPolygon(t,e)}}(),o.Rectangle=o.Polygon.extend({initialize:function(t,e){o.Polygon.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=o.latLngBounds(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}}),o.rectangle=function(t,e){return new o.Rectangle(t,e)},o.Circle=o.Path.extend({initialize:function(t,e,i){o.Path.prototype.initialize.call(this,i),this._latlng=o.latLng(t),this._mRadius=e},options:{fill:!0},setLatLng:function(t){return this._latlng=o.latLng(t),this.redraw()},setRadius:function(t){return this._mRadius=t,this.redraw()},projectLatlngs:function(){var t=this._getLngRadius(),e=this._latlng,i=this._map.latLngToLayerPoint([e.lat,e.lng-t]);this._point=this._map.latLngToLayerPoint(e),this._radius=Math.max(this._point.x-i.x,1)},getBounds:function(){var t=this._getLngRadius(),e=this._mRadius/40075017*360,i=this._latlng;return new o.LatLngBounds([i.lat-e,i.lng-t],[i.lat+e,i.lng+t])},getLatLng:function(){return this._latlng},getPathString:function(){var t=this._point,e=this._radius;return this._checkIfEmpty()?"":o.Browser.svg?"M"+t.x+","+(t.y-e)+"A"+e+","+e+",0,1,1,"+(t.x-.1)+","+(t.y-e)+" z":(t._round(),e=Math.round(e),"AL "+t.x+","+t.y+" "+e+","+e+" 0,23592600")},getRadius:function(){return this._mRadius},_getLatRadius:function(){return this._mRadius/40075017*360},_getLngRadius:function(){return this._getLatRadius()/Math.cos(o.LatLng.DEG_TO_RAD*this._latlng.lat)},_checkIfEmpty:function(){if(!this._map)return!1;var t=this._map._pathViewport,e=this._radius,i=this._point;return i.x-e>t.max.x||i.y-e>t.max.y||i.x+ei;i++)for(l=this._parts[i],n=0,r=l.length,s=r-1;r>n;s=n++)if((e||0!==n)&&(h=o.LineUtil.pointToSegmentDistance(t,l[s],l[n]),u>=h))return!0;return!1}}:{}),o.Polygon.include(o.Path.CANVAS?{_containsPoint:function(t){var e,i,n,s,a,r,h,l,u=!1;if(o.Polyline.prototype._containsPoint.call(this,t,!0))return!0;for(s=0,h=this._parts.length;h>s;s++)for(e=this._parts[s],a=0,l=e.length,r=l-1;l>a;r=a++)i=e[a],n=e[r],i.y>t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(u=!u);return u}}:{}),o.Circle.include(o.Path.CANVAS?{_drawPath:function(){var t=this._point;this._ctx.beginPath(),this._ctx.arc(t.x,t.y,this._radius,0,2*Math.PI,!1)},_containsPoint:function(t){var e=this._point,i=this.options.stroke?this.options.weight/2:0;return t.distanceTo(e)<=this._radius+i}}:{}),o.CircleMarker.include(o.Path.CANVAS?{_updateStyle:function(){o.Path.prototype._updateStyle.call(this)}}:{}),o.GeoJSON=o.FeatureGroup.extend({initialize:function(t,e){o.setOptions(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,s=o.Util.isArray(t)?t:t.features;if(s){for(e=0,i=s.length;i>e;e++)n=s[e],(n.geometries||n.geometry||n.features||n.coordinates)&&this.addData(s[e]);return this}var a=this.options;if(!a.filter||a.filter(t)){var r=o.GeoJSON.geometryToLayer(t,a.pointToLayer,a.coordsToLatLng,a);return r.feature=o.GeoJSON.asFeature(t),r.defaultOptions=r.options,this.resetStyle(r),a.onEachFeature&&a.onEachFeature(t,r),this.addLayer(r)}},resetStyle:function(t){var e=this.options.style;e&&(o.Util.extend(t.options,t.defaultOptions),this._setLayerStyle(t,e))},setStyle:function(t){this.eachLayer(function(e){this._setLayerStyle(e,t)},this)},_setLayerStyle:function(t,e){"function"==typeof e&&(e=e(t.feature)),t.setStyle&&t.setStyle(e)}}),o.extend(o.GeoJSON,{geometryToLayer:function(t,e,i,n){var s,a,r,h,l="Feature"===t.type?t.geometry:t,u=l.coordinates,c=[];switch(i=i||this.coordsToLatLng,l.type){case"Point":return s=i(u),e?e(t,s):new o.Marker(s);case"MultiPoint":for(r=0,h=u.length;h>r;r++)s=i(u[r]),c.push(e?e(t,s):new o.Marker(s));return new o.FeatureGroup(c);case"LineString":return a=this.coordsToLatLngs(u,0,i),new o.Polyline(a,n);case"Polygon":if(2===u.length&&!u[1].length)throw new Error("Invalid GeoJSON object.");return a=this.coordsToLatLngs(u,1,i),new o.Polygon(a,n);case"MultiLineString":return a=this.coordsToLatLngs(u,1,i),new o.MultiPolyline(a,n);case"MultiPolygon":return a=this.coordsToLatLngs(u,2,i),new o.MultiPolygon(a,n);case"GeometryCollection":for(r=0,h=l.geometries.length;h>r;r++)c.push(this.geometryToLayer({geometry:l.geometries[r],type:"Feature",properties:t.properties},e,i,n));return new o.FeatureGroup(c);default:throw new Error("Invalid GeoJSON object.")}},coordsToLatLng:function(t){return new o.LatLng(t[1],t[0],t[2])},coordsToLatLngs:function(t,e,i){var n,o,s,a=[];for(o=0,s=t.length;s>o;o++)n=e?this.coordsToLatLngs(t[o],e-1,i):(i||this.coordsToLatLng)(t[o]),a.push(n);return a},latLngToCoords:function(t){var e=[t.lng,t.lat];return t.alt!==i&&e.push(t.alt),e},latLngsToCoords:function(t){for(var e=[],i=0,n=t.length;n>i;i++)e.push(o.GeoJSON.latLngToCoords(t[i]));return e},getFeature:function(t,e){return t.feature?o.extend({},t.feature,{geometry:e}):o.GeoJSON.asFeature(e)},asFeature:function(t){return"Feature"===t.type?t:{type:"Feature",properties:{},geometry:t}}});var a={toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"Point",coordinates:o.GeoJSON.latLngToCoords(this.getLatLng())})}};o.Marker.include(a),o.Circle.include(a),o.CircleMarker.include(a),o.Polyline.include({toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"LineString",coordinates:o.GeoJSON.latLngsToCoords(this.getLatLngs())})}}),o.Polygon.include({toGeoJSON:function(){var t,e,i,n=[o.GeoJSON.latLngsToCoords(this.getLatLngs())];if(n[0].push(n[0][0]),this._holes)for(t=0,e=this._holes.length;e>t;t++)i=o.GeoJSON.latLngsToCoords(this._holes[t]),i.push(i[0]),n.push(i);return o.GeoJSON.getFeature(this,{type:"Polygon",coordinates:n})}}),function(){function t(t){return function(){var e=[];return this.eachLayer(function(t){e.push(t.toGeoJSON().geometry.coordinates)}),o.GeoJSON.getFeature(this,{type:t,coordinates:e})}}o.MultiPolyline.include({toGeoJSON:t("MultiLineString")}),o.MultiPolygon.include({toGeoJSON:t("MultiPolygon")}),o.LayerGroup.include({toGeoJSON:function(){var e,i=this.feature&&this.feature.geometry,n=[];if(i&&"MultiPoint"===i.type)return t("MultiPoint").call(this);var s=i&&"GeometryCollection"===i.type;return this.eachLayer(function(t){t.toGeoJSON&&(e=t.toGeoJSON(),n.push(s?e.geometry:o.GeoJSON.asFeature(e)))}),s?o.GeoJSON.getFeature(this,{geometries:n,type:"GeometryCollection"}):{type:"FeatureCollection",features:n}}})}(),o.geoJson=function(t,e){return new o.GeoJSON(t,e)},o.DomEvent={addListener:function(t,e,i,n){var s,a,r,h=o.stamp(i),l="_leaflet_"+e+h;return t[l]?this:(s=function(e){return i.call(n||t,e||o.DomEvent._getEvent())},o.Browser.pointer&&0===e.indexOf("touch")?this.addPointerListener(t,e,s,h):(o.Browser.touch&&"dblclick"===e&&this.addDoubleTapListener&&this.addDoubleTapListener(t,s,h),"addEventListener"in t?"mousewheel"===e?(t.addEventListener("DOMMouseScroll",s,!1),t.addEventListener(e,s,!1)):"mouseenter"===e||"mouseleave"===e?(a=s,r="mouseenter"===e?"mouseover":"mouseout",s=function(e){return o.DomEvent._checkMouse(t,e)?a(e):void 0},t.addEventListener(r,s,!1)):"click"===e&&o.Browser.android?(a=s,s=function(t){return o.DomEvent._filterClick(t,a)},t.addEventListener(e,s,!1)):t.addEventListener(e,s,!1):"attachEvent"in t&&t.attachEvent("on"+e,s),t[l]=s,this))},removeListener:function(t,e,i){var n=o.stamp(i),s="_leaflet_"+e+n,a=t[s];return a?(o.Browser.pointer&&0===e.indexOf("touch")?this.removePointerListener(t,e,n):o.Browser.touch&&"dblclick"===e&&this.removeDoubleTapListener?this.removeDoubleTapListener(t,n):"removeEventListener"in t?"mousewheel"===e?(t.removeEventListener("DOMMouseScroll",a,!1),t.removeEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?t.removeEventListener("mouseenter"===e?"mouseover":"mouseout",a,!1):t.removeEventListener(e,a,!1):"detachEvent"in t&&t.detachEvent("on"+e,a),t[s]=null,this):this},stopPropagation:function(t){return t.stopPropagation?t.stopPropagation():t.cancelBubble=!0,o.DomEvent._skipped(t),this},disableScrollPropagation:function(t){var e=o.DomEvent.stopPropagation;return o.DomEvent.on(t,"mousewheel",e).on(t,"MozMousePixelScroll",e)},disableClickPropagation:function(t){for(var e=o.DomEvent.stopPropagation,i=o.Draggable.START.length-1;i>=0;i--)o.DomEvent.on(t,o.Draggable.START[i],e);return o.DomEvent.on(t,"click",o.DomEvent._fakeStop).on(t,"dblclick",e)},preventDefault:function(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this},stop:function(t){return o.DomEvent.preventDefault(t).stopPropagation(t)},getMousePosition:function(t,e){if(!e)return new o.Point(t.clientX,t.clientY);var i=e.getBoundingClientRect();return new o.Point(t.clientX-i.left-e.clientLeft,t.clientY-i.top-e.clientTop)},getWheelDelta:function(t){var e=0;return t.wheelDelta&&(e=t.wheelDelta/120),t.detail&&(e=-t.detail/3),e},_skipEvents:{},_fakeStop:function(t){o.DomEvent._skipEvents[t.type]=!0},_skipped:function(t){var e=this._skipEvents[t.type];return this._skipEvents[t.type]=!1,e},_checkMouse:function(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(n){return!1}return i!==t},_getEvent:function(){var e=t.event;if(!e)for(var i=arguments.callee.caller;i&&(e=i.arguments[0],!e||t.Event!==e.constructor);)i=i.caller;return e},_filterClick:function(t,e){var i=t.timeStamp||t.originalEvent.timeStamp,n=o.DomEvent._lastClick&&i-o.DomEvent._lastClick;return n&&n>100&&500>n||t.target._simulatedClick&&!t._simulated?void o.DomEvent.stop(t):(o.DomEvent._lastClick=i,e(t))}},o.DomEvent.on=o.DomEvent.addListener,o.DomEvent.off=o.DomEvent.removeListener,o.Draggable=o.Class.extend({includes:o.Mixin.Events,statics:{START:o.Browser.touch?["touchstart","mousedown"]:["mousedown"],END:{mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},MOVE:{mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"}},initialize:function(t,e){this._element=t,this._dragStartTarget=e||t},enable:function(){if(!this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.on(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!0}},disable:function(){if(this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.off(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!1,this._moved=!1}},_onDown:function(t){if(this._moved=!1,!(t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(o.DomEvent.stopPropagation(t),o.Draggable._disabled||(o.DomUtil.disableImageDrag(),o.DomUtil.disableTextSelection(),this._moving)))){var i=t.touches?t.touches[0]:t;this._startPoint=new o.Point(i.clientX,i.clientY),this._startPos=this._newPos=o.DomUtil.getPosition(this._element),o.DomEvent.on(e,o.Draggable.MOVE[t.type],this._onMove,this).on(e,o.Draggable.END[t.type],this._onUp,this)}},_onMove:function(t){if(t.touches&&t.touches.length>1)return void(this._moved=!0);var i=t.touches&&1===t.touches.length?t.touches[0]:t,n=new o.Point(i.clientX,i.clientY),s=n.subtract(this._startPoint);(s.x||s.y)&&(o.Browser.touch&&Math.abs(s.x)+Math.abs(s.y)<3||(o.DomEvent.preventDefault(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=o.DomUtil.getPosition(this._element).subtract(s),o.DomUtil.addClass(e.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,o.DomUtil.addClass(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(s),this._moving=!0,o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updatePosition,this,!0,this._dragStartTarget)))},_updatePosition:function(){this.fire("predrag"),o.DomUtil.setPosition(this._element,this._newPos),this.fire("drag")},_onUp:function(){o.DomUtil.removeClass(e.body,"leaflet-dragging"),this._lastTarget&&(o.DomUtil.removeClass(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null);for(var t in o.Draggable.MOVE)o.DomEvent.off(e,o.Draggable.MOVE[t],this._onMove).off(e,o.Draggable.END[t],this._onUp);o.DomUtil.enableImageDrag(),o.DomUtil.enableTextSelection(),this._moved&&this._moving&&(o.Util.cancelAnimFrame(this._animRequest),this.fire("dragend",{distance:this._newPos.distanceTo(this._startPos)})),this._moving=!1}}),o.Handler=o.Class.extend({initialize:function(t){this._map=t},enable:function(){this._enabled||(this._enabled=!0,this.addHooks())},disable:function(){this._enabled&&(this._enabled=!1,this.removeHooks())},enabled:function(){return!!this._enabled}}),o.Map.mergeOptions({dragging:!0,inertia:!o.Browser.android23,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,inertiaThreshold:o.Browser.touch?32:18,easeLinearity:.25,worldCopyJump:!1}),o.Map.Drag=o.Handler.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new o.Draggable(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDrag,this),t.on("viewreset",this._onViewReset,this),t.whenReady(this._onViewReset,this))}this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){var t=this._map;t._panAnim&&t._panAnim.stop(),t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(){if(this._map.options.inertia){var t=this._lastTime=+new Date,e=this._lastPos=this._draggable._newPos;this._positions.push(e),this._times.push(t),t-this._times[0]>200&&(this._positions.shift(),this._times.shift())}this._map.fire("move").fire("drag")},_onViewReset:function(){var t=this._map.getSize()._divideBy(2),e=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.project([0,180]).x},_onPreDrag:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,s=(n+e+i)%t-e-i,a=Math.abs(o+i)i.inertiaThreshold||!this._positions[0];if(e.fire("dragend",t),s)e.fire("moveend");else{var a=this._lastPos.subtract(this._positions[0]),r=(this._lastTime+n-this._times[0])/1e3,h=i.easeLinearity,l=a.multiplyBy(h/r),u=l.distanceTo([0,0]),c=Math.min(i.inertiaMaxSpeed,u),d=l.multiplyBy(c/u),p=c/(i.inertiaDeceleration*h),_=d.multiplyBy(-p/2).round();_.x&&_.y?(_=e._limitOffset(_,e.options.maxBounds),o.Util.requestAnimFrame(function(){e.panBy(_,{duration:p,easeLinearity:h,noMoveStart:!0})})):e.fire("moveend")}}}),o.Map.addInitHook("addHandler","dragging",o.Map.Drag),o.Map.mergeOptions({doubleClickZoom:!0}),o.Map.DoubleClickZoom=o.Handler.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var e=this._map,i=e.getZoom()+(t.originalEvent.shiftKey?-1:1);"center"===e.options.doubleClickZoom?e.setZoom(i):e.setZoomAround(t.containerPoint,i)}}),o.Map.addInitHook("addHandler","doubleClickZoom",o.Map.DoubleClickZoom),o.Map.mergeOptions({scrollWheelZoom:!0}),o.Map.ScrollWheelZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"mousewheel",this._onWheelScroll,this),o.DomEvent.on(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault),this._delta=0},removeHooks:function(){o.DomEvent.off(this._map._container,"mousewheel",this._onWheelScroll),o.DomEvent.off(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault)},_onWheelScroll:function(t){var e=o.DomEvent.getWheelDelta(t);this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var i=Math.max(40-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(o.bind(this._performZoom,this),i),o.DomEvent.preventDefault(t),o.DomEvent.stopPropagation(t)},_performZoom:function(){var t=this._map,e=this._delta,i=t.getZoom();e=e>0?Math.ceil(e):Math.floor(e),e=Math.max(Math.min(e,4),-4),e=t._limitZoom(i+e)-i,this._delta=0,this._startTime=null,e&&("center"===t.options.scrollWheelZoom?t.setZoom(i+e):t.setZoomAround(this._lastMousePos,i+e))}}),o.Map.addInitHook("addHandler","scrollWheelZoom",o.Map.ScrollWheelZoom),o.extend(o.DomEvent,{_touchstart:o.Browser.msPointer?"MSPointerDown":o.Browser.pointer?"pointerdown":"touchstart",_touchend:o.Browser.msPointer?"MSPointerUp":o.Browser.pointer?"pointerup":"touchend",addDoubleTapListener:function(t,i,n){function s(t){var e;if(o.Browser.pointer?(_.push(t.pointerId),e=_.length):e=t.touches.length,!(e>1)){var i=Date.now(),n=i-(r||i);h=t.touches?t.touches[0]:t,l=n>0&&u>=n,r=i}}function a(t){if(o.Browser.pointer){var e=_.indexOf(t.pointerId);if(-1===e)return;_.splice(e,1)}if(l){if(o.Browser.pointer){var n,s={};for(var a in h)n=h[a],s[a]="function"==typeof n?n.bind(h):n;h=s}h.type="dblclick",i(h),r=null}}var r,h,l=!1,u=250,c="_leaflet_",d=this._touchstart,p=this._touchend,_=[];t[c+d+n]=s,t[c+p+n]=a;var m=o.Browser.pointer?e.documentElement:t;return t.addEventListener(d,s,!1),m.addEventListener(p,a,!1),o.Browser.pointer&&m.addEventListener(o.DomEvent.POINTER_CANCEL,a,!1),this},removeDoubleTapListener:function(t,i){var n="_leaflet_";return t.removeEventListener(this._touchstart,t[n+this._touchstart+i],!1),(o.Browser.pointer?e.documentElement:t).removeEventListener(this._touchend,t[n+this._touchend+i],!1),o.Browser.pointer&&e.documentElement.removeEventListener(o.DomEvent.POINTER_CANCEL,t[n+this._touchend+i],!1),this}}),o.extend(o.DomEvent,{POINTER_DOWN:o.Browser.msPointer?"MSPointerDown":"pointerdown",POINTER_MOVE:o.Browser.msPointer?"MSPointerMove":"pointermove",POINTER_UP:o.Browser.msPointer?"MSPointerUp":"pointerup",POINTER_CANCEL:o.Browser.msPointer?"MSPointerCancel":"pointercancel",_pointers:[],_pointerDocumentListener:!1,addPointerListener:function(t,e,i,n){switch(e){case"touchstart":return this.addPointerListenerStart(t,e,i,n);case"touchend":return this.addPointerListenerEnd(t,e,i,n);case"touchmove":return this.addPointerListenerMove(t,e,i,n);default:throw"Unknown touch event type"}},addPointerListenerStart:function(t,i,n,s){var a="_leaflet_",r=this._pointers,h=function(t){o.DomEvent.preventDefault(t);for(var e=!1,i=0;i1))&&(this._moved||(o.DomUtil.addClass(e._mapPane,"leaflet-touching"),e.fire("movestart").fire("zoomstart"),this._moved=!0),o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updateOnMove,this,!0,this._map._container),o.DomEvent.preventDefault(t))}},_updateOnMove:function(){var t=this._map,e=this._getScaleOrigin(),i=t.layerPointToLatLng(e),n=t.getScaleZoom(this._scale);t._animateZoom(i,n,this._startCenter,this._scale,this._delta,!1,!0)},_onTouchEnd:function(){if(!this._moved||!this._zooming)return void(this._zooming=!1);var t=this._map;this._zooming=!1,o.DomUtil.removeClass(t._mapPane,"leaflet-touching"),o.Util.cancelAnimFrame(this._animRequest),o.DomEvent.off(e,"touchmove",this._onTouchMove).off(e,"touchend",this._onTouchEnd);var i=this._getScaleOrigin(),n=t.layerPointToLatLng(i),s=t.getZoom(),a=t.getScaleZoom(this._scale)-s,r=a>0?Math.ceil(a):Math.floor(a),h=t._limitZoom(s+r),l=t.getZoomScale(h)/this._scale;t._animateZoom(n,h,i,l)},_getScaleOrigin:function(){var t=this._centerOffset.subtract(this._delta).divideBy(this._scale);return this._startCenter.add(t)}}),o.Map.addInitHook("addHandler","touchZoom",o.Map.TouchZoom),o.Map.mergeOptions({tap:!0,tapTolerance:15}),o.Map.Tap=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(o.DomEvent.preventDefault(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],n=i.target;this._startPos=this._newPos=new o.Point(i.clientX,i.clientY),n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.addClass(n,"leaflet-active"),this._holdTimeout=setTimeout(o.bind(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),o.DomEvent.on(e,"touchmove",this._onMove,this).on(e,"touchend",this._onUp,this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),o.DomEvent.off(e,"touchmove",this._onMove,this).off(e,"touchend",this._onUp,this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],n=i.target;n&&n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.removeClass(n,"leaflet-active"),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var e=t.touches[0];this._newPos=new o.Point(e.clientX,e.clientY)},_simulateEvent:function(i,n){var o=e.createEvent("MouseEvents");o._simulated=!0,n.target._simulatedClick=!0,o.initMouseEvent(i,!0,!0,t,1,n.screenX,n.screenY,n.clientX,n.clientY,!1,!1,!1,!1,0,null),n.target.dispatchEvent(o)}}),o.Browser.touch&&!o.Browser.pointer&&o.Map.addInitHook("addHandler","tap",o.Map.Tap),o.Map.mergeOptions({boxZoom:!0}),o.Map.BoxZoom=o.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._moved=!1},addHooks:function(){o.DomEvent.on(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){o.DomEvent.off(this._container,"mousedown",this._onMouseDown),this._moved=!1},moved:function(){return this._moved},_onMouseDown:function(t){return this._moved=!1,!t.shiftKey||1!==t.which&&1!==t.button?!1:(o.DomUtil.disableTextSelection(),o.DomUtil.disableImageDrag(),this._startLayerPoint=this._map.mouseEventToLayerPoint(t),void o.DomEvent.on(e,"mousemove",this._onMouseMove,this).on(e,"mouseup",this._onMouseUp,this).on(e,"keydown",this._onKeyDown,this))},_onMouseMove:function(t){this._moved||(this._box=o.DomUtil.create("div","leaflet-zoom-box",this._pane),o.DomUtil.setPosition(this._box,this._startLayerPoint),this._container.style.cursor="crosshair",this._map.fire("boxzoomstart"));var e=this._startLayerPoint,i=this._box,n=this._map.mouseEventToLayerPoint(t),s=n.subtract(e),a=new o.Point(Math.min(n.x,e.x),Math.min(n.y,e.y));o.DomUtil.setPosition(i,a),this._moved=!0,i.style.width=Math.max(0,Math.abs(s.x)-4)+"px",i.style.height=Math.max(0,Math.abs(s.y)-4)+"px"},_finish:function(){this._moved&&(this._pane.removeChild(this._box),this._container.style.cursor=""),o.DomUtil.enableTextSelection(),o.DomUtil.enableImageDrag(),o.DomEvent.off(e,"mousemove",this._onMouseMove).off(e,"mouseup",this._onMouseUp).off(e,"keydown",this._onKeyDown)},_onMouseUp:function(t){this._finish();var e=this._map,i=e.mouseEventToLayerPoint(t);if(!this._startLayerPoint.equals(i)){var n=new o.LatLngBounds(e.layerPointToLatLng(this._startLayerPoint),e.layerPointToLatLng(i));e.fitBounds(n),e.fire("boxzoomend",{boxZoomBounds:n})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}}),o.Map.addInitHook("addHandler","boxZoom",o.Map.BoxZoom),o.Map.mergeOptions({keyboard:!0,keyboardPanOffset:80,keyboardZoomOffset:1}),o.Map.Keyboard=o.Handler.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,173]},initialize:function(t){this._map=t,this._setPanOffset(t.options.keyboardPanOffset),this._setZoomOffset(t.options.keyboardZoomOffset)},addHooks:function(){var t=this._map._container;-1===t.tabIndex&&(t.tabIndex="0"),o.DomEvent.on(t,"focus",this._onFocus,this).on(t,"blur",this._onBlur,this).on(t,"mousedown",this._onMouseDown,this),this._map.on("focus",this._addHooks,this).on("blur",this._removeHooks,this)},removeHooks:function(){this._removeHooks();var t=this._map._container;o.DomEvent.off(t,"focus",this._onFocus,this).off(t,"blur",this._onBlur,this).off(t,"mousedown",this._onMouseDown,this),this._map.off("focus",this._addHooks,this).off("blur",this._removeHooks,this)},_onMouseDown:function(){if(!this._focused){var i=e.body,n=e.documentElement,o=i.scrollTop||n.scrollTop,s=i.scrollLeft||n.scrollLeft;this._map._container.focus(),t.scrollTo(s,o)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanOffset:function(t){var e,i,n=this._panKeys={},o=this.keyCodes;for(e=0,i=o.left.length;i>e;e++)n[o.left[e]]=[-1*t,0];for(e=0,i=o.right.length;i>e;e++)n[o.right[e]]=[t,0];for(e=0,i=o.down.length;i>e;e++)n[o.down[e]]=[0,t];for(e=0,i=o.up.length;i>e;e++)n[o.up[e]]=[0,-1*t]},_setZoomOffset:function(t){var e,i,n=this._zoomKeys={},o=this.keyCodes;for(e=0,i=o.zoomIn.length;i>e;e++)n[o.zoomIn[e]]=t;for(e=0,i=o.zoomOut.length;i>e;e++)n[o.zoomOut[e]]=-t},_addHooks:function(){o.DomEvent.on(e,"keydown",this._onKeyDown,this)},_removeHooks:function(){o.DomEvent.off(e,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){var e=t.keyCode,i=this._map;if(e in this._panKeys){if(i._panAnim&&i._panAnim._inProgress)return;i.panBy(this._panKeys[e]),i.options.maxBounds&&i.panInsideBounds(i.options.maxBounds)}else{if(!(e in this._zoomKeys))return;i.setZoom(i.getZoom()+this._zoomKeys[e])}o.DomEvent.stop(t)}}),o.Map.addInitHook("addHandler","keyboard",o.Map.Keyboard),o.Handler.MarkerDrag=o.Handler.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new o.Draggable(t,t)),this._draggable.on("dragstart",this._onDragStart,this).on("drag",this._onDrag,this).on("dragend",this._onDragEnd,this),this._draggable.enable(),o.DomUtil.addClass(this._marker._icon,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off("dragstart",this._onDragStart,this).off("drag",this._onDrag,this).off("dragend",this._onDragEnd,this),this._draggable.disable(),o.DomUtil.removeClass(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){this._marker.closePopup().fire("movestart").fire("dragstart")},_onDrag:function(){var t=this._marker,e=t._shadow,i=o.DomUtil.getPosition(t._icon),n=t._map.layerPointToLatLng(i);e&&o.DomUtil.setPosition(e,i),t._latlng=n,t.fire("move",{latlng:n}).fire("drag")},_onDragEnd:function(t){this._marker.fire("moveend").fire("dragend",t)}}),o.Control=o.Class.extend({options:{position:"topright"},initialize:function(t){o.setOptions(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),n=t._controlCorners[i];return o.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?n.insertBefore(e,n.firstChild):n.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this},_refocusOnMap:function(){this._map&&this._map.getContainer().focus()}}),o.control=function(t){return new o.Control(t)},o.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=o.DomUtil.create("div",a,n)}var e=this._controlCorners={},i="leaflet-",n=this._controlContainer=o.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){this._container.removeChild(this._controlContainer)}}),o.Control.Zoom=o.Control.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"-",zoomOutTitle:"Zoom out"},onAdd:function(t){var e="leaflet-control-zoom",i=o.DomUtil.create("div",e+" leaflet-bar");return this._map=t,this._zoomInButton=this._createButton(this.options.zoomInText,this.options.zoomInTitle,e+"-in",i,this._zoomIn,this),this._zoomOutButton=this._createButton(this.options.zoomOutText,this.options.zoomOutTitle,e+"-out",i,this._zoomOut,this),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,n,s,a){var r=o.DomUtil.create("a",i,n);r.innerHTML=t,r.href="#",r.title=e;var h=o.DomEvent.stopPropagation;return o.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",o.DomEvent.preventDefault).on(r,"click",s,a).on(r,"click",this._refocusOnMap,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";o.DomUtil.removeClass(this._zoomInButton,e),o.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&o.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&o.DomUtil.addClass(this._zoomInButton,e)}}),o.Map.mergeOptions({zoomControl:!0}),o.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new o.Control.Zoom,this.addControl(this.zoomControl))}),o.control.zoom=function(t){return new o.Control.Zoom(t)},o.Control.Attribution=o.Control.extend({options:{position:"bottomright",prefix:'Leaflet'},initialize:function(t){o.setOptions(this,t),this._attributions={}},onAdd:function(t){this._container=o.DomUtil.create("div","leaflet-control-attribution"),o.DomEvent.disableClickPropagation(this._container);for(var e in t._layers)t._layers[e].getAttribution&&this.addAttribution(t._layers[e].getAttribution());return t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):void 0},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):void 0},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" | ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),o.Map.mergeOptions({attributionControl:!0}),o.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new o.Control.Attribution).addTo(this))}),o.control.attribution=function(t){return new o.Control.Attribution(t)},o.Control.Scale=o.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=o.DomUtil.create("div",e),n=this.options;return this._addScales(n,e,i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=o.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=o.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),o.control.scale=function(t){return new o.Control.Scale(t)},o.Control.Layers=o.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){o.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var n in t)this._addLayer(t[n],n);for(n in e)this._addLayer(e[n],n,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=o.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=o.DomUtil.create("div",t);e.setAttribute("aria-haspopup",!0),o.Browser.touch?o.DomEvent.on(e,"click",o.DomEvent.stopPropagation):o.DomEvent.disableClickPropagation(e).disableScrollPropagation(e);var i=this._form=o.DomUtil.create("form",t+"-list");if(this.options.collapsed){o.Browser.android||o.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var n=this._layersLink=o.DomUtil.create("a",t+"-toggle",e);n.href="#",n.title="Layers",o.Browser.touch?o.DomEvent.on(n,"click",o.DomEvent.stop).on(n,"click",this._expand,this):o.DomEvent.on(n,"focus",this._expand,this),o.DomEvent.on(i,"click",function(){setTimeout(o.bind(this._onInputClick,this),0)},this),this._map.on("click",this._collapse,this)}else this._expand();this._baseLayersList=o.DomUtil.create("div",t+"-base",i),this._separator=o.DomUtil.create("div",t+"-separator",i),this._overlaysList=o.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var n=o.stamp(t);this._layers[n]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t,e,i=!1,n=!1;for(t in this._layers)e=this._layers[t],this._addItem(e),n=n||e.overlay,i=i||!e.overlay;this._separator.style.display=n&&i?"":"none"}},_onLayerChange:function(t){var e=this._layers[o.stamp(t.layer)];if(e){this._handlingClick||this._update();var i=e.overlay?"layeradd"===t.type?"overlayadd":"overlayremove":"layeradd"===t.type?"baselayerchange":null;i&&this._map.fire(i,e)}},_createRadioElement:function(t,i){var n='t;t++)e=n[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?this._map.addLayer(i.layer):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);this._handlingClick=!1,this._refocusOnMap()},_expand:function(){o.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),o.control.layers=function(t,e,i){return new o.Control.Layers(t,e,i)},o.PosAnimation=o.Class.extend({includes:o.Mixin.Events,run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._newPos=e,this.fire("start"),t.style[o.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(n||.5)+",1)",o.DomEvent.on(t,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),o.DomUtil.setPosition(t,e),o.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(o.bind(this._onStep,this),50)},stop:function(){this._inProgress&&(o.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),o.Util.falseFn(this._el.offsetWidth))},_onStep:function(){var t=this._getPos();return t?(this._el._leaflet_pos=t,void this.fire("step")):void this._onTransitionEnd()},_transformRe:/([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,_getPos:function(){var e,i,n,s=this._el,a=t.getComputedStyle(s);if(o.Browser.any3d){if(n=a[o.DomUtil.TRANSFORM].match(this._transformRe),!n)return;e=parseFloat(n[1]),i=parseFloat(n[2])}else e=parseFloat(a.left),i=parseFloat(a.top);return new o.Point(e,i,!0)},_onTransitionEnd:function(){o.DomEvent.off(this._el,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[o.DomUtil.TRANSITION]="",this._el._leaflet_pos=this._newPos,clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),o.Map.include({setView:function(t,e,n){if(e=e===i?this._zoom:this._limitZoom(e),t=this._limitCenter(o.latLng(t),e,this.options.maxBounds),n=n||{},this._panAnim&&this._panAnim.stop(),this._loaded&&!n.reset&&n!==!0){n.animate!==i&&(n.zoom=o.extend({animate:n.animate},n.zoom),n.pan=o.extend({animate:n.animate},n.pan));var s=this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,n.zoom):this._tryAnimatedPan(t,n.pan);if(s)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e){if(t=o.point(t).round(),e=e||{},!t.x&&!t.y)return this;if(this._panAnim||(this._panAnim=new o.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),e.noMoveStart||this.fire("movestart"),e.animate!==!1){o.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var i=this._getMapPanePos().subtract(t);this._panAnim.run(this._mapPane,i,e.duration||.25,e.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){o.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,e){var i=this._getCenterOffset(t)._floor();return(e&&e.animate)===!0||this.getSize().contains(i)?(this.panBy(i,e),!0):!1}}),o.PosAnimation=o.DomUtil.TRANSITION?o.PosAnimation:o.PosAnimation.extend({run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=o.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=o.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));o.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){o.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),o.Map.mergeOptions({zoomAnimation:!0,zoomAnimationThreshold:4}),o.DomUtil.TRANSITION&&o.Map.addInitHook(function(){this._zoomAnimated=this.options.zoomAnimation&&o.DomUtil.TRANSITION&&o.Browser.any3d&&!o.Browser.android23&&!o.Browser.mobileOpera,this._zoomAnimated&&o.DomEvent.on(this._mapPane,o.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),o.Map.include(o.DomUtil.TRANSITION?{_catchTransitionEnd:function(t){this._animatingZoom&&t.propertyName.indexOf("transform")>=0&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,e,i){if(this._animatingZoom)return!0;if(i=i||{},!this._zoomAnimated||i.animate===!1||this._nothingToAnimate()||Math.abs(e-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/n),s=this._getCenterLayerPoint()._add(o);return i.animate===!0||this.getSize().contains(o)?(this.fire("movestart").fire("zoomstart"),this._animateZoom(t,e,s,n,null,!0),!0):!1},_animateZoom:function(t,e,i,n,s,a,r){r||(this._animatingZoom=!0),o.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this._animateToCenter=t,this._animateToZoom=e,o.Draggable&&(o.Draggable._disabled=!0),o.Util.requestAnimFrame(function(){this.fire("zoomanim",{center:t,zoom:e,origin:i,scale:n,delta:s,backwards:a})},this)},_onZoomTransitionEnd:function(){this._animatingZoom=!1,o.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),o.Draggable&&(o.Draggable._disabled=!1)}}:{}),o.TileLayer.include({_animateZoom:function(t){this._animating||(this._animating=!0,this._prepareBgBuffer());var e=this._bgBuffer,i=o.DomUtil.TRANSFORM,n=t.delta?o.DomUtil.getTranslateString(t.delta):e.style[i],s=o.DomUtil.getScaleString(t.scale,t.origin);e.style[i]=t.backwards?s+" "+n:n+" "+s},_endZoomAnim:function(){var t=this._tileContainer,e=this._bgBuffer;t.style.visibility="",t.parentNode.appendChild(t),o.Util.falseFn(e.offsetWidth),this._animating=!1},_clearBgBuffer:function(){var t=this._map;!t||t._animatingZoom||t.touchZoom._zooming||(this._bgBuffer.innerHTML="",this._bgBuffer.style[o.DomUtil.TRANSFORM]="")},_prepareBgBuffer:function(){var t=this._tileContainer,e=this._bgBuffer,i=this._getLoadedTilesPercentage(e),n=this._getLoadedTilesPercentage(t);return e&&i>.5&&.5>n?(t.style.visibility="hidden",void this._stopLoadingImages(t)):(e.style.visibility="hidden",e.style[o.DomUtil.TRANSFORM]="",this._tileContainer=e,e=this._bgBuffer=t,this._stopLoadingImages(e),void clearTimeout(this._clearBgBufferTimer))},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,n,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)n=s[e],n.complete||(n.onload=o.Util.falseFn,n.onerror=o.Util.falseFn,n.src=o.Util.emptyImageUrl,n.parentNode.removeChild(n))}}),o.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locateOptions=o.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=o.bind(this._handleGeolocationResponse,this),i=o.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=t.coords.latitude,i=t.coords.longitude,n=new o.LatLng(e,i),s=180*t.coords.accuracy/40075017,a=s/Math.cos(o.LatLng.DEG_TO_RAD*e),r=o.latLngBounds([e-s,i-a],[e+s,i+a]),h=this._locateOptions;if(h.setView){var l=Math.min(this.getBoundsZoom(r),h.maxZoom);this.setView(n,l)}var u={latlng:n,bounds:r,timestamp:t.timestamp};for(var c in t.coords)"number"==typeof t.coords[c]&&(u[c]=t.coords[c]);this.fire("locationfound",u)}})}(window,document); \ No newline at end of file diff --git a/map/uiMap.js b/map/uiMap.js new file mode 100644 index 0000000..683f676 --- /dev/null +++ b/map/uiMap.js @@ -0,0 +1,129 @@ +/**************************************************************************** + * uiMap.js + * openacousticdevices.info + * February 2024 + *****************************************************************************/ + +/* global L */ +/* eslint-disable new-cap */ + +const electron = require('electron'); + +let map, marker; + +function convertToCoordinateArray (l) { + + while (l > 180) l -= 360; + while (l < -180) l += 360; + + l = Math.round(100 * l); + + const positiveDirection = l >= 0; + + l = Math.abs(l); + + const degrees = Math.floor(l / 100); + const hundredths = l % 100; + + return [degrees, hundredths, positiveDirection]; + +} + +electron.ipcRenderer.on('update-location-sub-window', (e, latArray, lonArray, changeZoom, newZoom) => { + + let lat = latArray[0] + latArray[1] / 100; + + if (latArray[2] === false) lat = -lat; + + let lon = lonArray[0] + lonArray[1] / 100; + + if (lonArray[2] === false) lon = -lon; + + marker.setLatLng([lat, lon]); + + if (changeZoom) { + + map.setView(L.latLng(lat, lon), newZoom); + + } else { + + map.setView(L.latLng(lat, lon)); + + } + +}); + +function updateMainWindow (latLng) { + + const latArray = convertToCoordinateArray(latLng.lat); + const lonArray = convertToCoordinateArray(latLng.lng); + + electron.ipcRenderer.send('update-location-main-window', latArray, lonArray); + +} + +function setUpMap () { + + try { + + map = new L.Map('location-picker'); + + } catch (e) { + + console.log(e); + + } + + const attributionElement = document.getElementsByClassName('leaflet-control-attribution')[0]; + attributionElement.innerHTML = 'Open Street Map'; + + map.doubleClickZoom.disable(); + + map.on('dblclick', (e) => { + + const latLng = e.latlng; + const zoom = Math.min(map.getZoom() + 1, map.getMaxZoom()); + + console.log('Map marker moved to ' + latLng + ' zoom ' + zoom); + + marker.setLatLng(latLng); + + updateMainWindow(latLng); + + map.setView(latLng, zoom); + + }); + + const osm = new L.TileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {minZoom: 1, maxZoom: 17, attribution: ''}); + + const lat = 0; + const lng = 0; + + map.addLayer(osm); + + if (!marker) { + + marker = new L.marker([lat, lng], {draggable: 'true'}); + + } else { + + marker.setLatLng([lat, lng]); + + } + + marker.on('dragend', (e) => { + + const latLng = e.target.getLatLng(); + console.log('Map marker moved to ' + latLng); + + updateMainWindow(latLng); + + map.setView(latLng); + + }); + + map.addLayer(marker); + +} + +setUpMap(); diff --git a/package.json b/package.json index 20bc0b8..f31cbc5 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "AudioMoth-Config", - "version": "1.10.2", + "version": "1.11.0", "description": "The configuration app for the AudioMoth acoustic monitoring device.", "main": "main.js", "author": "openacousticdevices.info", @@ -12,7 +12,8 @@ "scripts": { "postinstall": "install-app-deps", "start": "electron .", - "dist": "node builder.js" + "dist": "node builder.js", + "buildcss": "npx sass --load-path=node_modules VerticalTabs/verticalTabs.scss VerticalTabs/verticalTabs.css" }, "build": { "asar": { @@ -57,6 +58,7 @@ } }, "devDependencies": { + "clean-css-cli": "^5.6.3", "electron": "25.3.2", "electron-builder": "^24.6.3", "eslint": "^8.45.0", @@ -65,14 +67,16 @@ "eslint-plugin-n": "^16.0.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-standard": "^4.1.0" + "eslint-plugin-standard": "^4.1.0", + "sass": "^1.69.5" }, "dependencies": { "@electron/remote": "^2.0.10", "@popperjs/core": "^2.11.8", "audiomoth-hid": "^2.3.0", - "audiomoth-utils": "^1.4.2", + "audiomoth-utils": "^1.5.0", "bootstrap": "5.3.1", + "bootstrap-5-vertical-tabs": "^2.0.1", "bootstrap-slider": "^11.0.2", "electron-debug": "3.2.0", "electron-localshortcut": "^3.2.1", diff --git a/packetReader.js b/packetReader.js index 4bb9f86..7fd7676 100644 --- a/packetReader.js +++ b/packetReader.js @@ -16,6 +16,15 @@ function fourBytesToNumber (buffer, offset) { } +function twoBytesToSignedNumber (buffer, offset) { + + let value = (buffer[offset] & 0xFF) + ((buffer[offset + 1] & 0xFF) << 8); + value = value >= 32768 ? value - 65536 : value; + + return value; + +} + function twoBytesToNumber (buffer, offset) { return (buffer[offset] & 0xFF) + ((buffer[offset + 1] & 0xFF) << 8); @@ -67,7 +76,7 @@ function formatPercentage (mantissa, exponent) { typedef struct { uint16_t startMinutes; uint16_t stopMinutes; -} startStopPeriod_t; +} recordingPeriod_t; typedef struct { uint32_t time; @@ -80,8 +89,23 @@ typedef struct { uint16_t sleepDuration; uint16_t recordDuration; uint8_t enableLED; - uint8_t activeStartStopPeriods; - startStopPeriod_t startStopPeriods[MAX_START_STOP_PERIODS]; + union { + struct { + uint8_t activeRecordingPeriods; + recordingPeriod_t recordingPeriods[MAX_RECORDING_PERIODS]; + }; + struct { + uint8_t sunRecordingMode : 3; + uint8_t sunRecordingEvent : 2; + int16_t latitudeMinutes; + int16_t longitudeMinutes; + uint8_t sunRoundingMinutes; + uint16_t beforeSunriseMinutes : 10; + uint16_t afterSunriseMinutes : 10; + uint16_t beforeSunsetMinutes : 10; + uint16_t afterSunsetMinutes : 10; + }; + }; int8_t timeZoneHours; uint8_t enableLowVoltageCutoff; uint8_t disableBatteryLevelDisplay; @@ -119,10 +143,51 @@ typedef struct { uint8_t enableLowGainRange : 1; uint8_t enableGoertzelFilter : 1; uint8_t enableDailyFolders : 1; + uint8_t enableSunRecording : 1; } configSettings_t; */ +/** + * Extract four 10-bit numbers from a buffer, starting from a given index + * @param {buffer} buffer Buffer containing data + * @param {integer} start Where in the buffer to start looking for the four values + * @returns An array containing four 10-bit numbers + */ +function fiveBytesToFourNumbers (buffer, start) { + + const byte0 = buffer[start]; + const byte1 = buffer[start + 1]; + const byte2 = buffer[start + 2]; + const byte3 = buffer[start + 3]; + const byte4 = buffer[start + 4]; + + const value0 = (byte0 & 0b0011111111) | ((byte1 << 8) & 0b1100000000); + const value1 = ((byte1 >> 2) & 0b0000111111) | ((byte2 << 6) & 0b1111000000); + const value2 = ((byte2 >> 4) & 0b0000001111) | ((byte3 << 4) & 0b1111110000); + const value3 = ((byte3 >> 6) & 0b0000000011) | ((byte4 << 2) & 0b1111111100); + + return [value0, value1, value2, value3]; + +} + +function convertCoordMinsToObject (mins) { + + const positiveDirection = mins > 0; + + mins = Math.abs(mins); + + const degrees = Math.floor(mins / 100); + const hundredths = mins % 100; + + return { + degrees, + hundredths, + positiveDirection + }; + +} + exports.read = (packet) => { /* Read and decode configuration packet */ @@ -142,15 +207,70 @@ exports.read = (packet) => { const enableLED = packet[17]; - const activeStartStopPeriods = packet[18]; - const startStopPeriods = []; + /* Read advanced settings */ + + const packedByte3 = packet[61]; + + const energySaverModeEnabled = packedByte3 & 1; + + const disable48DCFilter = (packedByte3 >> 1) & 1; + + const timeSettingFromGPSEnabled = (packedByte3 >> 2) & 1; + + const magneticSwitchEnabled = (packedByte3 >> 3) & 1; + + const lowGainRangeEnabled = (packedByte3 >> 4) & 1; + + const enableFrequencyFilter = (packedByte3 >> 5) & 1; + + const dailyFolders = (packedByte3 >> 6) & 1; + + const sunRecordingEnabled = (packedByte3 >> 7) & 1; + + /* Read recording schedule or sunrise/sunset settings */ + + let sunMode; + let sunEvent; + let latitude, longitude; + let sunRounding; + let sunriseBefore, sunriseAfter, sunsetBefore, sunsetAfter; - for (let i = 0; i < activeStartStopPeriods; i += 1) { + let activeRecordingPeriods, recordingPeriods; - const startMinutes = twoBytesToNumber(packet, 19 + 4 * i); - const endMinutes = twoBytesToNumber(packet, 21 + 4 * i); + if (sunRecordingEnabled) { - startStopPeriods.push({startMinutes, endMinutes}); + const packedByte4 = packet[18]; + + sunMode = packedByte4 & 0b111; + sunEvent = (packedByte4 >> 3) & 0b11; + + latitude = convertCoordMinsToObject(twoBytesToSignedNumber(packet, 19)); + longitude = convertCoordMinsToObject(twoBytesToSignedNumber(packet, 21)); + + sunRounding = packet[23]; + + /* packet[24], packet[25], packet[26], packet[27], packet[28] */ + const numbers = fiveBytesToFourNumbers(packet, 24); + + sunriseBefore = numbers[0]; + sunriseAfter = numbers[1]; + sunsetBefore = numbers[2]; + sunsetAfter = numbers[3]; + + } else { + + activeRecordingPeriods = packet[18]; + + recordingPeriods = []; + + for (let i = 0; i < activeRecordingPeriods; i += 1) { + + const startMinutes = twoBytesToNumber(packet, 19 + 4 * i); + const endMinutes = twoBytesToNumber(packet, 21 + 4 * i); + + recordingPeriods.push({startMinutes, endMinutes}); + + } } @@ -180,24 +300,6 @@ exports.read = (packet) => { const minimumTriggerDuration = (packedByte0 >> 2) & 0b111111; - /* Read remaining settings */ - - const packedByte3 = packet[61]; - - const energySaverModeEnabled = packedByte3 & 1; - - const disable48DCFilter = (packedByte3 >> 1) & 1; - - const timeSettingFromGPSEnabled = (packedByte3 >> 2) & 1; - - const magneticSwitchEnabled = (packedByte3 >> 3) & 1; - - const lowGainRangeEnabled = (packedByte3 >> 4) & 1; - - const enableFrequencyFilter = (packedByte3 >> 5) & 1; - - const dailyFolders = (packedByte3 >> 6) & 1; - /* Indices contain either amplitude or frequency threshold, so use enableFrequencyFilter to tell which is which */ const packedByte1 = packet[59]; @@ -294,14 +396,42 @@ exports.read = (packet) => { console.log('Enable LED:', enableLED === 1); console.log('Enable battery level indication:', disableBatteryLevelDisplay === 0); - console.log('Active recording periods:', activeStartStopPeriods); + if (sunRecordingEnabled) { + + console.log('Sunrise/sunset schedule enabled'); + + console.log('\tSun mode:', sunMode); - for (let j = 0; j < activeStartStopPeriods; j++) { + const sunDefinitionStrings = ['Sunrise/sunset', 'Civil', 'Nautical', 'Astronomical']; + console.log('\tSun event:', sunEvent, '-', sunDefinitionStrings[sunEvent]); - const startMins = startStopPeriods[j].startMinutes; - const endMins = startStopPeriods[j].endMinutes; + const latitudeDirection = latitude.positiveDirection ? 'N' : 'S'; + console.log('\tLatitude:', latitude.degrees, '.', latitude.hundredths, '°', latitudeDirection); - console.log('Start: ' + formatTime(startMins) + ' (' + startMins + ') - End: ' + formatTime(endMins) + ' (' + endMins + ')'); + const longitudeDirection = longitude.positiveDirection ? 'E' : 'W'; + console.log('\tLongitude:', longitude.degrees, '.', longitude.hundredths, '°', longitudeDirection); + + console.log('\tSun rounding:', sunRounding); + + console.log('\tBefore sunrise mins:', sunriseBefore); + console.log('\tAfter sunrise mins:', sunriseAfter); + console.log('\tBefore sunset mins:', sunsetBefore); + console.log('\tAfter sunset mins:', sunsetAfter); + + } else { + + console.log('Standard schedule enabled'); + + console.log('\tActive recording periods:', activeRecordingPeriods); + + for (let j = 0; j < activeRecordingPeriods; j++) { + + const startMins = recordingPeriods[j].startMinutes; + const endMins = recordingPeriods[j].endMinutes; + + console.log('\tStart: ' + formatTime(startMins) + ' (' + startMins + ') - End: ' + formatTime(endMins) + ' (' + endMins + ')'); + + } } diff --git a/processing/summarise.html b/processing/summarise.html index 4dd201b..38f891d 100644 --- a/processing/summarise.html +++ b/processing/summarise.html @@ -29,7 +29,7 @@
- No files selected. + No folder selected.
diff --git a/processing/uiInput.js b/processing/uiInput.js index 5d6ae61..43590bb 100644 --- a/processing/uiInput.js +++ b/processing/uiInput.js @@ -98,10 +98,10 @@ function walk (dir) { /* Try to read the directory contents */ - var list; + let list; try { - + list = fs.readdirSync(dir); } catch (e) { @@ -111,7 +111,7 @@ function walk (dir) { } /* Process each file in the directory */ - + list.forEach((file) => { const filePath = path.join(dir, file); @@ -140,8 +140,6 @@ function walk (dir) { exports.selectAllFilesInFolder = () => { - let files; - const selection = dialog.showOpenDialogSync(currentWindow, { title: 'Select folder containing files', nameFieldLabel: 'Recordings', @@ -149,8 +147,22 @@ exports.selectAllFilesInFolder = () => { filters: [] }); + return updateFilesInFolder(selection); + +}; + +function updateFilesInFolder (selection) { + + let files; + if (selection && selection[0]) { + if (!fs.existsSync(selection[0])) { + + return; + + } + files = []; for (let i = 0; i < selection.length; i++) { @@ -162,10 +174,13 @@ exports.selectAllFilesInFolder = () => { } return { + selection, folder: selection[0], - files: files + files }; } -}; +} + +exports.updateFilesInFolder = updateFilesInFolder; diff --git a/processing/uiSummarise.js b/processing/uiSummarise.js index 323459f..0e6f93e 100644 --- a/processing/uiSummarise.js +++ b/processing/uiSummarise.js @@ -28,6 +28,7 @@ const summariseButton = document.getElementById('summarise-button'); let files = []; let outputDir = ''; let sourceDir = ''; +let selection = []; let summarising = false; @@ -59,7 +60,7 @@ function updateInputDirectoryDisplay (directoryArray) { if (!directoryArray || directoryArray.length === 0) { - fileLabel.innerHTML = 'No files selected.'; + fileLabel.innerHTML = 'No folder selected.'; summariseButton.disabled = true; } else { @@ -124,7 +125,9 @@ fileButton.addEventListener('click', () => { const response = uiInput.selectAllFilesInFolder(); if (response) { - + + selection = response.selection; + files = response.files; sourceDir = response.folder; @@ -219,11 +222,36 @@ summariseButton.addEventListener('click', () => { } - summarising = true; - disableUI(); + const response = uiInput.updateFilesInFolder(selection); + + if (response) { + + files = response.files; + sourceDir = response.folder; + + updateInputDirectoryDisplay(files); + + summarising = true; + disableUI(); - electron.ipcRenderer.send('start-summarise-bar', files.length); - setTimeout(summariseFiles, 2000); + electron.ipcRenderer.send('start-summarise-bar', files.length); + setTimeout(summariseFiles, 2000); + + } else { + + dialog.showMessageBoxSync({ + type: 'error', + title: 'Folder Not Found', + message: 'Selected folder no longer exists. Select a new location and try again.' + }); + + files = []; + sourceDir = ''; + selection = []; + + updateInputDirectoryDisplay(files); + + } }); diff --git a/resources/geo.svg b/resources/geo.svg new file mode 100644 index 0000000..20e18ba --- /dev/null +++ b/resources/geo.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/icon-256.png b/resources/icon-256.png new file mode 100644 index 0000000..e6dac83 Binary files /dev/null and b/resources/icon-256.png differ diff --git a/resources/ubuntu.mono.ttf b/resources/ubuntu.mono.ttf new file mode 100644 index 0000000..fdd309d Binary files /dev/null and b/resources/ubuntu.mono.ttf differ diff --git a/saveLoad.js b/saveLoad.js index 9115139..d47e60e 100644 --- a/saveLoad.js +++ b/saveLoad.js @@ -45,7 +45,27 @@ const DEFAULT_SETTINGS = { lowGainRangeEnabled: false, disable48DCFilter: false, timeSettingFromGPSEnabled: false, - magneticSwitchEnabled: false + magneticSwitchEnabled: false, + sunScheduleEnabled: false, + latitude: { + degrees: 0, + hundredths: 0, + positiveDirection: true + }, + longitude: { + degrees: 0, + hundredths: 0, + positiveDirection: true + }, + sunMode: 2, + sunPeriods: { + sunriseBefore: 60, + sunriseAfter: 60, + sunsetBefore: 60, + sunsetAfter: 60 + }, + sunRounding: 5, + sunDefinition: 0 }; /* Compare two semantic versions and return true if older */ @@ -146,7 +166,30 @@ function saveConfiguration (currentConfig, callback) { configuration += '"disable48DCFilter": ' + currentConfig.disable48DCFilter + ',\r\n'; configuration += '"lowGainRangeEnabled": ' + currentConfig.lowGainRangeEnabled + ',\r\n'; configuration += '"timeSettingFromGPSEnabled": ' + currentConfig.timeSettingFromGPSEnabled + ',\r\n'; - configuration += '"magneticSwitchEnabled": ' + currentConfig.magneticSwitchEnabled + '\r\n'; + configuration += '"magneticSwitchEnabled": ' + currentConfig.magneticSwitchEnabled + ',\r\n'; + + configuration += '"sunScheduleEnabled": ' + currentConfig.sunScheduleEnabled; + + if (currentConfig.sunScheduleEnabled) { + + configuration += ',\r\n'; + + configuration += '"latitude": ' + JSON.stringify(currentConfig.latitude) + ',\r\n'; + configuration += '"longitude": ' + JSON.stringify(currentConfig.longitude) + ',\r\n'; + + configuration += '"sunMode": ' + currentConfig.sunMode + ',\r\n'; + configuration += '"sunPeriods": ' + JSON.stringify(currentConfig.sunPeriods) + ',\r\n'; + + configuration += '"sunRounding": ' + currentConfig.sunRounding + ',\r\n'; + + configuration += '"sunDefinition": ' + currentConfig.sunDefinition + '\r\n'; + + } else { + + configuration += '\r\n'; + + } + configuration += '}'; const fileName = dialog.showSaveDialogSync({ @@ -367,6 +410,43 @@ function useLoadedConfiguration (err, currentConfig, data, callback) { }, magneticSwitchEnabled: { type: 'boolean' + }, + sunScheduleEnabled: { + type: 'boolean' + }, + latitude: { + type: 'object', + properties: { + degrees: {type: 'integer'}, + hundredths: {type: 'integer'}, + positiveDirection: {type: 'boolean'} + } + }, + longitude: { + type: 'object', + properties: { + degrees: {type: 'integer'}, + hundredths: {type: 'integer'}, + positiveDirection: {type: 'boolean'} + } + }, + sunMode: { + type: 'integer' + }, + sunPeriods: { + type: 'object', + properties: { + sunriseBefore: {type: 'integer'}, + sunriseAfter: {type: 'integer'}, + sunsetBefore: {type: 'integer'}, + sunsetAfter: {type: 'integer'} + } + }, + sunRounding: { + type: 'integer' + }, + sunDefinition: { + type: 'integer' } }, required: [] @@ -416,6 +496,28 @@ function useLoadedConfiguration (err, currentConfig, data, callback) { isMissingValues |= (typeof jsonObj.lowGainRangeEnabled === 'undefined'); isMissingValues |= (typeof jsonObj.timeSettingFromGPSEnabled === 'undefined'); isMissingValues |= (typeof jsonObj.magneticSwitchEnabled === 'undefined'); + isMissingValues |= (typeof jsonObj.sunScheduleEnabled === 'undefined'); + + /* Don't open config files created by newer app versions */ + + let version = (typeof jsonObj.version === 'undefined') ? '0.0.0' : jsonObj.version; + const versionArray = version.split('.'); + + const appVersionArray = app.getVersion().split('.'); + + if (isOlderSemanticVersion(appVersionArray, versionArray)) { + + console.error('Cannot open configuration files created by future app versions'); + + dialog.showMessageBox(BrowserWindow.getFocusedWindow(), { + type: 'error', + title: 'Incorrect format', + message: 'Cannot open the configuration file as it was created by a release of the AudioMoth Configuration App greater than ' + app.getVersion() + '.' + }); + + return; + + } if (isMissingValues) { @@ -440,35 +542,14 @@ function useLoadedConfiguration (err, currentConfig, data, callback) { } - /* Don't open config files created by newer app versions */ - - let version = (typeof jsonObj.version === 'undefined') ? '0.0.0' : jsonObj.version; - const versionArray = version.split('.'); - - const appVersionArray = app.getVersion().split('.'); - - if (isOlderSemanticVersion(appVersionArray, versionArray)) { - - console.error('Cannot open configuration files created by future app versions'); - - dialog.showMessageBox(BrowserWindow.getFocusedWindow(), { - type: 'error', - title: 'Incorrect format', - message: 'Cannot open the configuration file as it was created by a release of the AudioMoth Configuration App greater than ' + app.getVersion() + '.' - }); - - return; - - } - const timePeriods = (typeof jsonObj.timePeriods === 'undefined') ? replacementValues.timePeriods : jsonObj.timePeriods; /* If startTime or endTime === 1440, read it as 0 */ for (let i = 0; i < timePeriods.length; i++) { - timePeriods[i].startMins = timePeriods[i].startMins === 1440 ? 0 : timePeriods[i].startMins; - timePeriods[i].endMins = timePeriods[i].endMins === 1440 ? 0 : timePeriods[i].endMins; + timePeriods[i].startMins = timePeriods[i].startMins === constants.MINUTES_IN_DAY ? 0 : timePeriods[i].startMins; + timePeriods[i].endMins = timePeriods[i].endMins === constants.MINUTES_IN_DAY ? 0 : timePeriods[i].endMins; } @@ -654,7 +735,49 @@ function useLoadedConfiguration (err, currentConfig, data, callback) { const magneticSwitchEnabled = (typeof jsonObj.magneticSwitchEnabled === 'undefined') ? replacementValues.magneticSwitchEnabled : jsonObj.magneticSwitchEnabled; - callback(timePeriods, ledEnabled, batteryLevelCheckEnabled, sampleRateIndex, gain, dutyEnabled, recordDuration, sleepDuration, localTime, customTimeZoneOffset, firstRecordingDateEnabled, firstRecordingDate, lastRecordingDateEnabled, lastRecordingDate, passFiltersEnabled, filterType, lowerFilter, higherFilter, amplitudeThresholdingEnabled, amplitudeThreshold, frequencyTriggerEnabled, frequencyTriggerWindowLength, frequencyTriggerCentreFrequency, minimumFrequencyTriggerDuration, frequencyTriggerThreshold, requireAcousticConfig, displayVoltageRange, minimumAmplitudeThresholdDuration, amplitudeThresholdingScaleIndex, energySaverModeEnabled, disable48DCFilter, lowGainRangeEnabled, timeSettingFromGPSEnabled, magneticSwitchEnabled, dailyFolders); + let sunScheduleEnabled = (typeof jsonObj.sunScheduleEnabled === 'undefined') ? replacementValues.sunScheduleEnabled : jsonObj.sunScheduleEnabled; + + if (typeof jsonObj.sunScheduleEnabled === 'undefined') { + + if (timePeriods.length > 0) { + + sunScheduleEnabled = false; + + } else { + + sunScheduleEnabled = replacementValues.sunScheduleEnabled; + + } + + } else { + + sunScheduleEnabled = jsonObj.sunScheduleEnabled; + + } + + const latitude = (typeof jsonObj.latitude === 'undefined') ? replacementValues.latitude : jsonObj.latitude; + const longitude = (typeof jsonObj.longitude === 'undefined') ? replacementValues.longitude : jsonObj.longitude; + + const sunMode = (typeof jsonObj.sunMode === 'undefined') ? replacementValues.sunMode : jsonObj.sunMode; + + const sunPeriods = (typeof jsonObj.sunPeriods === 'undefined') ? replacementValues.sunPeriods : jsonObj.sunPeriods; + + const sunRounding = (typeof jsonObj.sunRounding === 'undefined') ? replacementValues.sunRounding : jsonObj.sunRounding; + + const sunDefinition = (typeof jsonObj.sunDefinition === 'undefined') ? replacementValues.sunDefinition : jsonObj.sunDefinition; + + callback(timePeriods, + ledEnabled, batteryLevelCheckEnabled, + sampleRateIndex, gain, dutyEnabled, recordDuration, sleepDuration, + localTime, customTimeZoneOffset, + firstRecordingDateEnabled, firstRecordingDate, lastRecordingDateEnabled, lastRecordingDate, + passFiltersEnabled, filterType, lowerFilter, higherFilter, + amplitudeThresholdingEnabled, amplitudeThreshold, + frequencyTriggerEnabled, frequencyTriggerWindowLength, frequencyTriggerCentreFrequency, minimumFrequencyTriggerDuration, frequencyTriggerThreshold, + requireAcousticConfig, displayVoltageRange, + minimumAmplitudeThresholdDuration, amplitudeThresholdingScaleIndex, + energySaverModeEnabled, disable48DCFilter, lowGainRangeEnabled, timeSettingFromGPSEnabled, magneticSwitchEnabled, dailyFolders, + sunScheduleEnabled, latitude, longitude, sunMode, sunPeriods, sunRounding, sunDefinition); version = version === '0.0.0' ? '< 1.5.0' : version; @@ -665,7 +788,7 @@ function useLoadedConfiguration (err, currentConfig, data, callback) { dialog.showMessageBox(BrowserWindow.getFocusedWindow(), { type: 'error', title: 'Incorrect format', - message: 'An error occurred whilst trying to read the Configuration file. The file format is incorrect.' + message: 'An error occurred whilst trying to read the configuration file. The file format is incorrect.' }); console.error(usageErr); diff --git a/schedule/calculateSunriseSunset.js b/schedule/calculateSunriseSunset.js new file mode 100644 index 0000000..48768a1 --- /dev/null +++ b/schedule/calculateSunriseSunset.js @@ -0,0 +1,111 @@ +/**************************************************************************** + * calculateSunriseSunset.js + * openacousticdevices.info + * December 2023 + *****************************************************************************/ + +const constants = require('../constants.js'); + +const ZENITH_ANGLES = [90.833 / 180 * Math.PI, 96 / 180 * Math.PI, 102 / 180 * Math.PI, 108 / 180 * Math.PI]; + +const DAYS_BY_MONTH = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]; + +function isLeapYear (year) { + + return (year & 3) === 0 && ((year % 25) !== 0 || (year & 15) === 0); + +} + +function dayOfYear (year, month, day) { + + let days = DAYS_BY_MONTH[month] + day; + + if (isLeapYear(year) && month > 2) days++; + + return days; + +} + +function normalise (minutes) { + + if (minutes > constants.MINUTES_IN_DAY) minutes -= constants.MINUTES_IN_DAY; + + if (minutes < 0) minutes += constants.MINUTES_IN_DAY; + + return minutes; + +} + +function calculateSunsetAndSunrise (event, gamma, latitude, longitude) { + + /* Convert latitude to radians */ + + latitude = latitude / 180 * Math.PI; + + /* Calculate equation of time, declination and hour angle */ + + const zenith = ZENITH_ANGLES[event]; + + const equationOfTime = 229.18 * (0.000075 + 0.001868 * Math.cos(gamma) - 0.032077 * Math.sin(gamma) - 0.014615 * Math.cos(2 * gamma) - 0.040849 * Math.sin(2 * gamma)); + + const decl = 0.006918 - 0.399912 * Math.cos(gamma) + 0.070257 * Math.sin(gamma) - 0.006758 * Math.cos(2 * gamma) + 0.000907 * Math.sin(2 * gamma) - 0.002697 * Math.cos(3 * gamma) + 0.00148 * Math.sin(3 * gamma); + + let argument = Math.cos(zenith) / Math.cos(latitude) / Math.cos(decl) - Math.tan(latitude) * Math.tan(decl); + + const solution = argument > 1 ? constants.SUN_BELOW_HORIZON : argument < -1 ? constants.SUN_ABOVE_HORIZON : constants.NORMAL_SOLUTION; + + let trend = argument < 0 ? constants.DAY_LONGER_THAN_NIGHT : constants.DAY_SHORTER_THAN_NIGHT; + + if (argument < -1) argument = -1; + + if (argument > 1) argument = 1; + + const ha = Math.acos(argument); + + /* Calculate sunrise and sunset */ + + let sunrise = normalise(constants.MINUTES_IN_DAY / 2 - 4 * (longitude + ha / Math.PI * 180) - equationOfTime); + + let sunset = normalise(constants.MINUTES_IN_DAY / 2 - 4 * (longitude - ha / Math.PI * 180) - equationOfTime); + + sunrise = Math.round(sunrise) % constants.MINUTES_IN_DAY; + + sunset = Math.round(sunset) % constants.MINUTES_IN_DAY; + + let offsetSunrise = sunrise + constants.MINUTES_IN_DAY / 2; + + offsetSunrise = offsetSunrise % constants.MINUTES_IN_DAY; + + if (offsetSunrise === sunset) trend = constants.DAY_EQUAL_TO_NIGHT; + + return [solution, trend, sunrise, sunset]; + +} + +function degreesAndHundredthsToFloatingPoint (degrees, hundredths, direction) { + + let latLon = degrees + hundredths / 100; + + if (direction === false) latLon *= -1; + + return latLon; + +} + +exports.calculate = (event, year, month, day, degrees0, hundredths0, direction0, degrees1, hundredths1, direction1) => { + + const latitude = degreesAndHundredthsToFloatingPoint(degrees0, hundredths0, direction0); + + const longitude = degreesAndHundredthsToFloatingPoint(degrees1, hundredths1, direction1); + + /* Calculate fractional part of year */ + + const totalDaysInYear = isLeapYear(year) ? 366 : 365; + + const gamma = 2 * Math.PI * dayOfYear(year, month, day) / totalDaysInYear; + + /* Calculate sunrise and sunset */ + + return calculateSunsetAndSunrise(event, gamma, latitude, longitude); + +}; diff --git a/schedule/coordinateInput.js b/schedule/coordinateInput.js index a9dd2f4..cbd98e8 100644 --- a/schedule/coordinateInput.js +++ b/schedule/coordinateInput.js @@ -6,7 +6,7 @@ 'use strict'; -const DEFAULT_WIDTH = '90px'; +const DEFAULT_WIDTH = '75px'; const DEFAULT_HEIGHT = '25px'; const inputData = {}; @@ -41,30 +41,13 @@ exports.setEnabled = (div, setting) => { } else { - switch (process.platform) { + textInput.style.backgroundColor = 'EBEBE4'; + textInput.style.border = '1px solid #cccccc'; - case 'linux': - case 'win32': - textInput.style.backgroundColor = '#EBEBE4'; - textInput.style.border = '1px solid #cccccc'; - - for (let i = 0; i < uiElements.length; i++) { - - uiElements[i].classList.add('grey'); - uiElements[i].style.backgroundColor = 'EBEBE4'; - - } - - break; - - case 'darwin': - for (let i = 0; i < uiElements.length; i++) { - - uiElements[i].classList.add('grey'); - uiElements[i].style.backgroundColor = 'white'; + for (let i = 0; i < uiElements.length; i++) { - } - break; + uiElements[i].classList.add('grey'); + uiElements[i].style.backgroundColor = 'EBEBE4'; } @@ -76,12 +59,12 @@ exports.setEnabled = (div, setting) => { /** * @param {Element} div Parent div element - * @returns [degrees, minutes, direction] + * @returns [degrees, hundredths, direction] */ exports.getValue = (div) => { - const inputValues = div.getAttribute('inputValues').split(','); - return [parseInt(inputValues[0]), parseInt(inputValues[1]), inputValues[2]]; + const values = getInputValues(div); + return [parseInt(values[0]), parseInt(values[1]), values[2]]; }; @@ -306,7 +289,7 @@ function getMaxValue (div) { } else if (selectedIndex === 1) { - maxValue = 59; + maxValue = 99; if (inputValues[0] === degreeMax) { @@ -714,9 +697,10 @@ function highlightInput (div) { * @param {string} divName Name assigned to custom div * @param {boolean} isLat Is the element a latitude or longitude coordinate * @param {boolean} alternateImplementation Whether or not to use alternate implementation which allows leading zeroes + * @param {Function} focusOutFunction Function called when focusing away from input * @returns Parent div element */ -exports.create = (divName, isLat, alternateImplementation) => { +exports.create = (divName, isLat, alternateImplementation, focusOutFunction) => { const customDiv = document.getElementById(divName); @@ -751,8 +735,8 @@ exports.create = (divName, isLat, alternateImplementation) => { const numSpanStyle1 = 'display: inline-block; text-align: center; width: 7px;'; const numSpanStyle2 = 'display: inline-block; text-align: center; width: 15px;'; + const dotSpanStyle = 'display: inline-block; text-align: center; width: 4px;'; const degreeSpanStyle = 'display: inline-block; text-align: center; width: 8px;'; - const apostropheSpanStyle = 'display: inline-block; text-align: center; width: 6px;'; const directionSpanStyle = 'display: inline-block; text-align: left; width: 12px;'; const inputNode = document.createElement('input'); @@ -767,7 +751,8 @@ exports.create = (divName, isLat, alternateImplementation) => { const holderNode = document.createElement('div'); holderNode.className = 'holder'; - holderNode.style = 'position: absolute; top: 0px; margin-left: 20px; margin-top: 3px;'; + const holderMarginLeft = isLat ? 9 : 7; + holderNode.style = 'position: absolute; top: 0px; margin-left: ' + holderMarginLeft + 'px; margin-top: 3px;'; const coordSpanNode0 = document.createElement('span'); coordSpanNode0.className = 'coord-span0'; @@ -779,20 +764,20 @@ exports.create = (divName, isLat, alternateImplementation) => { coordSpanNode1.innerText = '00'; coordSpanNode1.style = numSpanStyle2; - const degreeSpanNode = document.createElement('span'); - degreeSpanNode.className = 'degree-span'; - degreeSpanNode.innerText = '°'; - degreeSpanNode.style = degreeSpanStyle; + const dotSpanNode = document.createElement('span'); + dotSpanNode.className = 'dot-span'; + dotSpanNode.innerText = '.'; + dotSpanNode.style = dotSpanStyle; const coordSpanNode2 = document.createElement('span'); coordSpanNode2.className = 'coord-span2'; coordSpanNode2.innerText = '00'; coordSpanNode2.style = numSpanStyle2; - const apostropheSpanNode = document.createElement('span'); - apostropheSpanNode.className = 'apostrophe-span'; - apostropheSpanNode.innerText = '\''; - apostropheSpanNode.style = apostropheSpanStyle; + const degreeSpanNode = document.createElement('span'); + degreeSpanNode.className = 'degree-span'; + degreeSpanNode.innerText = '°'; + degreeSpanNode.style = degreeSpanStyle; const directionSpanNode = document.createElement('span'); directionSpanNode.className = 'direction-span'; @@ -801,9 +786,9 @@ exports.create = (divName, isLat, alternateImplementation) => { holderNode.appendChild(coordSpanNode0); holderNode.appendChild(coordSpanNode1); - holderNode.appendChild(degreeSpanNode); + holderNode.appendChild(dotSpanNode); holderNode.appendChild(coordSpanNode2); - holderNode.appendChild(apostropheSpanNode); + holderNode.appendChild(degreeSpanNode); holderNode.appendChild(directionSpanNode); blockerNode.appendChild(holderNode); @@ -918,6 +903,20 @@ exports.create = (divName, isLat, alternateImplementation) => { updateGrey(div); + const inputValues = getInputValues(div); + + if (inputValues[0] === 0 && inputValues[1] === 0 && inputValues[2] === false) { + + setValue(div, 0, 0, true); + + } + + if (focusOutFunction) { + + focusOutFunction(); + + } + }); inputNode.addEventListener('click', () => { diff --git a/schedule/dateInput.js b/schedule/dateInput.js index 8efa058..58fadd9 100644 --- a/schedule/dateInput.js +++ b/schedule/dateInput.js @@ -63,7 +63,7 @@ function handleFocusOut (e) { input.style.border = '1px solid #0000ff'; input.style.color = 'blue'; - setTimeout(function () { + setTimeout(() => { if (!input.disabled) { diff --git a/schedule/roundingInput.js b/schedule/roundingInput.js new file mode 100644 index 0000000..9a49d10 --- /dev/null +++ b/schedule/roundingInput.js @@ -0,0 +1,467 @@ +/**************************************************************************** + * roundingInput.js + * openacousticdevices.info + * January 2024 + *****************************************************************************/ + +'use strict'; + +const DEFAULT_WIDTH = '60px'; +const DEFAULT_HEIGHT = '25px'; + +const inputData = {}; + +exports.setEnabled = (div, setting) => { + + inputData[div.id].enabled = setting; + + const uiElements = getAllSpans(div); + const textInput = getTextInput(div); + + if (setting) { + + textInput.style.backgroundColor = ''; + textInput.style.border = ''; + textInput.tabIndex = 0; + + for (let i = 0; i < uiElements.length; i++) { + + uiElements[i].classList.remove('grey'); + uiElements[i].style.backgroundColor = ''; + + } + + updateGrey(div); + + } else { + + textInput.style.backgroundColor = 'EBEBE4'; + textInput.style.border = '1px solid #cccccc'; + + for (let i = 0; i < uiElements.length; i++) { + + uiElements[i].classList.add('grey'); + uiElements[i].style.backgroundColor = 'EBEBE4'; + + } + + textInput.tabIndex = -1; + + } + +}; + +/** + * @param {Element} div Parent div element + * @returns Time string + */ +function getValue (div) { + + return inputData[div.id].value; + +}; + +exports.getValue = getValue; + +// Data structure setters + +function setValue (div, value) { + + const maxValue = getMaxValue(); + + inputData[div.id].value = Math.min(value, maxValue); + + updateFieldSpan(div); + + updateGrey(div); + +} + +exports.setValue = setValue; + +function setSelectedIndex (div, index) { + + inputData[div.id].selectedIndex = index; + +} + +function setEntry (div, entry) { + + inputData[div.id].entry = entry; + +} + +function resetEntry (div) { + + inputData[div.id].entry = 0; + +} + +// Data structure getters + +function isEnabled (div) { + + return inputData[div.id].enabled; + +} + +function getSelectedIndex (div) { + + return inputData[div.id].selectedIndex; + +} + +function getEntry (div) { + + return inputData[div.id].entry; + +} + +// Get UI elements + +function getDurationSpan (div) { + + return div.getElementsByClassName('duration-span')[0]; + +} + +function getTextInput (div) { + + return div.getElementsByClassName('text-input')[0]; + +} + +function getAllSpans (div) { + + const holder = div.getElementsByClassName('holder')[0]; + return holder.children; + +} + +// Update values + +function getMaxValue () { + + return 60; + +} + +function updateFieldSpan (div) { + + const value = getValue(div); + + const field = getDurationSpan(div); + + const stringValue = value.toString().padStart(2, '0'); + + field.innerText = stringValue; + +} + +// Keypress event handler + +function handleKeyDown (e) { + + const div = e.target.parentNode; + + if (e.key === 'Tab') { + + return; + + } + + e.preventDefault(); + + if (e.key === 'ArrowUp') { + + resetEntry(div); + + const currentValue = getValue(div); + const maxValue = getMaxValue(); + + const newValue = currentValue + 1 > maxValue ? 0 : currentValue + 1; + + setValue(div, newValue); + + return; + + } + + if (e.key === 'ArrowDown') { + + resetEntry(div); + + const currentValue = getValue(div); + const maxValue = getMaxValue(); + + const newValue = currentValue - 1 < 0 ? maxValue : currentValue - 1; + + setValue(div, newValue); + + updateGrey(div); + + return; + + } + + if (e.key === 'Backspace' || e.key === 'Delete') { + + resetEntry(div); + setValue(div, 0); + + updateGrey(div); + + return; + + } + + const patt = /^[0-9]$/; + + if (patt.test(e.key)) { + + const digit = parseInt(e.key); + + let entry = getEntry(div); + + setEntry(div, 10 * entry + digit); + entry = getEntry(div); + + const maxValue = getMaxValue(div); + const value = Math.min(maxValue, entry); + + setValue(div, value); + + if (10 * value > maxValue || (maxValue === 0 && digit > 0)) { + + resetEntry(div); + + } + + } + +} + +/** + * Highlight the span at index selectedIndex + * @param {Element} div Time input div element + */ +function highlightInput (div) { + + const inputNode = getTextInput(div); + + const index = getSelectedIndex(div); + + const durationSpan = getDurationSpan(div); + + const deselectedColor = inputNode.style.background; + + if (index === 0) { + + durationSpan.style.color = ''; + durationSpan.style.backgroundColor = 'Highlight'; + durationSpan.style.color = 'HighlightText'; + + } else { + + durationSpan.style.color = ''; + durationSpan.style.backgroundColor = deselectedColor; + durationSpan.classList.remove('grey'); + + } + + updateGrey(div); + +} + +function updateGrey (div) { + + if (!isEnabled(div)) { + + return; + + } + + // Update grey + + const durationSpanNode = getDurationSpan(div); + + const inputValue = getValue(div); + + if (inputValue < 10) { + + durationSpanNode.classList.add('greyStart'); + + } else { + + durationSpanNode.classList.remove('greyStart'); + + } + + const selectedIndex = getSelectedIndex(div); + + if (selectedIndex === 0) { + + durationSpanNode.classList.remove('greyStart'); + + } + +} + +/** + * Create all the UI elements needed and add a new data structure to the lookup table + * @param {string} divName Name assigned to custom div + * @param {function} focusOutFunction Function run when focus leaves input + * @returns Parent div element + */ +exports.create = (divName, focusOutFunction) => { + + const customDiv = document.getElementById(divName); + + let width, height; + + const attributes = customDiv.attributes; + + width = customDiv.style.width; + width = (width === '') ? DEFAULT_WIDTH : width; + height = customDiv.style.height; + height = (height === '') ? DEFAULT_HEIGHT : height; + + const parent = customDiv.parentNode; + + const id = customDiv.id; + + parent.removeChild(customDiv); + + const div = document.createElement('div'); + div.style = 'position: relative;'; + div.id = id; + + for (let i = 0; i < attributes.length; i++) { + + if (attributes[i].name !== 'style') { + + div.setAttribute(attributes[i].name, attributes[i].value); + + } + + } + + const numSpanStyle1 = 'display: inline-block; text-align: center; width: 15px;'; + + const inputNode = document.createElement('input'); + inputNode.className = 'text-input'; + inputNode.type = 'text'; + inputNode.style = 'width: ' + width + '; height: ' + height + '; color: white; caret-color: transparent;'; + + div.appendChild(inputNode); + + const blockerNode = document.createElement('div'); + blockerNode.style = 'position: absolute; top: 0px; margin-left: 0px; margin-top: 0px; width: 100%; height: 100%;'; + + const holderNode = document.createElement('div'); + holderNode.className = 'holder'; + holderNode.style = 'position: absolute; top: 0px; margin-left: 39px; margin-top: 3px;'; + + const durationSpanNode = document.createElement('span'); + durationSpanNode.className = 'duration-span'; + durationSpanNode.innerText = '00'; + durationSpanNode.style = numSpanStyle1; + + holderNode.appendChild(durationSpanNode); + + blockerNode.appendChild(holderNode); + div.appendChild(blockerNode); + + parent.appendChild(div); + + const data = {}; + + data.value = 0; + data.width = 2; + data.selectedIndex = -1; + data.enabled = true; + + inputData[div.id] = data; + + updateGrey(div); + + inputNode.addEventListener('keydown', handleKeyDown); + + function handleSpanClick () { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, 0); + highlightInput(div); + inputNode.focus(); + + updateGrey(div); + + } + + durationSpanNode.addEventListener('click', handleSpanClick); + + inputNode.addEventListener('focusin', () => { + + if (!isEnabled(div)) { + + inputNode.blur(); + return; + + } + + resetEntry(div); + + if (getSelectedIndex(div) === -1) { + + setSelectedIndex(div, 0); + highlightInput(div); + + } + + updateGrey(div); + + }); + + inputNode.addEventListener('focusout', () => { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, -1); + highlightInput(div); + + updateGrey(div); + + if (focusOutFunction) { + + focusOutFunction(); + + } + + }); + + inputNode.addEventListener('click', () => { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, 0); + highlightInput(div); + inputNode.focus(); + + }); + + return div; + +}; diff --git a/schedule/schedule.js b/schedule/schedule.js index 56e8528..fd407be 100644 --- a/schedule/schedule.js +++ b/schedule/schedule.js @@ -4,8 +4,7 @@ * November 2019 *****************************************************************************/ -const MAX_PERIODS = 4; -exports.MAX_PERIODS = MAX_PERIODS; +const constants = require('../constants.js'); let timePeriods = []; @@ -44,7 +43,7 @@ exports.getTimePeriodsNoWrap = () => { noWrapTimePeriods.push({ startMins, - endMins: 1440 + endMins: constants.MINUTES_IN_DAY }); noWrapTimePeriods.push({ diff --git a/schedule/scheduleEditor.js b/schedule/scheduleEditor.js index b0fbad5..9013d48 100644 --- a/schedule/scheduleEditor.js +++ b/schedule/scheduleEditor.js @@ -6,19 +6,10 @@ 'use strict'; -/* global Event */ - const ui = require('../ui.js'); -const scheduleBar = require('../scheduleBar.js'); const timeHandler = require('../timeHandler.js'); -const schedule = require('../schedule/schedule.js'); const constants = require('../constants.js'); -const timeList = document.getElementById('time-list'); - -exports.setSelectedPeriod = scheduleBar.setSelectedPeriod; -exports.clearSelectedPeriod = scheduleBar.clearSelectedPeriod; - /* Remove a time from the recording period data structure and update UI to reflect change */ function removeTime (timePeriod, tps) { @@ -41,27 +32,6 @@ function removeTime (timePeriod, tps) { exports.removeTime = removeTime; -/* Rebuild the schedule bar using current state of schedule */ - -function updateScheduleBar () { - - scheduleBar.updateCanvas(); - -} - -exports.updateScheduleBar = updateScheduleBar; - -/* Remove all recordings periods and update UI */ - -function clearTimes () { - - schedule.clear(); - updateScheduleBar(); - -} - -exports.clearTimes = clearTimes; - /* Check to see if two periods of time overlap */ function isSubset (startTime1, endTime1, startTime2, endTime2) { @@ -115,13 +85,11 @@ function endOverlaps (startTime1, endTime1, startTime2, endTime2) { /* Add a new recording period to the data structure and update UI */ -function addTime (startMins, endMins) { +function addTime (startMins, endMins, timePeriods) { - endMins = endMins === 1440 ? 0 : endMins; + endMins = endMins === constants.MINUTES_IN_DAY ? 0 : endMins; - let timePeriods, newStart, newEnd; - - timePeriods = schedule.getTimePeriods(); + let newStart, newEnd; if (startMins === endMins) { @@ -132,9 +100,7 @@ function addTime (startMins, endMins) { endMins }); - schedule.setTimePeriods(timePeriods); - - return; + return timePeriods; } @@ -142,7 +108,7 @@ function addTime (startMins, endMins) { const existingStartMins = timePeriods[i].startMins; let existingEndMins = timePeriods[i].endMins; - existingEndMins = existingEndMins === 1440 ? 0 : existingEndMins; + existingEndMins = existingEndMins === constants.MINUTES_IN_DAY ? 0 : existingEndMins; /* Check if the new period is just a time inside an existing period */ @@ -150,7 +116,7 @@ function addTime (startMins, endMins) { console.log('Subset'); - return true; + return timePeriods; } @@ -160,9 +126,9 @@ function addTime (startMins, endMins) { timePeriods = removeTime(timePeriods[i], timePeriods); - schedule.setTimePeriods(timePeriods); + timePeriods = addTime(startMins, endMins, timePeriods); - return addTime(startMins, endMins); + return timePeriods; } @@ -172,9 +138,9 @@ function addTime (startMins, endMins) { timePeriods = removeTime(timePeriods[i], timePeriods); - schedule.setTimePeriods(timePeriods); + timePeriods = addTime(startMins, startMins, timePeriods); - return addTime(startMins, startMins); + return timePeriods; } @@ -187,9 +153,9 @@ function addTime (startMins, endMins) { timePeriods = removeTime(timePeriods[i], timePeriods); - schedule.setTimePeriods(timePeriods); + timePeriods = addTime(newStart, newEnd, timePeriods); - return addTime(newStart, newEnd); + return timePeriods; } @@ -202,9 +168,9 @@ function addTime (startMins, endMins) { timePeriods = removeTime(timePeriods[i], timePeriods); - schedule.setTimePeriods(timePeriods); + timePeriods = addTime(newStart, newEnd, timePeriods); - return addTime(newStart, newEnd); + return timePeriods; } @@ -215,13 +181,11 @@ function addTime (startMins, endMins) { endMins }); - schedule.setTimePeriods(timePeriods); - - return true; + return timePeriods; } -function formatAndAddTime (startTimestamp, endTimestamp) { +function formatAndAddTime (startTimestamp, endTimestamp, timePeriods) { let utcPeriod; @@ -235,8 +199,8 @@ function formatAndAddTime (startTimestamp, endTimestamp) { if (timeZoneMode === constants.TIME_ZONE_MODE_UTC) { utcPeriod = { - startMins: (timePeriod.startMins % 1440), - endMins: (timePeriod.endMins % 1440) + startMins: (timePeriod.startMins % constants.MINUTES_IN_DAY), + endMins: (timePeriod.endMins % constants.MINUTES_IN_DAY) }; } else { @@ -248,24 +212,11 @@ function formatAndAddTime (startTimestamp, endTimestamp) { startTimestamp = utcPeriod.startMins; endTimestamp = utcPeriod.endMins; - const added = addTime(startTimestamp, endTimestamp); + timePeriods = addTime(startTimestamp, endTimestamp, timePeriods); - /* Return success boolean (used to report failure when manually adding period) */ - - return added; + return timePeriods; } exports.addTime = addTime; exports.formatAndAddTime = formatAndAddTime; - -exports.getTimePeriods = schedule.getTimePeriods; -exports.setTimePeriods = schedule.setTimePeriods; - -scheduleBar.prepareScheduleCanvas(function (selectedIndex) { - - timeList.options.selectedIndex = selectedIndex; - timeList.focus(); - timeList.dispatchEvent(new Event('change')); - -}); diff --git a/schedule/sunIntervalInput.js b/schedule/sunIntervalInput.js new file mode 100644 index 0000000..efcfac3 --- /dev/null +++ b/schedule/sunIntervalInput.js @@ -0,0 +1,538 @@ +/**************************************************************************** + * sunIntervalInput.js + * openacousticdevices.info + * November 2023 + *****************************************************************************/ + +'use strict'; + +const DEFAULT_WIDTH = '60px'; +const DEFAULT_HEIGHT = '25px'; + +const inputData = {}; + +function isAlternateImplementation (div) { + + return inputData[div.id].alternateImplementation; + +} + +exports.setEnabled = (div, setting) => { + + inputData[div.id].enabled = setting; + + const uiElements = getAllSpans(div); + const textInput = getTextInput(div); + + if (setting) { + + textInput.style.backgroundColor = ''; + textInput.style.border = ''; + textInput.tabIndex = 0; + + for (let i = 0; i < uiElements.length; i++) { + + uiElements[i].classList.remove('grey'); + uiElements[i].style.backgroundColor = ''; + + } + + updateGrey(div); + + } else { + + textInput.style.backgroundColor = 'EBEBE4'; + textInput.style.border = '1px solid #cccccc'; + + for (let i = 0; i < uiElements.length; i++) { + + uiElements[i].classList.add('grey'); + uiElements[i].style.backgroundColor = 'EBEBE4'; + + } + + textInput.tabIndex = -1; + + } + +}; + +/** + * @param {Element} div Parent div element + * @returns Time string + */ +function getValue (div) { + + return inputData[div.id].value; + +}; + +exports.getValue = getValue; + +// Data structure setters + +function setValue (div, value) { + + const maxValue = getMaxValue(); + + inputData[div.id].value = Math.min(value, maxValue); + + updateFieldSpan(div); + + updateGrey(div); + +} + +exports.setValue = setValue; + +function setSelectedIndex (div, index) { + + inputData[div.id].selectedIndex = index; + +} + +function setEntry (div, entry) { + + inputData[div.id].entry = entry; + +} + +function resetEntry (div) { + + inputData[div.id].entry = isAlternateImplementation(div) ? '' : 0; + +} + +// Data structure getters + +function isEnabled (div) { + + return inputData[div.id].enabled; + +} + +function getSelectedIndex (div) { + + return inputData[div.id].selectedIndex; + +} + +function getEntry (div) { + + return inputData[div.id].entry; + +} + +function getWidth (div) { + + return inputData[div.id].width; + +} + +// Get UI elements + +function getDurationSpan0 (div) { + + return div.getElementsByClassName('duration-span0')[0]; + +} + +function getDurationSpan1 (div) { + + return div.getElementsByClassName('duration-span1')[0]; + +} + +function getTextInput (div) { + + return div.getElementsByClassName('text-input')[0]; + +} + +function getAllSpans (div) { + + const holder = div.getElementsByClassName('holder')[0]; + return holder.children; + +} + +// Update values + +function getMaxValue () { + + return 360; + +} + +function updateFieldSpan (div) { + + const value = getValue(div); + + const field0 = getDurationSpan0(div); + const field1 = getDurationSpan1(div); + + const stringValue = value.toString().padStart(3, '0'); + + field0.innerText = stringValue.slice(0, 1); + field1.innerText = stringValue.slice(1); + +} + +// Keypress event handler + +function handleKeyDown (e) { + + const div = e.target.parentNode; + + if (e.key === 'Tab') { + + return; + + } + + e.preventDefault(); + + if (e.key === 'ArrowUp') { + + resetEntry(div); + + const currentValue = getValue(div); + const maxValue = getMaxValue(); + + const newValue = currentValue + 1 > maxValue ? 0 : currentValue + 1; + + setValue(div, newValue); + + return; + + } + + if (e.key === 'ArrowDown') { + + resetEntry(div); + + const currentValue = getValue(div); + const maxValue = getMaxValue(); + + const newValue = currentValue - 1 < 0 ? maxValue : currentValue - 1; + + setValue(div, newValue); + + updateGrey(div); + + return; + + } + + if (e.key === 'Backspace' || e.key === 'Delete') { + + resetEntry(div); + setValue(div, 0); + + updateGrey(div); + + return; + + } + + const patt = /^[0-9]$/; + + if (patt.test(e.key)) { + + const digit = parseInt(e.key); + + let entry = getEntry(div); + + if (isAlternateImplementation(div)) { + + setEntry(div, entry + digit); + entry = getEntry(div); + + const maxValue = getMaxValue(div); + const value = Math.min(maxValue, parseInt(entry)); + + setValue(div, value); + + const width = getWidth(div); + + if (10 * value > maxValue || (maxValue === 0 && digit > 0) || entry.length === width) { + + resetEntry(div); + + } + + } else { + + setEntry(div, 10 * entry + digit); + entry = getEntry(div); + + const maxValue = getMaxValue(div); + const value = Math.min(maxValue, entry); + + setValue(div, value); + + if (10 * value > maxValue || (maxValue === 0 && digit > 0)) { + + resetEntry(div); + + } + + } + + } + +} + +/** + * Highlight the span at index selectedIndex + * @param {Element} div Time input div element + */ +function highlightInput (div) { + + const inputNode = getTextInput(div); + + const index = getSelectedIndex(div); + + const durationSpan0 = getDurationSpan0(div); + const durationSpan1 = getDurationSpan1(div); + + const deselectedColor = inputNode.style.background; + + if (index === 0) { + + durationSpan0.style.color = ''; + durationSpan0.style.backgroundColor = 'Highlight'; + durationSpan0.style.color = 'HighlightText'; + durationSpan1.style.color = ''; + durationSpan1.style.backgroundColor = 'Highlight'; + durationSpan1.style.color = 'HighlightText'; + + } else { + + durationSpan0.style.color = ''; + durationSpan0.style.backgroundColor = deselectedColor; + durationSpan0.classList.remove('grey'); + durationSpan1.style.color = ''; + durationSpan1.style.backgroundColor = deselectedColor; + durationSpan1.classList.remove('grey'); + + } + + updateGrey(div); + +} + +function updateGrey (div) { + + if (!isEnabled(div)) { + + return; + + } + + // Update grey + + const durationSpanNode0 = getDurationSpan0(div); + const durationSpanNode1 = getDurationSpan1(div); + + const inputValue = getValue(div); + + if (inputValue < 10) { + + durationSpanNode0.classList.add('allGrey'); + durationSpanNode1.classList.add('greyStart'); + + } else if (inputValue < 100) { + + durationSpanNode0.classList.add('allGrey'); + durationSpanNode1.classList.remove('greyStart'); + + } else { + + durationSpanNode0.classList.remove('allGrey'); + durationSpanNode1.classList.remove('greyStart'); + + } + + const selectedIndex = getSelectedIndex(div); + + if (selectedIndex === 0) { + + durationSpanNode0.classList.remove('allGrey'); + durationSpanNode1.classList.remove('greyStart'); + + } + +} + +/** + * Create all the UI elements needed and add a new data structure to the lookup table + * @param {string} divName Name assigned to custom div + * @param {boolean} alternateImplementation Whether or not to use alternate implementation which allows leading zeroes + * @param {function} focusOutFunction Function run when focus leaves input + * @returns Parent div element + */ +exports.create = (divName, alternateImplementation, focusOutFunction) => { + + const customDiv = document.getElementById(divName); + + let width, height; + + const attributes = customDiv.attributes; + + width = customDiv.style.width; + width = (width === '') ? DEFAULT_WIDTH : width; + height = customDiv.style.height; + height = (height === '') ? DEFAULT_HEIGHT : height; + + const parent = customDiv.parentNode; + + const id = customDiv.id; + + parent.removeChild(customDiv); + + const div = document.createElement('div'); + div.style = 'position: relative;'; + div.id = id; + + for (let i = 0; i < attributes.length; i++) { + + if (attributes[i].name !== 'style') { + + div.setAttribute(attributes[i].name, attributes[i].value); + + } + + } + + const numSpanStyle1 = 'display: inline-block; text-align: center; width: 7px;'; + const numSpanStyle2 = 'display: inline-block; text-align: center; width: 15px;'; + + const inputNode = document.createElement('input'); + inputNode.className = 'text-input'; + inputNode.type = 'text'; + inputNode.style = 'width: ' + width + '; height: ' + height + '; color: white; caret-color: transparent;'; + + div.appendChild(inputNode); + + const blockerNode = document.createElement('div'); + blockerNode.style = 'position: absolute; top: 0px; margin-left: 0px; margin-top: 0px; width: 100%; height: 100%;'; + + const holderNode = document.createElement('div'); + holderNode.className = 'holder'; + holderNode.style = 'position: absolute; top: 0px; margin-left: 32px; margin-top: 3px;'; + + const durationSpanNode0 = document.createElement('span'); + durationSpanNode0.className = 'duration-span0'; + durationSpanNode0.innerText = '0'; + durationSpanNode0.style = numSpanStyle1; + + const durationSpanNode1 = document.createElement('span'); + durationSpanNode1.className = 'duration-span1'; + durationSpanNode1.innerText = '00'; + durationSpanNode1.style = numSpanStyle2; + + holderNode.appendChild(durationSpanNode0); + holderNode.appendChild(durationSpanNode1); + + blockerNode.appendChild(holderNode); + div.appendChild(blockerNode); + + parent.appendChild(div); + + const data = {}; + + alternateImplementation = alternateImplementation === undefined ? false : alternateImplementation; + + data.alternateImplementation = alternateImplementation; + data.value = 0; + data.width = 3; + data.selectedIndex = -1; + data.entry = alternateImplementation ? '0' : 0; + data.enabled = true; + + inputData[div.id] = data; + + updateGrey(div); + + inputNode.addEventListener('keydown', handleKeyDown); + + function handleSpanClick () { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, 0); + highlightInput(div); + inputNode.focus(); + + updateGrey(div); + + } + + durationSpanNode0.addEventListener('click', handleSpanClick); + durationSpanNode1.addEventListener('click', handleSpanClick); + + inputNode.addEventListener('focusin', () => { + + if (!isEnabled(div)) { + + inputNode.blur(); + return; + + } + + resetEntry(div); + + if (getSelectedIndex(div) === -1) { + + setSelectedIndex(div, 0); + highlightInput(div); + + } + + updateGrey(div); + + }); + + inputNode.addEventListener('focusout', () => { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, -1); + highlightInput(div); + + updateGrey(div); + + if (focusOutFunction) { + + focusOutFunction(); + + } + + }); + + inputNode.addEventListener('click', () => { + + if (!isEnabled(div)) { + + return; + + } + + setSelectedIndex(div, 0); + highlightInput(div); + inputNode.focus(); + + }); + + return div; + +}; diff --git a/schedule/timeInput.js b/schedule/timeInput.js index f528412..432288d 100644 --- a/schedule/timeInput.js +++ b/schedule/timeInput.js @@ -39,30 +39,13 @@ exports.setEnabled = (div, setting) => { } else { - switch (process.platform) { + textInput.style.backgroundColor = 'EBEBE4'; + textInput.style.border = '1px solid #cccccc'; - case 'linux': - case 'win32': - textInput.style.backgroundColor = '#EBEBE4'; - textInput.style.border = '1px solid #cccccc'; - - for (let i = 0; i < uiElements.length; i++) { - - uiElements[i].classList.add('grey'); - uiElements[i].style.backgroundColor = 'EBEBE4'; - - } - - break; - - case 'darwin': - for (let i = 0; i < uiElements.length; i++) { - - uiElements[i].classList.add('grey'); - uiElements[i].style.backgroundColor = 'white'; + for (let i = 0; i < uiElements.length; i++) { - } - break; + uiElements[i].classList.add('grey'); + uiElements[i].style.backgroundColor = 'EBEBE4'; } diff --git a/schedule/uiSchedule.js b/schedule/uiSchedule.js index 4b49918..67e3979 100644 --- a/schedule/uiSchedule.js +++ b/schedule/uiSchedule.js @@ -8,6 +8,9 @@ /* global document */ +const electron = require('electron'); + +const constants = require('../constants.js'); const ui = require('../ui.js'); const scheduleEditor = require('./scheduleEditor.js'); const uiScheduleEditor = require('./uiScheduleEditor.js'); @@ -21,6 +24,37 @@ const lastRecordingDateCheckbox = document.getElementById('last-date-checkbox'); const lastRecordingDateLabel = document.getElementById('last-date-label'); const lastRecordingDateInput = document.getElementById('last-date-input'); +const sunriseIntervalLabel = document.getElementById('sunrise-interval-label'); +const sunsetIntervalLabel = document.getElementById('sunset-interval-label'); +const roundingLabel = document.getElementById('rounding-label'); + +const sunModeSelect = document.getElementById('sun-mode-select'); + +const sunCanvas = document.getElementById('sun-canvas'); + +const manualTabButton = document.getElementById('manual-tab-button'); +const sunTabButton = document.getElementById('sun-tab-button'); +const sunTabButtontext = document.getElementById('sun-tab-button-text'); + +/* Sun input controls */ + +const sunIntervalInput = require('./sunIntervalInput.js'); +const coordinateInput = require('./coordinateInput.js'); +const roundingInput = require('./roundingInput.js'); + +/* Previous valid first/last recording dates */ + +let prevFirstDate = dateObjectToFormattedString(new Date()); +let prevLastDate = dateObjectToFormattedString(new Date()); + +function dateObjectToFormattedString (d) { + + const day = ('0' + d.getDate()).slice(-2); + const month = ('0' + (d.getMonth() + 1)).slice(-2); + return d.getFullYear() + '-' + (month) + '-' + (day); + +} + exports.updateTimeZoneStatus = () => { let timeZoneText = 'UTC'; @@ -47,7 +81,7 @@ function startlastRecordingDateError (input) { input.style.border = '1px solid #0000ff'; input.style.color = 'blue'; - setTimeout(function () { + setTimeout(() => { if (!input.disabled) { @@ -62,8 +96,20 @@ function startlastRecordingDateError (input) { } +function checkDateRange (input) { + + input.value = input.value < constants.MIN_FIRST_LAST_DATE ? constants.MIN_FIRST_LAST_DATE : input.value; + input.value = input.value > constants.MAX_FIRST_LAST_DATE ? constants.MAX_FIRST_LAST_DATE : input.value; + +} + function checkDates (startEnd) { + firstRecordingDateInput.value = firstRecordingDateInput.value === '' ? prevFirstDate : firstRecordingDateInput.value; + lastRecordingDateInput.value = lastRecordingDateInput.value === '' ? prevLastDate : lastRecordingDateInput.value; + + checkDateRange(startEnd === 0 ? firstRecordingDateInput : lastRecordingDateInput); + if (firstRecordingDateInput.value > lastRecordingDateInput.value) { if (startEnd === 0) { @@ -80,6 +126,9 @@ function checkDates (startEnd) { } + prevFirstDate = firstRecordingDateInput.value; + prevLastDate = lastRecordingDateInput.value; + } /* Enable/disable start date entry based on checkbox */ @@ -153,6 +202,8 @@ exports.setFirstRecordingDate = (firstRecordingDateEnabled, firstRecordingDate) firstRecordingDateInput.value = firstRecordingDate; + checkDates(0); + }; exports.setLastRecordingDate = (lastRecordingDateEnabled, lastRecordingDate) => { @@ -162,52 +213,193 @@ exports.setLastRecordingDate = (lastRecordingDateEnabled, lastRecordingDate) => lastRecordingDateInput.value = lastRecordingDate; + checkDates(1); + }; -exports.getSchedule = scheduleEditor.getTimePeriods(); +electron.ipcRenderer.on('update-location', (e, latArray, lonArray) => { -/* First/last recording listeners */ + const latInput = document.getElementById('coord-lat-input'); + const lonInput = document.getElementById('coord-lon-input'); -firstRecordingDateInput.addEventListener('focusout', () => { + coordinateInput.setValue(latInput, latArray[0], latArray[1], latArray[2]); + coordinateInput.setValue(lonInput, lonArray[0], lonArray[1], lonArray[2]); - checkDates(0); + sunTabButton.click(); }); -lastRecordingDateInput.addEventListener('focusout', () => { +exports.setSunSettings = (sunScheduleEnabled, latitude, longitude, sunMode, sunPeriods, sunRounding) => { - checkDates(1); + const latInput = document.getElementById('coord-lat-input'); + const lonInput = document.getElementById('coord-lon-input'); -}); + const latDegrees = latitude.degrees >= -90 && latitude.degrees <= 90 ? latitude.degrees : 0; + const latHundredths = latitude.hundredths >= 0 && latitude.hundredths <= 9999 ? latitude.hundredths : 0; -firstRecordingDateCheckbox.addEventListener('change', () => { + const lonDegrees = longitude.degrees >= -180 && longitude.degrees <= 180 ? longitude.degrees : 0; + const lonHundredths = longitude.hundredths >= 0 && longitude.hundredths <= 9999 ? longitude.hundredths : 0; - updateFirstRecordingDateUI(); + coordinateInput.setValue(latInput, latDegrees, latHundredths, latitude.positiveDirection); + coordinateInput.setValue(lonInput, lonDegrees, lonHundredths, longitude.positiveDirection); -}); + sunModeSelect.value = sunMode; -lastRecordingDateCheckbox.addEventListener('change', () => { + const sunriseBeforeIntervalInput = document.getElementById('sunrise-before-interval-input'); + const sunriseAfterIntervalInput = document.getElementById('sunrise-after-interval-input'); - updateLastRecordingDateUI(); + const sunsetBeforeIntervalInput = document.getElementById('sunset-before-interval-input'); + const sunsetAfterIntervalInput = document.getElementById('sunset-after-interval-input'); -}); + sunIntervalInput.setValue(sunriseBeforeIntervalInput, sunPeriods.sunriseBefore); + sunIntervalInput.setValue(sunriseAfterIntervalInput, sunPeriods.sunriseAfter); + sunIntervalInput.setValue(sunsetBeforeIntervalInput, sunPeriods.sunsetBefore); + sunIntervalInput.setValue(sunsetAfterIntervalInput, sunPeriods.sunsetAfter); -firstRecordingDateLabel.addEventListener('click', () => { + const sunRoundingInput = document.getElementById('sun-rounding-input'); - firstRecordingDateCheckbox.toggleAttribute('checked'); - updateFirstRecordingDateUI(); + roundingInput.setValue(sunRoundingInput, sunRounding); -}); + if (sunScheduleEnabled) { -lastRecordingDateLabel.addEventListener('click', () => { + sunTabButton.click(); - lastRecordingDateCheckbox.toggleAttribute('checked'); - updateLastRecordingDateUI(); + } else { -}); + manualTabButton.click(); + + } + +}; + +exports.getLatitude = () => { + + const latInput = document.getElementById('coord-lat-input'); + const lat = coordinateInput.getValue(latInput); + + return { + degrees: lat[0], + hundredths: lat[1], + positiveDirection: lat[2] + }; + +}; + +exports.getLongitude = () => { + + const lonInput = document.getElementById('coord-lon-input'); + const lon = coordinateInput.getValue(lonInput); + + return { + degrees: lon[0], + hundredths: lon[1], + positiveDirection: lon[2] + }; + +}; + +exports.getSunMode = () => { + + return parseInt(sunModeSelect.value); + +}; + +exports.getSunPeriods = () => { + + const sunriseBeforeIntervalInput = document.getElementById('sunrise-before-interval-input'); + const sunriseAfterIntervalInput = document.getElementById('sunrise-after-interval-input'); + + const sunsetBeforeIntervalInput = document.getElementById('sunset-before-interval-input'); + const sunsetAfterIntervalInput = document.getElementById('sunset-after-interval-input'); + + return { + sunriseBefore: sunIntervalInput.getValue(sunriseBeforeIntervalInput), + sunriseAfter: sunIntervalInput.getValue(sunriseAfterIntervalInput), + sunsetBefore: sunIntervalInput.getValue(sunsetBeforeIntervalInput), + sunsetAfter: sunIntervalInput.getValue(sunsetAfterIntervalInput) + }; + +}; + +exports.getSunRounding = () => { + + const sunRoundingInput = document.getElementById('sun-rounding-input'); + return roundingInput.getValue(sunRoundingInput); + +}; exports.updateTimeList = uiScheduleEditor.updateTimeList; +function updateSunDefinitionUI (index) { + + switch (index) { + + case constants.SUNRISE_AND_SUNSET: + sunModeSelect.options[0].innerHTML = 'Sunrise'; + sunModeSelect.options[1].innerHTML = 'Sunset'; + sunModeSelect.options[2].innerHTML = 'Sunrise and Sunset'; + sunModeSelect.options[3].innerHTML = 'Sunset to Sunrise'; + sunModeSelect.options[4].innerHTML = 'Sunrise to Sunset'; + + sunriseIntervalLabel.innerHTML = 'Sunrise interval - before and after (mins):'; + sunsetIntervalLabel.innerHTML = 'Sunset interval - before and after (mins):'; + roundingLabel.innerHTML = 'Sunrise/sunset rounding (mins):'; + + sunTabButtontext.innerHTML = 'Sunrise/sunset'; + + break; + + case constants.CIVIL_DAWN_AND_DUSK: + sunModeSelect.options[0].innerHTML = 'Civil Dawn'; + sunModeSelect.options[1].innerHTML = 'Civil Dusk'; + sunModeSelect.options[2].innerHTML = 'Civil Dawn and Dusk'; + sunModeSelect.options[3].innerHTML = 'Civil Dusk to Dawn'; + sunModeSelect.options[4].innerHTML = 'Civil Dawn to Dusk'; + + sunriseIntervalLabel.innerHTML = 'Dawn interval - before and after (mins):'; + sunsetIntervalLabel.innerHTML = 'Dusk interval - before and after (mins):'; + roundingLabel.innerHTML = 'Dawn/dusk rounding (mins):'; + + sunTabButtontext.innerHTML = 'Dawn/dusk'; + + break; + + case constants.NAUTICAL_DAWN_AND_DUSK: + sunModeSelect.options[0].innerHTML = 'Nautical Dawn'; + sunModeSelect.options[1].innerHTML = 'Nautical Dusk'; + sunModeSelect.options[2].innerHTML = 'Nautical Dawn and Dusk'; + sunModeSelect.options[3].innerHTML = 'Nautical Dusk to Dawn'; + sunModeSelect.options[4].innerHTML = 'Nautical Dawn to Dusk'; + + sunriseIntervalLabel.innerHTML = 'Dawn interval - before and after (mins):'; + sunsetIntervalLabel.innerHTML = 'Dusk interval - before and after (mins):'; + roundingLabel.innerHTML = 'Dawn/dusk rounding (mins):'; + + sunTabButtontext.innerHTML = 'Dawn/dusk'; + + break; + + case constants.ASTRONOMICAL_DAWN_AND_DUSK: + sunModeSelect.options[0].innerHTML = 'Astro Dawn'; + sunModeSelect.options[1].innerHTML = 'Astro Dusk'; + sunModeSelect.options[2].innerHTML = 'Astro Dawn and Dusk'; + sunModeSelect.options[3].innerHTML = 'Astro Dusk to Dawn'; + sunModeSelect.options[4].innerHTML = 'Astro Dawn to Dusk'; + + sunriseIntervalLabel.innerHTML = 'Dawn interval - before and after (mins):'; + sunsetIntervalLabel.innerHTML = 'Dusk interval - before and after (mins):'; + roundingLabel.innerHTML = 'Dawn/dusk rounding (mins):'; + + sunTabButtontext.innerHTML = 'Dawn/dusk'; + + break; + + } + +} + +exports.updateSunDefinitionUI = updateSunDefinitionUI; + /* Prepare UI */ exports.prepareUI = (changeFunction) => { @@ -228,7 +420,91 @@ exports.prepareUI = (changeFunction) => { ui.disableTimeDisplay(); ui.showTime(); + /* Add event listeners for changing schedule modes */ + + manualTabButton.addEventListener('click', () => { + + sunCanvas.style.display = 'none'; + ui.update(); + changeFunction(); + + }); + + sunTabButton.addEventListener('click', () => { + + sunCanvas.style.display = ''; + ui.update(); + changeFunction(); + + }); + + sunModeSelect.addEventListener('change', changeFunction); + + electron.ipcRenderer.on('sun-definition-change', (e, index) => { + + updateSunDefinitionUI(index); + + ui.update(); + changeFunction(); + + }); + + /* First/last recording listeners */ + + firstRecordingDateInput.addEventListener('focusout', () => { + + checkDates(0); + + /* Slight delay to handle if you go from changing the start date to unchecking the first date checkbox */ + + setTimeout(() => { + + if (firstRecordingDateCheckbox.checked) { + + ui.update(); + changeFunction(); + + } + + }, 100); + + }); + + lastRecordingDateInput.addEventListener('focusout', () => { + + checkDates(1); + + }); + + firstRecordingDateCheckbox.addEventListener('change', () => { + + ui.update(); + updateFirstRecordingDateUI(); + changeFunction(); + + }); + + lastRecordingDateCheckbox.addEventListener('change', () => { + + updateLastRecordingDateUI(); + + }); + + firstRecordingDateLabel.addEventListener('click', () => { + + firstRecordingDateCheckbox.toggleAttribute('checked'); + updateFirstRecordingDateUI(); + changeFunction(); + + }); + + lastRecordingDateLabel.addEventListener('click', () => { + + lastRecordingDateCheckbox.toggleAttribute('checked'); + updateLastRecordingDateUI(); + + }); + }; exports.addTime = scheduleEditor.addTime; -exports.clearTimes = scheduleEditor.clearTimes; diff --git a/schedule/uiScheduleEditor.js b/schedule/uiScheduleEditor.js index e6358c3..bb4c553 100644 --- a/schedule/uiScheduleEditor.js +++ b/schedule/uiScheduleEditor.js @@ -4,12 +4,15 @@ * November 2019 *****************************************************************************/ +/* global Event */ + const electron = require('electron'); const ariaSpeak = require('../ariaSpeak.js'); const schedule = require('../schedule/schedule.js'); const scheduleEditor = require('./scheduleEditor.js'); +const scheduleBar = require('../scheduleBar.js'); const timeHandler = require('../timeHandler.js'); const ui = require('../ui.js'); const timeInput = require('./timeInput.js'); @@ -60,11 +63,13 @@ function addTimeOnClick () { ariaSpeak.speak(pad(startHours) + ':' + pad(startMins) + ' to ' + pad(endHours) + ':' + pad(endMins)); - scheduleEditor.formatAndAddTime(startTimestamp, endTimestamp); + let timePeriods = schedule.getTimePeriods(); + timePeriods = scheduleEditor.formatAndAddTime(startTimestamp, endTimestamp, timePeriods); + schedule.setTimePeriods(timePeriods); - scheduleEditor.updateScheduleBar(); + scheduleBar.updateCanvas(); updateTimeList(); - scheduleEditor.clearSelectedPeriod(); + scheduleBar.clearSelectedPeriod(); } @@ -78,7 +83,7 @@ function getTimePeriodFromList () { }; /* Allows time list to display 24:00 as 0:00 */ - timePeriod.endMins = (timePeriod.endMins === 0) ? 1440 : 0; + timePeriod.endMins = (timePeriod.endMins === 0) ? constants.MINUTES_IN_DAY : 0; return timePeriod; @@ -107,10 +112,10 @@ function removeTimeOnClick () { schedule.setTimePeriods(timePeriods); - scheduleEditor.updateScheduleBar(); + scheduleBar.updateCanvas(); updateTimeList(); removeTimeButton.disabled = true; - scheduleEditor.clearSelectedPeriod(); + scheduleBar.clearSelectedPeriod(); } @@ -144,7 +149,7 @@ function updateTimeList () { const startMins = tp[i].startMins; let endMins = tp[i].endMins; - endMins = endMins === 0 ? 1440 : endMins; + endMins = endMins === 0 ? constants.MINUTES_IN_DAY : endMins; const timeZoneText = '(' + timeHandler.getTimeZoneText() + ')'; @@ -157,7 +162,7 @@ function updateTimeList () { /* Disable or enable action buttons in response to number time periods entered */ - addTimeButton.disabled = (tp.length >= schedule.MAX_PERIODS); + addTimeButton.disabled = (tp.length >= constants.MAX_PERIODS); clearTimeButton.disabled = (tp.length === 0); updateLifeDisplayOnChange(); @@ -170,10 +175,11 @@ electron.ipcRenderer.on('update-schedule', updateTimeList); function clearTimesOnClick () { - scheduleEditor.clearTimes(); + schedule.setTimePeriods([]); + scheduleBar.updateCanvas(); updateTimeList(); removeTimeButton.disabled = true; - scheduleEditor.clearSelectedPeriod(); + scheduleBar.clearSelectedPeriod(); } @@ -199,11 +205,11 @@ exports.prepareUI = (changeFunction) => { const valueSplit = timeList.value.split(','); const selectedTimePeriod = {startMins: parseInt(valueSplit[0]), endMins: parseInt(valueSplit[1])}; - scheduleEditor.setSelectedPeriod(selectedTimePeriod); + scheduleBar.setSelectedPeriod(selectedTimePeriod); } else { - scheduleEditor.clearSelectedPeriod(); + scheduleBar.clearSelectedPeriod(); } @@ -212,3 +218,11 @@ exports.prepareUI = (changeFunction) => { timeInput.setValue(endTimeInput, 24, 0); }; + +scheduleBar.prepareScheduleCanvas((selectedIndex) => { + + timeList.options.selectedIndex = selectedIndex; + timeList.focus(); + timeList.dispatchEvent(new Event('change')); + +}); diff --git a/schedule/uiSun.js b/schedule/uiSun.js new file mode 100644 index 0000000..8317784 --- /dev/null +++ b/schedule/uiSun.js @@ -0,0 +1,506 @@ +/**************************************************************************** + * uiSun.js + * openacousticdevices.info + * January 2024 + *****************************************************************************/ + +const electron = require('electron'); +const {ipcRenderer} = require('electron'); +const {dialog, BrowserWindow} = require('@electron/remote'); + +const constants = require('../constants.js'); +const timeHandler = require('../timeHandler.js'); +const calculateSunriseSunset = require('./calculateSunriseSunset.js'); +const scheduleEditor = require('./scheduleEditor.js'); +const ui = require('../ui.js'); + +let scaleFactor = 1; + +const sunCanvas = document.getElementById('sun-canvas'); +const sunContext = sunCanvas.getContext('2d'); + +const sunTab = document.getElementById('sun-tab'); + +const coordinateInput = require('./coordinateInput.js'); +const sunIntervalInput = require('./sunIntervalInput.js'); +const roundingInput = require('./roundingInput.js'); + +let latInput; +let lonInput; + +let sunriseBeforeIntervalInput; +let sunriseAfterIntervalInput; + +let sunsetBeforeIntervalInput; +let sunsetAfterIntervalInput; + +const sunModeSelect = document.getElementById('sun-mode-select'); + +let sunRoundingInput; + +const firstRecordingDateCheckbox = document.getElementById('first-date-checkbox'); +const firstRecordingDateInput = document.getElementById('first-date-input'); + +const mapButton = document.getElementById('map-button'); + +function updateMapWindow () { + + const lat = coordinateInput.getValue(latInput); + const lon = coordinateInput.getValue(lonInput); + + electron.ipcRenderer.send('update-location-sub-window', lat, lon); + +} + +exports.updateMapWindow = updateMapWindow; + +exports.prepareUI = (updateFunction) => { + + /* Prepare scale factor for drawing sunrise/sunset lines */ + + scaleFactor = 1; + + if (Object.prototype.hasOwnProperty.call(window, 'devicePixelRatio')) { + + if (window.devicePixelRatio > 1) { + + scaleFactor = window.devicePixelRatio; + + } + + } + + /* Co-ordinate inputs */ + + latInput = coordinateInput.create('coord-lat-input', true, true, () => { + + updateMapWindow(); + updateFunction(); + + }); + + lonInput = coordinateInput.create('coord-lon-input', false, true, () => { + + updateMapWindow(); + updateFunction(); + + }); + + /* Define the next elements which tab navigation would jump to. This allows inputs to know whether or not to start from the final field if shift-tabbed to */ + + const lonTextInput = coordinateInput.getTextInput(lonInput); + coordinateInput.setNextElements(latInput, [lonTextInput]); + coordinateInput.setNextElements(lonInput, [mapButton]); + + coordinateInput.setValue(latInput, 0, 0, true); + coordinateInput.setValue(lonInput, 0, 0, true); + + /* Interval inputs */ + + sunriseBeforeIntervalInput = sunIntervalInput.create('sunrise-before-interval-input', false, updateFunction); + sunriseAfterIntervalInput = sunIntervalInput.create('sunrise-after-interval-input', false, updateFunction); + + sunsetBeforeIntervalInput = sunIntervalInput.create('sunset-before-interval-input', false, updateFunction); + sunsetAfterIntervalInput = sunIntervalInput.create('sunset-after-interval-input', false, updateFunction); + + sunIntervalInput.setValue(sunriseBeforeIntervalInput, 60); + sunIntervalInput.setValue(sunriseAfterIntervalInput, 60); + sunIntervalInput.setValue(sunsetBeforeIntervalInput, 60); + sunIntervalInput.setValue(sunsetAfterIntervalInput, 60); + + /* Rounding input */ + + sunRoundingInput = roundingInput.create('sun-rounding-input', updateFunction); + + roundingInput.setValue(sunRoundingInput, 5); + + /* Prepare other UI */ + + sunModeSelect.addEventListener('change', updateSunUI); + + mapButton.addEventListener('click', () => { + + if (!navigator.onLine) { + + console.error('Cannot open map view. No internet connection'); + + dialog.showMessageBox(BrowserWindow.getFocusedWindow(), { + type: 'error', + title: 'Cannot open map view', + message: 'Cannot open map due to lack of internet connection. Check your connection and try again.' + }); + + return; + + } + + const lat = coordinateInput.getValue(latInput); + const lon = coordinateInput.getValue(lonInput); + + electron.ipcRenderer.send('open-map-window', lat, lon); + + }); + +}; + +exports.usingSunSchedule = () => { + + return sunTab.classList.contains('active'); + +}; + +exports.getMode = () => { + + return parseInt(sunModeSelect.value); + +}; + +exports.getBeforeSunriseMins = () => { + + return sunIntervalInput.getValue(sunriseBeforeIntervalInput); + +}; + +exports.getAfterSunriseMins = () => { + + return sunIntervalInput.getValue(sunriseAfterIntervalInput); + +}; + +exports.getBeforeSunsetMins = () => { + + return sunIntervalInput.getValue(sunsetBeforeIntervalInput); + +}; + +exports.getAfterSunsetMins = () => { + + return sunIntervalInput.getValue(sunsetAfterIntervalInput); + +}; + +function getSunriseSunset () { + + const d = firstRecordingDateCheckbox.checked ? new Date(firstRecordingDateInput.value) : new Date(); + + const year = d.getUTCFullYear(); + const month = d.getUTCMonth(); + const day = d.getUTCDate(); + + const latValue = coordinateInput.getValue(latInput); + const latDegrees = latValue[0]; + const latHundredths = latValue[1]; + const latDirection = latValue[2]; + + const lonValue = coordinateInput.getValue(lonInput); + const lonDegrees = lonValue[0]; + const lonHundredths = lonValue[1]; + const lonDirection = lonValue[2]; + + const sunDefinitionIndex = ipcRenderer.sendSync('request-sun-definition-index'); + + return calculateSunriseSunset.calculate(sunDefinitionIndex, year, month, day, latDegrees, latHundredths, latDirection, lonDegrees, lonHundredths, lonDirection); + +} + +function drawPeriod (startMins, endMins) { + + sunContext.fillStyle = '#FF0000'; + + /* width / 1440 minutes */ + const recX = startMins * sunCanvas.width / constants.MINUTES_IN_DAY; + const recLen = (endMins - startMins) * sunCanvas.width / constants.MINUTES_IN_DAY; + + sunContext.fillRect(Math.round(recX), 0, Math.round(recLen), sunCanvas.height); + +} + +function updateCanvas (trend, sunriseMins, sunsetMins) { + + const roundingMins = roundingInput.getValue(sunRoundingInput); + + let roundedSunriseMins = roundingMins > 0 ? roundingMins * Math.round(sunriseMins / roundingMins) : sunriseMins; + let roundedSunsetMins = roundingMins > 0 ? roundingMins * Math.round(sunsetMins / roundingMins) : sunsetMins; + + const offset = timeHandler.getTimeZoneOffset(); + + roundedSunriseMins = (constants.MINUTES_IN_DAY + roundedSunriseMins + offset) % constants.MINUTES_IN_DAY; + roundedSunsetMins = (constants.MINUTES_IN_DAY + roundedSunsetMins + offset) % constants.MINUTES_IN_DAY; + + const sunriseX = Math.round(roundedSunriseMins * sunCanvas.width / constants.MINUTES_IN_DAY); + const sunsetX = Math.round(roundedSunsetMins * sunCanvas.width / constants.MINUTES_IN_DAY); + + /* Draw grey area to represent the night */ + + sunContext.clearRect(0, 0, sunCanvas.width, sunCanvas.height); + + sunContext.fillStyle = '#C3C3C3'; + + if (ui.isNightMode()) { + + sunContext.fillRect(0, 0, sunCanvas.width, sunCanvas.height); + + sunContext.fillStyle = '#000000'; + + } + + if (roundedSunriseMins === roundedSunsetMins) { + + if (trend === constants.DAY_SHORTER_THAN_NIGHT) { + + sunContext.fillRect(0, 0, sunCanvas.width, sunCanvas.height); + + } + + } else if (roundedSunriseMins < roundedSunsetMins) { + + sunContext.fillRect(sunsetX, 0, sunCanvas.width - sunsetX, sunCanvas.height); + sunContext.fillRect(0, 0, sunriseX, sunCanvas.height); + + } else { + + sunContext.fillRect(sunsetX, 0, sunriseX - sunsetX, sunCanvas.height); + + } + + /* Draw recording periods */ + + const recordingPeriods = getRecordingPeriods(); + + for (let i = 0; i < recordingPeriods.length; i++) { + + const startMins = recordingPeriods[i].startMins; + let endMins = recordingPeriods[i].endMins; + endMins = endMins === 0 ? constants.MINUTES_IN_DAY : endMins; + + if (startMins > endMins) { + + drawPeriod(startMins, constants.MINUTES_IN_DAY); + drawPeriod(0, endMins); + + } else if (startMins === endMins) { + + drawPeriod(0, constants.MINUTES_IN_DAY); + + } else { + + drawPeriod(startMins, endMins); + + } + + } + + /* Draw sunrise and sunset markers */ + + sunContext.fillStyle = '#B30000'; + sunContext.fillRect(Math.floor(sunriseX), 0, 2 * scaleFactor, sunCanvas.height); + sunContext.fillRect(Math.floor(sunsetX), 0, 2 * scaleFactor, sunCanvas.height); + +} + +function updateSunUI () { + + updateSunRecordingMode(); + + const [solution, trend, sunrise, sunset] = getSunriseSunset(); + + updateCanvas(trend, sunrise, sunset); + +} + +exports.updateSunUI = updateSunUI; + +function updateSunRecordingMode () { + + const mode = parseInt(sunModeSelect.value); + + switch (mode) { + + case constants.MODE_BEFORE_SUNRISE_AFTER_SUNRISE: + sunIntervalInput.setEnabled(sunriseBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunriseAfterIntervalInput, true); + + sunIntervalInput.setEnabled(sunsetBeforeIntervalInput, false); + sunIntervalInput.setEnabled(sunsetAfterIntervalInput, false); + + break; + + case constants.MODE_BEFORE_SUNSET_AFTER_SUNSET: + sunIntervalInput.setEnabled(sunriseBeforeIntervalInput, false); + sunIntervalInput.setEnabled(sunriseAfterIntervalInput, false); + + sunIntervalInput.setEnabled(sunsetBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunsetAfterIntervalInput, true); + + break; + + case constants.MODE_BEFORE_BOTH_AFTER_BOTH: + sunIntervalInput.setEnabled(sunriseBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunriseAfterIntervalInput, true); + + sunIntervalInput.setEnabled(sunsetBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunsetAfterIntervalInput, true); + + break; + + case constants.MODE_BEFORE_SUNSET_AFTER_SUNRISE: + sunIntervalInput.setEnabled(sunriseBeforeIntervalInput, false); + sunIntervalInput.setEnabled(sunriseAfterIntervalInput, true); + + sunIntervalInput.setEnabled(sunsetBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunsetAfterIntervalInput, false); + + break; + + case constants.MODE_BEFORE_SUNRISE_AFTER_SUNSET: + sunIntervalInput.setEnabled(sunriseBeforeIntervalInput, true); + sunIntervalInput.setEnabled(sunriseAfterIntervalInput, false); + + sunIntervalInput.setEnabled(sunsetBeforeIntervalInput, false); + sunIntervalInput.setEnabled(sunsetAfterIntervalInput, true); + + break; + + } + +} + +function getRecordingPeriods () { + + const [solution, trend, sunriseMins, sunsetMins] = getSunriseSunset(); + + const sunMode = parseInt(sunModeSelect.value); + + const roundingMins = roundingInput.getValue(sunRoundingInput); + + const sunriseBeforeMins = sunIntervalInput.getValue(sunriseBeforeIntervalInput); + const sunriseAfterMins = sunIntervalInput.getValue(sunriseAfterIntervalInput); + const sunsetBeforeMins = sunIntervalInput.getValue(sunsetBeforeIntervalInput); + const sunsetAfterMins = sunIntervalInput.getValue(sunsetAfterIntervalInput); + + const MINIMUM_RECORDING_GAP = Math.max(constants.MINIMUM_SUN_RECORDING_GAP, constants.SUN_RECORDING_GAP_MULTIPLIER * roundingMins); + + const MAXIMUM_RECORDING_DURATION = constants.MINUTES_IN_DAY - MINIMUM_RECORDING_GAP; + + // Calculate rounded sunrise and sunset minutes + + let roundedSunriseMins = roundingMins > 0 ? roundingMins * Math.round(sunriseMins / roundingMins) : sunriseMins; + let roundedSunsetMins = roundingMins > 0 ? roundingMins * Math.round(sunsetMins / roundingMins) : sunsetMins; + + // Correct to local time + + const offset = timeHandler.getTimeZoneOffset(); + + roundedSunriseMins += offset; + roundedSunsetMins += offset; + + if (roundedSunriseMins < 0) roundedSunriseMins += constants.MINUTES_IN_DAY; + if (roundedSunsetMins < 0) roundedSunsetMins += constants.MINUTES_IN_DAY; + + roundedSunriseMins = roundedSunriseMins % constants.MINUTES_IN_DAY; + roundedSunsetMins = roundedSunsetMins % constants.MINUTES_IN_DAY; + + // Calculate intervals before and after sunrise and sunset + + const beforeSunrise = (constants.MINUTES_IN_DAY + roundedSunriseMins - sunriseBeforeMins) % constants.MINUTES_IN_DAY; + const afterSunrise = (constants.MINUTES_IN_DAY + roundedSunriseMins + sunriseAfterMins) % constants.MINUTES_IN_DAY; + const beforeSunset = (constants.MINUTES_IN_DAY + roundedSunsetMins - sunsetBeforeMins) % constants.MINUTES_IN_DAY; + const afterSunset = (constants.MINUTES_IN_DAY + roundedSunsetMins + sunsetAfterMins) % constants.MINUTES_IN_DAY; + + // Calculate sunrise and sunset recording periods + + let timePeriods = []; + + if (sunMode === constants.MODE_BEFORE_SUNRISE_AFTER_SUNRISE || sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH) { + + if (sunriseBeforeMins > 0 || sunriseAfterMins > 0) timePeriods = scheduleEditor.addTime(beforeSunrise, afterSunrise, timePeriods); + + } + + if (sunMode === constants.MODE_BEFORE_SUNSET_AFTER_SUNSET || sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH) { + + if (sunsetBeforeMins > 0 || sunsetAfterMins > 0) timePeriods = scheduleEditor.addTime(beforeSunset, afterSunset, timePeriods); + + } + + if (sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH) { + + if (timePeriods.length === 1) { + + const duration = timePeriods[0].endMins <= timePeriods[0].startMins ? constants.MINUTES_IN_DAY + timePeriods[0].endMins - timePeriods[0].startMins : timePeriods[0].endMins - timePeriods[0].startMins; + + if (duration > MAXIMUM_RECORDING_DURATION) timePeriods = scheduleEditor.addTime(timePeriods[0].startMins, (timePeriods[0].startMins + MAXIMUM_RECORDING_DURATION) % constants.MINUTES_IN_DAY, []); + + } else if (timePeriods.length === 2) { + + const gapFromFirstPeriodToSecondPeriod = timePeriods[1].startMins - timePeriods[0].endMins; + + const gapFromSecondPeriodsToFirstPeriod = timePeriods[1].endMins < timePeriods[1].startMins ? timePeriods[0].startMins - timePeriods[1].endMins : constants.MINUTES_IN_DAY + timePeriods[0].startMins - timePeriods[1].endMins; + + if (gapFromFirstPeriodToSecondPeriod >= gapFromSecondPeriodsToFirstPeriod && gapFromFirstPeriodToSecondPeriod < MINIMUM_RECORDING_GAP) { + + let newTimePeriods = scheduleEditor.addTime(timePeriods[1].startMins, timePeriods[1].endMins, []); + + newTimePeriods = scheduleEditor.addTime(timePeriods[0].startMins, (constants.MINUTES_IN_DAY + timePeriods[0].endMins - MINIMUM_RECORDING_GAP + gapFromFirstPeriodToSecondPeriod) % constants.MINUTES_IN_DAY, newTimePeriods); + + timePeriods = newTimePeriods; + + } else if (gapFromSecondPeriodsToFirstPeriod >= gapFromFirstPeriodToSecondPeriod && gapFromSecondPeriodsToFirstPeriod < MINIMUM_RECORDING_GAP) { + + let newTimePeriods = scheduleEditor.addTime(timePeriods[0].startMins, timePeriods[0].endMins, []); + + newTimePeriods = scheduleEditor.addTime(timePeriods[1].startMins, (constants.MINUTES_IN_DAY + timePeriods[1].endMins - MINIMUM_RECORDING_GAP + gapFromSecondPeriodsToFirstPeriod) % constants.MINUTES_IN_DAY, newTimePeriods); + + timePeriods = newTimePeriods; + + } + + } + + } + + if (sunMode === constants.MODE_BEFORE_SUNSET_AFTER_SUNRISE) { + + let timeFromSunsetToSunrise; + + if (roundedSunriseMins === roundedSunsetMins) { + + timeFromSunsetToSunrise = trend === constants.DAY_SHORTER_THAN_NIGHT ? constants.MINUTES_IN_DAY : 0; + + } else { + + timeFromSunsetToSunrise = roundedSunriseMins < roundedSunsetMins ? constants.MINUTES_IN_DAY + roundedSunriseMins - roundedSunsetMins : roundedSunriseMins - roundedSunsetMins; + + } + + const duration = timeFromSunsetToSunrise + sunsetBeforeMins + sunriseAfterMins; + + if (duration > 0) timePeriods = scheduleEditor.addTime(beforeSunset, duration <= MAXIMUM_RECORDING_DURATION ? afterSunrise : (beforeSunset + MAXIMUM_RECORDING_DURATION) % constants.MINUTES_IN_DAY, timePeriods); + + } + + if (sunMode === constants.MODE_BEFORE_SUNRISE_AFTER_SUNSET) { + + let timeFromSunriseToSunset; + + if (roundedSunriseMins === roundedSunsetMins) { + + timeFromSunriseToSunset = trend === constants.DAY_LONGER_THAN_NIGHT ? constants.MINUTES_IN_DAY : 0; + + } else { + + timeFromSunriseToSunset = roundedSunsetMins < roundedSunriseMins ? constants.MINUTES_IN_DAY + roundedSunsetMins - roundedSunriseMins : roundedSunsetMins - roundedSunriseMins; + + } + + const duration = timeFromSunriseToSunset + sunriseBeforeMins + sunsetAfterMins; + + if (duration > 0) timePeriods = scheduleEditor.addTime(beforeSunrise, duration <= MAXIMUM_RECORDING_DURATION ? afterSunset : (beforeSunrise + MAXIMUM_RECORDING_DURATION) % constants.MINUTES_IN_DAY, timePeriods); + + } + + return timePeriods; + +} + +exports.getRecordingPeriods = getRecordingPeriods; diff --git a/scheduleBar.js b/scheduleBar.js index 6ab00f9..fafe58f 100644 --- a/scheduleBar.js +++ b/scheduleBar.js @@ -12,12 +12,17 @@ const ui = require('./ui.js'); const timeHandler = require('./timeHandler.js'); const schedule = require('./schedule/schedule.js'); const constants = require('./constants.js'); +const uiSun = require('./schedule/uiSun.js'); const timeCanvas = document.getElementById('time-canvas'); const timeContext = timeCanvas.getContext('2d'); const labelCanvas = document.getElementById('label-canvas'); const labelContext = labelCanvas.getContext('2d'); +let scaleFactor; + +const sunCanvas = document.getElementById('sun-canvas'); + let clickCallback; let selectedPeriod = null; @@ -26,7 +31,7 @@ let selectedPeriod = null; function rescale (canvas) { - let scaleFactor = 1; + scaleFactor = 1; if (Object.prototype.hasOwnProperty.call(window, 'devicePixelRatio')) { @@ -53,10 +58,10 @@ function rescale (canvas) { function drawPeriod (startMins, endMins, timeCanvas) { /* width / 1440 minutes */ - const recX = startMins * timeCanvas.width / 1440; - const recLen = (endMins - startMins) * timeCanvas.width / 1440; + const recX = startMins * timeCanvas.width / constants.MINUTES_IN_DAY; + const recLen = (endMins - startMins) * timeCanvas.width / constants.MINUTES_IN_DAY; - timeContext.fillRect(recX, 0, recLen, timeCanvas.height); + timeContext.fillRect(Math.round(recX), 0, Math.round(recLen), timeCanvas.height); } @@ -76,34 +81,42 @@ function updateCanvas () { timeContext.clearRect(0, 0, timeCanvas.width, timeCanvas.height); - for (let i = 0; i < timePeriods.length; i++) { + if (uiSun.usingSunSchedule()) { - const startMins = timePeriods[i].startMins; - let endMins = timePeriods[i].endMins; - endMins = endMins === 0 ? 1440 : endMins; + uiSun.updateSunUI(); - if (selectedPeriod !== null && (selectedPeriod.startMins === startMins && selectedPeriod.endMins === endMins)) { + } else { - timeContext.fillStyle = '#007BFF'; + for (let i = 0; i < timePeriods.length; i++) { - } else { + const startMins = timePeriods[i].startMins; + let endMins = timePeriods[i].endMins; + endMins = endMins === 0 ? constants.MINUTES_IN_DAY : endMins; - timeContext.fillStyle = '#FF0000'; + if (selectedPeriod !== null && (selectedPeriod.startMins === startMins && selectedPeriod.endMins === endMins)) { - } + timeContext.fillStyle = '#007BFF'; - if (startMins > endMins) { + } else { + + timeContext.fillStyle = '#FF0000'; - drawPeriod(startMins, 1440, timeCanvas); - drawPeriod(0, endMins, timeCanvas); + } - } else if (startMins === endMins) { + if (startMins > endMins) { - drawPeriod(0, 1440, timeCanvas); + drawPeriod(startMins, constants.MINUTES_IN_DAY, timeCanvas); + drawPeriod(0, endMins, timeCanvas); - } else { + } else if (startMins === endMins) { + + drawPeriod(0, constants.MINUTES_IN_DAY, timeCanvas); - drawPeriod(startMins, endMins, timeCanvas); + } else { + + drawPeriod(startMins, endMins, timeCanvas); + + } } @@ -121,9 +134,9 @@ function updateCanvas () { } - timeContext.fillRect(0.25 * timeCanvas.width, 0, 0.002 * timeCanvas.width, timeCanvas.height); - timeContext.fillRect(0.5 * timeCanvas.width, 0, 0.002 * timeCanvas.width, timeCanvas.height); - timeContext.fillRect(0.75 * timeCanvas.width, 0, 0.002 * timeCanvas.width, timeCanvas.height); + timeContext.fillRect(Math.round(0.25 * timeCanvas.width), 0, 1 * scaleFactor, timeCanvas.height); + timeContext.fillRect(Math.round(0.5 * timeCanvas.width), 0, 1 * scaleFactor, timeCanvas.height); + timeContext.fillRect(Math.round(0.75 * timeCanvas.width), 0, 1 * scaleFactor, timeCanvas.height); let currentMins = (currentTimeDate.getUTCHours() * constants.MINUTES_IN_HOUR) + currentTimeDate.getUTCMinutes(); @@ -133,10 +146,15 @@ function updateCanvas () { } - const currentX = currentMins * timeCanvas.width / 1440; + let currentX = currentMins * timeCanvas.width / constants.MINUTES_IN_DAY; + + /* Wrap time around midnight at both ends */ + + currentX = currentX % timeCanvas.width; + currentX = currentX < 0 ? currentX + timeCanvas.width : currentX; timeContext.fillStyle = '#00AF00'; - timeContext.fillRect((currentX - 1), 0, 0.004 * timeCanvas.width, timeCanvas.height); + timeContext.fillRect(Math.floor(currentX), 0, 2 * scaleFactor, timeCanvas.height); } @@ -174,7 +192,7 @@ function updateSelectedPeriod (event) { } const rect = timeCanvas.getBoundingClientRect(); - const clickMins = (event.clientX - rect.left) / timeCanvas.width * 1440; + const clickMins = (event.clientX - rect.left) / timeCanvas.width * constants.MINUTES_IN_DAY; if (ui.getTimeZoneMode() !== constants.TIME_ZONE_MODE_UTC) { @@ -191,7 +209,7 @@ function updateSelectedPeriod (event) { if (startMins > endMins) { - if ((clickMins >= startMins && clickMins < 1440) || (clickMins >= 0 && clickMins < endMins)) { + if ((clickMins >= startMins && clickMins < constants.MINUTES_IN_DAY) || (clickMins >= 0 && clickMins < endMins)) { selectedIndex = i; @@ -268,11 +286,20 @@ exports.drawTimeLabels = drawTimeLabels; exports.prepareScheduleCanvas = (callback) => { clickCallback = callback; - timeCanvas.addEventListener('click', updateSelectedPeriod); + timeCanvas.addEventListener('click', (event) => { + + if (!uiSun.usingSunSchedule()) { + + updateSelectedPeriod(event); + + } + + }); /* Rescale for resolution of screen */ rescale(timeCanvas); rescale(labelCanvas); + rescale(sunCanvas); /* Draw labels below timeline */ drawTimeLabels(); @@ -292,7 +319,3 @@ exports.setSchedule = (timePeriods) => { updateCanvas(); }; - -exports.getTimePeriods = schedule.getTimePeriods; -exports.getTimePeriodsNoWrap = schedule.getTimePeriodsNoWrap; -exports.MAX_PERIODS = schedule.MAX_PERIODS; diff --git a/settings/uiFiltering.js b/settings/uiFiltering.js index 479312b..2438e45 100644 --- a/settings/uiFiltering.js +++ b/settings/uiFiltering.js @@ -1488,42 +1488,36 @@ function prepareUI (changeFunction, checkRecordingDurationFunction, filterValueC bandPassFilterSlider.on('change', () => { updateFilterLabel(); - ariaSpeak.speak(filterLabel.textContent.replace('kHz', 'kilohertz')); }); lowPassFilterSlider.on('change', () => { updateFilterLabel(); - ariaSpeak.speak(filterLabel.textContent.replace('kHz', 'kilohertz')); }); highPassFilterSlider.on('change', () => { updateFilterLabel(); - ariaSpeak.speak(filterLabel.textContent.replace('kHz', 'kilohertz')); }); amplitudeThresholdSlider.on('change', () => { updateThresholdLabel(); - ariaSpeak.speak(thresholdLabel.textContent.replace('kHz', 'kilohertz')); }); goertzelThresholdSlider.on('change', () => { updateThresholdLabel(); - ariaSpeak.speak(thresholdLabel.textContent.replace('kHz', 'kilohertz')); }); goertzelFilterCentreSlider.on('change', () => { updateThresholdLabel(); - ariaSpeak.speak(goertzelFilterLabel.textContent.replace('kHz', 'kilohertz')); }); diff --git a/settings/uiSettings.js b/settings/uiSettings.js index 8dbc0de..78ae014 100644 --- a/settings/uiSettings.js +++ b/settings/uiSettings.js @@ -15,6 +15,8 @@ const splitDurationInput = require('./splitDurationInput.js'); /* UI components */ +const sunTab = document.getElementById('sun-tab'); + const sampleRadioButtons = document.getElementsByName('sample-rate-radio'); const gainRadioButtons = document.getElementsByName('gain-radio'); @@ -204,7 +206,8 @@ exports.getSettings = () => { lowGainRangeEnabled: uiAdvanced.isLowGainRangeEnabled(), disable48DCFilter: uiAdvanced.is48DCFilterDisabled(), timeSettingFromGPSEnabled: uiAdvanced.isTimeSettingFromGPSEnabled(), - magneticSwitchEnabled: uiAdvanced.isMagneticSwitchEnabled() + magneticSwitchEnabled: uiAdvanced.isMagneticSwitchEnabled(), + sunScheduleEnabled: sunTab.classList.contains('active') }; return settings; @@ -221,6 +224,7 @@ exports.getFrequencyFilterThresholdExponentMantissa = uiFiltering.getFrequencyFi exports.fillUI = (settings) => { voltageRangeCheckBox.checked = settings.displayVoltageRange; + updateVoltageRangeCheckboxStatus(); sampleRadioButtons[settings.sampleRateIndex].checked = true; gainRadioButtons[settings.gain].checked = true; @@ -320,7 +324,7 @@ function checkMinimumTriggerTime (recordingLength) { } -function updateVoltageRangeStatus () { +function updateVoltageRangeCheckboxStatus () { if (batteryLevelCheckbox.checked) { @@ -336,6 +340,4 @@ function updateVoltageRangeStatus () { } -exports.updateVoltageRangeStatus = updateVoltageRangeStatus; - -batteryLevelCheckbox.addEventListener('change', updateVoltageRangeStatus); +batteryLevelCheckbox.addEventListener('change', updateVoltageRangeCheckboxStatus); diff --git a/timeHandler.js b/timeHandler.js index e14d848..4dc4b34 100644 --- a/timeHandler.js +++ b/timeHandler.js @@ -65,13 +65,13 @@ function shiftTime (time, toUTC) { timeZoneOffset = toUTC ? timeZoneOffset * -1 : timeZoneOffset; - time = (time + timeZoneOffset) % 1440; + time = (time + timeZoneOffset) % constants.MINUTES_IN_DAY; /* If time zone offset move time over midnight */ if (time < 0) { - time += 1440; + time += constants.MINUTES_IN_DAY; } diff --git a/ui.js b/ui.js index dcf2510..3d1aa9d 100644 --- a/ui.js +++ b/ui.js @@ -50,9 +50,9 @@ function extractDateComponents (dateString) { const day = parseInt(dateArray[2]); return { - year: year, - month: month, - day: day, + year, + month, + day }; } diff --git a/uiIndex.js b/uiIndex.js index 04de505..2280868 100644 --- a/uiIndex.js +++ b/uiIndex.js @@ -18,6 +18,7 @@ const electron = require('electron'); const {dialog, Menu, clipboard, BrowserWindow} = require('@electron/remote'); const ui = require('./ui.js'); +const schedule = require('./schedule/schedule.js'); const scheduleBar = require('./scheduleBar.js'); const saveLoad = require('./saveLoad.js'); const timeHandler = require('./timeHandler.js'); @@ -27,6 +28,7 @@ const constants = require('./constants.js'); const uiSchedule = require('./schedule/uiSchedule.js'); const uiSettings = require('./settings/uiSettings.js'); +const uiSun = require('./schedule/uiSun.js'); const versionChecker = require('./versionChecker.js'); @@ -34,8 +36,6 @@ const THRESHOLD_SCALE_PERCENTAGE = 0; const THRESHOLD_SCALE_16BIT = 1; const THRESHOLD_SCALE_DECIBEL = 2; -const MILLISECONDS_IN_SECOND = 1000; - /* UI components */ const applicationMenu = Menu.getApplicationMenu(); @@ -54,6 +54,8 @@ const batteryLabel = document.getElementById('battery-label'); const ledCheckbox = document.getElementById('led-checkbox'); const batteryLevelCheckbox = document.getElementById('battery-level-checkbox'); +const firstRecordingDateCheckbox = document.getElementById('first-date-checkbox'); + const configureButton = document.getElementById('configure-button'); /* Store version number for packet size checks and description for compatibility check */ @@ -87,6 +89,17 @@ let communicating = false; const MAXIMUM_RETRIES = 10; const DEFAULT_RETRY_INTERVAL = 100; +/* Used for checking clock speed */ + +const MAXIMUM_SECONDS_DRIFT_IN_ONE_DAY = 600; + +const MAXIMUM_ALLOWABLE_AUDIOMOTH_TIME_ERROR = 2; + +let displayedClockError = false; + +let connectionComputerTime = null; +let connectionAudioMothTime = null; + /* Compare two semantic versions and return true if older */ function isOlderSemanticVersion (aVersion, bVersion) { @@ -125,7 +138,7 @@ async function callWithRetry (funcSync, argument, milliseconds, repeats) { try { if (argument) { - + result = await funcSync(argument); } else { @@ -186,6 +199,9 @@ async function getAudioMothPacket () { const date = await callWithRetry(getTime, null, DEFAULT_RETRY_INTERVAL, MAXIMUM_RETRIES); + const nowComputerTime = new Date(); + const nowAudioMothTime = date; + const id = await callWithRetry(getID, null, DEFAULT_RETRY_INTERVAL, MAXIMUM_RETRIES); const description = await callWithRetry(getFirmwareDescription, null, DEFAULT_RETRY_INTERVAL, MAXIMUM_RETRIES); @@ -194,6 +210,41 @@ async function getAudioMothPacket () { const batteryState = await callWithRetry(getBatteryState, null, DEFAULT_RETRY_INTERVAL, MAXIMUM_RETRIES); + /* Compare current date/time object with previous time to make sure clock isn't running too slow/fast */ + + if (communicating === false && displayedClockError === false) { + + if (connectionComputerTime === null || connectionAudioMothTime === null) { + + connectionComputerTime = nowComputerTime; + connectionAudioMothTime = date; + + } + + const computerTimeDiff = nowComputerTime - connectionComputerTime; + + const audioMothTimeDiff = nowAudioMothTime - connectionAudioMothTime; + + const maximumAllowableDrift = Math.floor(MAXIMUM_SECONDS_DRIFT_IN_ONE_DAY * computerTimeDiff / constants.MILLISECONDS_IN_SECOND / constants.SECONDS_IN_DAY); + + const measuredAudioMothDrift = Math.round((computerTimeDiff - audioMothTimeDiff) / constants.MILLISECONDS_IN_SECOND); + + if (Math.abs(measuredAudioMothDrift) > MAXIMUM_ALLOWABLE_AUDIOMOTH_TIME_ERROR && Math.abs(measuredAudioMothDrift) > maximumAllowableDrift) { + + const direction = measuredAudioMothDrift < 0 ? "fast" : "slow"; + + dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), { + type: 'warning', + title: 'Device clock too ' + direction, + message: 'The clock on the connected AudioMoth seems to be running ' + direction + '. This may be a hardware problem.' + }); + + displayedClockError = true; + + } + + } + /* No exceptions have occurred so update display */ if (id !== previousID) { @@ -213,11 +264,11 @@ async function getAudioMothPacket () { const supported = checkVersionCompatibility(); if (communicating === false) { - + ui.updateDate(date); ui.showTime(); - + enableDisplay(); } @@ -236,13 +287,20 @@ async function getAudioMothPacket () { disableDisplay(); + displayedClockError = false; + + connectionComputerTime = null; + connectionAudioMothTime = null; + } - const milliseconds = Date.now() % MILLISECONDS_IN_SECOND; + /* Schedule the next call */ + + const milliseconds = Date.now() % constants.MILLISECONDS_IN_SECOND; - let delay = MILLISECONDS_IN_SECOND / 2 - milliseconds; + let delay = constants.MILLISECONDS_IN_SECOND / 2 - milliseconds; - if (delay < 0) delay += MILLISECONDS_IN_SECOND; + if (delay < 0) delay += constants.MILLISECONDS_IN_SECOND; setTimeout(getAudioMothPacket, delay); @@ -276,19 +334,19 @@ function checkVersionCompatibility () { case constants.FIRMWARE_OFFICIAL_RELEASE: case constants.FIRMWARE_OFFICIAL_RELEASE_CANDIDATE: - + versionWarningTitle = 'Firmware update recommended'; versionWarningText = 'Update to at least version ' + constants.latestFirmwareVersionString + ' of AudioMoth-Firmware-Basic firmware to use all the features of this version of the AudioMoth Configuration App.'; - + break; case constants.FIRMWARE_CUSTOM_EQUIVALENT: - + trueVersionArr = getEquivalentVersion(firmwareDescription); versionWarningTitle = 'Unsupported features'; versionWarningText = 'The firmware installed on your AudioMoth does not allow you to use all the features of this version of the AudioMoth Configuration App.'; - + break; case constants.FIRMWARE_UNSUPPORTED: @@ -298,8 +356,8 @@ function checkVersionCompatibility () { if (firmwareWarningShown === false) { firmwareWarningShown = true; - - setTimeout(function () { + + setTimeout(() => { dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), { type: 'warning', @@ -325,7 +383,7 @@ function checkVersionCompatibility () { versionWarningShown = true; - setTimeout(function () { + setTimeout(() => { dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), { type: 'warning', @@ -460,9 +518,30 @@ async function sendAudioMothPacket (packet) { } -function configureDevice () { +/** + * Fit 4 ten bit values into a 5 byte area of a bvffer + * @param {buffer} buffer Buffer data is to be written to + * @param {integer} start Where in the buffer to start writing + * @param {integer} value1 First value + * @param {integer} value2 Second value + * @param {integer} value3 Third value + * @param {integer} value4 Fourth value + */ +function writeFourTenBitValuesAsFiveBytes (buffer, start, value1, value2, value3, value4) { - ui.disableTimeDisplay(); + buffer[start] = value1 & 0b0011111111; + + buffer[start + 1] = ((value1 & 0b1100000000) >> 8) | ((value2 & 0b0000111111) << 2); + + buffer[start + 2] = ((value2 & 0b1111000000) >> 6) | ((value3 & 0b0000001111) << 4); + + buffer[start + 3] = ((value3 & 0b1111110000) >> 4) | ((value4 & 0b0000000011) << 6); + + buffer[start + 4] = (value4 & 0b1111111100) >> 2; + +} + +function configureDevice () { const USB_LAG = 20; @@ -470,7 +549,7 @@ function configureDevice () { console.log('Configuring device'); - const settings = uiSettings.getSettings(); + const settings = getCurrentConfiguration(); /* Build configuration packet */ @@ -526,42 +605,76 @@ function configureDevice () { packet[index++] = ledCheckbox.checked ? 1 : 0; - let timePeriods; + if (settings.sunScheduleEnabled) { + + let packedValue3 = settings.sunMode & 0b111; + packedValue3 |= (settings.sunDefinition & 0b11) << 3; - if (isOlderSemanticVersion(trueFirmwareVersion, ['1', '9', '0'])) { + packet[index++] = packedValue3; + + let latitude = settings.latitude.degrees * 100 + settings.latitude.hundredths; + latitude *= settings.latitude.positiveDirection ? 1 : -1; + + writeLittleEndianBytes(packet, index, 2, latitude); + index += 2; + + let longitude = settings.longitude.degrees * 100 + settings.longitude.hundredths; + longitude *= settings.longitude.positiveDirection ? 1 : -1; + + writeLittleEndianBytes(packet, index, 2, longitude); + index += 2; - /* If AudioMoth is using a firmware version older than 1.9.0, split any periods which wrap around */ + packet[index++] = settings.sunRounding; - timePeriods = JSON.parse(JSON.stringify(scheduleBar.getTimePeriodsNoWrap())); + const sunPeriods = settings.sunPeriods; + + writeFourTenBitValuesAsFiveBytes(packet, index, sunPeriods.sunriseBefore, sunPeriods.sunriseAfter, sunPeriods.sunsetBefore, sunPeriods.sunsetAfter); + index += 5; + + /* Pad rest of block as normal schedule is 10 bytes longer than sunrise/sunset settings */ + + index += 10; } else { - timePeriods = JSON.parse(JSON.stringify(scheduleBar.getTimePeriods())); + let timePeriods; - } + if (isOlderSemanticVersion(trueFirmwareVersion, ['1', '9', '0'])) { - timePeriods = timeHandler.sortPeriods(timePeriods); + /* If AudioMoth is using a firmware version older than 1.9.0, split any periods which wrap around */ - packet[index++] = timePeriods.length; + timePeriods = JSON.parse(JSON.stringify(schedule.getTimePeriodsNoWrap())); - for (let i = 0; i < timePeriods.length; i++) { + } else { - writeLittleEndianBytes(packet, index, 2, timePeriods[i].startMins); - index += 2; + timePeriods = JSON.parse(JSON.stringify(schedule.getTimePeriods())); - const endMins = timePeriods[i].endMins === 0 ? 1440 : timePeriods[i].endMins; - writeLittleEndianBytes(packet, index, 2, endMins); - index += 2; + } - } + timePeriods = timeHandler.sortPeriods(timePeriods); - for (let i = 0; i < (scheduleBar.MAX_PERIODS + 1) - timePeriods.length; i++) { + packet[index++] = timePeriods.length; - writeLittleEndianBytes(packet, index, 2, 0); - index += 2; + for (let i = 0; i < timePeriods.length; i++) { - writeLittleEndianBytes(packet, index, 2, 0); - index += 2; + writeLittleEndianBytes(packet, index, 2, timePeriods[i].startMins); + index += 2; + + const endMins = timePeriods[i].endMins === 0 ? constants.MINUTES_IN_DAY : timePeriods[i].endMins; + writeLittleEndianBytes(packet, index, 2, endMins); + index += 2; + + } + + for (let i = 0; i < (constants.MAX_PERIODS + 1) - timePeriods.length; i++) { + + writeLittleEndianBytes(packet, index, 2, 0); + index += 2; + + writeLittleEndianBytes(packet, index, 2, 0); + index += 2; + + } } @@ -675,7 +788,7 @@ function configureDevice () { /* Amplitude threshold or Goertzel filter frequency can be in this packet index */ - let unionValue; + let thresholdUnionValue; const amplitudeThresholdScaleIndex = settings.amplitudeThresholdScaleIndex; @@ -703,21 +816,21 @@ function configureDevice () { } - unionValue = amplitudeThreshold; + thresholdUnionValue = amplitudeThreshold; } else if (settings.frequencyTriggerEnabled && !isOlderSemanticVersion(trueFirmwareVersion, ['1', '8', '0'])) { - /* If firmware is older than 1.8.0, then frequency thresholding isn't supported, so just send zero */ - - unionValue = settings.frequencyTriggerCentreFrequency / 100; + thresholdUnionValue = settings.frequencyTriggerCentreFrequency / 100; } else { - unionValue = 0; + /* If firmware is older than 1.8.0, then frequency thresholding isn't supported, so just send zero */ + + thresholdUnionValue = 0; } - writeLittleEndianBytes(packet, index, 2, unionValue); + writeLittleEndianBytes(packet, index, 2, thresholdUnionValue); index += 2; /* Pack values into a single byte */ @@ -854,6 +967,10 @@ function configureDevice () { /* Whether to create a new folder each day to store files */ const dailyFolders = settings.dailyFolders ? 1 : 0; + /* Whether to enable sunrise/sunset scheduling */ + + const sunScheduleEnabled = settings.sunScheduleEnabled ? 1 : 0; + let packedByte3 = (energySaverModeEnabled & 0b1) & 1; packedByte3 |= (disable48DCFilter & 0b1) << 1; packedByte3 |= (timeSettingFromGPSEnabled & 0b1) << 2; @@ -861,6 +978,7 @@ function configureDevice () { packedByte3 |= (lowGainRangeEnabled & 0b1) << 4; packedByte3 |= (enableFrequencyFilter & 0b1) << 5; packedByte3 |= (dailyFolders & 0b1) << 6; + packedByte3 |= (sunScheduleEnabled & 0b1) << 7; packet[index++] = packedByte3; @@ -882,11 +1000,19 @@ function configureDevice () { communicating = true; + ui.disableTimeDisplay(); + configureButton.disabled = true; - const updateDelay = sendTimeDiff <= 0 ? MILLISECONDS_IN_SECOND : sendTimeDiff; + connectionAudioMothTime = null; + + connectionComputerTime = null; - setTimeout(function () { + displayedClockError = false; + + const updateDelay = sendTimeDiff <= 0 ? constants.MILLISECONDS_IN_SECOND : sendTimeDiff; + + setTimeout(() => { communicating = false; @@ -904,8 +1030,8 @@ function configureDevice () { console.log('Sending in', sendTimeDiff); - setTimeout(function () { - + setTimeout(() => { + sendAudioMothPacket(packet); }, sendTimeDiff); @@ -918,7 +1044,6 @@ function configureDevice () { function initialiseDisplay () { - ui.showTime(); idDisplay.textContent = '-'; @@ -1005,7 +1130,7 @@ function copyDeviceID () { idDisplay.style.color = 'green'; - setTimeout(function () { + setTimeout(() => { idDisplay.style.color = ''; @@ -1033,16 +1158,27 @@ function toggleNightMode () { function updateLifeDisplayOnChange () { - let sortedPeriods = JSON.parse(JSON.stringify(scheduleBar.getTimePeriods())); - sortedPeriods = sortedPeriods.sort(function (a, b) { + let recordingPeriods; + + if (uiSun.usingSunSchedule()) { + + recordingPeriods = uiSun.getRecordingPeriods(); + + } else { + + recordingPeriods = JSON.parse(JSON.stringify(schedule.getTimePeriods())); + + } + + recordingPeriods = recordingPeriods.sort((a, b) => { return a.startMins - b.startMins; }); - const settings = uiSettings.getSettings(); + const settings = getCurrentConfiguration(); - lifeDisplay.updateLifeDisplay(sortedPeriods, constants.configurations[settings.sampleRateIndex], settings.recordDuration, settings.sleepDuration, settings.amplitudeThresholdingEnabled, settings.frequencyTriggerEnabled, settings.dutyEnabled, settings.energySaverModeEnabled, settings.timeSettingFromGPSEnabled); + lifeDisplay.updateLifeDisplay(recordingPeriods, constants.configurations[settings.sampleRateIndex], settings.recordDuration, settings.sleepDuration, settings.amplitudeThresholdingEnabled, settings.frequencyTriggerEnabled, settings.dutyEnabled, settings.energySaverModeEnabled, settings.timeSettingFromGPSEnabled); } @@ -1056,17 +1192,32 @@ function getCurrentConfiguration () { const config = {}; - const timePeriods = scheduleBar.getTimePeriodsNoWrap(); + const settings = uiSettings.getSettings(); + + const timePeriods = schedule.getTimePeriodsNoWrap(); for (let i = 0; i < timePeriods.length; i++) { timePeriods[i].startMins = timePeriods[i].startMins === 0 ? 0 : timePeriods[i].startMins; - timePeriods[i].endMins = timePeriods[i].endMins === 0 ? 1440 : timePeriods[i].endMins; + timePeriods[i].endMins = timePeriods[i].endMins === 0 ? constants.MINUTES_IN_DAY : timePeriods[i].endMins; } config.timePeriods = timePeriods; + config.sunScheduleEnabled = settings.sunScheduleEnabled; + + config.latitude = uiSchedule.getLatitude(); + config.longitude = uiSchedule.getLongitude(); + + config.sunMode = uiSchedule.getSunMode(); + + config.sunPeriods = uiSchedule.getSunPeriods(); + + config.sunRounding = uiSchedule.getSunRounding(); + + config.sunDefinition = ipcRenderer.sendSync('request-sun-definition-index'); + config.customTimeZoneOffset = ipcRenderer.sendSync('request-custom-time-zone'); config.localTime = ui.getTimeZoneMode() === constants.TIME_ZONE_MODE_LOCAL; @@ -1074,8 +1225,6 @@ function getCurrentConfiguration () { config.ledEnabled = ledCheckbox.checked; config.batteryLevelCheckEnabled = batteryLevelCheckbox.checked; - const settings = uiSettings.getSettings(); - config.sampleRateIndex = settings.sampleRateIndex; config.gain = settings.gain; config.recordDuration = settings.recordDuration; @@ -1151,7 +1300,7 @@ electron.ipcRenderer.on('load', () => { const currentConfig = getCurrentConfiguration(); - saveLoad.loadConfiguration(currentConfig, (timePeriods, ledEnabled, batteryLevelCheckEnabled, sampleRateIndex, gain, dutyEnabled, recordDuration, sleepDuration, localTime, customTimeZoneOffset, firstRecordingDateEnabled, firstRecordingDate, lastRecordingDateEnabled, lastRecordingDate, passFiltersEnabled, filterType, lowerFilter, higherFilter, amplitudeThresholdingEnabled, amplitudeThreshold, frequencyTriggerEnabled, frequencyTriggerWindowLength, frequencyTriggerCentreFrequency, minimumFrequencyTriggerDuration, frequencyTriggerThreshold, requireAcousticConfig, displayVoltageRange, minimumAmplitudeThresholdDuration, amplitudeThresholdScaleIndex, energySaverModeEnabled, disable48DCFilter, lowGainRangeEnabled, timeSettingFromGPSEnabled, magneticSwitchEnabled, dailyFolders) => { + saveLoad.loadConfiguration(currentConfig, (timePeriods, ledEnabled, batteryLevelCheckEnabled, sampleRateIndex, gain, dutyEnabled, recordDuration, sleepDuration, localTime, customTimeZoneOffset, firstRecordingDateEnabled, firstRecordingDate, lastRecordingDateEnabled, lastRecordingDate, passFiltersEnabled, filterType, lowerFilter, higherFilter, amplitudeThresholdingEnabled, amplitudeThreshold, frequencyTriggerEnabled, frequencyTriggerWindowLength, frequencyTriggerCentreFrequency, minimumFrequencyTriggerDuration, frequencyTriggerThreshold, requireAcousticConfig, displayVoltageRange, minimumAmplitudeThresholdDuration, amplitudeThresholdScaleIndex, energySaverModeEnabled, disable48DCFilter, lowGainRangeEnabled, timeSettingFromGPSEnabled, magneticSwitchEnabled, dailyFolders, sunScheduleEnabled, latitude, longitude, sunMode, sunPeriods, sunRounding, sunDefinition) => { document.activeElement.blur(); @@ -1190,14 +1339,16 @@ electron.ipcRenderer.on('load', () => { } - uiSchedule.clearTimes(); + let schedule = []; for (let i = 0; i < sortedPeriods.length; i++) { - uiSchedule.addTime(sortedPeriods[i].startMins, sortedPeriods[i].endMins); + schedule = uiSchedule.addTime(sortedPeriods[i].startMins, sortedPeriods[i].endMins, schedule); } + scheduleBar.setSchedule(schedule); + scheduleBar.updateCanvas(); uiSchedule.updateTimeList(); @@ -1250,14 +1401,23 @@ electron.ipcRenderer.on('load', () => { disable48DCFilter, lowGainRangeEnabled, timeSettingFromGPSEnabled, - magneticSwitchEnabled + magneticSwitchEnabled, + sunRounding, + sunDefinition }; - uiSettings.fillUI(settings); - ledCheckbox.checked = ledEnabled; batteryLevelCheckbox.checked = batteryLevelCheckEnabled; - uiSettings.updateVoltageRangeStatus(); + + uiSettings.fillUI(settings); + + electron.ipcRenderer.send('set-sun-definition-index', sunDefinition); + + uiSchedule.updateSunDefinitionUI(sunDefinition); + + uiSchedule.setSunSettings(sunScheduleEnabled, latitude, longitude, sunMode, sunPeriods, sunRounding); + + uiSun.updateMapWindow(); ui.update(); @@ -1337,9 +1497,122 @@ electron.ipcRenderer.on('change-time-zone-mode', (e, timeZoneMode) => { configureButton.addEventListener('click', () => { - const timePeriods = scheduleBar.getTimePeriods(); + const timePeriods = schedule.getTimePeriods(); + + const sunScheduleEnabled = uiSun.usingSunSchedule(); + + if (sunScheduleEnabled) { - if (timePeriods.length === 0) { + const sunRecordingPeriods = uiSun.getRecordingPeriods(); + const sunMode = uiSun.getMode(); + + const beforeSunriseMins = uiSun.getBeforeSunriseMins(); + const afterSunriseMins = uiSun.getAfterSunriseMins(); + const beforeSunsetMins = uiSun.getBeforeSunsetMins(); + const afterSunsetMins = uiSun.getAfterSunsetMins(); + + const noSunrise = beforeSunriseMins === 0 && afterSunriseMins === 0; + const noSunset = beforeSunsetMins === 0 && afterSunsetMins === 0; + + const sunDefinitionIndex = ipcRenderer.sendSync('request-sun-definition-index'); + + if (isOlderSemanticVersion(firmwareVersion.split('.'), [1, 10, 0])) { + + let message = 'The firmware on the connected AudioMoth does not support '; + message += sunDefinitionIndex === constants.SUNRISE_AND_SUNSET ? 'sunrise/sunset' : 'dawn/dusk'; + message += ' scheduling. Update to at least version 1.10.0 or switch to a fixed schedule to configure.'; + + dialog.showMessageBoxSync({ + type: 'error', + title: 'Unsupported firmware', + message + }); + + console.log('Configuration cancelled'); + + return; + + } + + if (sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH && noSunrise && noSunset) { + + let message = 'The '; + message += sunDefinitionIndex === constants.SUNRISE_AND_SUNSET ? 'sunrise and sunset' : 'dawn and dusk'; + message += ' recording periods have zero duration. This means the AudioMoth will not record when in CUSTOM mode.'; + + dialog.showMessageBoxSync({ + type: 'error', + title: 'No recording periods', + message + }); + + console.log('Configuration cancelled'); + + return; + + } + + if ((sunMode === constants.MODE_BEFORE_SUNRISE_AFTER_SUNRISE || sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH) && noSunrise) { + + let message = 'The '; + message += sunDefinitionIndex === constants.SUNRISE_AND_SUNSET ? 'sunrise' : 'dawn'; + message += ' recording period has zero duration. This means the AudioMoth will not record around sunrise when in CUSTOM mode.'; + + dialog.showMessageBoxSync({ + type: 'error', + title: 'No recording periods', + message + }); + + console.log('Configuration cancelled'); + + return; + + } + + if ((sunMode === constants.MODE_BEFORE_SUNSET_AFTER_SUNSET || sunMode === constants.MODE_BEFORE_BOTH_AFTER_BOTH) && noSunset) { + + let message = 'The '; + message += sunDefinitionIndex === constants.SUNRISE_AND_SUNSET ? 'sunset' : 'dusk'; + message += ' recording period has zero duration. This means the AudioMoth will not record around sunrise when in CUSTOM mode.'; + + dialog.showMessageBoxSync({ + type: 'error', + title: 'No recording periods', + message + }); + + console.log('Configuration cancelled'); + + return; + + } + + if (sunRecordingPeriods.length === 0) { + + let messageText = sunDefinitionIndex === constants.SUNRISE_AND_SUNSET ? 'Sunrise and sunset ' : 'Dawn and dusk'; + messageText += 'calculation shows no recording periods for the '; + messageText += firstRecordingDateCheckbox.checked ? 'selected first recording date. ' : 'current date. '; + messageText += 'This means the AudioMoth may not record when in CUSTOM mode. Are you sure you wish to apply this configuration?'; + + const buttonIndex = dialog.showMessageBoxSync({ + type: 'warning', + buttons: ['Yes', 'No'], + title: 'No recording periods', + message: messageText + }); + + if (buttonIndex === 1) { + + console.log('Configuration cancelled'); + + return; + + } + + } + + } else if (timePeriods.length === 0) { const buttonIndex = dialog.showMessageBoxSync({ type: 'warning', @@ -1362,5 +1635,12 @@ configureButton.addEventListener('click', () => { }); +uiSun.prepareUI(() => { + + updateLifeDisplayOnChange(); + scheduleBar.updateCanvas(); + +}); + uiSchedule.prepareUI(updateLifeDisplayOnChange); uiSettings.prepareUI(updateLifeDisplayOnChange); diff --git a/uiNight.css b/uiNight.css index 2ca2c7d..76cc2a1 100644 --- a/uiNight.css +++ b/uiNight.css @@ -39,3 +39,8 @@ select { .greyStart::first-letter, .allGrey { color: #404040; } + +.tab-pane { + background: #000000; + color: #FFFFFF; +} diff --git a/uiTimeZoneSelection.js b/uiTimeZoneSelection.js index 286acf7..b22e83c 100644 --- a/uiTimeZoneSelection.js +++ b/uiTimeZoneSelection.js @@ -403,7 +403,7 @@ function addBlankOption () { const blankOpt = document.createElement('option'); blankOpt.value = timeZoneOffset.toString(); - + blankOpt.innerHTML = getTimeZoneText(timeZoneOffset); for (let i = 0; i < options.length; i++) { @@ -431,7 +431,7 @@ for (let i = 0; i < timeZones.length; i++) { const acronym = timeZones[i][0]; const name = timeZones[i][1]; - + let offsetString = timeZones[i][2]; if (offsetString.includes(':') === false) offsetString += ':00'; @@ -446,14 +446,14 @@ for (let i = 0; i < timeZones.length; i++) { /* Generate option text */ - let optionText = getTimeZoneText(timeZoneOffset) + ' ' + acronym + ' ' + name; - + const optionText = getTimeZoneText(timeZoneOffset) + ' ' + acronym + ' ' + name; + /* Add option to selection */ opt.innerHTML = optionText; opt.value = timeZoneOffset; - + timeZoneSelect.appendChild(opt); } @@ -476,4 +476,3 @@ timeZoneSelect.addEventListener('change', () => { updateButtons(); }); -