[Maposmatic-dev] [PATCH 2/4] Use late slippy map initialization

[Maxime Petazzoni]

---
 www/maposmatic/widgets.py           |   26 ++++++++++----------------
 www/media/osm_map.js                |    3 +--
 www/templates/maposmatic/index.html |    5 +++--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/www/maposmatic/widgets.py b/www/maposmatic/widgets.py
index 0569c83..feda256 100644
--- a/www/maposmatic/widgets.py
+++ b/www/maposmatic/widgets.py
@@ -66,22 +66,16 @@ class AreaWidget(forms.TextInput):
                 lower_right_lat, lower_right_lon = settings.BASE_BOUNDING_BOX
 
         tpl = u"""<div id="map"></div>
-<div id="map_bb">
-    <input type="text" name="lat_upper_left" id="lat_upper_left"
-           onchange="updateMap();" value="%s" /><br />
-    <input type="text" name="lon_upper_left" id="lon_upper_left"
-           onchange="updateMap();" value="%s" />
-    <input type="text" name="lon_bottom_right" id="lon_bottom_right"
-           onchange="updateMap();" value="%s" /><br />
-    <input type="text" name="lat_bottom_right" id="lat_bottom_right"
-           onchange="updateMap();" value="%s" />
-</div>
-""" % (upper_left_lat, upper_left_lon, lower_right_lon, lower_right_lat)
-        tpl += u"""<script type='text/javascript'><!--
-init();
-// -->
-</script>
-"""
+        <div id="map_bb">
+            <input type="text" name="lat_upper_left" id="lat_upper_left"
+                   onchange="updateMap();" value="%s" /><br />
+            <input type="text" name="lon_upper_left" id="lon_upper_left"
+                   onchange="updateMap();" value="%s" />
+            <input type="text" name="lon_bottom_right" id="lon_bottom_right"
+                   onchange="updateMap();" value="%s" /><br />
+            <input type="text" name="lat_bottom_right" id="lat_bottom_right"
+                   onchange="updateMap();" value="%s" />
+        </div>""" % (upper_left_lat, upper_left_lon, lower_right_lon, 
lower_right_lat)
         return mark_safe(tpl)
 
     def value_from_datadict(self, data, files, name):
diff --git a/www/media/osm_map.js b/www/media/osm_map.js
index e14ab7a..89d3b86 100644
--- a/www/media/osm_map.js
+++ b/www/media/osm_map.js
@@ -27,7 +27,7 @@
 
 /* OSM slippy map management. */
 
-var map;
+var map = null;
 var update_lock = 0;
 var epsg_display_projection = new OpenLayers.Projection('EPSG:4326');
 var epsg_projection = new OpenLayers.Projection('EPSG:900913');
@@ -91,6 +91,5 @@ function init()
     map.events.register('zoomend', map, updateForm);
     map.events.register('moveend', map, updateForm);
     updateMap();
-    updateForm();
 }
 
diff --git a/www/templates/maposmatic/index.html 
b/www/templates/maposmatic/index.html
index ac57670..aa35a94 100644
--- a/www/templates/maposmatic/index.html
+++ b/www/templates/maposmatic/index.html
@@ -49,9 +49,10 @@ function area_selection_mode_switch(mode)
         arr[i].style.display = 'table-row';
     }
   }
-  if (mode == 'bbox-mode')
-  {
+
+  if (mode == 'bbox-mode') {
     reset_osmid_field();
+    if (map == null) init();
   }
 }
 
-- 
1.6.3.3.261.g85c6