Skip to content

Commit

Permalink
Jenkins bumped version to 1.5.50
Browse files Browse the repository at this point in the history
  • Loading branch information
Exchange Jenkins committed Mar 13, 2017
1 parent 4746a3e commit 717ef81
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 18 deletions.
0 .../static/maploom/assets/MapLoom-1.5.49.css → .../static/maploom/assets/MapLoom-1.5.50.css
View file
File renamed without changes.
69 changes: 58 additions & 11 deletions ...m/static/maploom/assets/MapLoom-1.5.49.js → ...m/static/maploom/assets/MapLoom-1.5.50.js
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -174264,6 +174271,7 @@ function addXMLRequestCallback(callback) {
];
scope.sortField = 'Title';
scope.sortAscending = 'Ascending';
scope.searchState = 'no-search';
scope.owners = [];
scope.categories = [];
scope.keyword = '';
Expand Down Expand Up @@ -174460,6 +174468,7 @@ function addXMLRequestCallback(callback) {
case 'bbox':
scope.bbox = [];
scope.mapPreviewChangeCount = 0;
scope.$emit('resetMap');
break;
case 'owner':
checkNone(scope.owners);
Expand Down Expand Up @@ -174579,6 +174588,7 @@ function addXMLRequestCallback(callback) {
'exchange': [],
'registry': []
};
scope.searchState = 'finished';
if (response.data && response.data.objects) {
servers.geoserver.layersConfig = [];
servers.registry.layersConfig = [];
Expand Down Expand Up @@ -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 };
Expand Down Expand Up @@ -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
}),
Expand All @@ -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) {
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
Expand All @@ -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');
}
}
};
});
Expand Down Expand Up @@ -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" +
Expand Down Expand Up @@ -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 );
4 changes: 2 additions & 2 deletions maploom/templates/maploom/_maploom_js.html
View file
Original file line number Diff line number Diff line change
@@ -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>"
8 changes: 4 additions & 4 deletions maploom/templates/maps/maploom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>



Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 717ef81

Please sign in to comment.