Changeset 2510

Timestamp:

01/28/10 16:41:54 (7 weeks ago)

Author:

JensDiemer

Message:

OpenStreetMap? plugin: Bugfix if more than one map on the same page (add map name to id).
Add lucidTag example on admin page.

Location:

branches/0.9/pylucid_project

Files:

• media/PyLucid/OpenStreetMap.js (modified) (3 diffs)
• pylucid_plugins/OpenStreetMap/admin.py (modified) (1 diff)
• pylucid_plugins/OpenStreetMap/templates/OpenStreetMap/OpenStreetMap.html (modified) (1 diff)

branches/0.9/pylucid_project/media/PyLucid/OpenStreetMap.js

@@ -4 +4 @@
 var layer_markers;
 
-function drawmap(lang_code, popuptext, lon, lat, zoom, marker_lon, marker_lat, marker_width, marker_height) {
+function drawmap(map_id, lang_code, popuptext, lon, lat, zoom, marker_lon, marker_lat, marker_width, marker_height) {
         log("draw OpenStreetMap:");
+        log("map_id:" + map_id);
         log("lang_code:" + lang_code);
         log("popuptext:" + popuptext);
@@ -14 +15 @@
     OpenLayers.Lang.setCode(lang_code);
         
-    map = new OpenLayers.Map('map', {
+    map = new OpenLayers.Map(map_id, {
         projection: new OpenLayers.Projection("EPSG:900913"),
         displayProjection: new OpenLayers.Projection("EPSG:4326"),
@@ -81 +82 @@
 }
 
-//~ function getCycleTileURL(bounds) {
-   //~ var res = this.map.getResolution();
-   //~ var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-   //~ var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
-   //~ var z = this.map.getZoom();
-   //~ var limit = Math.pow(2, z);
-
-   //~ if (y < 0 || y >= limit) {
-     //~ return null;
-   //~ } else {
-     //~ x = ((x % limit) + limit) % limit;
-
-     //~ return this.url + z + "/" + x + "/" + y + "." + this.type;
-   //~ }
-//~ }

branches/0.9/pylucid_project/pylucid_plugins/OpenStreetMap/admin.py

@@ -15 +15 @@
 """
 
+from django.utils.translation import ugettext_lazy as _
+
 from reversion.admin import VersionAdmin
 
-from pylucid.base_admin import BaseAdmin
-from pylucid_admin.admin_site import pylucid_admin_site
+from pylucid_project.apps.pylucid_admin.admin_site import pylucid_admin_site
 
-from OpenStreetMap.models import MapEntry
+from pylucid_project.pylucid_plugins.OpenStreetMap.models import MapEntry
 
 
-class MapEntryAdmin(BaseAdmin, VersionAdmin):
-    list_display = ("name", "lon", "lat", "marker_text")
+class MapEntryAdmin(VersionAdmin):
+    def lucidTag_example(self, obj):
+        return '{%% lucidTag OpenStreetMap name="%s" %%}' % obj.name
+
+    lucidTag_example.short_description = _("lucidTag example")
+    lucidTag_example.allow_tags = False
+
+    list_display = ("name", "lucidTag_example", "lon", "lat", "marker_text")
     list_display_links = ("name",)
     list_filter = ("createby", "lastupdateby",)

branches/0.9/pylucid_project/pylucid_plugins/OpenStreetMap/templates/OpenStreetMap/OpenStreetMap.html

@@ -10 +10 @@
 {% endextrahead %}
 <div id="map_container">
-    <div id="map" class="{{ map.name }}" style="width: {{ map.width }}px; height: {{ map.height }}px;">
+    <div id="map_{{ map.name }}" class="{{ map.name }}" style="width: {{ map.width }}px; height: {{ map.height }}px;">
     <noscript><h2>JavaScript is needed!</h2></noscript>
     </div>
+    {% if perms.OpenStreetMap.change_mapentry %}
+    <div class="admin_links">
+        <a href="{% url admin:OpenStreetMap_mapentry_change map.id %}" title="{% trans 'edit in django admin site' %}" class="add_openinwindow">{% trans 'edit this map entry' %}</a>
+    </div>
+    {% endif %}
     <a href="http://www.openstreetmap.org/?lat={{ map.lat }}&lon={{ map.lon }}&zoom={{ map.zoom }}" id="osm" class="add_openinwindow">www.openstreetmap.org</a>
-    <script type="text/javascript">drawmap("{{ lang_code }}", "{{ map.get_html }}", {{ map.lon }}, {{ map.lat }}, {{ map.zoom }}, {{ map.marker_lon }}, {{ map.marker_lat }}, {{ map.marker_width }}, {{ map.marker_height }});</script>
+    <script type="text/javascript">drawmap("map_{{ map.name }}", "{{ lang_code }}", "{{ map.get_html }}", {{ map.lon }}, {{ map.lat }}, {{ map.zoom }}, {{ map.marker_lon }}, {{ map.marker_lat }}, {{ map.marker_width }}, {{ map.marker_height }});</script>
 </div>
 {% endblock %}