diff --git a/app/components/leaflet.directive.js b/app/components/leaflet.directive.js index 88e66a05..b62183f5 100644 --- a/app/components/leaflet.directive.js +++ b/app/components/leaflet.directive.js @@ -97,7 +97,7 @@ var baselayer = L.tileLayer('@@OPENSENSEMAP_MAPTILES_URL', { subdomains: 'abc', - attribution: '© OpenStreetMap contributors | Tiles © Mapbox', + attribution: '© Mapbox © OpenStreetMap Improve this map', detectRetina: true, reuseTiles: true, maxZoom: 18 diff --git a/app/scripts/controllers/account.box.edit.script.js b/app/scripts/controllers/account.box.edit.script.js index fde9ae35..b0546393 100644 --- a/app/scripts/controllers/account.box.edit.script.js +++ b/app/scripts/controllers/account.box.edit.script.js @@ -17,6 +17,8 @@ vm.showSerialPort = false; vm.soilDigitalPort = 'A'; vm.showSoilDigitalPort = false; + vm.soundMeterPort = 'B'; + vm.showSoundMeterPort = false; vm.compiling = false; vm.wifi = { ssid: '', @@ -45,6 +47,12 @@ vm.showSoilDigitalPort = true; } + if (boxData.sensorsArray.filter(function (s) { + return s.sensorType === 'SOUNDLEVELMETER'; + }).length !== 0) { + vm.showSoundMeterPort = true; + } + return getScript(); } @@ -58,6 +66,7 @@ return AccountService.getScript(boxData._id, { serialPort: vm.serialPort, soilDigitalPort: vm.soilDigitalPort, + soundMeterPort: vm.soundMeterPort, ssid: vm.wifi.ssid, password: vm.wifi.password }) diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js index d9baaaf8..d041679c 100644 --- a/app/scripts/controllers/register.js +++ b/app/scripts/controllers/register.js @@ -38,6 +38,7 @@ }, serialPort: 'Serial1', soilDigitalPort: 'A', + soundMeterPort: 'B', bmePhenomenon: 'tempHumiPress' }; @@ -178,6 +179,7 @@ return AccountService.getScript(vm.newSenseBox.id, { serialPort: vm.newSenseBox.serialPort, soilDigitalPort: vm.newSenseBox.soilDigitalPort, + soundMeterPort: vm.newSenseBox.soundMeterPort, ssid: vm.wifi.ssid, password: vm.wifi.password }) @@ -323,6 +325,7 @@ if (model.startsWith('homeV2')) { data.serialPort = vm.newModel.serialPort; data.soilDigitalPort = vm.newSenseBox.soilDigitalPort; + data.soundMeterPort = vm.newSenseBox.soundMeterPort; } AccountService.getScript(boxId, data) .then(function (data) { @@ -395,7 +398,7 @@ } if (vm.extensions.soundLevelMeter.id !== '') { vm.newSenseBox.sensorTemplates.push('soundlevelmeter'); - vm.newSenseBox.soundLevelMeterPort = vm.extensions.soundLevelMeter.port; + vm.newSenseBox.soundMeterPort = vm.extensions.soundLevelMeter.port; } } diff --git a/app/views/account.box.edit.script.html b/app/views/account.box.edit.script.html index 8f302ecf..8dfb5587 100644 --- a/app/views/account.box.edit.script.html +++ b/app/views/account.box.edit.script.html @@ -35,6 +35,20 @@
+ +
+