Changeset 1546

Timestamp:

Oct 3, 2010, 3:11:59 AM (10 years ago)

Author:

goya

Message:

correction cartes

Location:

cpc/trunk/project/apps/frontend/modules

Files:

• circonscription/actions/actions.class.php (modified) (4 diffs)
• solr/actions/actions.class.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/circonscription/actions/actions.class.php

@@ -172 +172 @@
 
     $paths = $dom->getElementsByTagName('path');
+    sfProjectConfiguration::getActive()->loadHelpers(array('Url'));
 
     foreach ($paths as $path)
@@ -294 +295 @@
   }
 
-  /* $circo is a three digits string, or "full" for the full map */
-  public static function echoCircoMap($circo, $w, $h)
+  private static function prepareMap($circo, $w, $h)
   {
     $dom = self::generateSvgDom($circo, $w, $h);
@@ -304 +304 @@
       $regexp = "/^$circo-(0[1-9]|[1-9]\d)$/";
 
-    $r = self::compute_areas($dom, $w, $h, $regexp);
+    return array($dom, self::compute_areas($dom, $w, $h, $regexp));
+  }
+
+  /* $circo is a three digits string, or "full" for the full map */
+  public static function echoCircoMap($circo, $w, $h)
+  {
+    $arr = self::prepareMap($circo, $w, $h);
+    $r = $arr[1];
     $w = $r['w'];
     $h = $r['h'];
@@ -326 +333 @@
      * http://www.php.net/manual/en/function.imagick-setresolution.php
      */
-
-    $dom = self::generateSvgDom($circo, $w, $h);
+    $arr = self::prepareMap($circo, $w, $h);
+    $dom = $arr[0];
+    $r = $arr[1];
+    $w = $r['w'];
+    $h = $r['h'];
 
     $im = new Imagick();

cpc/trunk/project/apps/frontend/modules/solr/actions/actions.class.php

@@ -30 +30 @@
       return '<img width="53" src="'.url_for('@photo_citoyen?slug='.$obj->getSlug()).'"/>';
     case 'NonObjectPage':
-      return '<img width="53" src="'.url_for("@circo_image_png?circo=".strtolower(Parlementaire::getNumeroDepartement(str_replace(' ', '_', preg_replace('/^.*\/([^\/]+)$/', '\\1', $obj->getLink()))))."&w=53&h=0").'"/>';
+      $num = strtolower(Parlementaire::getNumeroDepartement(str_replace(' ', '_', preg_replace('/^.*\/([^\/]+)$/', '\\1', $obj->getLink()))));
+      if (preg_match('/^\d$/', $num))
+        $num = sprintf("%02d",$num);
+      if (preg_match('/\d[a-z]/i', $num))
+        $fixednum = '0'.$num;
+      else $fixednum = sprintf('%03d',$num);
+      return '<img width="53" src="'.url_for("@circo_image_png?circo=".$fixednum."&w=53&h=0").'"/>';
     }
   }