Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
django
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
django
Commits
93eca976
Kaydet (Commit)
93eca976
authored
Mar 17, 2017
tarafından
Tim Graham
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #27939 -- Updated OpenLayersWidget.map_srid for OpenLayers 3.
Regression in
2ebfda38
(refs #25004).
üst
66bbde68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
widgets.py
django/contrib/gis/forms/widgets.py
+1
-1
test_geoforms.py
tests/gis_tests/test_geoforms.py
+5
-3
No files found.
django/contrib/gis/forms/widgets.py
Dosyayı görüntüle @
93eca976
...
@@ -76,6 +76,7 @@ class BaseGeometryWidget(Widget):
...
@@ -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):
...
@@ -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__
()
...
...
tests/gis_tests/test_geoforms.py
Dosyayı görüntüle @
93eca976
...
@@ -116,7 +116,7 @@ class GeometryFieldTest(SimpleTestCase):
...
@@ -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
(
'"'
,
'"'
))
pt1_json
=
json
.
loads
(
pt1_serialized
.
replace
(
'"'
,
'"'
))
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):
...
@@ -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):
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment