Changeset 403

Timestamp:

07/14/06 13:08:34 (4 years ago)

Author:

piv

Message:

added overlay switching functionality

Location:

qPloneGoogleMaps/trunk

Files:

• Extensions/Install.py (modified) (4 diffs)
• content/Map.py (modified) (1 diff)
• skins/qPloneGoogleMaps/map_view.pt (modified) (1 diff)
• skins/qPloneGoogleMaps/map_widget.pt (modified) (1 diff)
• skins/qPloneGoogleMaps/maps_markers.py (modified) (6 diffs)
• skins/qPloneGoogleMaps/marker_view.pt (modified) (1 diff)
• skins/qPloneGoogleMaps/portlet_maps.pt (modified) (1 diff)
• skins/qPloneGoogleMaps/portlet_overlays.pt (added)
• skins/qPloneGoogleMaps/switchOverlays.py (added)

qPloneGoogleMaps/trunk/Extensions/Install.py

@@ -90 +90 @@
             right_slots = list(right_slots) + [slot,]
             self.right_slots = right_slots
-            out.write('Added maps portlet to right_slots property.\n')
+            out.write('Added %s portlet to right_slots property.\n' % slot)
 
 def removePortlet(self, out, slot):
@@ -99 +99 @@
         right_slots.remove(slot)
         self.right_slots = right_slots
-        out.write('Removed maps portlet from right slots property.\n')
+        out.write('Removed %s portlet from right slots property.\n' % slot)
 
 def setupSkin(self, out, skinFolder):
@@ -153 +153 @@
     installContentTypes(self, out)
 
-    # add portlet to right slot
+    # add portlets to right slot
     addPortlet(self, out, 'here/portlet_maps/macros/portlet')
+    addPortlet(self, out, 'here/portlet_overlays/macros/portlet')
 
     # add map view template to the topic portal type
@@ -174 +175 @@
     removeCatalogColumn(self, 'geoLocation', out)
 
-    # remove portlet from right slot
+    # remove portlets from right slot
     removePortlet(self, out, 'here/portlet_maps/macros/portlet')
+    removePortlet(self, out, 'here/portlet_overlays/macros/portlet')
 
     # remove map view template from the topic portal type

qPloneGoogleMaps/trunk/content/Map.py

@@ -163 +163 @@
             if el.portal_type == 'Overlay':
                 color = el.getMarkersColor()
-                markers = el.getMarkers()
+                markers =  el.getMarkers()
             elif el.portal_type == 'Marker':
                 color = el.getColor()
                 markers = list(catalog(path='/'.join(el.getPhysicalPath())))
             else: continue
-            result[color] = result.get(color, []) + markers
+            result[(el.getId(),color)] = result.get(el.getId(), []) + markers
         return result
 

qPloneGoogleMaps/trunk/skins/qPloneGoogleMaps/map_view.pt

@@ -22 +22 @@
     </div>
 
+    <h1 tal:content="here/pretty_title_or_id" class="documentFirstHeading">
+      Title or id
+    </h1>
+
     <div metal:use-macro="here/document_byline/macros/byline">
       Get the byline - contains details about author and modification date.

qPloneGoogleMaps/trunk/skins/qPloneGoogleMaps/map_widget.pt

@@ -39 +39 @@
                      tal:attributes="tabindex tabindex/next"></div>
             <tal:block define="coord python:test(latitude and longitude, (latitude, longitude), None);
-                               longlat python:test(here.getOverlayMarkers, here.getOverlayMarkers(), []);"
+                               longlat here/getOverlayMarkers|python:[]"
                        replace="structure python:context.edit_js(coord, longlat)" />
         </metal:fill>

qPloneGoogleMaps/trunk/skins/qPloneGoogleMaps/maps_markers.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters= longlat=[], node, controls='nothing', maptype='hybrid', overviewControls=None, typeControls=None, events=False, color='default', zoom=None, loc=(37.4419, -122.1419), mapevents=None, auto='None'
+##parameters= longlat=[], node, controls='nothing', maptype='hybrid', overviewControls=None, typeControls=None, events=False, color='default', zoom=None, loc=(37.4419, -122.1419), mapevents=None, auto='Full'
 ##title=
 ##
@@ -33 +33 @@
     lat = [float(e.geoLocation[0]) for el in longlat.values() for e in el]
     lon = [float(e.geoLocation[1]) for el in longlat.values() for e in el]
