innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.10.x] Fixed #26972 -- Fixed is_collection definition in MapWidget initialization 

Backport of f530b4fdfc from master.
This commit is contained in:
Claude Paroz 2016-07-30 22:08:50 +02:00
parent 83b950e9ff
commit 39387efbba
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/static/gis/js/OLMapWidget.js
View File

@ -184,7 +184,7 @@
default_lat: 0,
default_lon: 0,
default_zoom: 4,
is_collection: new options.geom_type() instanceof OpenLayers.Geometry.Collection,
is_collection: options.geom_name.indexOf('Multi') > -1 || options.geom_name.indexOf('Collection') > -1,
layerswitcher: false,
map_options: {},
map_srid: 4326,

32
js_tests/gis/mapwidget.test.js
View File

@ -44,3 +44,35 @@ test('MapWidget.getControls', function(assert) {
assert.equal(widget.controls[1].displayClass, 'olControlDrawFeaturePoint', 'Draw control');
assert.equal(widget.controls[2].displayClass, 'olControlModifyFeature', 'Modify control');
});
test('MapWidget.IsCollection', function(assert) {
var options = {id: 'id_point', map_id: 'id_point_map', geom_name: 'Point'};
var widget = new MapWidget(options);
assert.notOk(widget.options.is_collection);
// Empty the default initial Point
document.getElementById('id_point').value = "";
options.geom_name = 'Polygon';
widget = new MapWidget(options);
assert.notOk(widget.options.is_collection);
options.geom_name = 'LineString';
widget = new MapWidget(options);
assert.notOk(widget.options.is_collection);
options.geom_name = 'MultiPoint';
widget = new MapWidget(options);
assert.ok(widget.options.is_collection);
options.geom_name = 'MultiPolygon';
widget = new MapWidget(options);
assert.ok(widget.options.is_collection);
options.geom_name = 'MultiLineString';
widget = new MapWidget(options);
assert.ok(widget.options.is_collection);
options.geom_name = 'GeometryCollection';
widget = new MapWidget(options);
assert.ok(widget.options.is_collection);
});