Changeset 253

Timestamp:

Apr 20, 2010, 9:07:14 AM (13 years ago)

Author:

Andrej Dundović

Message:

dodan X na popup, ticket #58

File:

• linux-za-sve/karta/frontend/js/LinuxMap.js (modified) (2 diffs)

linux-za-sve/karta/frontend/js/LinuxMap.js

@@ -6 +6 @@
     var map, layer, drawControls, selectControl, selectedFeature;; //complex object of type OpenLayers.Map
  
-        function onPopupClose( feature ) {
-            selectControl.unselect(selectedFeature);
+        function onPopupClose(evt) {
+            drawControls['select'].unselectAll();
         }
-        function onFeatureSelect( feature ) {
-            selectedFeature = feature;
+        function onFeatureSelect(event) {
+            var feature = event.feature;
             OpenLayers.Popup.FramedCloud.prototype.autoSize = false;
+            var content = "<h2>"+feature.attributes.title + "</h2>" + feature.attributes.description;
 
             popup = new OpenLayers.Popup.FramedCloud("marker", 
                                      feature.geometry.getBounds().getCenterLonLat(),
-                                     new OpenLayers.Size(215, 210),
-                                     "<h2>"+feature.attributes.title + "</h2>" +
-                                          feature.attributes.description,
-                                     null, false, onPopupClose);
+                                     new OpenLayers.Size(245, 225),
+                                     content,
+                                     null, true, onPopupClose);
             feature.popup = popup;
-            popup.feature = feature;
-            map.addPopup( popup );
+            map.addPopup(popup);
         }
-        function onFeatureUnselect(feature) {
-            map.removePopup(feature.popup);
-            feature.popup.destroy();
-            feature.popup = null;
+        function onFeatureUnselect(event) {
+            var feature = event.feature;
+            if(feature.popup) {
+                map.removePopup(feature.popup);
+                feature.popup.destroy();
+                delete feature.popup;
+            }
         }
 
@@ -82 +84 @@
 
             drawControls = {
-                polygon: new OpenLayers.Control.DrawFeature(markeri,
-                            OpenLayers.Handler.Polygon),
-                select: new OpenLayers.Control.SelectFeature(markeri, {onSelect: onFeatureSelect, onUnselect: onFeatureUnselect})
+                polygon: new OpenLayers.Control.DrawFeature(markeri, OpenLayers.Handler.Polygon),
+                select: new OpenLayers.Control.SelectFeature(markeri)
             };
+            markeri.events.on({
+                "featureselected": onFeatureSelect,
+                "featureunselected": onFeatureUnselect
+            });
 
             map.addControl(drawControls['select']);