Changeset 841

Timestamp:

08/29/08 04:42:32 (3 months ago)

Author:

ayunyan

Message:

plugin:googlemaps added map parameters (_size, _markers, _controls)

Location:

plugins/googlemaps/trunk

Files:

• googlemaps.plugin.php (modified) (2 diffs)
• js/googlemaps.js (modified) (3 diffs)

plugins/googlemaps/trunk/googlemaps.plugin.php

@@ -28 +28 @@
             'license' => 'Apache License 2.0',
             'description' => 'easily/quickly insert Google Maps into your posts.',
+            'guid' => '14c8414f-6cdf-11dd-b14a-001b210f913f'
             );
     }
@@ -74 +75 @@
     public function action_update_check()
     {
-        Update::add('Google Maps', '14c8414f-6cdf-11dd-b14a-001b210f913f', $this->info->version);
+        Update::add('Google Maps', $this->info->guid, $this->info->version);
     }
 

plugins/googlemaps/trunk/js/googlemaps.js

@@ -45 +45 @@
             }
 
+            var width = 0;
+            var height = 0;
+            var _size_r = query.match(/(\?|&|&)_size=(\d+)x(\d+)/);
+            if (_size_r) {
+                width = _size_r[2];
+                height = _size_r[3];
+            }
+
+            var controls = '';
+            var _controls_r = query.match(/(\?|&|&)_controls=(none)/);
+            if (_controls_r) {
+                controls = _controls_r[2];
+            }
+
+            var markers = [];
+            var _markers_r = query.match(/(\?|&|&)_markers=([\d\-\.\,\|]+)/);
+            if (_markers_r) {
+                $.each(_markers_r[2].split('|'), function(k, marker) {
+                    marker = marker.split(',');
+                    markers.push(new google.maps.LatLng(marker[0], marker[1]));
+                });
+            }
+
             canvas = $('<div class="googlemaps-canvas"></div>');
             $(this).replaceWith(canvas);
 
             if (layer == 'c') {
-                canvas.width(habari_googlemaps.streetview_width);
-                canvas.height(habari_googlemaps.streetview_height);
+                if (width == 0 || height == 0) {
+                    width = habari_googlemaps.streetview_width;
+                    height = habari_googlemaps.streetview_height;
+                }
+                canvas.width(width);
+                canvas.height(height);
                 var pov = { yaw: cbp[1], pitch: cbp[4], zoom: cbp[3] };
                 options = { latlng: new google.maps.LatLng(cblat, cblng), pov: pov };
@@ -61 +88 @@
                 });
             } else {
-                map = new google.maps.Map2(canvas.get(0), {size: new GSize(habari_googlemaps.map_width, habari_googlemaps.map_height)});
-                map.addControl(new google.maps.MapTypeControl());
-                map.addControl(new google.maps.LargeMapControl());
+                if (width == 0 || height == 0) {
+                    width = habari_googlemaps.map_width;
+                    height = habari_googlemaps.map_height;
+                }
+                map = new google.maps.Map2(canvas.get(0), {size: new GSize(width, height)});
+                if (controls != 'none') {
+                    map.addControl(new google.maps.MapTypeControl());
+                    map.addControl(new google.maps.LargeMapControl());
+                }
                 map.enableScrollWheelZoom();
                 map.enableContinuousZoom();
@@ -74 +107 @@
                     map.setMapType(G_NORMAL_MAP);
                 }
+
+                $.each(markers, function(k, marker) {
+                    map.addOverlay(new google.maps.Marker(marker));
+                });
             }
         });