-    sMarkers = "\n".join(["""addMarker(%f, %f, "%s", "%s/view", "%s", "%s");""" % (float(e.geoLocation[0]), float(e.geoLocation[1]), e.Title, e.getURL(), processDesc(e.Description), el) for el, value in longlat.items() for e in value])
+    #raise str(longlat.items()[0][1].items()[0][1])
+#{id:{color:[markers]}}
+    sMarkers = "\n".join(["""
+addMarker(%(lt)f, %(lg)f, "%(title)s", "%(url)s/view", "%(desc)s", "%(c)s");
+typeof(overLays["%(id)s"])=='undefined'?overLays["%(id)s"]=[]:'';
+overLays["%(id)s"].push([%(lt)f, %(lg)f, "%(title)s", "%(url)s/view", "%(desc)s", "%(c)s"]);
+""" % {'lt':float(e.geoLocation[0]),
+       'lg':float(e.geoLocation[1]),
+       'title':e.Title,
+       'url':e.getURL(),
+       'desc':processDesc(e.Description),
+       'c':el[1],
+       'id':el[0]} for el, value in longlat.items() for e in value])
 elif longlat:
     lat = [float(el.geoLocation[0]) for el in longlat]
@@ -39 +51 @@
     sMarkers = "\n".join(["""addMarker(%f, %f, "%s", "%s/view", "%s", "%s");""" % (float(el.geoLocation[0]), float(el.geoLocation[1]), el.Title, el.getURL(), processDesc(el.Description), color) for el in longlat])
 
-if controls == 'large': sControls += "map.addControl(new GLargeMapControl());"
-elif controls == 'small': sControls += "map.addControl(new GSmallMapControl());"
-if typeControls: sControls += "map.addControl(new GMapTypeControl());"
+if controls == 'large': sControls += "map.addControl(new GLargeMapControl());\n"
+elif controls == 'small': sControls += "map.addControl(new GSmallMapControl());\n"
+if typeControls: sControls += "map.addControl(new GMapTypeControl());\n"
 if overviewControls: sControls += "map.addControl(new GOverviewMapControl());\n"
 
@@ -89 +101 @@
 //<![CDATA[
 
-function registerUnloadFunction(func){
-  if (window.addEventListener) window.addEventListener("unload", func, false);
-  else if (window.attachEvent) window.attachEvent("onunload", func);
+function addEvent(el, evt, func){
+  if (el.addEventListener) el.addEventListener(evt, func, false);
+  else if (el.attachEvent) el.attachEvent("on"+evt, func);
 };
 
@@ -97 +109 @@
   if (GBrowserIsCompatible()) {
 
-    var map = new GMap2(document.getElementById('%(node)s'));
+    map = new GMap2(document.getElementById('%(node)s'));
     %(controls)s
     map.setCenter(new GLatLng(%(lt)f, %(ln)f), %(zoom)s, %(maptype)s);
-    var opt = map.getInfoWindow();
+    var opt = map.getInfoWindow(), overLays = {};
     opt.maxWidth = 400;
 
@@ -116 +128 @@
       map.addOverlay(marker);
       %(event)s
-    }
+    };
     %(mapevents)s
     %(markers)s
     %(defaults)s
+
+    if (typeof(getData) == 'function') {
+        var over_obj = getData();
+        if (over_obj) {
+            for (var i=0; i < over_obj['boxes'].length; i++) addEvent(over_obj['boxes'][i], 'click',
+                function (){
+                    map.clearOverlays();
+                    var bs = getData();
+                    for (id in bs) {
+                        if (bs[id] == true) {
+                            for (var j=0; j < overLays[id].length; j++) {
+                                var opts = overLays[id][j];
+                                //alert(opts);
+                                addMarker(opts[0], opts[1], opts[2], opts[3], opts[4], opts[5]);
+                            };
+                        }
+                    };
+                });
+        }
+    };
+
   }
   else window.alert("Google maps aren't compatible with current Browser.");
 };
 
-registerPloneFunction(onLoadMap);
-registerUnloadFunction(GUnload);
+addEvent(window, 'load', onLoadMap);
+addEvent(window, 'unload', GUnload);
 
 //]]>

qPloneGoogleMaps/trunk/skins/qPloneGoogleMaps/marker_view.pt

@@ -9 +9 @@
             tal:attributes="src string:http://maps.google.com/maps?file=api&v=2&key=${key}">
     </script>
-    <span tal:replace="structure python:here.maps_markers(here.portal_catalog(path='/'.join(here.getPhysicalPath())), node='map', events=True, loc=here.geoLocation(), controls='large', typeControls=True, overviewControls=True, color=here.getColor(), zoom=6)" />
+    <span tal:replace="structure python:here.maps_markers(here.portal_catalog(path='/'.join(here.getPhysicalPath())), node='map', events=True, loc=here.geoLocation(), controls='large', typeControls=True, overviewControls=True, color=here.getColor(), zoom=6, auto='None')" />
 
   </metal:block>

qPloneGoogleMaps/trunk/skins/qPloneGoogleMaps/portlet_maps.pt

@@ -12 +12 @@
             tal:attributes="src string:http://maps.google.com/maps?file=api&v=2&key=${key}">
     </script>
-    <span tal:replace="structure python:here.maps_markers(longlat, loc=longlat[0].geoLocation, zoom=5, node='portlet_map', controls='small')" />
+    <span tal:replace="structure python:here.maps_markers(longlat, loc=longlat[0].geoLocation, zoom=5, node='portlet_map', controls='small', auto='None')" />
 
 <dl class="portlet" id="portlet-maps">