Applied initial patch

ornicar · Apr 27, 2010 · a22527d · a22527d
1 parent 7b8e6a8
commit a22527d
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 8 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.markdown b/README.markdown
diff --git a/config/dm/assets.yml b/config/dm/assets.yml
diff --git a/config/dm/services.yml b/config/dm/services.yml
diff --git a/config/dm/widget_types.yml b/config/dm/widget_types.yml
diff --git a/lib/dmWidget/dmWidgetGoogleMapShowForm.php b/lib/dmWidget/dmWidgetGoogleMapShowForm.php
diff --git a/lib/dmWidget/dmWidgetGoogleMapShowView.php b/lib/dmWidget/dmWidgetGoogleMapShowView.php
@@ -9,6 +9,7 @@ public function configure()
 
     $this->addRequiredVar(array(
       'address',
+      'json',
       'mapTypeId',
       'zoom',
       'navigationControl',
@@ -24,6 +25,7 @@ protected function doRender()
 
     $map = $this->getService('google_map_helper')->map()
     ->address($vars['address'])
+    ->json($vars['json'])
     ->mapTypeId($vars['mapTypeId'])
     ->zoom($vars['zoom'])
     ->style(sprintf(
@@ -50,4 +52,4 @@ protected function doRenderForIndex()
     return $vars['address'];
   }
 
-}
+}
diff --git a/lib/helper/DmGoogleMapHelper.php b/lib/helper/DmGoogleMapHelper.php
diff --git a/lib/view/dmGoogleMapHelper.php b/lib/view/dmGoogleMapHelper.php
diff --git a/lib/view/html/dmGoogleMapTag.php b/lib/view/html/dmGoogleMapTag.php
@@ -41,8 +41,14 @@ public function address($location)
     return $this->setOption('address', (string) $location);
   }
 
-  public function coords($latitude, $longitude)
+  public function json($json_url)
   {
+    return $this->setOption('json', (string) $json_url);
+  }
+
+  public function coords($latitude, $longitude, $showMarker = true)
+  {
+    $this->setOption('showMarker', $showMarker);
     return $this->setOption('coords', array($latitude, $longitude));
   }
 
@@ -109,7 +115,7 @@ protected function jsonifyAttributes(array $attributes)
 
   protected function getJsonAttributes()
   {
-    return array('address', 'coords', 'mapTypeId', 'zoom', 'navigationControl', 'mapTypeControl', 'scaleControl');
+    return array('address', 'coords', 'mapTypeId', 'zoom', 'navigationControl', 'mapTypeControl', 'scaleControl', 'json', 'showMarker');
   }
 
   public function getJavascripts()
@@ -124,4 +130,4 @@ public function getStylesheets()
   {
     return array();
   }
-}
+}
diff --git a/modules/dmWidgetGoogleMap/templates/_showForm.php b/modules/dmWidgetGoogleMap/templates/_showForm.php
diff --git a/web/js/dmGoogleMap.js b/web/js/dmGoogleMap.js
@@ -1,6 +1,6 @@
 (function($)
 {
-	$.fn.dmGoogleMap = function(opt)
+  $.fn.dmGoogleMap = function(opt)
   {
     if(typeof google == "undefined" || typeof google.maps == "undefined")
     {
@@ -15,9 +15,46 @@
       mapTypeId: google.maps.MapTypeId.HYBRID
     }, self.metadata(), opt || {}),
     map,
-    marker;
+    marker,
+    Markers = new Array(),
+    Infos = new Array();
 
-    if(options.coords)
+    if(options.json) {
+        coords = new google.maps.LatLng(options.coords[0], options.coords[1]);
+
+        map = new google.maps.Map(self.get(0), $.extend(options, { center: coords }));
+        if (options.showMarker == true) {
+          marker = new google.maps.Marker({
+              position: coords,
+              map: map
+          });
+        };
+
+        var json = $.parseJSON(options.json);
+        $.each(json.markers, function(indice, marker) {
+            Markers[indice] = new google.maps.Marker({
+                position: new google.maps.LatLng(marker.lat, marker.lng),
+                map: map,
+                clickable: true,
+                visible: true,
+                title: marker.title
+            });
+
+            Infos[indice] = new google.maps.InfoWindow({
+                content: marker.html
+            });
+
+            if (marker.image != undefined) {
+                Markers[indice].icon = marker.image;
+            }
+
+            google.maps.event.addListener(Markers[indice], 'click', function() {
+                Infos[indice].open(map, Markers[indice]);
+            });
+        });
+    }
+
+    else if(options.coords)
     {
       coords = new google.maps.LatLng(options.coords[0], options.coords[1]);
 
@@ -27,6 +64,7 @@
         map: map
       });
     }
+
     else if(options.address)
     {
       geocoder = new google.maps.Geocoder();
@@ -58,4 +96,4 @@
 
     return this;
   }
-})(jQuery);
+})(jQuery);
diff --git a/web/js/launcher.js b/web/js/launcher.js
diff --git a/web/js/widget/showForm.js b/web/js/widget/showForm.js