Skip to content

Commit

Permalink
Sync with GeoNode 2.8 part 1/2
Browse files Browse the repository at this point in the history
  • Loading branch information
@capooti
capooti committed Apr 30, 2018
1 parent f42ed7d commit 7b17e8c
Show file tree
Hide file tree
Showing 18 changed files with 1,348 additions and 771 deletions.
110 changes: 87 additions & 23 deletions geonode/client/templates/geoext/layers/layer_geoext_map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,82 @@

listeners: {
"ready": function() {
app.mapPanel.map.getMaxExtent = function() {
return new OpenLayers.Bounds(-80150033.36/2,-80150033.36/2,80150033.36/2,80150033.36/2);
app.mapPanel.map.getResolutions = function() {
return [156543.03390625, 78271.516953125, 39135.7584765625,
19567.87923828125, 9783.939619140625, 4891.9698095703125,
2445.9849047851562, 1222.9924523925781, 611.4962261962891,
305.74811309814453, 152.87405654907226, 76.43702827453613,
38.218514137268066, 19.109257068634033, 9.554628534317017,
4.777314267158508, 2.388657133579254, 1.194328566789627,
0.5971642833948135, 0.25, 0.1, 0.05];
}
app.mapPanel.map.getServerResolutions = function() {
return [156543.03390625, 78271.516953125, 39135.7584765625,
19567.87923828125, 9783.939619140625,
4891.9698095703125, 2445.9849047851562,
1222.9924523925781, 611.4962261962891,
305.74811309814453, 152.87405654907226,
76.43702827453613, 38.218514137268066,
19.109257068634033, 9.554628534317017,
4.777314267158508, 2.388657133579254,
1.194328566789627, 0.5971642833948135];
}
app.mapPanel.map.getMaxResolution = function() {
return 626172.135625/2;
return 156543.0339 * 2;
}
app.mapPanel.map.getNumZoomLevels = function() {
return 28;
}
app.mapPanel.map.getMinZoom = function() {
return 0;
}
app.mapPanel.map.getMaxZoom = function() {
return 28;
}
app.mapPanel.map.getResolutionForZoom = function(zoom) {
zoom = Math.max(0, Math.min(zoom, this.getResolutions().length - 1));
var resolution;
var fractionalZoom = true;
if(fractionalZoom) {
var low = Math.floor(zoom);
var high = Math.ceil(zoom);
resolution = this.getResolutions()[low] -
((zoom-low) * (this.getResolutions()[low]-this.getResolutions()[high]));
} else {
resolution = this.getResolutions()[Math.round(zoom)];
}
return resolution;
}
app.mapPanel.map.adjustZoom = function(zoom) {
var maxResolution = 156543.0339 * 4;
if (this.baseLayer && this.baseLayer.wrapDateLine) {
var resolution, resolutions = this.getResolutions(),
// maxResolution = this.getMaxExtent().getWidth() / this.size.w;
maxResolution = this.getMaxResolution();
if (this.getResolutionForZoom(zoom) > maxResolution) {
var fractionalZoom = true;
if (fractionalZoom) {
zoom = this.getZoomForResolution(maxResolution);
} else {
for (var i=zoom|0, ii=resolutions.length; i<ii; ++i) {
if (resolutions[i] <= maxResolution) {
zoom = i;
break;
}
}
}
}
}
return zoom;
}

try {
l = app.selectedLayer.getLayer();
l.addOptions({wrapDateLine:true, displayOutsideMaxExtent: true});
l.addOptions({maxExtent:app.mapPanel.map.getMaxExtent()});
} catch(err) {
;
}
l = app.selectedLayer.getLayer();
l.addOptions({wrapDateLine:true, displayOutsideMaxExtent: true});
l.addOptions({maxExtent:app.mapPanel.map.getMaxExtent(), restrictedExtent:app.mapPanel.map.getMaxExtent()});

{% if 'access_token' in request.session %}
try {
Expand All @@ -80,38 +147,35 @@
var map = app.mapPanel.map;
var layer = app.map.layers.slice(-1)[0];
var bbox = layer.bbox;
var crs = layer.crs
var crs = layer.srs;
if (bbox != undefined)
{
if (!Array.isArray(bbox) && Object.keys(layer.srs) in bbox) {
bbox = bbox[Object.keys(layer.srs)].bbox;
}

var extent = new OpenLayers.Bounds();

if(map.projection != 'EPSG:900913' && crs && crs.properties) {
extent.left = bbox[0];
extent.right = bbox[1];
extent.bottom = bbox[2];
extent.top = bbox[3];

if (crs.properties != map.projection) {
extent = extent.clone().transform(crs.properties, map.projection);
}
} else {
if (layer.capability.bbox &&
!Array.isArray(layer.capability.bbox) &&
map.projection in layer.capability.bbox) {
bbox = layer.capability.bbox[map.projection].bbox;
extent = OpenLayers.Bounds.fromArray(bbox);
} else {
if (crs != map.projection) {
extent = OpenLayers.Bounds.fromArray(bbox);
extent = extent.clone().transform(crs, map.projection);
} else {
extent = OpenLayers.Bounds.fromArray(bbox);
}
}

var zoomToData = function()
{
map.zoomToExtent(extent, false);
map.zoomToExtent(extent, true);
app.mapPanel.center = map.center;
app.mapPanel.zoom = map.zoom;
map.events.unregister('changebaselayer', null, zoomToData);
};
map.events.register('changebaselayer',null,zoomToData);
if(map.baseLayer){
map.zoomToExtent(extent, false);
map.zoomToExtent(extent, true);
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion geonode/contrib/worldmap/wm_extra/utils.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from geonode.geoserver.helpers import create_gs_thumbnail_geonode
from geonode.layers.utils import create_gs_thumbnail_geonode
from geonode.layers.models import Layer

def create_wm_thumbnail(instance, overwrite=False):
Expand Down
1 change: 1 addition & 0 deletions geonode/geoserver/context_processors.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
def geoserver_urls(request):
"""Global values to pass to templates"""
defaults = dict(
GEOSERVER_LOCAL_URL=ogc_server_settings.LOCATION,
GEOSERVER_BASE_URL=ogc_server_settings.public_url,
UPLOADER_URL=reverse('data_upload') if getattr(
settings,
Expand Down

0 comments on commit 7b17e8c

Please sign in to comment.