mirror of https://github.com/django/django.git
[1.10.x] Fixed #26972 -- Fixed is_collection definition in MapWidget initialization
Backport of f530b4fdfc
from master.
This commit is contained in:
parent
83b950e9ff
commit
39387efbba
|
@ -184,7 +184,7 @@
|
||||||
default_lat: 0,
|
default_lat: 0,
|
||||||
default_lon: 0,
|
default_lon: 0,
|
||||||
default_zoom: 4,
|
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,
|
layerswitcher: false,
|
||||||
map_options: {},
|
map_options: {},
|
||||||
map_srid: 4326,
|
map_srid: 4326,
|
||||||
|
|
|
@ -44,3 +44,35 @@ test('MapWidget.getControls', function(assert) {
|
||||||
assert.equal(widget.controls[1].displayClass, 'olControlDrawFeaturePoint', 'Draw control');
|
assert.equal(widget.controls[1].displayClass, 'olControlDrawFeaturePoint', 'Draw control');
|
||||||
assert.equal(widget.controls[2].displayClass, 'olControlModifyFeature', 'Modify 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);
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in New Issue