Ticket #13926: osm_ol_admin.django-1.5.1.diff

openlayers.js

@@ -1 +1 @@
 {% load l10n %}
 OpenLayers.Projection.addTransform("EPSG:4326", "EPSG:3857", OpenLayers.Layer.SphericalMercator.projectForward);
 {% block vars %}var {{ module }} = {};
-{{ module }}.map = null; {{ module }}.controls = null; {{ module }}.panel = null; {{ module }}.re = new RegExp("^SRID=\\d+;(.+)", "i"); {{ module }}.layers = {};
+{{ module }}.map = null;
+{{ module }}.controls = null;
+{{ module }}.panel = null;
+{{ module }}.re = new RegExp("^SRID=\\d+;(.+)", "i");
+{{ module }}.layers = {};
 {{ module }}.modifiable = {{ modifiable|yesno:"true,false" }};
 {{ module }}.wkt_f = new OpenLayers.Format.WKT();
 {{ module }}.is_collection = {{ is_collection|yesno:"true,false" }};
@@ -10 +14 @@
 {{ module }}.is_polygon = {{ is_polygon|yesno:"true,false" }};
 {{ module }}.is_point = {{ is_point|yesno:"true,false" }};
 {% endblock %}
-{{ module }}.get_ewkt = function(feat){return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);}
+// Patch for http://trac.osgeo.org/openlayers/ticket/2240
+{{ module }}.get_ewkt = function(feat){
+  if (feat.constructor == Array) {
+    wkts = [];
+    for(var i = 0; i < feat.length; i++){
+      wkts.push(feat[i].geometry.toString());
+    }
+    return 'SRID={{ srid }};GEOMETRYCOLLECTION(' + wkts.join(', ') + ')';
+  } else if (feat.geometry.CLASS_NAME == 'OpenLayers.Geometry.Collection') {
+    wkts = [];
+    for (var i=0; i < feat.geometry.components.length; i++){
+      wkts.push(feat.geometry.components[i].toString());
+    }
+    return 'SRID={{ srid }};GEOMETRYCOLLECTION(' + wkts.join(', ') + ')';
+  } else {
+    return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);
+  }
+}
 {{ module }}.read_wkt = function(wkt){
   // OpenLayers cannot handle EWKT -- we make sure to strip it out.
   // EWKT is only exposed to OL if there's a validation error in the admin.
@@ -19 +40 @@
   return {{ module }}.wkt_f.read(wkt);
 }
 {{ module }}.write_wkt = function(feat){
-  if ({{ module }}.is_collection){ {{ module }}.num_geom = feat.geometry.components.length;}
-  else { {{ module }}.num_geom = 1;}
+  if ({{ module }}.is_collection){
+    if (feat.constructor == Array) {
+      {{ module }}.num_geom = feat.length;
+    } else {
+      {{ module }}.num_geom = feat.geometry.components.length;
+    }
+  } else {
+    {{ module }}.num_geom = 1;
+  }
   document.getElementById('{{ id }}').value = {{ module }}.get_ewkt(feat);
 }
 {{ module }}.add_wkt = function(event){
   // This function will sync the contents of the `vector` layer with the
   // WKT in the text field.
   if ({{ module }}.is_collection){
+    if ({{ module }}.collection_type == 'Any') {
+      var feat = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Collection());
+    } else {
     var feat = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.{{ geom_type }}());
+    }
     for (var i = 0; i < {{ module }}.layers.vector.features.length; i++){
       feat.geometry.addComponents([{{ module }}.layers.vector.features[i].geometry]);
     }
@@ -50 +82 @@
     } else {
       // When modifying the selected components are added to the
       // vector layer so we only increment to the `num_geom` value.
+      if ({{ module }}.collection_type == 'Any') {
+        var feat = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Collection());
+      } else {
       var feat = new OpenLayers.Feature.Vector(new OpenLayers.Geometry.{{ geom_type }}());
+      }
       for (var i = 0; i < {{ module }}.num_geom; i++){
         feat.geometry.addComponents([{{ module }}.layers.vector.features[i].geometry]);
       }
@@ -84 +120 @@
 {{ module }}.getControls = function(lyr){
   {{ module }}.panel = new OpenLayers.Control.Panel({'displayClass': 'olControlEditingToolbar'});
   var nav = new OpenLayers.Control.Navigation();
-  var draw_ctl;
-  if ({{ module }}.is_linestring){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'});
-  } else if ({{ module }}.is_polygon){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'});
-  } else if ({{ module }}.is_point){
-    draw_ctl = new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'});
+  var draw_ctl = [];
+  if ({{ module }}.is_linestring || {{ module }}.is_collection){
+    draw_ctl.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}));
+  }
+  if ({{ module }}.is_polygon || {{ module }}.is_collection){
+    draw_ctl.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'}));
+  }
+  if ({{ module }}.is_point|| {{ module }}.is_collection){
+    draw_ctl.push(new OpenLayers.Control.DrawFeature(lyr, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'}));
   }
+  var ctls = draw_ctl;
   if ({{ module }}.modifiable){
     var mod = new OpenLayers.Control.ModifyFeature(lyr, {'displayClass': 'olControlModifyFeature'});
-    {{ module }}.controls = [nav, draw_ctl, mod];
+    ctls.splice(0, 0, nav);
+    ctls.push(mod);
   } else {
     if(!lyr.features.length){
-      {{ module }}.controls = [nav, draw_ctl];
+      ictls.splice(0, 0, nav);
     } else {
-      {{ module }}.controls = [nav];
+      ctls = [nav];
     }
   }
+  {{ module }}.controls = ctls;
 }
+
 {{ module }}.init = function(){
     {% block map_options %}// The options hash, w/ zoom, resolution, and projection settings.
     var options = {
@@ -129 +171 @@
       if ({{ module }}.is_collection){
         // If geometry collection, add each component individually so they may be
         // edited individually.
+        if ({{ module }}.collection_type == 'Any') {
+          {{ module }}.layers.vector.addFeatures(admin_geom);
+          var admin_bounds = new OpenLayers.Bounds();
+          for(var i = 0; i < {{ module }}.num_geom; i++){
+            admin_bounds.extend(admin_geom[i].geometry.getBounds());
+          }
+        } else {
         for (var i = 0; i < {{ module }}.num_geom; i++){
           {{ module }}.layers.vector.addFeatures([new OpenLayers.Feature.Vector(admin_geom.geometry.components[i].clone())]);
         }
+          var admin_bounds = admin_geom.geometry.getBounds();
+        }
       } else {
         {{ module }}.layers.vector.addFeatures([admin_geom]);
+        var admin_bounds = admin_geom.geometry.getBounds();
       }
       // Zooming to the bounds.
-      {{ module }}.map.zoomToExtent(admin_geom.geometry.getBounds());
+      {{ module }}.map.zoomToExtent(admin_bounds);
       if ({{ module }}.is_point){
           {{ module }}.map.zoomTo({{ point_zoom }});
       }