Changeset 332

Timestamp:

07/28/10 01:47:29 (19 months ago)

Author:

takanori

Message:

simple polyline support

Location:

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps

Files:

• content/GPolyline.py (modified) (2 diffs)
• profiles/default/types/GPolyline.xml (modified) (1 diff)
• skins/ATGoogleMaps/atgooglemaps.js.dtml (modified) (1 diff)
• skins/ATGoogleMaps/gmap.py (modified) (3 diffs)
• skins/ATGoogleMaps/gmap_view.pt (modified) (1 diff)
• skins/ATGoogleMaps/latlng_widget.pt (modified) (4 diffs)

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/content/GPolyline.py

@@ -31 +31 @@
     FloatField('opacity',
                default=1.0,
+               widget=StringWidget(
+                   label='Opacity',
+                   label_msgid='label_opacity',
+                   description_msgid='help_opacity',
+                   i18n_domain='googlemaps',
+                   size=8,
+                   )
                ),
     IntegerField('weight',
-                 default=2,
+                 default=5,
+                 widget=StringWidget(
+                     label='Weight',
+                     label_msgid='label_weight',
+                     description_msgid='help_weight',
+                     i18n_domain='googlemaps',
+                     size=8,
+                     )
                  ),
+    LinesField('coordinates',
+               widget=LinesWidget(
+                   label='Coordinates',
+                   label_msgid='label_path',
+                   description_msgid='help_path',
+                   i18n_domain='googlemaps',
+                   )
+               ),
     ),)
 gpolyline_schema = getattr(ATCTContent, 'schema', Schema(())).copy() + schema.copy()
@@ -59 +81 @@
         return latlng
 
+    # return coordinates array string
+    def getCoordinatesArray(self):
+        coordinates_array = "["
+        for coordinate in self.coordinates:
+             coordinates_array += "[%s]," % coordinate
+        coordinates_array = coordinates_array[:-1] + "]"
+        return coordinates_array
+
 registerType(GPolyline, PROJECTNAME)

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/profiles/default/types/GPolyline.xml

@@ -15 +15 @@
  <property name="allowed_content_types" />
  <property name="allow_discussion">False</property>
- <property name="default_view">gpolyline_view</property>
+ <property name="default_view">base_view</property>
  <property name="view_methods">
   <!-- <element value="banner_view"/> -->

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/atgooglemaps.js.dtml

@@ -85 +85 @@
     return marker;
 }
+
+function createPolyline(map, color, opacity, weight, title) {
+    var polyline = new google.maps.Polyline({
+        strokeColor: color,
+        strokeOpacity: opacity,
+        strokeWeight: weight
+    });
+
+    polyline.setMap(map);
+    return polyline;
+}
+
+function createPath(array) {
+    var mvcArray = new google.maps.MVCArray();
+    for (var i = 0; i < array.length; i++) {
+        mvcArray.push(new google.maps.LatLng(array[i][0], array[i][1]));
+    }
+    return mvcArray;
+}

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/gmap.py

@@ -1 +1 @@
 site_encoding =  context.plone_utils.getSiteEncoding()
 
+def add_polylines(js, items):
+    for index in range(len(items)):
+        polyline = items[index].getObject()
+        js.append('  var polyline_%d = createPolyline(map, "%s", %f, %d, "%s");'
+                  % (index, polyline.color, polyline.opacity, polyline.weight, polyline.title))
+        js.append('  polyline_%d.setPath(createPath(%s));' % (index, polyline.getCoordinatesArray()))
+    
 def add_markers(js, items):
     for index in range(len(items)):
@@ -6 +13 @@
         lat = marker.point['latitude']
         lng = marker.point['longitude']
-        js.append('  var marker_%d = createMarker(map, %s, %s, "%d", "%s");' % (index, lat, lng, index, marker.title))
+        js.append('  var marker_%d = createMarker(map, %s, %s, "%d", "%s");'
+                  % (index, lat, lng, index, marker.title))
 
 # create initialize method
@@ -16 +24 @@
                ))
 
-    add_markers(js, context.getFolderContents())
+    add_markers(js, context.getFolderContents({'portal_type': 'GMarker'}))
+    add_polylines(js, context.getFolderContents({'portal_type': 'GPolyline'}))
 
     js.append('}')

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/gmap_view.pt

@@ -35 +35 @@
     <!-- gmarker -->
     <div class="gmarkerBox"
-         tal:define="folderContents context/getFolderContents;
+         tal:define="folderContents python:context.getFolderContents({'portal_type': 'GMarker'});
                      normalizeString nocall:context/@@plone/normalizeString;">
       <ul class="gmarkerBlock">

Products.ATGoogleMaps/trunk/Products/ATGoogleMaps/skins/ATGoogleMaps/latlng_widget.pt

@@ -18 +18 @@
       <tal:block tal:define="latitude value/latitude | string:35.7317;
                              longitude value/longitude | string:139.7278;
-                             zoom python:test(value, '14', '4');
-                             Iterator python:modules['Products.CMFPlone'].IndexIterator;
-                 tabindex python:Iterator(mainSlot=False);">
+                             zoom python:test(value, '14', '4');">
 
         <span tal:replace="structure context/latlng_map" />
@@ -32 +30 @@
                value=""
                size="12"
-               tabindex="#"
                tal:attributes="name string:${fieldName}.latitude:record:ignore_empty;
                                value latitude;
                                size widget/size;
-                               maxlength widget/maxlength;
-                               tabindex tabindex/next;"
+                               maxlength widget/maxlength;"
                />
         
@@ -48 +44 @@
                value=""
                size="12"
-               tabindex="#"
                tal:attributes="name string:${fieldName}.longitude:record:ignore_empty;
                                value longitude;
                                size widget/size;
-                               maxlength widget/maxlength;
-                               tabindex tabindex/next;"
+                               maxlength widget/maxlength;"
                />
 
@@ -67 +61 @@
         <input class="standalone" type="button" id="s"
                value="Search"
-               tabindex=""
                onclick="geocode();"
                i18n:domain="plone"
                i18n:attributes="value label_search;"
-               tal:attributes="tabindex tabindex/next;"
                />
 
-        <div id="map_canvas" style="height: 300px; width: 400px;">
+        <div id="map_canvas" style="height: 500px;">
         <div id="crosshair"></div>
         </div>