p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #27939 -- Updated OpenLayersWidget.map_srid for OpenLayers 3. 

Regression in 2ebfda38e6 (refs #25004).
This commit is contained in:
Tim Graham 2017-03-17 09:57:42 -04:00
parent 66bbde6819
commit 93eca976c1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/forms/widgets.py
View File

@ -76,6 +76,7 @@ class BaseGeometryWidget(Widget):
class OpenLayersWidget(BaseGeometryWidget): class OpenLayersWidget(BaseGeometryWidget):
template_name = 'gis/openlayers.html' template_name = 'gis/openlayers.html'
map_srid = 3857
class Media: class Media:
css = { css = {
@ -100,7 +101,6 @@ class OSMWidget(OpenLayersWidget):
template_name = 'gis/openlayers-osm.html' template_name = 'gis/openlayers-osm.html'
default_lon = 5 default_lon = 5
default_lat = 47 default_lat = 47
map_srid = 3857
def __init__(self, attrs=None): def __init__(self, attrs=None):
super().__init__() super().__init__()

8
tests/gis_tests/test_geoforms.py
View File

@ -116,7 +116,7 @@ class GeometryFieldTest(SimpleTestCase):
# ordering of the rendered dictionary. # ordering of the rendered dictionary.
pt1_serialized = re.search(r'<textarea [^>]*>({[^<]+})<', output).groups()[0] pt1_serialized = re.search(r'<textarea [^>]*>({[^<]+})<', output).groups()[0]
pt1_json = json.loads(pt1_serialized.replace('&quot;', '"')) pt1_json = json.loads(pt1_serialized.replace('&quot;', '"'))
self.assertEqual(pt1_json, {'coordinates': [7.3, 44.0], 'type': 'Point'}) self.assertEqual(pt1_json, {'coordinates': [812632.2827908975, 5465442.183322753], 'type': 'Point'})
self.assertInHTML( self.assertInHTML(
'<textarea id="id_pt2" class="vSerializedField required" cols="150"' '<textarea id="id_pt2" class="vSerializedField required" cols="150"'
@ -200,7 +200,7 @@ class SpecializedFieldTest(SimpleTestCase):
self.assertTrue(form_instance.is_valid()) self.assertTrue(form_instance.is_valid())
rendered = form_instance.as_p() rendered = form_instance.as_p()
self.assertIn('new MapWidget(options);', rendered) self.assertIn('new MapWidget(options);', rendered)
self.assertIn('map_srid: 4326,', rendered) self.assertIn('map_srid: 3857,', rendered)
self.assertIn('gis/js/OLMapWidget.js', str(form_instance.media)) self.assertIn('gis/js/OLMapWidget.js', str(form_instance.media))
def assertTextarea(self, geom, rendered): def assertTextarea(self, geom, rendered):
@ -208,7 +208,9 @@ class SpecializedFieldTest(SimpleTestCase):
self.assertIn('<textarea ', rendered) self.assertIn('<textarea ', rendered)
self.assertIn('required', rendered) self.assertIn('required', rendered)
self.assertIn(escape(geom.json), rendered) ogr = geom.ogr
ogr.transform(3857)
self.assertIn(escape(ogr.json), rendered)
# map_srid in operlayers.html template must not be localized. # map_srid in operlayers.html template must not be localized.
@override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True) @override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True)