diff options
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/chimere/widgets.py b/chimere/widgets.py index f76b4b2..1cc8918 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -40,13 +40,12 @@ def getMapJS(area_name=''): '''Variable initialization for drawing the map ''' # projection, center and bounds definitions - js = u"var epsg_display_projection = new OpenLayers.Projection('EPSG:%d')"\ - u";\n" % settings.CHIMERE_EPSG_DISPLAY_PROJECTION - js += u"OpenLayers.ImgPath = '%schimere/img/';\n" % settings.STATIC_URL - js += u"var epsg_projection = new OpenLayers.Projection('EPSG:%d');\n" % \ + js = u"var epsg_display_projection = 'EPSG:%d';\n" \ + % settings.CHIMERE_EPSG_DISPLAY_PROJECTION + js += u"var epsg_projection = 'EPSG:%d';\n" % \ settings.CHIMERE_EPSG_PROJECTION - js += u"var centerLonLat = new OpenLayers.LonLat(%f,"\ - u"%f).transform(epsg_display_projection, epsg_projection);\n" % \ + js += u"var centerLonLat = ol.proj.transform("\ + u"[%f, %f], epsg_display_projection, epsg_projection);\n" % \ settings.CHIMERE_DEFAULT_CENTER js += u"var media_path = '%s';\n" % settings.MEDIA_URL js += u"var static_path = '%s';\n" % settings.STATIC_URL @@ -91,8 +90,10 @@ def get_map_layers(area_name=''): map_layers = [(_(u"Default layer"), settings.CHIMERE_DEFAULT_MAP_LAYER, True)] else: - map_layers = [(u"Mapnik", "new OpenLayers.Layer.OSM.Mapnik('Mapnik')", - True)] + map_layers = [(u"Mapquest", """new ol.layer.Tile({ + style: 'Road', + source: new ol.source.MapQuest({layer: 'osm'}) +})""", True)] return map_layers, default @@ -381,12 +382,11 @@ class RouteChooserWidget(forms.TextInput): var zoomOffset; var extra_url = "%s"; - OpenLayers.ImgPath = '%schimere/img/'; - epsg_display_projection = new OpenLayers.Projection('EPSG:%s'); + epsg_display_projection = 'EPSG:%s'; var EPSG_DISPLAY_PROJECTION = epsg_display_projection; - epsg_projection = new OpenLayers.Projection('EPSG:%s'); + epsg_projection = 'EPSG:%s'; var EPSG_PROJECTION = epsg_projection; - centerLonLat = new OpenLayers.LonLat%s.transform( + centerLonLat = ol.proj.transform([%f %f], epsg_display_projection, epsg_projection); var CENTER_LONLAT = centerLonLat; var DEFAULT_ZOOM = %s; @@ -399,7 +399,8 @@ class RouteChooserWidget(forms.TextInput): """ % (reverse("chimere:index"), settings.STATIC_URL, settings.CHIMERE_EPSG_DISPLAY_PROJECTION, settings.CHIMERE_EPSG_PROJECTION, - settings.CHIMERE_DEFAULT_CENTER, + settings.CHIMERE_DEFAULT_CENTER[0], + settings.CHIMERE_DEFAULT_CENTER[1], settings.CHIMERE_DEFAULT_ZOOM, ", ".join(map_layers)) if default_area: js += "chimere_init_options['selected_map_layer'] = %d;\n" % \ @@ -571,12 +572,11 @@ class AreaWidget(forms.TextInput): tpl += u"<script type='text/javascript'>\n" tpl += u"function init_map_form (){\ninit('map_edit_area');\n" if value: - tpl += u"var extent = new OpenLayers.Bounds(%f, %f, %f, %f);\n"\ - u"extent.transform(epsg_display_projection, epsg_projection);\n"\ - u"updateForm(extent);\n"\ - u"area_map.zoomToExtent(extent, true);\n"\ - u"area_map.zoomOut();" % (upper_left_lon, upper_left_lat, - lower_right_lon, lower_right_lat) + tpl += u"extent = ol.proj.transformExtent([%f, %f, %f, %f], "\ + u"epsg_display_projection, epsg_projection);\n"\ + u"initArea(extent);\n" % ( + upper_left_lon, upper_left_lat, lower_right_lon, + lower_right_lat) tpl += u"}\n" if initialized: tpl += u"$(document).ready(function($) {init_map_form()});\n" |