From ffeeb933a5526407e6b8550ae2b76019fb434de6 Mon Sep 17 00:00:00 2001 From: Justin Walgran Date: Thu, 21 Sep 2017 11:33:21 -0700 Subject: [PATCH 1/5] Specify Java major version and flavor Provisioning the services VM was failing because the default `java_major_version` set by the `azavea.java` role is 8 and we specify a `java_version` from the 7 series. While making this change we also specify an explicit `java_flavor` to avoid relying on the shared role default value. --- deployment/ansible/group_vars/all | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all index 6d4ea4a26..b53f6a419 100644 --- a/deployment/ansible/group_vars/all +++ b/deployment/ansible/group_vars/all @@ -33,6 +33,8 @@ nodejs_npm_version: 2.1.17 apache_version: "2.4.7-*" java_version: "7u151-*" +java_major_version: "7" +java_flavor: "openjdk" graphite_carbon_version: "0.9.13-pre1" graphite_whisper_version: "0.9.13-pre1" From 8277bdb4155255d6d1599fff74c2571720ef8ba8 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Fri, 22 Sep 2017 10:50:43 -0400 Subject: [PATCH 2/5] Upgrade RWD to 1.2.2 --- .../ansible/roles/model-my-watershed.rwd/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml index ca67b1610..90199a7ed 100644 --- a/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml +++ b/deployment/ansible/roles/model-my-watershed.rwd/defaults/main.yml @@ -2,7 +2,7 @@ rwd_data_path: "/opt/rwd-data" rwd_host: "localhost" rwd_port: 5000 -rwd_docker_image: "quay.io/wikiwatershed/rwd:1.2.1" +rwd_docker_image: "quay.io/wikiwatershed/rwd:1.2.2" app_config: RWD_HOST: "{{ rwd_host }}" From 0c9c493c4992962cdb2ac7769e4f198a81ccd1b3 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 25 Sep 2017 15:19:35 -0400 Subject: [PATCH 3/5] Fix Disabling Draw Tool If Zoom < Layer MinZoom * At some point the draw tool option buttons must have switched to ``s, which don't have the "disabled" attribute, which we were still trying to use * Make the draw tools proper buttons again, and re-render them on map zoom to keep the disabled state synced with the map --- src/mmw/js/src/draw/templates/drawTool.html | 16 +++++++++++----- src/mmw/js/src/draw/views.js | 2 ++ src/mmw/sass/pages/_draw.scss | 10 ++++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/mmw/js/src/draw/templates/drawTool.html b/src/mmw/js/src/draw/templates/drawTool.html index 12101fd92..2c1d5205f 100644 --- a/src/mmw/js/src/draw/templates/drawTool.html +++ b/src/mmw/js/src/draw/templates/drawTool.html @@ -13,6 +13,17 @@
    {% for item in toolData.items %} {% if not loop.last %} diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index a62c0de7b..987510ff4 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -515,6 +515,8 @@ var DrawToolBaseView = Marionette.ItemView.extend({ self.model.closeDrawTool(); } }); + + this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.render, this)); }, templateHelpers: function() { diff --git a/src/mmw/sass/pages/_draw.scss b/src/mmw/sass/pages/_draw.scss index 7deea5444..a20a1fd42 100644 --- a/src/mmw/sass/pages/_draw.scss +++ b/src/mmw/sass/pages/_draw.scss @@ -127,12 +127,16 @@ width: 100%; & .draw-pane-list-item { - list-style-type: none; - font-size: $font-size-h4; + list-style-type: none; + font-size: $font-size-h4; + display: flex; & .draw-pane-list-item-button { background: transparent; display: block; + width: 100%; + text-align: left; + border: none; padding-top: 0.5rem; padding-bottom: 0.5rem; padding-left: 0.8rem; @@ -154,6 +158,8 @@ & a.help { color: #999; padding: 0.5rem 1rem; + margin-right: 0; + margin-left: auto; &:hover { color: inherit; From 533065c5a003882aca30f3a9d1ff48c512630e91 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 25 Sep 2017 15:45:44 -0400 Subject: [PATCH 4/5] Close Draw Tool If Outside Its Min Zoom * If a draw tool is open and you zoom out beyond its min zoom, close the tool --- src/mmw/js/src/draw/views.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mmw/js/src/draw/views.js b/src/mmw/js/src/draw/views.js index 987510ff4..9282f477f 100644 --- a/src/mmw/js/src/draw/views.js +++ b/src/mmw/js/src/draw/views.js @@ -516,12 +516,11 @@ var DrawToolBaseView = Marionette.ItemView.extend({ } }); - this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.render, this)); + this.listenTo(App.getLeafletMap(), 'zoomend', _.bind(this.onMapZoom, this)); }, templateHelpers: function() { var activeDrawTool = this.model.get('activeDrawTool'), - activeDrawToolItem = this.model.get('activeDrawToolItem'), currentZoomLevel = App.getLeafletMap().getZoom(), openDrawTool = this.model.get('openDrawTool'), activeTitle = null, @@ -529,9 +528,7 @@ var DrawToolBaseView = Marionette.ItemView.extend({ toolData = this.getToolData(); if (activeDrawTool === toolData.id) { - var activeItem = _.find(toolData.items, function(item) { - return item.id === activeDrawToolItem; - }); + var activeItem = this.getActiveToolDataItem(); activeTitle = activeItem.title; activeDirections = activeItem.directions; } @@ -553,6 +550,21 @@ var DrawToolBaseView = Marionette.ItemView.extend({ this.activatePopovers(); }, + onMapZoom: function() { + var activeItem = this.getActiveToolDataItem(); + if (activeItem && App.getLeafletMap().getZoom() < activeItem.minZoom) { + this.resetDrawingState(); + } + this.render(); + }, + + getActiveToolDataItem: function() { + var activeDrawToolItem = this.model.get('activeDrawToolItem'); + return _.find(this.getToolData().items, function(item) { + return item.id === activeDrawToolItem; + }); + }, + openDrawTool: function() { this.model.openDrawTool(this.id); }, From 2295772836c66244984e2450369c474080f649e3 Mon Sep 17 00:00:00 2001 From: Alice Rottersman Date: Mon, 25 Sep 2017 16:17:40 -0400 Subject: [PATCH 5/5] Lower Boundary Layer Min Zoom * We cache the boundary layer tiles forever, so we can afford to lower their min zoom levels and allow the user to view/select them from a higher-altitude --- src/mmw/mmw/settings/layer_settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py index 832c04e5f..8ebf1a88c 100644 --- a/src/mmw/mmw/settings/layer_settings.py +++ b/src/mmw/mmw/settings/layer_settings.py @@ -237,7 +237,7 @@ 'target=\'_blank\' rel=\'noreferrer noopener\'>Model ' 'My Watershed Technical Documentation on Boundaries.' '', - 'minZoom': 7, + 'minZoom': 6, 'selectable': True, 'searchable': True, 'search_rank': 30, @@ -274,7 +274,7 @@ 'target=\'_blank\' rel=\'noreferrer noopener\'>Model ' 'My Watershed Technical Documentation on Boundaries.' '', - 'minZoom': 9, + 'minZoom': 8, 'selectable': True, 'searchable': True, 'search_rank': 10, @@ -291,7 +291,7 @@ 'target=\'_blank\' rel=\'noreferrer noopener\'>Model ' 'My Watershed Technical Documentation on Boundaries.' '', - 'minZoom': 9, + 'minZoom': 6, 'selectable': True, }, { @@ -307,7 +307,7 @@ 'target=\'_blank\' rel=\'noreferrer noopener\'>Model ' 'My Watershed Technical Documentation on Boundaries.' '', - 'minZoom': 6, + 'minZoom': 5, 'selectable': True, }, { @@ -322,7 +322,7 @@ 'target=\'_blank\' rel=\'noreferrer noopener\'>Model ' 'My Watershed Technical Documentation on Boundaries.' '', - 'minZoom': 9, + 'minZoom': 8, 'selectable': True, }, { @@ -330,7 +330,7 @@ 'table_name': 'dep_municipalities', 'display': 'PA Municipalities', 'short_display': 'PA Municipalities', - 'minZoom': 7, + 'minZoom': 6, 'perimeter': pa_perimeter, }, ],