测试gitnore
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Geo-enabled Sitemap classes.
|
||||
from django.contrib.gis.sitemaps.kml import KMLSitemap, KMZSitemap
|
||||
|
||||
__all__ = ["KMLSitemap", "KMZSitemap"]
|
||||
__all__ = ['KMLSitemap', 'KMZSitemap']
|
||||
|
||||
@@ -9,8 +9,7 @@ class KMLSitemap(Sitemap):
|
||||
"""
|
||||
A minimal hook to produce KML sitemaps.
|
||||
"""
|
||||
|
||||
geo_format = "kml"
|
||||
geo_format = 'kml'
|
||||
|
||||
def __init__(self, locations=None):
|
||||
# If no locations specified, then we try to build for
|
||||
@@ -32,22 +31,15 @@ class KMLSitemap(Sitemap):
|
||||
if isinstance(source, models.base.ModelBase):
|
||||
for field in source._meta.fields:
|
||||
if isinstance(field, GeometryField):
|
||||
kml_sources.append(
|
||||
(
|
||||
source._meta.app_label,
|
||||
source._meta.model_name,
|
||||
field.name,
|
||||
)
|
||||
)
|
||||
kml_sources.append((source._meta.app_label,
|
||||
source._meta.model_name,
|
||||
field.name))
|
||||
elif isinstance(source, (list, tuple)):
|
||||
if len(source) != 3:
|
||||
raise ValueError(
|
||||
"Must specify a 3-tuple of (app_label, module_name, "
|
||||
"field_name)."
|
||||
)
|
||||
raise ValueError('Must specify a 3-tuple of (app_label, module_name, field_name).')
|
||||
kml_sources.append(source)
|
||||
else:
|
||||
raise TypeError("KML Sources must be a model or a 3-tuple.")
|
||||
raise TypeError('KML Sources must be a model or a 3-tuple.')
|
||||
return kml_sources
|
||||
|
||||
def get_urls(self, page=1, site=None, protocol=None):
|
||||
@@ -57,7 +49,7 @@ class KMLSitemap(Sitemap):
|
||||
"""
|
||||
urls = Sitemap.get_urls(self, page=page, site=site, protocol=protocol)
|
||||
for url in urls:
|
||||
url["geo_format"] = self.geo_format
|
||||
url['geo_format'] = self.geo_format
|
||||
return urls
|
||||
|
||||
def items(self):
|
||||
@@ -65,14 +57,14 @@ class KMLSitemap(Sitemap):
|
||||
|
||||
def location(self, obj):
|
||||
return reverse(
|
||||
"django.contrib.gis.sitemaps.views.%s" % self.geo_format,
|
||||
'django.contrib.gis.sitemaps.views.%s' % self.geo_format,
|
||||
kwargs={
|
||||
"label": obj[0],
|
||||
"model": obj[1],
|
||||
"field_name": obj[2],
|
||||
'label': obj[0],
|
||||
'model': obj[1],
|
||||
'field_name': obj[2],
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
class KMZSitemap(KMLSitemap):
|
||||
geo_format = "kmz"
|
||||
geo_format = 'kmz'
|
||||
|
||||
@@ -17,10 +17,7 @@ def kml(request, label, model, field_name=None, compress=False, using=DEFAULT_DB
|
||||
try:
|
||||
klass = apps.get_model(label, model)
|
||||
except LookupError:
|
||||
raise Http404(
|
||||
'You must supply a valid app label and module name. Got "%s.%s"'
|
||||
% (label, model)
|
||||
)
|
||||
raise Http404('You must supply a valid app label and module name. Got "%s.%s"' % (label, model))
|
||||
|
||||
if field_name:
|
||||
try:
|
||||
@@ -28,7 +25,7 @@ def kml(request, label, model, field_name=None, compress=False, using=DEFAULT_DB
|
||||
if not isinstance(field, GeometryField):
|
||||
raise FieldDoesNotExist
|
||||
except FieldDoesNotExist:
|
||||
raise Http404("Invalid geometry field.")
|
||||
raise Http404('Invalid geometry field.')
|
||||
|
||||
connection = connections[using]
|
||||
|
||||
@@ -41,9 +38,8 @@ def kml(request, label, model, field_name=None, compress=False, using=DEFAULT_DB
|
||||
placemarks = []
|
||||
if connection.features.has_Transform_function:
|
||||
qs = klass._default_manager.using(using).annotate(
|
||||
**{"%s_4326" % field_name: Transform(field_name, 4326)}
|
||||
)
|
||||
field_name += "_4326"
|
||||
**{'%s_4326' % field_name: Transform(field_name, 4326)})
|
||||
field_name += '_4326'
|
||||
else:
|
||||
qs = klass._default_manager.using(using).all()
|
||||
for mod in qs:
|
||||
@@ -55,7 +51,7 @@ def kml(request, label, model, field_name=None, compress=False, using=DEFAULT_DB
|
||||
render = render_to_kmz
|
||||
else:
|
||||
render = render_to_kml
|
||||
return render("gis/kml/placemarks.kml", {"places": placemarks})
|
||||
return render('gis/kml/placemarks.kml', {'places': placemarks})
|
||||
|
||||
|
||||
def kmz(request, label, model, field_name=None, using=DEFAULT_DB_ALIAS):
|
||||
|
||||
Reference in New Issue
Block a user