From 717ef81b7a69065ea427fdfa31cae7d2f7b4ee46 Mon Sep 17 00:00:00 2001
From: Exchange Jenkins <exchange@boundlessgeo.com>
Date: Mon, 13 Mar 2017 15:26:04 -0400
Subject: [PATCH] Jenkins bumped version to 1.5.50

---
 ...{MapLoom-1.5.49.css => MapLoom-1.5.50.css} |  0
 .../{MapLoom-1.5.49.js => MapLoom-1.5.50.js}  | 69 ++++++++++++++++---
 maploom/templates/maploom/_maploom_js.html    |  4 +-
 maploom/templates/maps/maploom.html           |  8 +--
 setup.py                                      |  2 +-
 5 files changed, 65 insertions(+), 18 deletions(-)
 rename maploom/static/maploom/assets/{MapLoom-1.5.49.css => MapLoom-1.5.50.css} (100%)
 rename maploom/static/maploom/assets/{MapLoom-1.5.49.js => MapLoom-1.5.50.js} (99%)

diff --git a/maploom/static/maploom/assets/MapLoom-1.5.49.css b/maploom/static/maploom/assets/MapLoom-1.5.50.css
similarity index 100%
rename from maploom/static/maploom/assets/MapLoom-1.5.49.css
rename to maploom/static/maploom/assets/MapLoom-1.5.50.css
diff --git a/maploom/static/maploom/assets/MapLoom-1.5.49.js b/maploom/static/maploom/assets/MapLoom-1.5.50.js
similarity index 99%
rename from maploom/static/maploom/assets/MapLoom-1.5.49.js
rename to maploom/static/maploom/assets/MapLoom-1.5.50.js
index a64a494..8af505b 100644
--- a/maploom/static/maploom/assets/MapLoom-1.5.49.js
+++ b/maploom/static/maploom/assets/MapLoom-1.5.50.js
@@ -1,5 +1,5 @@
 /**
- * MapLoom - v1.5.49 - 2017-03-09
+ * MapLoom - v1.5.50 - 2017-03-13
  * http://www.prominentedge.com
  *
  * Copyright (c) 2017 Prominent Edge
@@ -171688,6 +171688,8 @@ var maploomProj4Defs = function (defs) {
       'mgrs': 'MGRS',
       'other': 'Other',
       'search': 'Search',
+      'searching': 'Searching...',
+      'search_prompt': 'Please use any of the settings on the left to start a search.',
       'search_locations': 'Search Locations',
       'search_table': 'Search All Fields',
       'search_results': 'Search Results',
@@ -172033,6 +172035,8 @@ var maploomProj4Defs = function (defs) {
       'mgrs': 'MGRS',
       'other': 'Otro',
       'search': 'B\xfasqueda',
+      'searching': 'Buscando...',
+      'search_prompt': 'Por favor, utilice cualquiera de las opciones de la izquierda para iniciar una b\xfasqueda.',
       'search_locations': 'Ubicaciones de B\xfasqueda',
       'search_table': 'Buscar Todos Los Campos',
       'search_results': 'Resultados de la B\xfasqueda',
@@ -173985,6 +173989,9 @@ var SERVER_SERVICE_USE_PROXY = true;
               sourceParams: { imagerySet: 'ordnanceSurvey' }
             }
           ];
+          for (var i = 0, ii = server.layersConfig.length; i < ii; i++) {
+            server.layersConfig[i].sourceParams.key = server.apiKey;
+          }
           deferredResponse.resolve(server);
         } else if (server.ptype === 'gxp_mapquestsource') {
           server.defaultServer = true;
@@ -174264,6 +174271,7 @@ function addXMLRequestCallback(callback) {
           ];
           scope.sortField = 'Title';
           scope.sortAscending = 'Ascending';
+          scope.searchState = 'no-search';
           scope.owners = [];
           scope.categories = [];
           scope.keyword = '';
@@ -174460,6 +174468,7 @@ function addXMLRequestCallback(callback) {
             case 'bbox':
               scope.bbox = [];
               scope.mapPreviewChangeCount = 0;
+              scope.$emit('resetMap');
               break;
             case 'owner':
               checkNone(scope.owners);
@@ -174579,6 +174588,7 @@ function addXMLRequestCallback(callback) {
                 'exchange': [],
                 'registry': []
               };
+            scope.searchState = 'finished';
             if (response.data && response.data.objects) {
               servers.geoserver.layersConfig = [];
               servers.registry.layersConfig = [];
@@ -174608,6 +174618,7 @@ function addXMLRequestCallback(callback) {
           };
           scope.search = function () {
             var filter_options = scope.getSearchParams();
+            scope.searchState = 'started';
             scope.configureServers();
             scope.currentPage = 0;
             var params = { limit: 100 };
@@ -179916,11 +179927,20 @@ var GeoGigRevertFeatureOptions = function () {
             }
             return null;
           };
+          var world_bounds = [
+              -180,
+              -85,
+              180,
+              85
+            ];
+          var map_proj = configService.configuration.map.projection;
+          var working_bounds = ol.proj.transformExtent(world_bounds, 'EPSG:4326', map_proj);
           var createMap = function () {
             map = new ol.Map({
               target: scope.mapId,
               view: new ol.View({
-                projection: configService.configuration.map.projection,
+                projection: map_proj,
+                extent: working_bounds,
                 center: scope.center,
                 zoom: scope.zoom
               }),
@@ -179944,10 +179964,12 @@ var GeoGigRevertFeatureOptions = function () {
             }
           });
           $rootScope.$on('resetMap', function (event) {
-            var zoom = ol.animation.zoom({ resolution: map.getView().getResolution() });
-            var pan = ol.animation.pan({ source: map.getView().getCenter() });
-            map.beforeRender(pan, zoom);
-            map.getView().fit(firstExtent, map.getSize());
+            if (goog.isDefAndNotNull(map)) {
+              var zoom = ol.animation.zoom({ resolution: map.getView().getResolution() });
+              var pan = ol.animation.pan({ source: map.getView().getCenter() });
+              map.beforeRender(pan, zoom);
+              map.getView().fit(firstExtent, map.getSize());
+            }
           });
           scope.$watch('layers', function (layers) {
             if (layers && map) {
@@ -180645,7 +180667,7 @@ var GeoGigRevertFeatureOptions = function () {
           });
         } else if (server.ptype === 'gxp_bingsource') {
           var sourceParams = {
-              key: 'Ak-dzM4wZjSqTlzveKz5u0d4IQ4bRzVI309GxmkgSVr1ewS6iPSrOvOKhA-CJlm3',
+              key: '',
               imagerySet: 'Aerial'
             };
           if (goog.isDefAndNotNull(fullConfig.sourceParams)) {
@@ -186146,7 +186168,10 @@ var mgrsToXYFormat = function (string) {
     return {
       restrict: 'C',
       templateUrl: 'utils/partial/loading.tpl.html',
-      scope: { spinnerHidden: '=' },
+      scope: {
+        spinnerText: '@text',
+        spinnerHidden: '='
+      },
       link: function (scope, element, attrs) {
         scope.spinnerWidth = 3;
         scope.spinnerRadius = 28;
@@ -186171,6 +186196,13 @@ var mgrsToXYFormat = function (string) {
         var spinner = element.find('.spinner');
         spinner.css('width', scope.spinnerRadius + 'px');
         spinner.css('height', scope.spinnerRadius + 'px');
+        var text = element.find('.spinner-text');
+        if (goog.isDefAndNotNull(scope.spinnerText) && scope.spinnerText.length > 0) {
+          text.css('padding-left', scope.spinnerRadius + 2 + 'px');
+          text.css('padding-top', scope.spinnerWidth + 'px');
+        } else {
+          text.css('display', 'none');
+        }
       }
     };
   });
@@ -187292,12 +187324,23 @@ angular.module("addlayers/partials/unifiedLayerSearch.tpl.html", []).run(["$temp
     "            </div> <!-- end of filters -->\n" +
     "\n" +
     "            <div class=\"col-md-6 unified-split-view\">\n" +
-    "                <div class=\"row\" ng-hide=\"resultsCount > 0\">\n" +
+    "                <div class=\"row\" ng-show=\"searchState == 'no-search'\">\n" +
+    "                    <div class=\"col-xs-12\">\n" +
+    "                        <span loom-helpicon help=\"\"></span> Please use any of the settings on the left to start a search.\n" +
+    "\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"row\" ng-show=\"searchState == 'started'\">\n" +
+    "                    <div class=\"col-xs-12\">\n" +
+    "                        <div class=\"loom-loading\" text=\"{{ 'searching' | translate }}\"></div>\n" +
+    "                    </div>\n" +
+    "                </div>\n" +
+    "                <div class=\"row\" ng-show=\"searchState == 'finished' && resultsCount == 0\">\n" +
     "                    <div class=\"col-xs-12\">\n" +
     "                        <i>{{ 'search_no_results' | translate }}</i>\n" +
     "                    </div>\n" +
     "                </div>\n" +
-    "                <div class=\"row\" ng-show=\"resultsCount > 0\">\n" +
+    "                <div class=\"row\" ng-show=\"searchState == 'finished' && resultsCount > 0\">\n" +
     "                    <div class=\"col-xs-8\">\n" +
     "                        <div class=\"layers-count\">\n" +
     "                          {{ pagingTitle }}\n" +
@@ -189113,8 +189156,12 @@ angular.module("utils/partial/loading.tpl.html", []).run(["$templateCache", func
     "        <div class=\"loading-spinner\"></div>\n" +
     "      </div>\n" +
     "    </div>\n" +
+    "    <div class=\"spinner-text\">\n" +
+    "      {{ spinnerText }}\n" +
+    "    </div>\n" +
     "  </div>\n" +
-    "</div>");
+    "</div>\n" +
+    "");
 }]);
 
 })( window, window.angular );
diff --git a/maploom/templates/maploom/_maploom_js.html b/maploom/templates/maploom/_maploom_js.html
index bb6a95e..9b83195 100644
--- a/maploom/templates/maploom/_maploom_js.html
+++ b/maploom/templates/maploom/_maploom_js.html
@@ -1,3 +1,3 @@
 {% load i18n static %}
-<link rel="stylesheet" type="text/css" href="{% static 'maploom/assets/MapLoom-1.5.49.css' %}"/>
-<script type="text/javascript" src="{% static 'maploom/assets/MapLoom-1.5.49.js' %}"></script>"
+<link rel="stylesheet" type="text/css" href="{% static 'maploom/assets/MapLoom-1.5.50.css' %}"/>
+<script type="text/javascript" src="{% static 'maploom/assets/MapLoom-1.5.50.js' %}"></script>"
diff --git a/maploom/templates/maps/maploom.html b/maploom/templates/maps/maploom.html
index 42428e5..e348767 100644
--- a/maploom/templates/maps/maploom.html
+++ b/maploom/templates/maps/maploom.html
@@ -11,21 +11,21 @@
   <meta http-equiv="X-UA-COMPATIBLE" content="IE-Edge">
   <script type="text/javascript">
     window.MAPLOOM_VERSION = {
-        "version_string": "1.5.49",
-        "build_date": "2017-03-09"
+        "version_string": "1.5.50",
+        "build_date": "2017-03-13"
     };
   </script>
 
 <!-- compiled CSS -->
     
-        <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}maploom/assets/MapLoom-1.5.49.css"/>
+        <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}maploom/assets/MapLoom-1.5.50.css"/>
     
 
 
 
 <!-- compiled JavaScript -->
     
-        <script type="text/javascript" src="{{STATIC_URL}}maploom/assets/MapLoom-1.5.49.js"></script>
+        <script type="text/javascript" src="{{STATIC_URL}}maploom/assets/MapLoom-1.5.50.js"></script>
     
 
 
diff --git a/setup.py b/setup.py
index 03536a9..e8bb8d8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='django-exchange-maploom',
-    version='1.5.49',
+    version='1.5.50',
     author='GeoNode Development Team - Prominent Edge, Terranodo, Boundless Spatial',
     author_email='exchange@boundlessgeo.com',
     url='https://github.com/boundlessgeo/django-exchange-maploom',